Merge branch 'develop' into release-1.5.5

diff --cc res/values/strings.xml
index 3967d9f,2223c6e..a73f906
--- 1/res/values/strings.xml
--- 2/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>