From: David A. Velasco <dvelasco@solidgear.es>
Date: Fri, 31 Oct 2014 14:23:59 +0000 (+0100)
Subject: Merge branch 'remember_last_share_location' into remember_last_share_location_fixed
X-Git-Tag: oc-android-1.7.0_signed~119^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/0bedcb9128a96f71d3877d8e08230f31be0c3388?ds=inline;hp=-c

Merge branch 'remember_last_share_location' into remember_last_share_location_fixed
---

0bedcb9128a96f71d3877d8e08230f31be0c3388
diff --combined res/values/strings.xml
index af5a684d,4332c19b..2655e29f
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -12,14 -12,6 +12,14 @@@
      <string name="actionbar_settings">Settings</string>
      <string name="actionbar_see_details">Details</string>
      <string name="actionbar_send_file">Send</string>
 +    <string name="actionbar_sort">Sort</string>
 +    <string name="actionbar_sort_title">Sort by</string>
 +    <string-array name="actionbar_sortby">
 +    	<item>A-Z</item>
 +    	<item>Newest - Oldest</item>
 +    	<!-- TODO re-enable when server-side folder size calculation is available   
 +    	<item>Biggest - Smallest</item>  -->
 +    </string-array>
      <string name="prefs_category_general">General</string>
      <string name="prefs_category_more">More</string>
      <string name="prefs_accounts">Accounts</string>
@@@ -39,7 -31,9 +39,9 @@@
      <string name="prefs_recommend">Recommend to a friend</string>
      <string name="prefs_feedback">Feedback</string>
      <string name="prefs_imprint">Imprint</string>
-     
+     <string name="prefs_remember_last_share_location">Remember share location</string>
+     <string name="prefs_remember_last_upload_location_summary">Remember last share upload location</string>
+ 
  	<string name="recommend_subject">"Try %1$s on your smartphone!"</string>
  	<string name="recommend_text">"I want to invite you to use %1$s on your smartphone!\nDownload here: %2$s"</string>
  
@@@ -279,6 -273,7 +281,7 @@@
  	<string name="network_error_socket_timeout_exception">An error occurred while waiting for the server, the operation couldn\'t have been done</string>
  	<string name="network_error_connect_timeout_exception">An error occurred while waiting for the server, the operation couldn\'t have been done</string>
  	<string name="network_host_not_available">The operation couldn\'t be completed, server is unavailable</string>
+ 
  	<string name="empty"></string>
  	
  	<string name="forbidden_permissions">You do not have permission %s</string>
@@@ -292,7 -287,7 +295,7 @@@
  
  	<string name="prefs_category_accounts">Accounts</string>
  	<string name="prefs_add_account">Add account</string>
 -	<string name="auth_redirect_non_secure_connection_title">Secure connection is redirected through an unsecured route.</string>
 +	<string name="auth_redirect_non_secure_connection_title">Secure connection is redirected to an unsecured route.</string>
  
  	<string name="actionbar_logger">Logs</string>
  	<string name="log_send_history_button">Send History</string>
@@@ -313,5 -308,4 +316,4 @@@
  
  	<string name="prefs_category_instant_uploading">Instant Uploads</string>
  	<string name="prefs_category_security">Security</string>
- 
  </resources>