Show maintenance mode message while authenticating

# Conflicts:
#	src/com/owncloud/android/authentication/AuthenticatorActivity.java

src/main/java/com/owncloud/android/authentication/AuthenticatorActivity.java

@@ -1452,6 +1452,9 @@ public class AuthenticatorActivity extends AccountAuthenticatorActivity
                 mServerStatusIcon = R.drawable.ic_lock_open_white;
                 mServerStatusText = R.string.auth_redirect_non_secure_connection_title;
                 break;
+            case MAINTENANCE_MODE:
+                mServerStatusText = R.string.maintenance_mode;
+                break;
             default:
                 mServerStatusText = 0;
                 mServerStatusIcon = 0;

src/main/java/com/owncloud/android/utils/ErrorMessageAdapter.java

@@ -125,6 +125,7 @@ public class ErrorMessageAdapter {
                     // Error --> No permissions
                     message = String.format(res.getString(R.string.forbidden_permissions),
                             res.getString(R.string.forbidden_permissions_delete));
+
                 } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
                     message = res.getString(R.string.maintenance_mode);
 
@@ -300,7 +301,7 @@ public class ErrorMessageAdapter {
             } else if (result.getCode() == ResultCode.FORBIDDEN) {
                 message = String.format(res.getString(R.string.forbidden_permissions),
                         res.getString(R.string.forbidden_permissions_copy));
-                
+
             } else if (result.getCode() == ResultCode.MAINTENANCE_MODE) {
                 message = res.getString(R.string.maintenance_mode);
 

src/main/res/values/strings.xml

@@ -543,7 +543,7 @@
     <string name="local_file_not_found_toast">File not found in local file system</string>
     <string name="confirmation_remove_files_alert">Do you really want to remove the selected items?</string>
     <string name="confirmation_remove_folders_alert">Do you really want to remove the selected items and their contents?</string>
-    <string name="maintenance_mode">This Owncloud instance is in maintenance mode, please try again later or contact your system administrator.</string>
+    <string name="maintenance_mode">This ownCloud server is in maintenance mode, please try again later.</string>
 
     <string name="uploads_view_upload_status_waiting_for_charging">Awaiting charge</string>
     <string name="actionbar_search">Search</string>