From 71324261e5560fa70ef028fba35bd121f2527578 Mon Sep 17 00:00:00 2001
From: kruks23 <scardenas@openmailbox.org>
Date: Tue, 8 Jul 2014 21:13:53 +0200
Subject: Show time in messages previous days

---
 src/eu/siacs/conversations/utils/UIHelper.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/eu/siacs/conversations/utils/UIHelper.java b/src/eu/siacs/conversations/utils/UIHelper.java
index ddd5e1be..f3f1d9e5 100644
--- a/src/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/eu/siacs/conversations/utils/UIHelper.java
@@ -54,7 +54,7 @@ public class UIHelper {
 	private static final int FG_COLOR = 0xFFFAFAFA;
 	private static final int TRANSPARENT = 0x00000000;
 	private static final int DATE_NO_YEAR_FLAGS = DateUtils.FORMAT_SHOW_DATE
-			| DateUtils.FORMAT_NO_YEAR | DateUtils.FORMAT_ABBREV_ALL;
+			| DateUtils.FORMAT_NO_YEAR | DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_ABBREV_ALL;
 
 	public static String readableTimeDifference(Context context, long time) {
 		if (time == 0) {
-- 
cgit v1.2.3


From bb6e732ca1306939291796e5c878e1967f0b9c8e Mon Sep 17 00:00:00 2001
From: kruks23 <scardenas@openmailbox.org>
Date: Thu, 10 Jul 2014 18:04:24 +0200
Subject: Show time in messages previous days

---
 src/eu/siacs/conversations/utils/UIHelper.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/eu/siacs/conversations/utils/UIHelper.java b/src/eu/siacs/conversations/utils/UIHelper.java
index 9fd16c43..97accb58 100644
--- a/src/eu/siacs/conversations/utils/UIHelper.java
+++ b/src/eu/siacs/conversations/utils/UIHelper.java
@@ -54,7 +54,7 @@ public class UIHelper {
 	private static final int FG_COLOR = 0xFFFAFAFA;
 	private static final int TRANSPARENT = 0x00000000;
 	private static final int DATE_NO_YEAR_FLAGS = DateUtils.FORMAT_SHOW_DATE
-			| DateUtils.FORMAT_NO_YEAR | DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_ABBREV_ALL;
+			| DateUtils.FORMAT_NO_YEAR | DateUtils.FORMAT_ABBREV_ALL;
 
 	public static String readableTimeDifference(Context context, long time) {
 		if (time == 0) {
@@ -69,7 +69,7 @@ public class UIHelper {
 		} else if (difference < 60 * 15) {
 			return context.getString(R.string.minutes_ago,
 					Math.round(difference / 60.0));
-		} else if (today(date)) {
+		} else if (today(date) || difference < 12 * 60 * 60) {
 			java.text.DateFormat df = DateFormat.getTimeFormat(context);
 			return df.format(date);
 		} else {
-- 
cgit v1.2.3


From 1da0845d5235f5754aae36216bbb7ca24ffc51bf Mon Sep 17 00:00:00 2001
From: kruks23 <scardenas@openmailbox.org>
Date: Thu, 10 Jul 2014 18:12:57 +0200
Subject: Update Spanish Translations

---
 res/values-es/strings.xml | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index c6c6cd27..8dd17059 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -21,6 +21,7 @@
     <string name="title_activity_contact_details">Detalles del Contacto</string>
     <string name="title_activity_conversations">Conversations</string>
     <string name="title_activity_sharewith">Compartir con Conversación</string>
+    <string name="title_activity_start_conversation">Nueva Conversación</string>
     <string name="just_now">ahora</string>
     <string name="minute_ago">hace 1 min</string>
     <string name="minutes_ago">hace %d min</string>
@@ -200,10 +201,10 @@
     <string name="mgmt_account_account_offline">La cuenta está desconectada</string>
     <string name="attach_record_voice">Grabar audio</string>
     <string name="account_settings">Configuración de cuenta</string>
-    <string name="account_settings_jabber_id">Identificador Jabber:</string>
-    <string name="account_settings_password">Contraseña:</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="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>
@@ -250,4 +251,16 @@
     <string name="openpgp_click_to_decrypt">Pulsa para introducir la contraseña y desencriptar el mensaje</string>
     <string name="reception_failed">Error al recibir</string>
     <string name="no_muc_server_found">No se ha encontrado un servidor de conferencias apropiado</string>
+    <string name="your_fingerprint">Tu clave</string>
+    <string name="otr_fingerprint">Clave OTR</string>
+    <string name="verify">Verificar</string>
+    <string name="decrypt">Desencriptar</string>
+    <string name="conferences">Conferencias</string>
+    <string name="search">Buscar</string>
+    <string name="create_contact">Crear Contacto</string>
+    <string name="create_conference">Crear Conferencia</string>
+    <string name="delete_contact">Eliminar Contacto</string>
+    <string name="view_contact_details">Ver detalles del contacto</string>
+    <string name="create">Crear</string>
+    <string name="contact_already_exists">El contacto ya existe</string>
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3