moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-28 03:32:15 -05:00
Code Issues Releases Wiki Activity

Merge pull request #157 from kruks23/development

Browse Source 
More harcoded translations + updated Spanish
This commit is contained in:
Daniel Gultsch 2014-05-30 12:35:59 +02:00
commit 1a9e97c314
6 changed files with 60 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
res/layout/server_info.xml
View File

@ -12,14 +12,14 @@
android:paddingLeft="8dp" android:paddingLeft="8dp"
android:paddingRight="8dp" android:paddingRight="8dp"
android:paddingBottom="8dp" android:paddingBottom="8dp"
android:text="Statistics" /> android:text="@string/server_info_statistics" />
<TextView <TextView
android:layout_below="@+id/stats_header" android:layout_below="@+id/stats_header"
android:id="@+id/textView1" android:id="@+id/textView1"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Connection age" android:text="@string/server_info_connection_age"
android:textSize="18sp"/> android:textSize="18sp"/>
<TextView <TextView
android:id="@+id/connection" android:id="@+id/connection"
@ -36,7 +36,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_below="@+id/textView1" android:layout_below="@+id/textView1"
android:text="Session age" android:text="@string/server_info_session_age"
android:textSize="18sp"/> android:textSize="18sp"/>
<TextView <TextView
android:id="@+id/session" android:id="@+id/session"
@ -53,7 +53,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_below="@+id/textView2" android:layout_below="@+id/textView2"
android:text="Packets sent" android:text="@string/server_info_packets_sent"
android:textSize="18sp"/> android:textSize="18sp"/>
<TextView <TextView
android:id="@+id/pcks_sent" android:id="@+id/pcks_sent"
@ -69,7 +69,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/textView3" android:layout_below="@+id/textView3"
android:text="Packets received" android:text="@string/server_info_packets_received"
android:textSize="18sp"/> android:textSize="18sp"/>
<TextView <TextView
android:id="@+id/pcks_received" android:id="@+id/pcks_received"
@ -85,7 +85,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/textView4" android:layout_below="@+id/textView4"
android:text="Connected accounts" android:text="@string/server_info_connected_accounts"
android:textSize="18sp"/> android:textSize="18sp"/>
<TextView <TextView
android:id="@+id/number_presences" android:id="@+id/number_presences"
@ -103,14 +103,14 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="8dp" android:padding="8dp"
android:text="Server Features" /> android:text="@string/server_info_server_features" />
<TextView <TextView
android:layout_below="@+id/features_header" android:layout_below="@+id/features_header"
android:id="@+id/textView5" android:id="@+id/textView5"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Roster Versioning" android:text="@string/server_info_roster_versioning"
android:textSize="18sp"/> android:textSize="18sp"/>
<TextView <TextView
android:id="@+id/roster" android:id="@+id/roster"
@ -127,7 +127,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_below="@+id/textView5" android:layout_below="@+id/textView5"
android:text="Carbon Messages" android:text="@string/server_info_carbon_messages"
android:textSize="18sp"/> android:textSize="18sp"/>
<TextView <TextView
android:id="@+id/carbon" android:id="@+id/carbon"
@ -144,7 +144,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_below="@+id/textView6" android:layout_below="@+id/textView6"
android:text="Stream Managment" android:text="@string/server_info_stream_management"
android:textSize="18sp"/> android:textSize="18sp"/>
<TextView <TextView
android:id="@+id/stream" android:id="@+id/stream"

4
res/layout/share_with.xml
View File

@ -12,7 +12,7 @@
android:id="@+id/conversations_header" android:id="@+id/conversations_header"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Active Conversations" android:text="@string/share_with_active_conversations"
style="@style/sectionHeader" style="@style/sectionHeader"
android:paddingLeft="8dp" android:paddingLeft="8dp"
android:paddingTop="8dp" android:paddingTop="8dp"
@ -32,7 +32,7 @@
android:id="@+id/contacts_header" android:id="@+id/contacts_header"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Contacts" android:text="@string/contacts"
style="@style/sectionHeader" style="@style/sectionHeader"
android:paddingLeft="8dp" android:paddingLeft="8dp"
android:paddingTop="8dp" android:paddingTop="8dp"

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

