From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 23 Jun 2014 06:49:06 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/develop' into develop
X-Git-Tag: oc-android-1.7.0_signed~277
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/bcfd1f63bd5cf20104a74685864f4de6bb573f25?hp=670b22fb69e1a660432fb15778c2f778f29a4f77

Merge remote-tracking branch 'origin/develop' into develop
---

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 3a1f97d2..04f769bc 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -112,7 +112,7 @@
     <string name="foreign_files_fail">"Some files could not be moved"</string>
     <string name="foreign_files_local_text">"Local: %1$s"</string>
     <string name="foreign_files_remote_text">"Remote: %1$s"</string>
-    <string name="upload_query_move_foreign_files">There is not space enough to copy the selected files into the %1$s folder. Would like to move them into instead? </string>
+    <string name="upload_query_move_foreign_files">There is not space enough to copy the selected files into the %1$s folder. Would like to move them instead? </string>
     <string name="pincode_enter_pin_code">Please, insert your App PIN</string>
     
     <string name="pincode_configure_your_pin">Enter your App PIN</string>