From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 28 Oct 2013 09:11:40 +0000 (+0100)
Subject: Merge branch 'develop' into clean_up
X-Git-Tag: oc-android-1.5.5~144^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/4160e7e256cc91479a5ec883db32172a91ea8243?ds=inline;hp=-c

Merge branch 'develop' into clean_up
---

4160e7e256cc91479a5ec883db32172a91ea8243
diff --combined res/values/strings.xml
index 7259b1e7,a83d8e78..4f75db18
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@@ -1,6 -1,18 +1,6 @@@
  <?xml version="1.0" encoding="utf-8"?>
  <resources>
  
 -    <string name="main_password">Password:</string>
 -    <string name="main_login">Username:</string>
 -    <string name="main_button_login">Login</string>
 -    <string name="main_welcome">Welcome</string>
 -    <string name="main_files">Files</string>
 -    <string name="main_music">Music</string>
 -    <string name="main_contacts">Contacts</string>
 -    <string name="main_calendar">Calendar</string>
 -    <string name="main_bookmarks">Bookmarks</string>
 -    <string name="main_settings">Settings</string>
 -    <string name="main_tit_accsetup">Setup Account</string>
 -    <string name="main_wrn_accsetup">There is no account set up on your device. In order to use this App, you need to create one.</string>
      <string name="about_android">%1$s Android App</string>
      <string name="about_version">version %1$s</string>
      <string name="actionbar_sync">Refresh account</string>
@@@ -9,11 -21,21 +9,11 @@@
      <string name="actionbar_upload_files">Files</string>
      <string name="actionbar_open_with">Open with</string>
      <string name="actionbar_mkdir">Create directory</string>
 -    <string name="actionbar_search">Search</string>
      <string name="actionbar_settings">Settings</string>
      <string name="actionbar_see_details">Details</string>
      
      <string name="prefs_category_general">General</string>
      <string name="prefs_category_more">More</string>
 -    <string name="prefs_add_session">Add new session</string>
 -    <string name="prefs_create_img_thumbnails">Create image thumbnails</string>
 -    <string name="prefs_select_oc_account">Select an account</string>
 -    <string name="prefs_summary_select_oc_account">Choose which of your accounts the app should use.</string>
 -    <string name="prefs_trackmydevice">Device Tracking</string>
 -    <string name="prefs_trackmydevice_summary_off">Enable this App to track your device location</string>
 -    <string name="prefs_trackmydevice_summary_on">This App keeps track of this device</string>
 -    <string name="prefs_trackmydevice_interval">Update Interval</string>
 -    <string name="prefs_trackmydevice_interval_summary">Update every %1$s minutes</string>
      <string name="prefs_accounts">Accounts</string>
      <string name="prefs_manage_accounts">Manage Accounts</string>
      <string name="prefs_pincode">App PIN</string>
@@@ -34,11 -56,20 +34,11 @@@
  	<string name="recommend_text">"I want to invite you to use %1$s on your smartphone!\nDownload here: %2$s"</string>  
  
      <string name="auth_check_server">Check Server</string>
 -    <string name="auth_account_name">Account name</string>
      <string name="auth_host_url">Server address</string>
      <string name="auth_username">Username</string>
      <string name="auth_password">Password</string>
      <string name="auth_register">New to %1$s?</string>
 -    <string name="new_session_uri_error">Incorrect address given</string>
 -    <string name="new_session_session_name_error">Incorrect session name</string>
      <string name="sync_string_files">Files</string>
 -    <string name="uploader_no_file_selected">No file selected for upload</string>
 -    <string name="setup_hint_username">Username</string>
 -    <string name="setup_hint_password">Password</string>
 -    <string name="setup_hint_address">Web address</string>
 -    <string name="setup_hint_show_password">Show password?</string>
 -    <string name="setup_title">Connect to your %1$s</string>
      <string name="setup_btn_connect">Connect</string>
      <string name="uploader_btn_upload_text">Upload</string>
      <string name="uploader_top_message">Choose upload directory:</string>
