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

More harcoded translations + Spanish

This commit is contained in:
kruks23 2014-05-24 00:17:42 +02:00
parent d6fd0343ae
commit d74faa3f7c
7 changed files with 54 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
res/layout/activity_muc_details.xml
View File

@ -13,7 +13,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
android:text="Conference" />
android:text="@string/muc_details_conference" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -28,7 +28,7 @@
android:layout_toLeftOf="@+id/muc_edit_subject"
android:background="#eee"
android:ems="10"
android:hint="Conferenece Subject"
android:hint="@string/muc_details_conference_subject"
android:inputType="textAutoComplete"
android:paddingBottom="12dp"
android:paddingLeft="8dp"
@ -62,7 +62,7 @@
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingTop="8dp"
android:text="Your Nickname" />
android:text="@string/muc_details_your_nickname" />
<RelativeLayout
android:layout_width="match_parent"
@ -78,7 +78,7 @@
android:layout_toLeftOf="@+id/muc_edit_nick"
android:background="#eee"
android:ems="10"
android:hint="Your nickname"
android:hint="@string/muc_details_your_nickname"
android:inputType="textEmailAddress"
android:paddingBottom="12dp"
android:paddingLeft="8dp"
@ -119,7 +119,7 @@
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingTop="8dp"
android:text="Other Members" />
android:text="@string/muc_details_other_members" />
<LinearLayout
android:id="@+id/muc_members"

2
res/layout/activity_new_conversation.xml
View File

@ -23,7 +23,7 @@
android:layout_alignParentTop="true"
android:background="#eee"
android:ems="10"
android:hint="Search or enter Jabber ID"
android:hint="@string/search_jabber_id"
android:inputType="textEmailAddress"
android:paddingBottom="12dp"
android:paddingLeft="8dp"

14
res/layout/edit_account_dialog.xml
View File

@ -9,7 +9,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
android:text="Jabber ID:" />
android:text="@string/account_settings_jabber_id" />
@ -19,7 +19,7 @@
android:layout_height="wrap_content"
android:ems="10"
android:inputType="textEmailAddress"
android:hint="username@example.com">
android:hint="@string/account_settings_example_jabber_id">
</EditText>
@ -30,7 +30,7 @@
android:id="@+id/textView1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Password:"
android:text="@string/account_settings_password"
android:textSize="14sp"/>
<EditText
@ -39,14 +39,14 @@
android:layout_height="wrap_content"
android:ems="10"
android:inputType="textPassword"
android:hint="Password"
android:hint="@string/password"
android:fontFamily="sans-serif" />
<CheckBox
android:id="@+id/edit_account_register_new"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Register a new account on server"/>
android:text="@string/register_account"/>
<TextView
@ -54,7 +54,7 @@
android:id="@+id/account_confirm_password_desc"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Confirm password:"
android:text="@string/account_settings_confirm_password"
android:textSize="14sp"
android:visibility="gone"/>
@ -64,7 +64,7 @@
android:layout_height="wrap_content"
android:ems="10"
android:inputType="textPassword"
android:hint="Confirm password"
android:hint="@string/confirm_password"
android:visibility="gone"
android:fontFamily="sans-serif" />

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

@ -28,6 +28,8 @@
<string name="encrypted_message">Desencriptando mensaje. Espera por favor&#8230;</string>
<string name="conference_details">Detalles de la conferencia</string>
<string name="nick_in_use">El apodo ya está en uso</string>
<string name="admin">Administrador</string>
<string name="owner">Propietario</string>
<string name="moderator">Moderador</string>
<string name="participant">Participante</string>
<string name="visitor">Visitante</string>
@ -46,6 +48,7 @@
<string name="new_conference">Crear nueva conferencia</string>
<string name="new_contact">Crear nuevo contacto</string>
<string name="contacts">Contactos</string>
<string name="search_jabber_id">Busca o escribe identificador Jabber</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>
@ -57,6 +60,7 @@
<string name="yes">Sí</string>
<string name="no">No</string>
<string name="ok">Ok</string>
<string name="done">Hecho</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>
@ -97,7 +101,7 @@
<string name="files">archivos</string>
<string name="otr_messages">Mensajes encriptados con OTR</string>
<string name="manage_account">Gestionar cuenta</string>
<string name="contact_offline">Tu contacto está desconectado</string>
<string name="contact_offline">El contacto está desconectado</string>
<string name="contact_offline_otr">Desgraciadamente no es posible enviar mensajes encriptados con OTR a un contacto desconectado.\n¿Quieres enviar el mensaje en texto plano?</string>
<string name="contact_offline_file">Desgraciadamente no es posible enviar archivos a un contacto desconectado.</string>
<string name="send_unencrypted">Enviar sin encriptar</string>
@ -108,7 +112,7 @@
<string name="install">Instalar</string>
<string name="offering">ofreciendo&#8230;</string>
<string name="no_pgp_key">Clave openPGP no encontrada</string>
<string name="contact_has_no_pgp_key">Conversations no ha podido encriptar tus mensajes porque tu contacto no está anunciando su clave publica.\n\n<small>Por favor, pide a tu contacto que configure openPGP.</small></string>
<string name="contact_has_no_pgp_key">Conversations no ha podido encriptar tus mensajes porque el contacto no está anunciando su clave publica.\n\n<small>Por favor, pide a tu contacto que configure openPGP.</small></string>
<string name="encrypted_message_received"><i>Mensaje encriptado recibido. Pulsa para ver.</i></string>
<string name="encrypted_image_received"><i>Imagen encriptada recibida. Pulsa para ver.</i></string>
<string name="image_file"><i>Imagen recibida. Pulsa para ver</i></string>
@ -185,9 +189,16 @@
<string name="mgmt_account_delete">Eliminar cuenta</string>
<string name="mgmt_account_disable">Deshabilitar temporalmente</string>
<string name="mgmt_account_enable">Habilitar</string>
<string name="mgmt_account_are_you_sure">¿Estás seguro?</string>
<string name="mgmt_account_delete_confirm_text">Si eliminas tu cuenta tu historial completo de conversaciones se perderá</string>
<string name="attach_record_voice">Grabar audio</string>
<string name="account_settings">Configuración de cuenta</string>
<string name="save">Guardar</string>
<string name="account_settings_jabber_id">Identificador Jabber:</string>
<string name="account_settings_password">Contraseña:</string>
<string name="account_settings_example_jabber_id">usuario@ejemplo.com</string>
<string name="account_settings_confirm_password">Confirmar contraseña:</string>
<string name="password">Contraseña</string>
<string name="confirm_password">Confirmar contraseña</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>
@ -198,4 +209,8 @@
<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>
<string name="muc_details_conference">Conferencia</string>
<string name="muc_details_conference_subject">Ausnto de la Conferencia</string>
<string name="muc_details_your_nickname">Tu apodo</string>
<string name="muc_details_other_members">Otros Miembros</string>
</resources>