@ -20,6 +20,7 @@
<string name="title_activity_conference_details">Detalles de Conferencia</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_contact_details">Detalles de Contacto</string>
<string name="title_activity_conversations">Conversations</string> <string name="title_activity_conversations">Conversations</string>
<string name="title_activity_sharewith">Compartir con Conversación</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>
@ -61,6 +62,7 @@
<string name="no">No</string> <string name="no">No</string>
<string name="ok">Ok</string> <string name="ok">Ok</string>
<string name="done">Hecho</string> <string name="done">Hecho</string>
<string name="hide">Ocultar</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>
@ -122,7 +124,7 @@
<string name="pref_xmpp_resource">Recurso</string> <string name="pref_xmpp_resource">Recurso</string>
<string name="pref_xmpp_resource_summary">El nombre que identifica el cliente que estás utilizando</string> <string name="pref_xmpp_resource_summary">El nombre que identifica el cliente que estás utilizando</string>
<string name="pref_accept_files">Aceptar archivos</string> <string name="pref_accept_files">Aceptar archivos</string>
<string name="pref_accept_files_summary">De forma automática aceptar archivos menores de&#8230;</string> <string name="pref_accept_files_summary">De forma automática aceptar archivos menores que&#8230;</string>
<string name="pref_notification_settings">Ajustes de notificación</string> <string name="pref_notification_settings">Ajustes de notificación</string>
<string name="pref_notifications">Notificaciones</string> <string name="pref_notifications">Notificaciones</string>
<string name="pref_notifications_summary">Notifica cuando llega un nuevo mensaje</string> <string name="pref_notifications_summary">Notifica cuando llega un nuevo mensaje</string>
@ -191,6 +193,7 @@
<string name="mgmt_account_enable">Habilitar</string> <string name="mgmt_account_enable">Habilitar</string>
<string name="mgmt_account_are_you_sure">¿Estás seguro?</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="mgmt_account_delete_confirm_text">Si eliminas tu cuenta tu historial completo de conversaciones se perderá</string>
<string name="mgmt_account_account_offline">La cuenta está desconectada</string>
<string name="attach_record_voice">Grabar audio</string> <string name="attach_record_voice">Grabar audio</string>
<string name="account_settings">Configuración de cuenta</string> <string name="account_settings">Configuración de cuenta</string>
<string name="account_settings_jabber_id">Identificador Jabber:</string> <string name="account_settings_jabber_id">Identificador Jabber:</string>
@ -206,11 +209,25 @@
<string name="contact_status_online">Disponible</string> <string name="contact_status_online">Disponible</string>
<string name="contact_status_free_to_chat">Hablador</string> <string name="contact_status_free_to_chat">Hablador</string>
<string name="contact_status_away">Ausente</string> <string name="contact_status_away">Ausente</string>
<string name="contact_status_extended_away">Ausencia ext.</string> <string name="contact_status_extended_away">Ausencia extendida</string>
<string name="contact_status_do_not_disturb">No molestar</string> <string name="contact_status_do_not_disturb">No molestar</string>
<string name="contact_status_offline">Desconectado</string> <string name="contact_status_offline">Desconectado</string>
<string name="muc_details_conference">Conferencia</string> <string name="muc_details_conference">Conferencia</string>
<string name="muc_details_conference_subject">Ausnto de la 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_your_nickname">Tu apodo</string>
<string name="muc_details_other_members">Otros Miembros</string> <string name="muc_details_other_members">Otros Miembros</string>
<string name="subscription_not_updated_offline">Cuenta desconectada. No se puede actualizar suscripciones</string>
<string name="share_with_active_conversations">Conversaciones Activas</string>
<string name="server_info_statistics">Estadísticas</string>
<string name="server_info_connection_age">Tiempo de conexión</string>
<string name="server_info_session_age">Duración de la sesión</string>
<string name="server_info_packets_sent">Paquetes enviados</string>
<string name="server_info_packets_received">Paquetes recibidos</string>
<string name="server_info_connected_accounts">Cuentas conectadas</string>
<string name="server_info_server_features">Características del Servidor</string>
<string name="server_info_roster_versioning">Roster Versioning</string>
<string name="server_info_carbon_messages">Mensajes Carbon</string>
<string name="server_info_stream_management">Stream Management</string>
<string name="hours">horas</string>
<string name="mins">mins</string>
</resources> </resources>

16
res/values/strings.xml
View File

