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

Merge pull request #145 from kruks23/development 

Title activities translations + contacts translations + update Spanish
This commit is contained in:
Daniel Gultsch 2014-05-23 16:58:58 +02:00
parent a0dde05ee5 d6fd0343ae
commit 600ab81010
5 changed files with 47 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
AndroidManifest.xml
View File

@ -39,7 +39,7 @@
<activity <activity
android:name="eu.siacs.conversations.ui.ConversationActivity" android:name="eu.siacs.conversations.ui.ConversationActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:label="Conversations" android:label="@string/title_activity_conversations"
android:windowSoftInputMode="stateHidden" > android:windowSoftInputMode="stateHidden" >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
@ -49,23 +49,23 @@
</activity> </activity>
<activity <activity
android:name="eu.siacs.conversations.ui.SettingsActivity" android:name="eu.siacs.conversations.ui.SettingsActivity"
android:label="Settings" android:label="@string/title_activity_settings"
android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity" > android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity" >
</activity> </activity>
<activity <activity
android:name="eu.siacs.conversations.ui.ManageAccountActivity" android:name="eu.siacs.conversations.ui.ManageAccountActivity"
android:label="Manage Accounts" android:label="@string/title_activity_manage_accounts"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize"
android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity" > android:parentActivityName="eu.siacs.conversations.ui.ConversationActivity" >
</activity> </activity>
<activity <activity
android:name="eu.siacs.conversations.ui.MucDetailsActivity" android:name="eu.siacs.conversations.ui.MucDetailsActivity"
android:label="Conference Details" android:label="@string/title_activity_conference_details"
android:windowSoftInputMode="stateHidden" > android:windowSoftInputMode="stateHidden" >
</activity> </activity>
<activity <activity
android:name="eu.siacs.conversations.ui.ContactDetailsActivity" android:name="eu.siacs.conversations.ui.ContactDetailsActivity"
android:label="Contact Details" android:label="@string/title_activity_contact_details"
android:windowSoftInputMode="stateHidden" > android:windowSoftInputMode="stateHidden" >
</activity> </activity>
<activity <activity
@ -85,7 +85,7 @@
</activity> </activity>
<activity <activity
android:name="eu.siacs.conversations.ui.ShareWithActivity" android:name="eu.siacs.conversations.ui.ShareWithActivity"
android:label="Conversations" android:label="@string/title_activity_conversations"
android:theme="@android:style/Theme.Holo.Light.DialogWhenLarge" android:theme="@android:style/Theme.Holo.Light.DialogWhenLarge"
android:icon="@drawable/ic_launcher"> android:icon="@drawable/ic_launcher">
<intent-filter> <intent-filter>

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

