Merge branch 'trz/rebase' into trz/rename

Conflicts:
	build.gradle
	src/main/java/de/thedevstack/conversationsplus/services/AvatarService.java
	src/main/res/values-bg/strings.xml
	src/main/res/values-cs/strings.xml
	src/main/res/values-fr/strings.xml
	src/main/res/values-ja/strings.xml
	src/main/res/values-nl/strings.xml
	src/main/res/values-pt/strings.xml
	src/main/res/values-ro-rRO/strings.xml
	src/main/res/values-sv/strings.xml
	src/main/res/values-zh-rCN/strings.xml
	src/main/res/values/strings.xml

3 files changed, 13 insertions, 2 deletions

diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml
index 2cad436c..135301c0 100644
--- a/src/main/res/values/attrs.xml
+++ b/src/main/res/values/attrs.xml
@@ -27,6 +27,7 @@
     <attr name="icon_search" format="reference"/>
     <attr name="icon_secure" format="reference"/>
     <attr name="icon_settings" format="reference"/>
+    <attr name="icon_share" format="reference"/>
     <attr name="icon_import_export" format="reference"/>
     <declare-styleable name="AmbilWarnaPreference">
         <attr name="supportsAlpha"
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index f41e9619..99f16722 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -104,6 +104,9 @@
 	<string name="pref_xmpp_resource_summary">The name this client identifies itself with</string>
 	<string name="pref_accept_files">Accept files</string>
 	<string name="pref_accept_files_summary">Automatically accept files smaller than…</string>
+	<string name="pref_attachments">Attachments</string>
+	<string name="pref_return_to_previous">Quick Sharing</string>
+	<string name="pref_return_to_previous_summary">Immediately return to previous activity instead of opening the conversation after sharing something</string>
     <string name="pref_accept_files_size">Size</string>
     <string name="pref_accept_files_size_summary">Automatically accept files smaller than…</string>
     <string name="pref_accept_files_download">Wi-Fi only</string>
@@ -114,9 +117,11 @@
 	<string name="pref_notifications">Notifications</string>
 	<string name="pref_notifications_summary">Notify when a new message arrives</string>
 	<string name="pref_vibrate">Vibrate</string>
-	<string name="pref_vibrate_summary">Also vibrate when a new message arrives</string>
+	<string name="pref_vibrate_summary">Vibrate when a new message arrives</string>
+	<string name="pref_led">LED Notification</string>
+	<string name="pref_led_summary">Blink notification light when a new message arrives</string>
 	<string name="pref_sound">Sound</string>
-	<string name="pref_sound_summary">Play ringtone with notification</string>
+	<string name="pref_sound_summary">Play sound when a new message arrives</string>
 	<string name="pref_notification_grace_period">Notification grace period</string>
 	<string name="pref_notification_grace_period_summary">Disable notifications for a short time after a carbon copy was received</string>
 	<string name="pref_advanced_options">Advanced</string>
@@ -636,6 +641,7 @@
 	<string name="shared_file_with_x">Shared file with %s</string>
 	<string name="shared_image_with_x">Shared image with %s</string>
 	<string name="shared_images_with_x">Shared images with %s</string>
+	<string name="shared_text_with_x">Shared text with %s</string>
 	<string name="no_storage_permission">Conversations+ need access to external storage</string>
 	<string name="sync_with_contacts">Synchronize with contacts</string>
 	<string name="sync_with_contacts_long">Conversations+ wants to match your XMPP roster with your contacts to show their full names and avatars.\n\nConversations+ will only read your contacts and match them locally without uploading them to your server.\n\nYou will now be asked to grant permission to access your contacts.</string>
@@ -667,4 +673,7 @@
 	<string name="select_image_and_crop">Select image and crop</string>
 	<string name="this_account_is_disabled">You have disabled this account</string>
 	<string name="cplus_copy_item">Copy item</string>
+	<string name="security_error_invalid_file_access">Security error: Invalid file access</string>
+	<string name="no_application_to_share_uri">No application found to share URI</string>
+	<string name="share_uri_with">Share URI with…</string>
 </resources>
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index 67e0a5ee..4209a39a 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -33,6 +33,7 @@
         <item name="attr/icon_secure">@drawable/ic_action_secure</item>
         <item name="attr/icon_settings">@drawable/ic_action_settings</item>
         <item name="attr/icon_import_export">@drawable/ic_stat_communication_import_export</item>
+        <item name="attr/icon_share">@drawable/ic_action_share</item>
     </style>
 
     <style name="ConversationsTheme.LargerText" parent="ConversationsTheme">