@ -20,6 +20,7 @@
<string name="title_activity_conference_details">Conference Details</string> <string name="title_activity_conference_details">Conference Details</string>
<string name="title_activity_contact_details">Contact Details</string> <string name="title_activity_contact_details">Contact Details</string>
<string name="title_activity_conversations">Conversations</string> <string name="title_activity_conversations">Conversations</string>
<string name="title_activity_sharewith">Share with Conversation</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>
@ -61,6 +62,7 @@
<string name="no">No</string> <string name="no">No</string>
<string name="ok">Ok</string> <string name="ok">Ok</string>
<string name="done">Done</string> <string name="done">Done</string>
<string name="hide">Hide</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>
@ -191,6 +193,7 @@
<string name="mgmt_account_enable">Enable</string> <string name="mgmt_account_enable">Enable</string>
<string name="mgmt_account_are_you_sure">Are you sure?</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="mgmt_account_delete_confirm_text">If you delete your account your entire conversation history will be lost</string>
<string name="mgmt_account_account_offline">Account is offline</string>
<string name="attach_record_voice">Record voice</string> <string name="attach_record_voice">Record voice</string>
<string name="account_settings">Account Settings</string> <string name="account_settings">Account Settings</string>
<string name="account_settings_jabber_id">Jabber ID:</string> <string name="account_settings_jabber_id">Jabber ID:</string>
@ -214,4 +217,17 @@
<string name="muc_details_your_nickname">Your nickname</string> <string name="muc_details_your_nickname">Your nickname</string>
<string name="muc_details_other_members">Other Members</string> <string name="muc_details_other_members">Other Members</string>
<string name="subscription_not_updated_offline">Account offline. Could not update subscription</string> <string name="subscription_not_updated_offline">Account offline. Could not update subscription</string>
<string name="share_with_active_conversations">Active Conversations</string>
<string name="server_info_statistics">Statistics</string>
<string name="server_info_connection_age">Connection age</string>
<string name="server_info_session_age">Session age</string>
<string name="server_info_packets_sent">Packets sent</string>
<string name="server_info_packets_received">Packets received</string>
<string name="server_info_connected_accounts">Connected accounts</string>
<string name="server_info_server_features">Server Features</string>
<string name="server_info_roster_versioning">Roster Versioning</string>
<string name="server_info_carbon_messages">Carbon Messages</string>
<string name="server_info_stream_management">Stream Management</string>
<string name="hours">hours</string>
<string name="mins">mins</string>
</resources> </resources>

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

@ -317,36 +317,36 @@ public class ManageAccountActivity extends XmppActivity {
pcks_received.setText(""+xmpp.getReceivedStanzas()); pcks_received.setText(""+xmpp.getReceivedStanzas());
pcks_sent.setText(""+xmpp.getSentStanzas()); pcks_sent.setText(""+xmpp.getSentStanzas());
if (connectionAgeHours >= 2) { if (connectionAgeHours >= 2) {
connection.setText(connectionAgeHours+" hours"); connection.setText(connectionAgeHours+" " + getString(R.string.hours));
} else { } else {
connection.setText(connectionAge+" mins"); connection.setText(connectionAge+" " + getString(R.string.mins));
} }
if (xmpp.hasFeatureStreamManagment()) { if (xmpp.hasFeatureStreamManagment()) {
if (sessionAgeHours >= 2) { if (sessionAgeHours >= 2) {
session.setText(sessionAgeHours+" hours"); session.setText(sessionAgeHours+" " + getString(R.string.hours));
} else { } else {
session.setText(sessionAge+" mins"); session.setText(sessionAge+" " + getString(R.string.mins));
} }
stream.setText("Yes"); stream.setText(getString(R.string.yes));
} else { } else {
stream.setText("No"); stream.setText(getString(R.string.no));
session.setText(connection.getText()); session.setText(connection.getText());
} }
if (xmpp.hasFeaturesCarbon()) { if (xmpp.hasFeaturesCarbon()) {
carbon.setText("Yes"); carbon.setText(getString(R.string.yes));
} else { } else {
carbon.setText("No"); carbon.setText(getString(R.string.no));
} }
if (xmpp.hasFeatureRosterManagment()) { if (xmpp.hasFeatureRosterManagment()) {
roster.setText("Yes"); roster.setText(getString(R.string.yes));
} else { } else {
roster.setText("No"); roster.setText(getString(R.string.no));
} }
builder.setView(view); builder.setView(view);
} else { } 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(); builder.create().show();
} }
return true; return true;

2
src/eu/siacs/conversations/ui/ShareWithActivity.java
View File

@ -34,7 +34,7 @@ public class ShareWithActivity extends XmppActivity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.share_with); setContentView(R.layout.share_with);
setTitle("Share with Conversation"); setTitle(getString(R.string.title_activity_sharewith));
contacts = (LinearLayout) findViewById(R.id.contacts); contacts = (LinearLayout) findViewById(R.id.contacts);
conversations = (LinearLayout) findViewById(R.id.conversations); conversations = (LinearLayout) findViewById(R.id.conversations);