From 75b14a1d5c08d10b795b92e4f2b21035d773dc8c Mon Sep 17 00:00:00 2001
From: kruks23 <scardenas@openmailbox.org>
Date: Thu, 29 May 2014 18:17:21 +0200
Subject: More harcoded translations + updated Spanish

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

(limited to 'res/values')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 13e43f5f..50235c43 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -20,6 +20,7 @@
     <string name="title_activity_conference_details">Conference Details</string>
     <string name="title_activity_contact_details">Contact Details</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="minutes_ago">min ago</string>
     <string name="unread_conversations">unread Conversations</string>
@@ -61,6 +62,7 @@
     <string name="no">No</string>
     <string name="ok">Ok</string>
     <string name="done">Done</string>
+    <string name="hide">Hide</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>
@@ -191,6 +193,7 @@
     <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="mgmt_account_account_offline">Account is offline</string>
     <string name="attach_record_voice">Record voice</string>
     <string name="account_settings">Account Settings</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_other_members">Other Members</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>
\ No newline at end of file
-- 
cgit v1.2.3


From 732848fc0ec96b9c41a0d11f317c32313380dc01 Mon Sep 17 00:00:00 2001
From: Alethea Butler <alethea@alethea.io>
Date: Fri, 30 May 2014 02:03:24 -0400
Subject: Added question mark to remove_contact_text

---
 res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'res/values')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 13e43f5f..abfdf306 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -34,7 +34,7 @@
     <string name="participant">Participant</string>
     <string name="visitor">Visitor</string>
     <string name="enter_new_name">Enter a new name:</string>
-    <string name="remove_contact_text">Do you want to delete %s from your roster. The conversation associated with this account will not be removed.</string>
+    <string name="remove_contact_text">Do you want to delete %s from your roster? The conversation associated with this account will not be removed.</string>
     <string name="untrusted_cert_hint">The server %s presented you with an untrusted, possible self signed, certificate.</string>
     <string name="account_info">Server Info</string>
     <string name="register_account">Register new account on server</string>
-- 
cgit v1.2.3


From cb127add56cc34126e7c5527b6299f7a7c2e3aaf Mon Sep 17 00:00:00 2001
From: Alethea Butler <alethea@alethea.io>
Date: Fri, 30 May 2014 02:04:24 -0400
Subject: Changed "unsuccessful delivery" to "delivery failed"

---
 res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'res/values')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index abfdf306..b345fc81 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -77,7 +77,7 @@
     <string name="attach_file">Attach file</string>
     <string name="not_in_roster">The contact is not in your roster. Would you like to add it?</string>
     <string name="add_contact">Add contact</string>
-    <string name="send_failed">unsuccessful delivery</string>
+    <string name="send_failed">delivery failed</string>
     <string name="send_rejected">rejected</string>
     <string name="receiving_image">Receiving image file. Please wait&#8230;</string>
     <string name="preparing_image">Preparing image for transmission</string>
-- 
cgit v1.2.3


From 3e9627dc50ce4cb7be004fd07999ddb6c02e3f29 Mon Sep 17 00:00:00 2001
From: Alethea Butler <alethea@alethea.io>
Date: Sat, 31 May 2014 00:11:47 -0400
Subject: Capitalized openPGP -> OpenPGP

---
 res/values/strings.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'res/values')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 9d6e5b38..fef874b0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -92,7 +92,7 @@
     <string name="send_message_to_conference">Send message to conference</string>
     <string name="send_plain_text_message">Send plain text message</string>
     <string name="send_otr_message">Send OTR encrypted message</string>
-    <string name="send_pgp_message">Send openPGP encrypted message</string>
+    <string name="send_pgp_message">Send OpenPGP encrypted message</string>
     <string name="your_nick_has_been_changed">Your nickname has been changed</string>
     <string name="download_image">Download Image</string>
     <string name="error_loading_image">Error loading image (File not found)</string>
@@ -113,14 +113,14 @@
     <string name="restart">Restart</string>
     <string name="install">Install</string>
     <string name="offering">offering&#8230;</string>
-    <string name="no_pgp_key">No openPGP Key found</string>
-    <string name="contact_has_no_pgp_key">Conversations is unable to encrypt your messages because your contact is not announcing his or hers public key.\n\n<small>Please ask your contact to setup openPGP.</small></string>
+    <string name="no_pgp_key">No OpenPGP Key found</string>
+    <string name="contact_has_no_pgp_key">Conversations is unable to encrypt your messages because your contact is not announcing his or hers public key.\n\n<small>Please ask your contact to setup OpenPGP.</small></string>
     <string name="encrypted_message_received"><i>Encrypted message received. Touch to view and decrypt.</i></string>
     <string name="encrypted_image_received"><i>Encrypted image received. Touch to view and decrypt.</i></string>
     <string name="image_file"><i>Image received. Touch to view</i></string>
     <string name="otr_file_transfer">OTR encryption not available</string>
-    <string name="otr_file_transfer_msg">Unfortunaly OTR encryption is not available for file transfer. You can choose either openPGP or no encryption.</string>
-    <string name="use_pgp_encryption">Use openPGP encryption</string>
+    <string name="otr_file_transfer_msg">Unfortunaly OTR encryption is not available for file transfer. You can choose either OpenPGP or no encryption.</string>
+    <string name="use_pgp_encryption">Use OpenPGP encryption</string>
     <string name="pref_xmpp_resource">XMPP resource</string>
     <string name="pref_xmpp_resource_summary">The name this client identifies itself with</string>
     <string name="pref_accept_files">Accept files</string>
@@ -186,7 +186,7 @@
     <string name="certif_trust">Trust certificate</string>
     <string name="encryption_choice_none">Plain text</string>
     <string name="encryption_choice_otr">OTR</string>
-    <string name="encryption_choice_pgp">openPGP</string>
+    <string name="encryption_choice_pgp">OpenPGP</string>
     <string name="mgmt_account_edit">Edit account</string>
     <string name="mgmt_account_delete">Delete</string>
     <string name="mgmt_account_disable">Temporarily disable</string>
-- 
cgit v1.2.3