From: masensio <masensio@solidgear.es>
Date: Fri, 20 Mar 2015 13:55:48 +0000 (+0100)
Subject: Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop
X-Git-Tag: oc-android-1.7.1_signed^2~9^2~5
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/c0da8a93f24f4f87256e71c32f3c2a300d22e62f?hp=-c

Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop
---

c0da8a93f24f4f87256e71c32f3c2a300d22e62f
diff --combined res/values/strings.xml
index da18ec58,8b2224bd..abf48d39
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -53,7 -53,6 +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>
@@@ -167,7 -166,7 +167,7 @@@
  	<string name="auth_no_net_conn_title">No network connection</string>
  	<string name="auth_nossl_plain_ok_title">Secure connection unavailable.</string>
  	<string name="auth_connection_established">Connection established</string>
- 	<string name="auth_testing_connection">Testing connection&#8230;</string>
+ 	<string name="auth_testing_connection">Testing connection</string>
  	<string name="auth_not_configured_title">Malformed server configuration</string>
  	<string name="auth_account_not_new">An account for the same user and server already exists in the device</string>
  	<string name="auth_account_not_the_same">The entered user does not match the user of this account</string>
@@@ -332,4 -331,7 +332,7 @@@
  
  	<string name="subject_token">%1$s shared \"%2$s\" with you</string>
  
+     <string name="auth_refresh_button">Refresh connection</string>
+     <string name="auth_host_address">Server address</string>
+ 
  </resources>