Merge pull request #784 from ekeitho/develop

subject mail populated when user shares >>file/folder<<

diff --combined res/values/strings.xml
index 2ea02db,4898a43..27751d1
--- 1/res/values/strings.xml
--- 2/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -304,9 -304,8 +304,9 @@@
  
        <string name="actionbar_logger">Logs</string>
        <string name="log_send_history_button">Send History</string>
 -      <string name="log_mail_subject">ownCloud Android app logs</string>
 -      <string name="log_progress_dialog_text">Loading data...</string>
 +      <string name="log_send_no_mail_app">No app for sending logs found. Install mail app!</string>
 +      <string name="log_send_mail_subject">%1$s Android app logs</string>
 +      <string name="log_progress_dialog_text">Loading data&#8230;</string>
  
        <string name="saml_authentication_required_text">Authentication required</string>
        <string name="saml_authentication_wrong_pass">Wrong password</string>
@@@ -325,4 -324,8 +325,8 @@@
  
        <string name="prefs_instant_video_upload_path_title">Upload Video Path</string>
  
+       <string name="shared_subject_header">shared</string>
+       <string name="with_you_subject_header">with you</string>
+       <string name="subject_token">%1$s %2$s &gt;&gt;%3$s&lt;&lt; %4$s</string>
+ 
  </resources>