From a6d4b0aec5ab5d8df887e7e0aefaaeef7c42a8b9 Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Sun, 14 Dec 2014 02:02:17 -0500
Subject: Add quiet hours feature

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

(limited to 'src/main/res/values/strings.xml')

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 6b639452..02be6348 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -41,6 +41,7 @@
     <string name="invite_contact">Invite Contact</string>
     <string name="contacts">Contacts</string>
     <string name="cancel">Cancel</string>
+    <string name="set">Set</string>
     <string name="add">Add</string>
     <string name="edit">Edit</string>
     <string name="delete">Delete</string>
@@ -282,6 +283,11 @@
             \n\nhttps://developer.android.com/tools/support-library\n(Apache License, Version 2.0)
             \n\nhttps://github.com/zxing/zxing\n(Apache License, Version 2.0)
     </string>
+    <string name="title_pref_quiet_hours">Quiet Hours</string>
+    <string name="title_pref_quiet_hours_start_time">Start time</string>
+    <string name="title_pref_quiet_hours_end_time">End time</string>
+    <string name="title_pref_enable_quiet_hours">Enable quiet hours</string>
+    <string name="pref_quiet_hours_summary">Notifications will be silenced during quiet hours</string>
     <string name="pref_use_larger_font">Increase font size</string>
     <string name="pref_use_larger_font_summary">Use larger font sizes across the entire app</string>
     <string name="pref_use_send_button_to_indicate_status">Send button indicates status</string>
-- 
cgit v1.2.3


From 80435eca5cda499e0319cc4b248bb807693c952d Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Wed, 17 Dec 2014 09:32:51 +0100
Subject: smoothed out scrolling a bit

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

(limited to 'src/main/res/values/strings.xml')

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 02be6348..5288466f 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -366,4 +366,5 @@
     <string name="reset">Reset</string>
     <string name="account_image_description">Account avatar</string>
     <string name="copy_otr_clipboard_description">Copy OTR fingerprint to clipboard</string>
+    <string name="fetching_history_from_server">Fetching history from server</string>
 </resources>
-- 
cgit v1.2.3


From 741a0c129d3558e9b9a714848a590a1f0a499799 Mon Sep 17 00:00:00 2001
From: iNPUTmice <daniel@gultsch.de>
Date: Wed, 17 Dec 2014 10:50:51 +0100
Subject: made scroling smoother + bug fixes for history loading

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

(limited to 'src/main/res/values/strings.xml')

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 5288466f..ec761d6e 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -367,4 +367,5 @@
     <string name="account_image_description">Account avatar</string>
     <string name="copy_otr_clipboard_description">Copy OTR fingerprint to clipboard</string>
     <string name="fetching_history_from_server">Fetching history from server</string>
+    <string name="no_more_history_on_server">No more history on server</string>
 </resources>
-- 
cgit v1.2.3


From af7a64491fa5c514866d0f1952c034a7672bb508 Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Sun, 21 Dec 2014 15:43:58 -0500
Subject: Add support for XEP-0191 (Blocking command)

Fixes #791

Squash of commits:
534f25d7dae3ce6852243e28fdd0a69ac01e9463
808fdf5147f27a912a60bee39aa4bf1ddd4f43b4
1eaf8a8330710ad35ba7c368e04f909af623ae4c
31585242c2359efdcd0eeddb9745077f54dbc9eb
2e69bd0bd0286ed1e98a42f4c3421ba4d8cf524b
e904fb5015bf3a1904ab941a1957edf3b1e7abd2
eebbadf3b3816bbf8fcccb763e419fed252d266f
7c5b87724ce494e5a6e8026557ed50a8fd9f23e8
b0eaaf446937794fe19cbdb4f8309c3ff83d4e42
8c652f9e8bb3512958d9ad8c6f1326505f2d98c8
ad0ea1ad948ff6f8fde7b0b10f5163dc8852032f
f5d49897e0dba691ef53a0eddb9ed34d129ad442
a08fa64c505bd895b7c626cfad182380373be20b
de67079113e08394a276048c31f6b21baa300829
9069f342173ba30c2b20c67529c7ff497a6a257d
0169fa79d161ee898c4b6762e207087682a952d8
8585a5bd75a5d56927fed8317729bd15fffe4dcc
0053528a078369e0b65dcf71bda251072a1299c7
e901a9c3554bd7cca193e92919b463991eadfea7
c5c78257434813c69ab9b7558bcc8f7cbe858433
e905af348d46d77bc46b5f7211527684acc02fab
13a0f9a10c7892b0f90f5fabd2f2615701b0fd66
2cfba1e24b0139839e4453b92be7e20634d150cf
58e074fb5bb44b05a8104250fccd7c024c808c1a
0d6cf98fc8eab212d798ac79b336f9b70a14f06d
e23620f56b85bcab9f3b5d9ce1c01524cd9674dc
d72cd2fcc8d54176c3ff53411a69b9bb4642eff3
195143dff8836623a37094a6b8fa6aa01ef31580
5f5f3caf3a1e480a99d27ee5c34ba516419c52e4
1dee3d5861c9f9c710da4cbda3688d94c622ca93
23949b8aa32c78b27bab49bb3c4f3ff588925ce1
9bf97f8ae522796e0dacb7f6fe7a7f90f86a93a1
---
 src/main/res/values/strings.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'src/main/res/values/strings.xml')

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index ec761d6e..ba3051b2 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -13,6 +13,10 @@
     <string name="action_edit_contact">Edit name</string>
     <string name="action_add_phone_book">Add to phone book</string>
     <string name="action_delete_contact">Delete from roster</string>
