X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/38ece35da5372d828e79a9ba31bdcd828cb5cd52..5be4bf17e11bfae134f24bbc8501b618304467b4:/res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index c482937e..8f1b9874 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -15,8 +15,12 @@
     <string name="main_tit_accsetup">Setup Account</string>
     <string name="main_wrn_accsetup">There are no ownCloud accounts on your device. In order to use this App, you need to create one.</string>
     
+	<string name="about_message">ownCloud Android client\n\nversion: %1$s</string>
+    
     <string name="actionbar_sync">Refresh</string>
-    <string name="actionbar_upload">Upload file</string>
+    <string name="actionbar_upload">Upload</string>
+    <string name="actionbar_upload_from_apps">Content from other apps</string>
+    <string name="actionbar_upload_files">Files</string>
     <string name="actionbar_mkdir">Create directory</string>
     <string name="actionbar_search">Search</string>
     <string name="actionbar_settings">Settings</string>
@@ -42,6 +46,7 @@
     <string name="auth_host_url">ownCloud URL</string>
     <string name="auth_username">Username</string>
     <string name="auth_password">Password</string>
+    <string name="auth_register">I am new to ownCloud</string>
     <string name="new_session_uri_error">Wrong URL given</string>
     <string name="new_session_session_name_error">Wrong session name</string>
     <string name="sync_string_files">Files</string>
@@ -57,29 +62,33 @@
     <string name="uploader_wrn_no_account_text">There are no ownCloud accounts on your device. Please setup an account first.</string>
     <string name="uploader_wrn_no_account_setup_btn_text">Setup</string>
     <string name="uploader_wrn_no_account_quit_btn_text">Quit</string>
+	<string name="uploader_wrn_no_content_title">No content to upload</string>
+	<string name="uploader_wrn_no_content_text">No content was received. Nothing to upload.</string>
+    <string name="uploader_error_forbidden_content">ownCloud is not allowed to access the shared content</string>
     <string name="uploader_info_uploading">Uploading</string>
     <string name="uploader_btn_create_dir_text">Create directory for upload</string>
+	<string name="file_list_empty">There are no files in this folder.\nNew files can be added with the \"Upload\" menu option.</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>
     <string name="filedetails_created">Created:</string>
     <string name="filedetails_modified">Modified:</string>
     <string name="filedetails_download">Download</string>
-	<string name="filedetails_redownload">Redownload</string>
-	<string name="filedetails_download_in_progress">Downloading</string>
+	<string name="filedetails_redownload">Refresh</string>
     <string name="filedetails_open">Open</string>
     <string name="common_yes">Yes</string>
     <string name="common_no">No</string>
     <string name="common_ok">OK</string>
     <string name="common_cancel">Cancel</string>
     <string name="common_save_exit">Save &amp; Exit</string>
+    <string name="common_exit">Leave ownCloud</string>
     <string name="common_error">Error</string>
     <string name="about_title">About</string>
     
     <string name="delete_account">Delete account</string>
     <string name="create_account">Create account</string>
     
-    <string name="upload_chooser_title">Upload file from &#8230;</string>
+    <string name="upload_chooser_title">Upload from &#8230;</string>
     <string name="uploader_info_dirname">Directory name</string>
 	<string name="uploader_upload_in_progress_ticker">Uploading &#8230;</string>    
 	<string name="uploader_upload_in_progress_content">%1$d%% Uploading %2$s</string>    
@@ -97,12 +106,15 @@
     <string name="downloader_download_failed_content">Download of %1$s could not be completed</string>
     <string name="common_choose_account">Choose account</string>
     <string name="sync_string_contacts">Contacts</string>
-    <string name="use_ssl">Use Secure Connection</string>
+	<string name="sync_fail_ticker">Synchronization failed</string>
+    <string name="sync_fail_content">Synchronization of %1$s could not be completed</string>
+	<string name="use_ssl">Use Secure Connection</string>
     <string name="location_no_provider">ownCloud cannot track your device. Please check your location settings</string>
     
     <string name="pincode_enter_pin_code">Please, insert your App PIN</string>
     <string name="pincode_enter_new_pin_code">Please, insert your new App PIN</string>
     <string name="pincode_configure_your_pin">Enter ownCloud App PIN</string>
