From: jabarros <jabarros@solidgear.es>
Date: Wed, 27 Aug 2014 08:01:28 +0000 (+0200)
Subject: Update messages for moving files operation results
X-Git-Tag: oc-android-1.7.0_signed~197^2~12
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/8188d4fa922d4bef0b4f017efff96485f1308871

Update messages for moving files operation results
---

diff --git a/res/values/strings.xml b/res/values/strings.xml
index d3696501..69417069 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -290,9 +290,9 @@
 	<string name="file_list_empty_moving">Nothing in here. You can add a folder!</string>
 	<string name="move_choose_button_text">Choose</string>
 
-	<string name="move_file_invalid_into_descendent">Invalid move into descendent.</string>
-	<string name="move_file_invalid_overwrite">It is not possible to move one file where another with the same name exists.</string>
+	<string name="move_file_invalid_into_descendent">It is not possible to move a folder into a descendant</string>
+	<string name="move_file_invalid_overwrite">The file exists already in the destination folder</string>
 	<string name="move_file_error">An error occurred while trying to move this file or folder</string>
-	<string name="move_file_forbidden">It is forbidden to move this file or folder.</string>
+	<string name="forbidden_permissions_move">to move this file</string>
 
 </resources>
diff --git a/src/com/owncloud/android/utils/ErrorMessageAdapter.java b/src/com/owncloud/android/utils/ErrorMessageAdapter.java
index 8604f6fb..04d34f4b 100644
--- a/src/com/owncloud/android/utils/ErrorMessageAdapter.java
+++ b/src/com/owncloud/android/utils/ErrorMessageAdapter.java
@@ -196,7 +196,8 @@ public class ErrorMessageAdapter {
                 message = res.getString(R.string.move_file_invalid_overwrite);
 
             } else if (result.getCode() == ResultCode.FORBIDDEN) {
-                message = res.getString(R.string.move_file_forbidden);
+                message = String.format(res.getString(R.string.forbidden_permissions),
+                        res.getString(R.string.forbidden_permissions_move));
 
             }else {    // Generic error
                 // Show a Message, operation finished without success