@ -15,6 +15,11 @@
<string name="action_delete_contact">Eliminar contacto de la lista</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="action_add_phone_book">Añadir a contactos del teléfono</string>
<string name="title_activity_contacts">Contactos</string> <string name="title_activity_contacts">Contactos</string>
<string name="title_activity_manage_accounts">Gestionar Cuentas</string>
<string name="title_activity_settings">Ajustes</string>
<string name="title_activity_conference_details">Detalles de Conferencia</string>
<string name="title_activity_contact_details">Detalles de Contacto</string>
<string name="title_activity_conversations">Conversations</string>
<string name="just_now">ahora</string> <string name="just_now">ahora</string>
<string name="minutes_ago">min</string> <string name="minutes_ago">min</string>
<string name="unread_conversations">conversaciones por leer</string> <string name="unread_conversations">conversaciones por leer</string>
@ -39,10 +44,19 @@
<string name="invite_contacts">Invitar contactos</string> <string name="invite_contacts">Invitar contactos</string>
<string name="invite_contacts_to_existing">Invitar a conferencia existente</string> <string name="invite_contacts_to_existing">Invitar a conferencia existente</string>
<string name="new_conference">Crear nueva conferencia</string> <string name="new_conference">Crear nueva conferencia</string>
<string name="new_contact">Crear nuevo contacto</string>
<string name="contacts">Contactos</string>
<string name="choose_account">Seleccionar cuenta</string>
<string name="multi_user_conference">Conferencia multiusuario</string>
<string name="trying_join_conference">¿Estás intentando unirte a una conferencia?</string>
<string name="cancel">Cancelar</string> <string name="cancel">Cancelar</string>
<string name="add">Añadir</string> <string name="add">Añadir</string>
<string name="edit">Editar</string> <string name="edit">Editar</string>
<string name="delete">Eliminar</string> <string name="delete">Eliminar</string>
<string name="save">Guardar</string>
<string name="yes">Sí</string>
<string name="no">No</string>
<string name="ok">Ok</string>
<string name="create_invite">Crear \u0026 Invitar</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="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> <string name="no_open_mucs">No hay conferencias existentes</string>
@ -130,7 +144,7 @@
<string name="accept">Aceptar</string> <string name="accept">Aceptar</string>
<string name="error">Ha ocurrido un error</string> <string name="error">Ha ocurrido un error</string>
<string name="pref_grant_presence_updates">Suscripción de presencia</string> <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="pref_grant_presence_updates_summary">Por defecto solicitar y conceder suscripciones de presencia de los contactos que has creado</string>
<string name="subscriptions">Suscripciones</string> <string name="subscriptions">Suscripciones</string>
<string name="subscription_updated">Suscripción actualizada</string> <string name="subscription_updated">Suscripción actualizada</string>
<string name="your_account">Tu cuenta</string> <string name="your_account">Tu cuenta</string>
@ -141,7 +155,7 @@
<string name="asked_for_presence_updates">Solictida 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_choose_picture">Seleccionar imagen</string>
<string name="attach_take_picture">Hacer foto</string> <string name="attach_take_picture">Hacer foto</string>
<string name="preemptively_grant">Por defecto otorgar peticiones de suscripción</string> <string name="preemptively_grant">Por defecto conceder solicitud de suscripción</string>
<string name="error_not_an_image_file">El archivo seleccionado no es una imagen</string> <string name="error_not_an_image_file">El archivo seleccionado no es una imagen</string>
<string name="error_compressing_image">Error convirtiendo el archivo de imagen</string> <string name="error_compressing_image">Error convirtiendo el archivo de imagen</string>
<string name="error_file_not_found">Archivo no encontrado</string> <string name="error_file_not_found">Archivo no encontrado</string>

14
res/values/strings.xml
View File

@ -15,6 +15,11 @@
<string name="action_add_phone_book">Add to phone book</string> <string name="action_add_phone_book">Add to phone book</string>
<string name="action_delete_contact">Delete from roster</string> <string name="action_delete_contact">Delete from roster</string>
<string name="title_activity_contacts">Contacts</string> <string name="title_activity_contacts">Contacts</string>
<string name="title_activity_manage_accounts">Manage Accounts</string>
<string name="title_activity_settings">Settings</string>
<string name="title_activity_conference_details">Conference Details</string>
<string name="title_activity_contact_details">Contact Details</string>
<string name="title_activity_conversations">Conversations</string>
<string name="just_now">just now</string> <string name="just_now">just now</string>
<string name="minutes_ago">min ago</string> <string name="minutes_ago">min ago</string>
<string name="unread_conversations">unread Conversations</string> <string name="unread_conversations">unread Conversations</string>
@ -39,10 +44,19 @@
<string name="invite_contacts">Invite Contacts</string> <string name="invite_contacts">Invite Contacts</string>
<string name="invite_contacts_to_existing">Invite to existing conference</string> <string name="invite_contacts_to_existing">Invite to existing conference</string>
<string name="new_conference">Create new conference</string> <string name="new_conference">Create new conference</string>
<string name="new_contact">Create new contact</string>
<string name="contacts">Contacts</string>
<string name="choose_account">Choose account</string>
<string name="multi_user_conference">Multi User Conference</string>
<string name="trying_join_conference">Are you trying to join a conference?</string>
<string name="cancel">Cancel</string> <string name="cancel">Cancel</string>
<string name="add">Add</string> <string name="add">Add</string>
<string name="edit">Edit</string> <string name="edit">Edit</string>
<string name="delete">Delete</string> <string name="delete">Delete</string>
<string name="save">Save</string>
<string name="yes">Yes</string>
<string name="no">No</string>
<string name="ok">Ok</string>
<string name="create_invite">Create \u0026 Invite</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="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> <string name="no_open_mucs">No existing conferences</string>