+    <string name="action_block_contact">Block contact</string>
+    <string name="action_unblock_contact">Unblock contact</string>
+    <string name="action_block_domain">Block domain</string>
+    <string name="action_unblock_domain">Unblock domain</string>
     <string name="title_activity_manage_accounts">Manage Accounts</string>
     <string name="title_activity_settings">Settings</string>
     <string name="title_activity_conference_details">Conference Details</string>
@@ -21,6 +25,7 @@
     <string name="title_activity_sharewith">Share with Conversation</string>
     <string name="title_activity_start_conversation">Start Conversation</string>
     <string name="title_activity_choose_contact">Choose contact</string>
+    <string name="title_activity_block_list">Block list</string>
     <string name="just_now">just now</string>
     <string name="minute_ago">1 min ago</string>
     <string name="minutes_ago">%d mins ago</string>
@@ -34,6 +39,11 @@
     <string name="participant">Participant</string>
     <string name="visitor">Visitor</string>
     <string name="remove_contact_text">Would you like to remove %s from your roster? The conversation associated with this contact will not be removed.</string>
+    <string name="block_contact_text">Would you like to block %s from sending you messages?</string>
+    <string name="unblock_contact_text">Would you like to unblock %s and allow them to send you messages?</string>
+    <string name="block_domain_text">Block all contacts from %s?</string>
+    <string name="unblock_domain_text">Unblock all contacts from %s?</string>
+    <string name="contact_blocked">Contact blocked</string>
     <string name="remove_bookmark_text">Would you like to remove %s as a bookmark? The conversation associated with this bookmark will not be removed.</string>
     <string name="register_account">Register new account on server</string>
     <string name="share_with">Share with</string>
@@ -45,6 +55,8 @@
     <string name="add">Add</string>
     <string name="edit">Edit</string>
     <string name="delete">Delete</string>
+    <string name="block">Block</string>
+    <string name="unblock">Unblock</string>
     <string name="save">Save</string>
     <string name="ok">OK</string>
     <string name="crash_report_title">Conversations has crashed</string>
@@ -202,6 +214,8 @@
     <string name="join_conference">Join Conference</string>
     <string name="delete_contact">Delete Contact</string>
     <string name="view_contact_details">View contact details</string>
+    <string name="block_contact">Block contact</string>
+    <string name="unblock_contact">Unblock contact</string>
     <string name="create">Create</string>
     <string name="contact_already_exists">The contact already exists</string>
     <string name="join">Join</string>
@@ -318,6 +332,7 @@
     <string name="image_transmission_failed">Image transmission failed</string>
     <string name="scan_qr_code">Scan QR code</string>
     <string name="show_qr_code">Show QR code</string>
+    <string name="show_block_list">Show block list</string>
     <string name="account_details">Account details</string>
     <string name="verify_otr">Verify OTR</string>
     <string name="remote_fingerprint">Remote Fingerprint</string>
-- 
cgit v1.2.3


From 01107e31ae22d84922742717ad5b7d87581e4096 Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Tue, 21 Oct 2014 16:22:01 -0400
Subject: Add more server compatibility info.

Hide server info behind a checkbox.

Add XEP-0352 support to the server info list

Add XEP-0237 to server info list

Add XEP-0352 support to the server info list

Add MaM and Blocking to the account XEPs list

Also add a toggle button to hide some of the list
Rebase on current codebase

Make MAM string more descriptive

Change show more button to checkbox menu item

Shorten `MAM (History)' to `MAM'

Order XEP list and hide all by default

Supress warning (which is wrong anyways)

Change `Show more' to `Show more info'
---
 src/main/res/values/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/main/res/values/strings.xml')

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index ba3051b2..29b81354 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -186,7 +186,12 @@
     <string name="contact_status_offline">offline</string>
     <string name="muc_details_conference">Conference</string>
     <string name="muc_details_other_members">Other Members</string>
