From 75b14a1d5c08d10b795b92e4f2b21035d773dc8c Mon Sep 17 00:00:00 2001 From: kruks23 Date: Thu, 29 May 2014 18:17:21 +0200 Subject: [PATCH] More harcoded translations + updated Spanish --- res/layout/server_info.xml | 20 ++++++++-------- res/layout/share_with.xml | 4 ++-- res/values-es/strings.xml | 21 ++++++++++++++-- res/values/strings.xml | 16 +++++++++++++ .../ui/ManageAccountActivity.java | 24 +++++++++---------- .../conversations/ui/ShareWithActivity.java | 2 +- 6 files changed, 60 insertions(+), 27 deletions(-) diff --git a/res/layout/server_info.xml b/res/layout/server_info.xml index 25e5a4715..499a20def 100644 --- a/res/layout/server_info.xml +++ b/res/layout/server_info.xml @@ -12,14 +12,14 @@ android:paddingLeft="8dp" android:paddingRight="8dp" android:paddingBottom="8dp" - android:text="Statistics" /> + android:text="@string/server_info_statistics" /> + android:text="@string/server_info_server_features" /> Detalles de Conferencia Detalles de Contacto Conversations + Compartir con Conversación ahora min conversaciones por leer @@ -61,6 +62,7 @@ No Ok Hecho + Ocultar 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 @@ -122,7 +124,7 @@ Recurso El nombre que identifica el cliente que estás utilizando Aceptar archivos - De forma automática aceptar archivos menores de… + De forma automática aceptar archivos menores que… Ajustes de notificación Notificaciones Notifica cuando llega un nuevo mensaje @@ -191,6 +193,7 @@ Habilitar ¿Estás seguro? Si eliminas tu cuenta tu historial completo de conversaciones se perderá + La cuenta está desconectada Grabar audio Configuración de cuenta Identificador Jabber: @@ -206,11 +209,25 @@ Disponible Hablador Ausente - Ausencia ext. + Ausencia extendida No molestar Desconectado Conferencia Ausnto de la Conferencia Tu apodo Otros Miembros + Cuenta desconectada. No se puede actualizar suscripciones + Conversaciones Activas + Estadísticas + Tiempo de conexión + Duración de la sesión + Paquetes enviados + Paquetes recibidos + Cuentas conectadas + Características del Servidor + Roster Versioning + Mensajes Carbon + Stream Management + horas + mins \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 13e43f5f3..50235c437 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -20,6 +20,7 @@ Conference Details Contact Details Conversations + Share with Conversation just now min ago unread Conversations @@ -61,6 +62,7 @@ No Ok Done + Hide 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 @@ -191,6 +193,7 @@ Enable Are you sure? If you delete your account your entire conversation history will be lost + Account is offline Record voice Account Settings Jabber ID: @@ -214,4 +217,17 @@ Your nickname Other Members Account offline. Could not update subscription + Active Conversations + Statistics + Connection age + Session age + Packets sent + Packets received + Connected accounts + Server Features + Roster Versioning + Carbon Messages + Stream Management + hours + mins \ No newline at end of file diff --git a/src/eu/siacs/conversations/ui/ManageAccountActivity.java b/src/eu/siacs/conversations/ui/ManageAccountActivity.java index 70af44e0f..d1c9c7f72 100644 --- a/src/eu/siacs/conversations/ui/ManageAccountActivity.java +++ b/src/eu/siacs/conversations/ui/ManageAccountActivity.java @@ -317,36 +317,36 @@ public class ManageAccountActivity extends XmppActivity { pcks_received.setText(""+xmpp.getReceivedStanzas()); pcks_sent.setText(""+xmpp.getSentStanzas()); if (connectionAgeHours >= 2) { - connection.setText(connectionAgeHours+" hours"); + connection.setText(connectionAgeHours+" " + getString(R.string.hours)); } else { - connection.setText(connectionAge+" mins"); + connection.setText(connectionAge+" " + getString(R.string.mins)); } if (xmpp.hasFeatureStreamManagment()) { if (sessionAgeHours >= 2) { - session.setText(sessionAgeHours+" hours"); + session.setText(sessionAgeHours+" " + getString(R.string.hours)); } else { - session.setText(sessionAge+" mins"); + session.setText(sessionAge+" " + getString(R.string.mins)); } - stream.setText("Yes"); + stream.setText(getString(R.string.yes)); } else { - stream.setText("No"); + stream.setText(getString(R.string.no)); session.setText(connection.getText()); } if (xmpp.hasFeaturesCarbon()) { - carbon.setText("Yes"); + carbon.setText(getString(R.string.yes)); } else { - carbon.setText("No"); + carbon.setText(getString(R.string.no)); } if (xmpp.hasFeatureRosterManagment()) { - roster.setText("Yes"); + roster.setText(getString(R.string.yes)); } else { - roster.setText("No"); + roster.setText(getString(R.string.no)); } builder.setView(view); } else { - builder.setMessage("Account is offline"); + builder.setMessage(getString(R.string.mgmt_account_account_offline)); } - builder.setPositiveButton("Hide", null); + builder.setPositiveButton(getString(R.string.hide), null); builder.create().show(); } return true; diff --git a/src/eu/siacs/conversations/ui/ShareWithActivity.java b/src/eu/siacs/conversations/ui/ShareWithActivity.java index 6dbb20c96..0a8ee1a70 100644 --- a/src/eu/siacs/conversations/ui/ShareWithActivity.java +++ b/src/eu/siacs/conversations/ui/ShareWithActivity.java @@ -34,7 +34,7 @@ public class ShareWithActivity extends XmppActivity { super.onCreate(savedInstanceState); setContentView(R.layout.share_with); - setTitle("Share with Conversation"); + setTitle(getString(R.string.title_activity_sharewith)); contacts = (LinearLayout) findViewById(R.id.contacts); conversations = (LinearLayout) findViewById(R.id.conversations);