X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/236895e7f88813546c99a5d3306285e033998faf..e8ae33b62889ca0ae97abb813f08e6aad4d9b4c2:/res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 77b7a324..45b4a303 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">ownCloud</string>
+    <string name="whats_new">What\'s new</string>
     <string name="main_password">Password:</string>
     <string name="main_login">Username:</string>
     <string name="main_button_login">Login</string>
@@ -23,6 +24,7 @@
     <string name="actionbar_mkdir">Create directory</string>
     <string name="actionbar_search">Search</string>
     <string name="actionbar_settings">Settings</string>
+    <string name="actionbar_see_details">See details</string>
     
     <string name="prefs_category_general">General</string>
     <string name="prefs_category_trackmydevice">Device tracking</string>
@@ -115,6 +117,18 @@
 	<string name="sync_conflicts_in_favourites_content">%1$d kept-in-sync files could not be sync\'ed</string>
     <string name="sync_fail_in_favourites_ticker">Kept-in-sync files failed</string>
 	<string name="sync_fail_in_favourites_content">Contents of %1$d files could not be sync\'ed (%2$d conflicts)</string>
+	<string name="sync_foreign_files_forgotten_ticker">Some local files were forgotten</string>
+	<string name="sync_foreign_files_forgotten_content">%1$d files out of the %2$s directory could not be copied into</string>
+	<string name="sync_foreign_files_forgotten_explanation">"As of version 1.3.16, files uploaded from this device are copied into the local %1$s folder to prevent data loss when a single file is synced with multiple accounts.\n\nDue to this change, all files uploaded in previous versions of this app were copied into the %2$s folder. However, an error prevented the completion of this operation during account synchronization. You may either leave the file(s) as is and remove the link to %3$s, or move the file(s) into the %1$s directory and retain the link to %4$s.\n\nListed below are the local file(s), and the the remote file(s) in %5$s they were linked to.</string>
+    
+    <string name="foreign_files_move">"Move all"</string>
+    <string name="foreign_files_success">"All files were moved"</string>
+    <string name="foreign_files_fail">"Some files could not be moved"</string>
+    <string name="foreign_files_local_text">"Local: %1$s"</string>
+	<string name="foreign_files_remote_text">"Remote: %1$s"</string>
+
+	<string name="upload_query_move_foreign_files">There is not space enough to copy the selected files into the %1$s folder. Would like to move them into instead? </string>	
+    	
 	<string name="use_ssl">Use Secure Connection</string>
     <string name="location_no_provider">%1$s cannot track your device. Please check your location settings</string>
     
@@ -129,6 +143,23 @@
     <string name="pincode_removed">App PIN removed</string>
     <string name="pincode_stored">App PIN stored</string>
     
+    <string name="media_notif_ticker">"%1$s music player"</string>
+    <string name="media_state_playing">"%1$s (playing)"</string>
+    <string name="media_state_loading">"%1$s (loading)"</string>
+    <string name="media_event_done">"%1$s playback finished"</string>
+    <string name="media_err_nothing_to_play">No media file found</string>
+	<string name="media_err_no_account">No account provided</string>
+    <string name="media_err_not_in_owncloud">File not in a valid account</string>
+    <string name="media_err_unsupported">Unsupported media codec</string>
+    <string name="media_err_io">Media file could not be read</string>
+    <string name="media_err_malformed">Media file not correctly encoded</string>
+    <string name="media_err_timeout">Too much time trying to play</string>
+    <string name="media_err_invalid_progressive_playback">Media file cannot be streamed</string>
+    <string name="media_err_unknown">Media file cannot be played with the stock media player</string>
+    <string name="media_err_security_ex">Security error trying to play %1$s</string>
+	<string name="media_err_io_ex">Input error trying to play %1$s</string>
+	<string name="media_err_unexpected">Unexpected error tryung to playe %1$s</string>
+            
     <string-array name="prefs_trackmydevice_intervall_keys">
     	<item>15 Minutes</item>
     	<item>30 Minutes</item>
@@ -228,7 +259,11 @@
 	<string name="ssl_validator_label_signature">Signature:</string>
 	<string name="ssl_validator_label_signature_algorithm">Algorithm:</string>
 			
-    <string name="text_placeholder">This is a placeholder</string>
+    <string name="placeholder_sentence">This is a placeholder</string>
+    <string name="placeholder_filename">placeholder.txt</string>
+    <string name="placeholder_filetype">PNG Image</string>
+    <string name="placeholder_filesize">389 KB</string>
+    <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
     
     <string name="instant_upload_on_wifi">Upload pictures via WiFi only</string>
 	<string name="instant_upload_path">/InstantUpload</string>
@@ -238,4 +273,10 @@
     <string name="conflict_keep_both">Keep both</string>
     <string name="conflict_overwrite">Overwrite</string>
     <string name="conflict_dont_upload">Don\'t upload</string>
+    
+    <string name="image_preview">Image preview</string>
+    
+    <!-- we need to improve the communication of errors to the user -->
+    <string name="error__upload__local_file_not_copied">%1$s could not be copied to %2$s local directory</string>
+    
 </resources>