From: jabarros <jabarros@solidgear.es>
Date: Fri, 26 Dec 2014 08:04:02 +0000 (+0100)
Subject: Merge pull request #784 from ekeitho/develop
X-Git-Tag: oc-android-1.7.0_signed~61
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/f0905fbaac2249eb08a57a27e4471d1b2ddfac98?ds=inline;hp=-c

Merge pull request #784 from ekeitho/develop

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

f0905fbaac2249eb08a57a27e4471d1b2ddfac98
diff --combined res/values/strings.xml
index 2ea02dba,4898a435..27751d14
--- a/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>