@@@ -50,6 -81,7 +50,6 @@@
      <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="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>
@@@ -58,6 -90,7 +58,6 @@@
      <string name="filedetails_modified">Modified:</string>
      <string name="filedetails_download">Download</string>
      <string name="filedetails_sync_file">Refresh file</string>
 -    <string name="filedetails_redownload">Redownload</string>
      <string name="filedetails_renamed_in_upload_msg">File was renamed to %1$s during upload</string>
      <string name="common_yes">Yes</string>
      <string name="common_no">No</string>
@@@ -66,6 -99,7 +66,6 @@@
      <string name="common_cancel_upload">Cancel upload</string>
      <string name="common_cancel">Cancel</string>
      <string name="common_save_exit">Save &amp; Exit</string>
 -    <string name="common_exit">Leave %1$s</string>
      <string name="common_error">Error</string>
      <string name="common_loading">Loading &#8230;</string>
      <string name="common_error_unknown">Unknown error</string>
@@@ -79,8 -113,10 +79,8 @@@
      <string name="uploader_upload_in_progress_content">%1$d%% Uploading %2$s</string>
      <string name="uploader_upload_succeeded_ticker">Upload succeeded</string>
      <string name="uploader_upload_succeeded_content_single">%1$s was successfully uploaded</string>
 -    <string name="uploader_upload_succeeded_content_multiple">%1$d files were successfully uploaded</string>
      <string name="uploader_upload_failed_ticker">Upload failed</string>
      <string name="uploader_upload_failed_content_single">Upload of %1$s could not be completed</string>
 -    <string name="uploader_upload_failed_content_multiple">Upload failed: %1$d/%2$d files were upload</string>
      <string name="downloader_download_in_progress_ticker">Downloading &#8230;</string>
      <string name="downloader_download_in_progress_content">%1$d%% Downloading %2$s</string>
      <string name="downloader_download_succeeded_ticker">Download succeeded</string>
@@@ -89,6 -125,7 +89,6 @@@
      <string name="downloader_download_failed_content">Download of %1$s could not be completed</string>
      <string name="downloader_not_downloaded_yet">Not downloaded yet</string>
      <string name="common_choose_account">Choose account</string>
 -    <string name="sync_string_contacts">Contacts</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="sync_fail_content_unauthorized">Invalid password for %1$s</string>
@@@ -99,13 -136,17 +99,14 @@@
      <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="sync_current_folder_was_removed">Folder %1$s does not exist anymore</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>
      <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 your 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">Please, reenter your App PIN</string>
