From: masensio <masensio@solidgear.es>
Date: Fri, 30 Jan 2015 11:10:15 +0000 (+0100)
Subject: Merge commit 'refs/pr/701' into create_folder_during_upload_pr_701_with_develop
X-Git-Tag: oc-android-1.7.1_signed^2~9^2~10
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/7f6c5bd3b2d0396a838168cd5e3f622b16239e67?hp=-c

Merge commit 'refs/pr/701' into create_folder_during_upload_pr_701_with_develop
---

7f6c5bd3b2d0396a838168cd5e3f622b16239e67
diff --combined res/values/strings.xml
index 914681b4,9772edff..d04bd1bc
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -53,6 -53,7 +53,7 @@@
      <string name="sync_string_files">Files</string>
      <string name="setup_btn_connect">Connect</string>
      <string name="uploader_btn_upload_text">Upload</string>
+     <string name="uploader_btn_new_folder_text">New folder</string>
      <string name="uploader_top_message">Choose upload folder:</string>
      <string name="uploader_wrn_no_account_title">No account found</string>
      <string name="uploader_wrn_no_account_text">There are no %1$s accounts on your device. Please setup an account first.</string>
@@@ -324,7 -325,6 +325,7 @@@
  	<string name="prefs_category_security">Security</string>
  
  	<string name="prefs_instant_video_upload_path_title">Upload Video Path</string>
 +    <string name="download_folder_failed_content">Download of %1$s folder could not be completed</string>
  
  	<string name="shared_subject_header">shared</string>
  	<string name="with_you_subject_header">with you</string>