From: David A. Velasco <dvelasco@solidgear.es>
Date: Thu, 18 Sep 2014 12:27:13 +0000 (+0200)
Subject: Merge branch 'develop' into release-1.6.0
X-Git-Tag: oc-android-1.7.0_signed~15^2~35
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/aa354e5d73d2e1777b93e957220990d145f3b6ba

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

aa354e5d73d2e1777b93e957220990d145f3b6ba
diff --cc res/values/strings.xml
index 3208bf17,dd5fe981..d80a79b3
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -283,8 -283,13 +283,13 @@@
  
  	<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_progress_dialog_text">Loading data...</string>
+ 
  	<string name="saml_authentication_required_text">Authentication required</string>
  	<string name="saml_authentication_wrong_pass">Wrong password</string>
  	<string name="actionbar_move">Move</string>