From: David A. Velasco <dvelasco@solidgear.es>
Date: Tue, 1 Jul 2014 12:21:26 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/develop' into add_cookie_based_session_support
X-Git-Tag: oc-android-1.7.0_signed~264^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/dacc14a882be8b499c00ad2f75b68e10a42dee9e?hp=-c

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

dacc14a882be8b499c00ad2f75b68e10a42dee9e
diff --combined owncloud-android-library
index 8080e490,f323dda0..3c116514
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 8080e4904de8f042fdff17691674e900607c66a8
 -Subproject commit f323dda0445b455af638c7e8e4653c22959adb91
++Subproject commit 3c116514fb33992d050f7051e756b6c2244953b0
diff --combined res/values/strings.xml
index bc3e1b1d,9992b18c..71436a86
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -97,7 -97,6 +97,7 @@@
      <string name="downloader_download_failed_credentials_error">Download failed, you need to relogin</string>
      <string name="common_choose_account">Choose account</string>
      <string name="sync_fail_ticker">Synchronization failed</string>
 +    <string name="sync_fail_ticker_unauthorized">Synchronization failed, you need to relogin</string>
      <string name="sync_fail_content">Synchronization of %1$s could not be completed</string>
      <string name="sync_fail_content_unauthorized">Invalid password for %1$s</string>
  	<string name="sync_conflicts_in_favourites_ticker">Conflicts found</string>
@@@ -113,7 -112,7 +113,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 you 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>