From: tobiasKaminsky <tobias@kaminsky.me>
Date: Fri, 21 Nov 2014 16:59:51 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/develop' into fileCount
X-Git-Tag: oc-android-1.7.0_signed~91^2~2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ae6b686775ea4a16a1d756bcacec393dcd76d1da?hp=-c

Merge remote-tracking branch 'upstream/develop' into fileCount
---

ae6b686775ea4a16a1d756bcacec393dcd76d1da
diff --combined res/values/strings.xml
index dc7ec2a4,d8f1e930..de88a5b3
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -39,7 -39,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>
  
@@@ -60,13 -62,10 +62,14 @@@
      <string name="uploader_wrn_no_content_text">No content was received. Nothing to upload.</string>
      <string name="uploader_error_forbidden_content">%1$s is not allowed to access the shared content</string>
      <string name="uploader_info_uploading">Uploading</string>
+     <string name="file_list_seconds_ago">seconds ago</string>
      <string name="file_list_empty">Nothing in here. Upload something!</string>
      <string name="file_list_loading">Loading...</string>
      <string name="local_file_list_empty">There are no files in this folder.</string>
 +    <string name="file_list_folder">folder</string>
 +    <string name="file_list_folders">folders</string>
 +    <string name="file_list_file">file</string>
 +    <string name="file_list_files">files</string>
      <string name="filedetails_select_file">Tap on a file to display additional information.</string>
      <string name="filedetails_size">Size:</string>
      <string name="filedetails_type">Type:</string>
@@@ -283,6 -282,7 +286,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>
@@@ -317,5 -317,4 +321,4 @@@
  
  	<string name="prefs_category_instant_uploading">Instant Uploads</string>
  	<string name="prefs_category_security">Security</string>
- 
  </resources>