From: jabarros <jabarros@solidgear.es>
Date: Thu, 2 Oct 2014 07:04:11 +0000 (+0200)
Subject: Merge branch 'develop' into release-1.6.0
X-Git-Tag: oc-android-1.7.0_signed~15^2~28
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/2e472998c16e504c0c2ceddf7de52a000d7bd7f8?hp=-c

Merge branch 'develop' into release-1.6.0
---

2e472998c16e504c0c2ceddf7de52a000d7bd7f8
diff --combined res/values/strings.xml
index d80a79b3,4c7cf34d..03b53623
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -283,11 -283,11 +283,11 @@@
  
  	<string name="prefs_category_accounts">Accounts</string>
  	<string name="prefs_add_account">Add account</string>
 -	<string name="auth_redirect_non_secure_connection_title">Secure connection is redirected through an unsecured route.</string>
 +	<string name="auth_redirect_non_secure_connection_title">Secure connection is redirected to an unsecured route.</string>
  
  	<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_mail_subject">ownCloud Android app logs</string>
  	<string name="log_progress_dialog_text">Loading data...</string>
  
  	<string name="saml_authentication_required_text">Authentication required</string>