From 1b6a07e3807596d5fb3b0be3201b51ba85ea0084 Mon Sep 17 00:00:00 2001
From: kruks23 <scardenas@openmailbox.org>
Date: Sat, 24 May 2014 15:37:54 +0200
Subject: [PATCH 1/3] Fix Contact Status width in contact details

---
 res/layout/activity_contact_details.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/res/layout/activity_contact_details.xml b/res/layout/activity_contact_details.xml
index cb001b790..ce172fd95 100644
--- a/res/layout/activity_contact_details.xml
+++ b/res/layout/activity_contact_details.xml
@@ -47,8 +47,8 @@
 
             <TextView
                 android:id="@+id/details_contactstatus"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:paddingLeft="16dp"
                 android:textSize="24sp"
                 android:textStyle="bold" />

From c4e45458fb3627af532c37c25f908937d121e917 Mon Sep 17 00:00:00 2001
From: Aitor Beriain <beriain@bitmessage.ch>
Date: Mon, 26 May 2014 17:27:03 +0200
Subject: [PATCH 2/3] Update strings.xml

---
 res/values-eu/strings.xml | 50 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 48 insertions(+), 2 deletions(-)

diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index a78811414..604d85871 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -12,14 +12,24 @@
   	<string name="action_secure">Elkarrizketa segurua</string>
   	<string name="action_add_account">Kontua gehitu</string>
   	<string name="action_edit_contact">Izena editatu</string>
+  	<string name="action_add_phone_book">Telefono kontaktuetara gehitu</string>
   	<string name="action_delete_contact">Zerrendatik ezabatu</string>
   	<string name="title_activity_contacts">Kontaktuak</string>
+  	<string name="title_activity_manage_accounts">Kontuak kudeatu</string>
+	<string name="title_activity_settings">Ezarpenak</string>
+	<string name="title_activity_conference_details">Konferentziaren xehetasunak</string>
+	<string name="title_activity_contact_details">Kontaktuaren xehetasunak</string>
+	<string name="title_activity_conversations">Conversations</string>
   	<string name="just_now">orain</string>
+  	<string name="minutes_ago">min lehenago</string>
+	<string name="unread_conversations">irakurri gabeko elkarrizketak</string>
   	<string name="sending">bidaltzen&#8230;</string>
   	<string name="announce_pgp">PGP iragarpena berritu</string>
   	<string name="encrypted_message">Mezua desenkriptatzen. Mesedez itxaron&#8230;</string>
   	<string name="conference_details">Konferentziaren xehetasunak</string>
   	<string name="nick_in_use">Ezizena erabilita dagoeneko</string>
+  	<string name="admin">Administratzailea</string>
+	<string name="owner">Jabea</string>
   	<string name="moderator">Moderatzailea</string>
   	<string name="participant">Parte-hartzailea</string>
   	<string name="visitor">Bisitaria</string>
@@ -36,7 +46,21 @@
   	<string name="invite_contacts">Kontaktuak gonbidatu</string>
   	<string name="invite_contacts_to_existing">Existitzen den konferentzia batera gonbidatu</string>
   	<string name="new_conference">Konferentzia berria sortu</string>
-  	<string name="cancel">Utzi</string>
+  	<string name="new_contact">Kontaktu berria sortu</string>
+	<string name="contacts">Kontaktuak</string>
+	<string name="search_jabber_id">Bilatu edo sartu Jabber ID bat</string>
+	<string name="choose_account">Kontua hautatu</string>
+	<string name="multi_user_conference">Erabiltzaile ugariko konferentzia</string>
+	<string name="trying_join_conference">Are you trying to join a conference?</string>
+	<string name="cancel">Utzi</string>
+	<string name="add">Gehitu</string>
+	<string name="edit">Editatu</string>
+	<string name="delete">Ezabatu</string>
+	<string name="save">Gorde</string>
+	<string name="yes">Bai</string>
+	<string name="no">Ez</string>
+	<string name="ok">Ados</string>
+	<string name="done">Eginda</string>
   	<string name="create_invite">Sortu \u0026 Gonbidatu</string>
 	<string name="new_conference_explained">Ausazki sortutako helbide batekin konferentzia berri bat sortu eta hautatutako kontaktuak bertara gonbidatu nahi al dituzu?</string>
   	<string name="no_open_mucs">Ez da konferentziarik existitzen</string>
@@ -126,11 +150,13 @@
   	<string name="pref_grant_presence_updates">Presentzia eguneraketak eman</string>
 	<string name="pref_grant_presence_updates_summary">Prebentiboki presentzia eguneraketak eman eta eskatu sortu dituzun kontaktuetarako</string>
 	<string name="subscriptions">Harpidetzak</string>
