From 7f1de73784348562b8236b61ba88147196782861 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Mon, 11 Jan 2016 15:34:26 +0100
Subject: [PATCH] don't use the word phone in strings

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

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 2185d099c..cdb5ae22b 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -11,7 +11,7 @@
 	<string name="action_secure">Secure conversation</string>
 	<string name="action_add_account">Add account</string>
 	<string name="action_edit_contact">Edit name</string>
-	<string name="action_add_phone_book">Add to phone book</string>
+	<string name="action_add_phone_book">Add to address 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>
@@ -175,7 +175,7 @@
 	<string name="passwords_do_not_match">Passwords do not match</string>
 	<string name="invalid_jid">This is not a valid Jabber ID</string>
 	<string name="error_out_of_memory">Out of memory. Image is too large</string>
-	<string name="add_phone_book_text">Do you want to add %s to your devices’s contact list?</string>
+	<string name="add_phone_book_text">Do you want to add %s to your address book?</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>
@@ -355,7 +355,6 @@
 	<string name="verify_otr">Verify OTR</string>
 	<string name="remote_fingerprint">Remote Fingerprint</string>
 	<string name="scan">scan</string>
-	<string name="or_touch_phones">(or touch phones)</string>
 	<string name="smp">Socialist Millionaire Protocol</string>
 	<string name="shared_secret_hint">Hint or Question</string>
 	<string name="shared_secret_secret">Shared Secret</string>
@@ -528,7 +527,7 @@
 	<string name="pref_away_when_screen_off">Away when screen is off</string>
 	<string name="pref_away_when_screen_off_summary">Marks your resource as away when the screen is turned off</string>
 	<string name="pref_xa_on_silent_mode">Not available in silent mode</string>
-	<string name="pref_xa_on_silent_mode_summary">Marks your resource as not available when phone is in silent mode</string>
+	<string name="pref_xa_on_silent_mode_summary">Marks your resource as not available when device is in silent mode</string>
 	<string name="action_add_account_with_certificate">Add account with certificate</string>
 	<string name="unable_to_parse_certificate">Unable to parse certificate</string>
 	<string name="authenticate_with_certificate">Leave empty to authenticate w/ certificate</string>
@@ -576,7 +575,7 @@
 	<string name="always">Always</string>
 	<string name="automatically">Automatically</string>
 	<string name="battery_optimizations_enabled">Battery optimizations enabled</string>
-	<string name="battery_optimizations_enabled_explained">Your phone is doing some heavy battery optimizations on Conversations that might lead to delayed notifications or even message loss. It is recommended to disable those.</string>
-	<string name="battery_optimizations_enabled_dialog">Your phone is doing some heavy battery optimizations on Conversations that might lead to delayed notifications or even message loss.\n\nYou will now be asked to disable those.</string>
+	<string name="battery_optimizations_enabled_explained">Your device is doing some heavy battery optimizations on Conversations that might lead to delayed notifications or even message loss.\nIt is recommended to disable those.</string>
+	<string name="battery_optimizations_enabled_dialog">Your device is doing some heavy battery optimizations on Conversations that might lead to delayed notifications or even message loss.\n\nYou will now be asked to disable those.</string>
 	<string name="disable">Disable</string>
 </resources>