+    <string name="server_info_show_more">Server info</string>
+    <string name="server_info_mam">XEP-0313: MAM</string>
     <string name="server_info_carbon_messages">XEP-0280: Message Carbons</string>
+    <string name="server_info_csi">XEP-0352: Client State Indication</string>
+    <string name="server_info_blocking">XEP-0191: Blocking Command</string>
+    <string name="server_info_roster_version">XEP-0237: Roster Versioning</string>
     <string name="server_info_stream_management">XEP-0198: Stream Management</string>
     <string name="server_info_pep">XEP-0163: PEP (Avatars)</string>
     <string name="server_info_available">available</string>
-- 
cgit v1.2.3


From e4d9dca2fe6a75960d24f8af4dadba9a1a42845c Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Tue, 23 Dec 2014 17:19:00 -0500
Subject: Add ability to change password on server

Fixes #260
---
 src/main/res/values/strings.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/main/res/values/strings.xml')

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 29b81354..22e39a89 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -46,6 +46,7 @@
     <string name="contact_blocked">Contact blocked</string>
     <string name="remove_bookmark_text">Would you like to remove %s as a bookmark? The conversation associated with this bookmark will not be removed.</string>
     <string name="register_account">Register new account on server</string>
+    <string name="change_password">Change password</string>
     <string name="share_with">Share with</string>
     <string name="start_conversation">Start Conversation</string>
     <string name="invite_contact">Invite Contact</string>
@@ -249,7 +250,7 @@
     <string name="private_message_to">to %s</string>
     <string name="send_private_message_to">Send private message to %s</string>
     <string name="connect">Connect</string>
-    <string name="account_already_exists">This account does already exist</string>
+    <string name="account_already_exists">This account already exists</string>
     <string name="next">Next</string>
     <string name="server_info_session_established">Current session established</string>
     <string name="additional_information">Additional Information</string>
-- 
cgit v1.2.3


From 0c22a8d1c6a984ccd0080d74a07d500879ee8242 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 25 Dec 2014 22:08:13 +0100
Subject: added callback to change account password to notify UI on success /
 failure

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

(limited to 'src/main/res/values/strings.xml')

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 22e39a89..6634c96a 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -389,4 +389,7 @@
     <string name="copy_otr_clipboard_description">Copy OTR fingerprint to clipboard</string>
     <string name="fetching_history_from_server">Fetching history from server</string>
     <string name="no_more_history_on_server">No more history on server</string>
+    <string name="updating">Updating…</string>
+    <string name="password_changed">Password changed!</string>
+    <string name="could_not_change_password">Could not change password</string>
 </resources>
-- 
cgit v1.2.3


From 193d2645e6995a2631a16c88c78e3b0b5581cbc6 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Thu, 25 Dec 2014 22:28:19 +0100
Subject: code cleanup for change password stuff

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

(limited to 'src/main/res/values/strings.xml')

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 6634c96a..f75a698b 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -46,7 +46,7 @@
     <string name="contact_blocked">Contact blocked</string>
     <string name="remove_bookmark_text">Would you like to remove %s as a bookmark? The conversation associated with this bookmark will not be removed.</string>
     <string name="register_account">Register new account on server</string>
-    <string name="change_password">Change password</string>
+    <string name="change_password_on_server">Change password on server</string>
     <string name="share_with">Share with</string>
     <string name="start_conversation">Start Conversation</string>
     <string name="invite_contact">Invite Contact</string>
-- 
cgit v1.2.3


