X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/d9604bf99e68fc853fa969949c7f97e1854330f5..8ceb0c3e2a0ab9ff2adcf0157dd01be7637f5420:/res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index af5a684d..296a8e0e 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -39,7 +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,9 +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>
@@ -279,6 +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>
@@ -296,14 +304,15 @@
 
 	<string name="actionbar_logger">Logs</string>
 	<string name="log_send_history_button">Send History</string>
-	<string name="log_mail_subject">ownCloud Android app logs</string>
-	<string name="log_progress_dialog_text">Loading data...</string>
+	<string name="log_send_no_mail_app">No app for sending logs found. Install mail app!</string>
+	<string name="log_send_mail_subject">%1$s Android app logs</string>
+	<string name="log_progress_dialog_text">Loading data&#8230;</string>
 
 	<string name="saml_authentication_required_text">Authentication required</string>
 	<string name="saml_authentication_wrong_pass">Wrong password</string>
 	<string name="actionbar_move">Move</string>
 	<string name="file_list_empty_moving">Nothing in here. You can add a folder!</string>
-	<string name="move_choose_button_text">Choose</string>
+	<string name="folder_picker_choose_button_text">Choose</string>
 
 	<string name="move_file_not_found">Unable to move. Please check whether the file exists</string>
 	<string name="move_file_invalid_into_descendent">It is not possible to move a folder into a descendant</string>
@@ -314,4 +323,9 @@
 	<string name="prefs_category_instant_uploading">Instant Uploads</string>
 	<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="subject_token">%1$s shared \"%2$s\" with you</string>
+
 </resources>