From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 24 Mar 2014 09:23:05 +0000 (+0100)
Subject: Merge branch 'develop' into release-1.5.5
X-Git-Tag: oc-android-1.5.5~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/d2ff7d47553944206bcb904b423fa33b91ef0977?ds=inline;hp=--cc

Merge branch 'develop' into release-1.5.5
---

d2ff7d47553944206bcb904b423fa33b91ef0977
diff --cc res/values/strings.xml
index 3967d9fb,2223c6e4..a73f9061
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -166,7 -166,8 +166,8 @@@
  	<string name="auth_connecting_auth_server">Connecting to authentication server…</string>
  	<string name="auth_unsupported_auth_method">The server does not support this authentication method</string>    
  	<string name="auth_unsupported_multiaccount">%1$s does not support multiple accounts</string>
 -	<string name="auth_fail_get_user_name">Your server is not returning a correct user id, contact with your admin please</string>
 +	<string name="auth_fail_get_user_name">Your server is not returning a correct user id, please contact an administrator</string>
+ 	<string name="auth_can_not_auth_against_server">Can not authenticate against this server</string>
      
      <string name="fd_keep_in_sync">Keep file up to date</string>
      <string name="common_rename">Rename</string>