From 0882da2568e8ca926cfcebbefe91adbfebe0e0d9 Mon Sep 17 00:00:00 2001
From: Sam Whited <sam@samwhited.com>
Date: Mon, 29 Dec 2014 19:09:27 -0500
Subject: Make `app_name' string untranslatable

Remove untranslatable about message

Escape single quote in NL translation
---
 src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/main/res/values/strings.xml')

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index f75a698b..34c574ee 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">Conversations</string>
+    <string name="app_name" translatable="false">Conversations</string>
     <string name="action_settings">Settings</string>
     <string name="action_add">New conversation</string>
     <string name="action_accounts">Manage accounts</string>
@@ -279,7 +279,7 @@
     <string name="pref_expert_options_summary">Please be careful with these</string>
     <string name="title_activity_about">About Conversations</string>
     <string name="pref_about_conversations_summary">Build and licensing information</string>
-    <string name="pref_about_message"  translatable="false">
+    <string name="pref_about_message" translatable="false">
             Conversations • the very last word in instant messaging.
             \n\nCopyright © 2014 Daniel Gultsch
             \n\nThis program is free software: you can redistribute it and/or modify
-- 
cgit v1.2.3


From 3833e6dfef8c7a06982ad7783f89c28d27d83bfe Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <inputmice@siacs.eu>
Date: Fri, 2 Jan 2015 01:21:14 +0100
Subject: improved OTR verification part one

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

(limited to 'src/main/res/values/strings.xml')

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 34c574ee..be548ad4 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -392,4 +392,11 @@
     <string name="updating">Updating…</string>
     <string name="password_changed">Password changed!</string>
     <string name="could_not_change_password">Could not change password</string>
+    <string name="otr_session_not_started">Send a message to start an encrypted chat</string>
+    <string name="ask_question">Ask question</string>
+    <string name="smp_explain_question">If you and your contact have a secret in common that no one else knows (like an inside joke or simply what you had for lunch the last time you met) you can use that secret to verify each other\'s fingerprints.\n\nYou provide a hint or a question for your contact who will respond with a case-sensitive answer.</string>
+    <string name="smp_explain_answer">Your contact would like to verify your fingerprint by challenging you with a shared secret. Your contact provided the following hint or question for that secret.</string>
+    <string name="shared_secret_hint_should_not_be_empty">Your hint should not be empty</string>
+    <string name="shared_secret_can_not_be_empty">Your shared secret can not be empty</string>
+    <string name="manual_verification_explanation">Carefully compare the fingerprints shown below with the fingerprints of your contact.\nYou can use a trusted communication channel like an encrypted e-mail or a telephone call channel to exchange those.</string>
 </resources>
-- 
cgit v1.2.3


From 1988e244ef035da5ddc309c3ad587f967518509e Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <inputmice@siacs.eu>
Date: Fri, 2 Jan 2015 15:14:06 +0100
Subject: some further otr improvements

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

(limited to 'src/main/res/values/strings.xml')

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index be548ad4..1d1f609d 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -398,5 +398,5 @@
     <string name="smp_explain_answer">Your contact would like to verify your fingerprint by challenging you with a shared secret. Your contact provided the following hint or question for that secret.</string>
     <string name="shared_secret_hint_should_not_be_empty">Your hint should not be empty</string>
     <string name="shared_secret_can_not_be_empty">Your shared secret can not be empty</string>
-    <string name="manual_verification_explanation">Carefully compare the fingerprints shown below with the fingerprints of your contact.\nYou can use a trusted communication channel like an encrypted e-mail or a telephone call channel to exchange those.</string>
+    <string name="manual_verification_explanation">Carefully compare the fingerprint shown below with the fingerprint of your contact.\nYou can use any trusted form of communication like an encrypted e-mail or a telephone call to exchange those.</string>
 </resources>
-- 
cgit v1.2.3


From 969044b1133fa2fd82d209953a1970a2a5b2eb97 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <inputmice@siacs.eu>
Date: Sat, 3 Jan 2015 00:11:02 +0100
Subject: migrated change password into separate activity

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

(limited to 'src/main/res/values/strings.xml')

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 1d1f609d..ebb95278 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -399,4 +399,8 @@
     <string name="shared_secret_hint_should_not_be_empty">Your hint should not be empty</string>
     <string name="shared_secret_can_not_be_empty">Your shared secret can not be empty</string>
     <string name="manual_verification_explanation">Carefully compare the fingerprint shown below with the fingerprint of your contact.\nYou can use any trusted form of communication like an encrypted e-mail or a telephone call to exchange those.</string>
+	<string name="change_password">Change password</string>
+	<string name="current_password">Current password</string>
+	<string name="new_password">New password</string>
+	<string name="password_should_not_be_empty">Password should not be empty</string>
 </resources>
-- 
cgit v1.2.3


From 960b7343d3bf2511be4a6da838b9cf4a0f0a3c43 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <inputmice@siacs.eu>
Date: Sat, 3 Jan 2015 13:36:48 +0100
Subject: disable / enable all accounts

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

(limited to 'src/main/res/values/strings.xml')

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index ebb95278..73259228 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -403,4 +403,6 @@
 	<string name="current_password">Current password</string>
 	<string name="new_password">New password</string>
 	<string name="password_should_not_be_empty">Password should not be empty</string>
+	<string name="enable_all_accounts">Enable all accounts</string>
+	<string name="disable_all_accounts">Disable all accounts</string>
 </resources>
-- 
cgit v1.2.3


From be7de054be6b31b82947b9c641c8b1d5bbefb284 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <inputmice@siacs.eu>
Date: Sat, 3 Jan 2015 16:06:59 +0100
Subject: record voice and attachment refactor

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

(limited to 'src/main/res/values/strings.xml')

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 73259228..45174cd8 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -405,4 +405,5 @@
 	<string name="password_should_not_be_empty">Password should not be empty</string>
 	<string name="enable_all_accounts">Enable all accounts</string>
 	<string name="disable_all_accounts">Disable all accounts</string>
+	<string name="perform_action_with">Perform action with</string>
 </resources>
-- 
cgit v1.2.3