+    <string name="pincode_configure_your_pin_explanation">The PIN will be requested every time the app is started</string> 
     <string name="pincode_reenter_your_pincode">Reenter ownCloud App PIN, please</string>
     <string name="pincode_remove_your_pincode">Remove your ownCloud App PIN</string>
     <string name="pincode_mismatch">Both ownCloud App PIN are not the same</string> 
@@ -160,7 +172,7 @@
 	  <string name="confirmation_remove_alert">"Do you really want to remove %1$s ?"</string>
 	  <string name="confirmation_remove_local">Local only</string>
 	  <string name="confirmation_remove_remote">Remove from server</string>
-	  <string name="confirmation_remove_remote_and_local">Both remote and local</string>
+	  <string name="confirmation_remove_remote_and_local">Remote and local</string>
 
     <string name="remove_success_msg">"Successful removal"</string>
     <string name="remove_fail_msg">"Removal could not be completed"</string>
@@ -173,4 +185,45 @@
     <string name="wait_a_moment">Wait a moment</string>
 	
     <string name="filedisplay_unexpected_bad_get_content">"Unexpected problem ; please, try other app to select the file"</string>
+    <string name="filedisplay_no_file_selected">No file was selected</string>
+    
+    <string name="oauth_host_url">oAuth2 URL</string> 
+    <string name="oauth_check_onoff">Login with oAuth2.</string> 
+    <string name="oauth_login_connection">Connecting to oAuth2 server…</string>    
+    <string name="oauth_code_validation_message">Please, open a web browser and go to:\n%1$s.\nValidate this code there:\n%2$s</string>
+    <string name="oauth_connection_url_unavailable">Connection to this URL not available.</string> 
+        
+    <string name="ssl_validator_title">Warning</string>
+    <string name="ssl_validator_header">The identity of the site could not be verified</string>
+    <string name="ssl_validator_reason_cert_not_trusted">- The server certificate is not trusted</string>
+    <string name="ssl_validator_reason_cert_expired">- The server certificate expired</string>
+    <string name="ssl_validator_reason_cert_not_yet_valid">- The server certificate is too young</string>
+    <string name="ssl_validator_reason_hostname_not_verified">- The URL does not match the hostname in the certificate</string>
+    <string name="ssl_validator_certificate_not_available">The server certificate could not be obtained</string>
+    <string name="ssl_validator_question">Do you want to trust this certificate anyway?</string>
+    <string name="ssl_validator_not_saved">The certificate could not be saved</string>
+    <string name="ssl_validator_btn_details_see">Details</string>
+    <string name="ssl_validator_btn_details_hide">Hide</string>
+    <string name="ssl_validator_label_subject">Issued to:</string>
+    <string name="ssl_validator_label_issuer">Issued by:</string>
+    <string name="ssl_validator_label_CN">Common name:</string>
+    <string name="ssl_validator_label_O">Organization:</string>
+	<string name="ssl_validator_label_OU">Organizational unit:</string>
+	<string name="ssl_validator_label_C">Country:</string>
+	<string name="ssl_validator_label_ST">State:</string>
+	<string name="ssl_validator_label_L">Location:</string>
+    <string name="ssl_validator_label_validity">Validity:</string>
+    <string name="ssl_validator_label_validity_from">From:</string>
+	<string name="ssl_validator_label_validity_to">To:</string>
+	<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="instant_upload_on_wifi">Upload pictures via WiFi only</string>
+    <string name="conflict_title">Update conflict</string>
+    <string name="conflict_message">Remote file %s is not synchronized with local file. Continuing will replace content of file on server.</string>
+    <string name="conflict_keep_both">Keep both</string>
+    <string name="conflict_overwrite">Overwrite</string>
+    <string name="conflict_dont_upload">Don\'t upload</string>
 </resources>