17
res/values/strings.xml
View File

@ -28,6 +28,8 @@
<string name="encrypted_message">Decrypting message. Please wait&#8230;</string>
<string name="conference_details">Conference Details</string>
<string name="nick_in_use">Nickname is already in use</string>
<string name="admin">Admin</string>
<string name="owner">Owner</string>
<string name="moderator">Moderator</string>
<string name="participant">Participant</string>
<string name="visitor">Visitor</string>
@ -46,6 +48,7 @@
<string name="new_conference">Create new conference</string>
<string name="new_contact">Create new contact</string>
<string name="contacts">Contacts</string>
<string name="search_jabber_id">Search or enter Jabber ID</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>
@ -57,6 +60,7 @@
<string name="yes">Yes</string>
<string name="no">No</string>
<string name="ok">Ok</string>
<string name="done">Done</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>
@ -185,9 +189,16 @@
<string name="mgmt_account_delete">Delete</string>
<string name="mgmt_account_disable">Temporarily disable</string>
<string name="mgmt_account_enable">Enable</string>
<string name="mgmt_account_are_you_sure">Are you sure?</string>
<string name="mgmt_account_delete_confirm_text">If you delete your account your entire conversation history will be lost</string>
<string name="attach_record_voice">Record voice</string>
<string name="account_settings">Account Settings</string>
<string name="save">Save</string>
<string name="account_settings_jabber_id">Jabber ID:</string>
<string name="account_settings_password">Password:</string>
<string name="account_settings_example_jabber_id">username@example.com</string>
<string name="account_settings_confirm_password">Confirm password:</string>
<string name="password">Password</string>
<string name="confirm_password">Confirm password</string>
<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>
@ -198,4 +209,8 @@
<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>
<string name="muc_details_conference">Conference</string>
<string name="muc_details_conference_subject">Conference Subject</string>
<string name="muc_details_your_nickname">Your nickname</string>
<string name="muc_details_other_members">Other Members</string>
</resources>

10
src/eu/siacs/conversations/ui/ManageAccountActivity.java
View File

@ -261,10 +261,10 @@ public class ManageAccountActivity extends XmppActivity {
mode.finish();
} else if (item.getItemId()==R.id.mgmt_account_delete) {
AlertDialog.Builder builder = new AlertDialog.Builder(activity);
builder.setTitle("Are you sure?");
builder.setTitle(getString(R.string.mgmt_account_are_you_sure));
builder.setIconAttribute(android.R.attr.alertDialogIcon);
builder.setMessage("If you delete your account your entire conversation history will be lost");
builder.setPositiveButton("Delete", new OnClickListener() {
builder.setMessage(getString(R.string.mgmt_account_delete_confirm_text));
builder.setPositiveButton(getString(R.string.delete), new OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
@ -273,7 +273,7 @@ public class ManageAccountActivity extends XmppActivity {
mode.finish();
}
});
builder.setNegativeButton("Cancel",null);
builder.setNegativeButton(getString(R.string.cancel),null);
builder.create().show();
} else if (item.getItemId()==R.id.mgmt_account_announce_pgp) {
if (activity.hasPgp()) {
@ -293,7 +293,7 @@ public class ManageAccountActivity extends XmppActivity {
noFingerprintView.setVisibility(View.GONE);
}
builder.setView(view);
builder.setPositiveButton("Done", null);
builder.setPositiveButton(getString(R.string.done), null);
builder.create().show();
} else if (item.getItemId() == R.id.mgmt_account_info) {
AlertDialog.Builder builder = new AlertDialog.Builder(activity);

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

@ -153,11 +153,11 @@ public class MucDetailsActivity extends XmppActivity {
switch (self.getAffiliation()) {
case User.AFFILIATION_ADMIN:
mRoleAffiliaton.setText(getReadableRole(self.getRole())
+ " (Admin)");
+ " (" + getString(R.string.admin) + ")");
break;
case User.AFFILIATION_OWNER:
mRoleAffiliaton.setText(getReadableRole(self.getRole())
+ " (Owner)");
+ " (" + getString(R.string.owner) + ")");
break;
default:
mRoleAffiliaton