18
src/eu/siacs/conversations/ui/ContactsActivity.java
View File

@ -186,7 +186,7 @@ public class ContactsActivity extends XmppActivity {
AlertDialog.Builder builder = new AlertDialog.Builder(this); AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(getString(R.string.account_offline)); builder.setTitle(getString(R.string.account_offline));
builder.setMessage(getString(R.string.cant_invite_while_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.setIconAttribute(android.R.attr.alertDialogIcon);
builder.create().show(); builder.create().show();
return false; return false;
@ -289,12 +289,12 @@ public class ContactsActivity extends XmppActivity {
Contact newContact = new Contact(searchString); Contact newContact = new Contact(searchString);
newContact.resetOption(Contact.Options.IN_ROSTER); newContact.resetOption(Contact.Options.IN_ROSTER);
aggregatedContacts.add(newContact); aggregatedContacts.add(newContact);
contactsHeader.setText("Create new contact"); contactsHeader.setText(getString(R.string.new_contact));
} else { } else {
contactsHeader.setText("Contacts"); contactsHeader.setText(getString(R.string.contacts));
} }
} else { } else {
contactsHeader.setText("Contacts"); contactsHeader.setText(getString(R.string.contacts));
} }
contactsAdapter.notifyDataSetChanged(); contactsAdapter.notifyDataSetChanged();
@ -427,7 +427,7 @@ public class ContactsActivity extends XmppActivity {
} }
AlertDialog.Builder accountChooser = new AlertDialog.Builder(this); AlertDialog.Builder accountChooser = new AlertDialog.Builder(this);
accountChooser.setTitle("Choose account"); accountChooser.setTitle(getString(R.string.choose_account));
accountChooser.setItems(accountList, listener); accountChooser.setItems(accountList, listener);
return accountChooser.create(); return accountChooser.create();
} }
@ -435,9 +435,9 @@ public class ContactsActivity extends XmppActivity {
public void showIsMucDialogIfNeeded(final Contact clickedContact) { public void showIsMucDialogIfNeeded(final Contact clickedContact) {
if (clickedContact.couldBeMuc()) { if (clickedContact.couldBeMuc()) {
AlertDialog.Builder dialog = new AlertDialog.Builder(this); AlertDialog.Builder dialog = new AlertDialog.Builder(this);
dialog.setTitle("Multi User Conference"); dialog.setTitle(getString(R.string.multi_user_conference));
dialog.setMessage("Are you trying to join a conference?"); dialog.setMessage(getString(R.string.trying_join_conference));
dialog.setPositiveButton("Yes", new OnClickListener() { dialog.setPositiveButton(getString(R.string.yes), new OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
@ -445,7 +445,7 @@ public class ContactsActivity extends XmppActivity {
clickedContact.getAccount(), true); clickedContact.getAccount(), true);
} }
}); });
dialog.setNegativeButton("No", new OnClickListener() { dialog.setNegativeButton(getString(R.string.no), new OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {

4
src/eu/siacs/conversations/ui/EditAccount.java
View File

@ -82,8 +82,8 @@ public class EditAccount extends DialogFragment {
}); });
builder.setView(view); builder.setView(view);
builder.setNeutralButton(R.string.cancel, null); builder.setNeutralButton(getString(R.string.cancel), null);
builder.setPositiveButton(R.string.save, null); builder.setPositiveButton(getString(R.string.save), null);
return builder.create(); return builder.create();
} }