@@@ -125,46 -166,74 +126,46 @@@
      <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_timeout">Timed out while 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 trying to play %1$s</string>
 -	<string name="media_previous_description">Previous track button</string>
  	<string name="media_rewind_description">Rewind button</string>
  	<string name="media_play_pause_description">Play or pause button</string>
  	<string name="media_forward_description">Fast forward button</string>
 -	<string name="media_next_description">Next track button</string>
 -    <string-array name="prefs_trackmydevice_intervall_keys">
 -        <item>15 Minutes</item>
 -        <item>30 Minutes</item>
 -        <item>60 Minutes</item>
 -    </string-array>
 -    <string-array name="prefs_trackmydevice_intervall_values">
 -        <item>15</item>
 -        <item>30</item>
 -        <item>60</item>
 -    </string-array>
  
      <string name="auth_trying_to_login">Trying to login&#8230;</string>
      <string name="auth_no_net_conn_title">No network connection</string>
 -    <string name="auth_no_net_conn_message">No network connection has been detected, check your Internet connection and try again.</string>
 -    <string name="auth_connect_anyway">Connect anyway</string>
      <string name="auth_nossl_plain_ok_title">Secure connection unavailable.</string>
 -    <string name="auth_nossl_plain_ok_message">The Application cannot establish a secure connection to the server. A non secure connection is available. You may continue or cancel.</string>
      <string name="auth_connection_established">Connection established</string>
      <string name="auth_testing_connection">Testing connection&#8230;</string>
      <string name="auth_not_configured_title">Malformed server configuration</string>
 -    <string name="auth_not_configured_message">It seems that your server instance is not correctly configured. Contact your administrator for more details.</string>
      <string name="auth_account_not_new">An account for the same user and server already exists in the device</string>
      <string name="auth_account_not_the_same">The entered user does not match the user of this account</string>
      <string name="auth_unknown_error_title">Unknown error occurred!</string>
 -    <string name="auth_unknown_error_message">An unknown error occurred. Please contact support and include logs from your device.</string>
      <string name="auth_unknown_host_title">Couldn\'t find host</string>
 -    <string name="auth_unknown_host_message">Couldn\'t find the entered host. Please check hostname and server availability and try again.</string>
      <string name="auth_incorrect_path_title">Server instance not found</string>
 -    <string name="auth_incorrect_path_message">Application couldn\'t find a server instance at the given path. Please check your path and try again.</string>
      <string name="auth_timeout_title">The server took too long to respond</string>
      <string name="auth_incorrect_address_title">Malformed URL</string>
      <string name="auth_ssl_general_error_title">SSL initialization failed</string>
 -    <string name="auth_ssl_unverified_server_title">Unverified SSL server\'s identity</string>
 +    <string name="auth_ssl_unverified_server_title">Couldn\'t verify SSL server\'s identity</string>
      <string name="auth_bad_oc_version_title">Unrecognized server version</string>
      <string name="auth_wrong_connection_title">Couldn\'t establish connection</string>
      <string name="auth_secure_connection">Secure connection established</string>
      <string name="auth_unauthorized">Wrong username or password</string>
  	<string name="auth_oauth_error">Unsuccessful authorization</string>
  	<string name="auth_oauth_error_access_denied">Access denied by authorization server</string>
 -    <string name="auth_not_found">Wrong path given</string>
 -    <string name="auth_internal">Internal server error, code %1$d</string>
      <string name="auth_wtf_reenter_URL">Unexpected state; please, enter the server URL again</string>
      <string name="auth_expired_oauth_token_toast">Your authorization expired. Please, authorize again</string>
      <string name="auth_expired_basic_auth_toast">Please, enter the current password</string>
      <string name="auth_expired_saml_sso_token_toast">Your session expired. Please connect again</string>
  	<string name="auth_connecting_auth_server">Connecting to authentication server…</string>
 -	<string name="auth_follow_auth_server">Follow instructions above to get authenticated</string>
  	<string name="auth_unsupported_auth_method">The server does not support this authentication method</string>    
  	<string name="auth_unsupported_multiaccount">%1$s does not support multiple accounts</string>
      
 -    <string name="crashlog_message">Application terminated unexpectedly. Would you like to submit a crash report?</string>
 -    <string name="crashlog_send_report">Send report</string>
 -    <string name="crashlog_dont_send_report">Don\'t send report</string>
 -    <string name="extensions_avail_title">Extensions available!</string>
 -    <string name="extensions_avail_message">Looks like your server instance is supporting advanced extensions. Would you like to see extensions available for android ?</string>
      <string name="fd_keep_in_sync">Keep file up to date</string>
 -    <string name="common_share">Share</string>
      <string name="common_rename">Rename</string>
      <string name="common_remove">Remove</string>
      <string name="confirmation_remove_alert">"Do you really want to remove %1$s ?"</string>
@@@ -185,14 -254,19 +186,14 @@@
      <string name="filedisplay_unexpected_bad_get_content">"Unexpected problem ; please select the file from a different app"</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_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 valid dates are in the future</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>
@@@ -228,7 -302,9 +229,7 @@@
      
      <string name="preview_image_description">Image preview</string>
      <string name="preview_image_error_unknown_format">This image can not be shown</string>
 -    <string name="preview_image_error_out_of_memory">"Not enough memory to show this image</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>
      <string name="actionbar_failed_instant_upload">Failed InstantUpload"</string>
      <string name="failed_upload_headline_text">Failed instant uploads</string>