+	<string name="subscription_updated">Herpidetza eguneratuta</string>
 	<string name="your_account">Zure kontua</string>
 	<string name="keys">Gakoak</string>
 	<string name="send_presence_updates">Presentzia eguneraketak bidali</string>
 	<string name="receive_presence_updates">Presentzia eguneraketak jaso</string>
 	<string name="ask_for_presence_updates">Presentzia eguneraketak eskatu</string>
+	<string name="asked_for_presence_updates">Presentzia eguneraketak eskatu dira</string>
 	<string name="attach_choose_picture">Argazkia aukeratu</string>
 	<string name="attach_take_picture">Argazkia egin</string>
 	<string name="preemptively_grant">Prebentiboki harpidetza eskaera eman</string>
@@ -163,10 +189,30 @@
 	<string name="mgmt_account_delete">Ezabatu</string>	
 	<string name="mgmt_account_disable">Aldi baterako ezgaitu</string>
 	<string name="mgmt_account_enable">Gaitu</string>
+	<string name="mgmt_account_are_you_sure">Ziur al zaude?</string>
+	<string name="mgmt_account_delete_confirm_text">Zure kontua ezabatzen baduzu zure elkarrizketa historia guztia galduko da</string>
 	<string name="attach_record_voice">Ahotsa grabatu</string>
 	<string name="account_settings">Kontuaren ezarpenak</string>
-	<string name="save">Gorde</string>
+	<string name="account_settings_jabber_id">Jabber IDa:</string>
+	<string name="account_settings_password">Pasahitza:</string>
+	<string name="account_settings_example_jabber_id">erabiltzailea@adibidea.com</string>
+	<string name="account_settings_confirm_password">Pasahitza egiaztatu:</string>
+	<string name="password">Pasahitza</string>
+	<string name="confirm_password">Pasahitza egiaztatu</string>
 	<string name="passwords_do_not_match">Pasahitzak ez dute bat egiten</string>
 	<string name="invalid_jid">Hau ez da Jabber ID baliodun bat</string>
+	<string name="error_out_of_memory">Ouf of memory. Image is to large</string>
+	<string name="add_phone_book_text">Do you want to add %s to your phones contact list?</string>
+	<string name="contact_status_online">online</string>
+	<string name="contact_status_free_to_chat">free to chat</string>
+	<string name="contact_status_away">away</string>
+	<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>
+	<string name="subscription_not_updated_offline">Account offline. Could not update subscription</string>
 	
 </resources>

From 10aa935331acdf452a24971f6b232b88cc237635 Mon Sep 17 00:00:00 2001
From: Aitor Beriain <beriain@bitmessage.ch>
Date: Mon, 26 May 2014 17:30:15 +0200
Subject: [PATCH 3/3] Update strings.xml

Some strings were untranslated in the previous commit
---
 res/values-eu/strings.xml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 604d85871..71fd22b19 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -201,18 +201,18 @@
 	<string name="confirm_password">Pasahitza egiaztatu</string>
 	<string name="passwords_do_not_match">Pasahitzak ez dute bat egiten</string>
 	<string name="invalid_jid">Hau ez da Jabber ID baliodun bat</string>
-	<string name="error_out_of_memory">Ouf of memory. Image is to large</string>
-	<string name="add_phone_book_text">Do you want to add %s to your phones contact list?</string>
-	<string name="contact_status_online">online</string>
-	<string name="contact_status_free_to_chat">free to chat</string>
-	<string name="contact_status_away">away</string>
-	<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>
-	<string name="subscription_not_updated_offline">Account offline. Could not update subscription</string>
+	<string name="error_out_of_memory">Memoriarik gabe. Irudia handiegia da</string>
+	<string name="add_phone_book_text">%s zure telefono kontaktu zerrendara gehitu nahi al duzu?</string>
+	<string name="contact_status_online">konektatuta</string>
+	<string name="contact_status_free_to_chat">hitzegiteko aske</string>
+	<string name="contact_status_away">kanpoan</string>
+	<string name="contact_status_extended_away">luzerako kanpoan</string>
+	<string name="contact_status_do_not_disturb">ez gogaitu</string>
+	<string name="contact_status_offline">lineaz kanpo</string>
+	<string name="muc_details_conference">Konferentzia</string>
+	<string name="muc_details_conference_subject">Konferentziaren gaia</string>
+	<string name="muc_details_your_nickname">Zure ezizena</string>
+	<string name="muc_details_other_members">Beste kideak</string>
+	<string name="subscription_not_updated_offline">Kontua lineaz kanpo. Ezin izan da harpidetza eguneratu</string>
 	
 </resources>