From: masensio <masensio@solidgear.es>
Date: Thu, 17 Oct 2013 16:20:38 +0000 (+0200)
Subject: Merge branch 'transifex' into setup_app_name
X-Git-Tag: oc-android-1.5.5~159^2~11
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/91e50a97a527a27d134836f89c01d52ffaf1c20d

Merge branch 'transifex' into setup_app_name

Conflicts:
	res/values-ko/strings.xml
	res/values-lt-rLT/strings.xml
	res/values-tr/strings.xml
---

91e50a97a527a27d134836f89c01d52ffaf1c20d
diff --cc res/values-en-rGB/strings.xml
index 00000000,8e41efe9..339bf2df
mode 000000,100644..100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@@ -1,0 -1,292 +1,291 @@@
+ <?xml version='1.0' encoding='UTF-8'?>
+ <resources>
 -  <string name="app_name">ownCloud</string>
+   <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>
+   <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_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_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 is tracking 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>
+   <string name="prefs_pincode_summary">Protect your client</string>
+   <string name="prefs_instant_upload">Enable instant uploads</string>
+   <string name="prefs_instant_upload_summary">Instantly upload photos taken by camera</string>
+   <string name="prefs_log_title">Enable Logging</string>
+   <string name="prefs_log_summary">This is used to log problems</string>
+   <string name="prefs_log_title_history">Logging History</string>
+   <string name="prefs_log_summary_history">This shows the recorded logs</string>
+   <string name="prefs_log_delete_history_button">Delete History</string>
+   <string name="auth_check_server">Check Server</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>
+   <string name="uploader_wrn_no_account_title">No account found</string>
+   <string name="uploader_wrn_no_account_text">There are no %1$s 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">%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>
+   <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_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>
+   <string name="common_ok">OK</string>
+   <string name="common_cancel_download">Cancel download</string>
+   <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 …</string>
+   <string name="common_error_unknown">Unknown error</string>
+   <string name="about_title">About</string>
+   <string name="change_password">Change password</string>
+   <string name="delete_account">Delete account</string>
+   <string name="create_account">Create account</string>
+   <string name="upload_chooser_title">Upload from …</string>
+   <string name="uploader_info_dirname">Directory name</string>
+   <string name="uploader_upload_in_progress_ticker">Uploading …</string>
+   <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 uploaded</string>
+   <string name="downloader_download_in_progress_ticker">Downloading …</string>
+   <string name="downloader_download_in_progress_content">%1$d%% Downloading %2$s</string>
+   <string name="downloader_download_succeeded_ticker">Download succeeded</string>
+   <string name="downloader_download_succeeded_content">%1$s was successfully downloaded</string>
+   <string name="downloader_download_failed_ticker">Download failed</string>
+   <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">Synchronisation failed</string>
+   <string name="sync_fail_content">Synchronisation of %1$s could not be completed</string>
+   <string name="sync_fail_content_unauthorized">Invalid password for %1$s</string>
+   <string name="sync_conflicts_in_favourites_ticker">Conflicts found</string>
+   <string name="sync_conflicts_in_favourites_content">%1$d kept-in-sync files could not be synced</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 synced (%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 synchronisation. 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 enough space to copy the selected files into the %1$s folder. Would you like to move them 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, re-enter your App PIN</string>
+   <string name="pincode_remove_your_pincode">Remove your App PIN</string>
+   <string name="pincode_mismatch">The App PINs are not the same</string>
+   <string name="pincode_wrong">Incorrect App PIN</string>
+   <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 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…</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 secured connection to the server. An unsecured connection is available. You may continue or cancel.</string>
+   <string name="auth_connection_established">Connection established</string>
+   <string name="auth_testing_connection">Testing connection…</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 configured correctly. Contact your administrator for more details.</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 initialisation failed</string>
+   <string name="auth_ssl_unverified_server_title">Unverified SSL server\'s identity</string>
+   <string name="auth_bad_oc_version_title">Unrecognised 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 authorisation</string>
+   <string name="auth_oauth_error_access_denied">Access denied by authorisation 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 authorisation expired.\nPlease, authorise again</string>
+   <string name="auth_expired_basic_auth_toast">Please enter the current password</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 supports 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>
+   <string name="confirmation_remove_folder_alert">Do you really want to remove %1$s and its contents ?</string>
+   <string name="confirmation_remove_local">Local only</string>
+   <string name="confirmation_remove_folder_local">Local contents only</string>
+   <string name="confirmation_remove_remote">Remove from server</string>
+   <string name="confirmation_remove_remote_and_local">Remote and local</string>
+   <string name="remove_success_msg">Removal succeeded</string>
+   <string name="remove_fail_msg">Removal failed</string>
+   <string name="rename_dialog_title">Enter a new name</string>
+   <string name="rename_local_fail_msg">Local copy could not be renamed; try a different name</string>
+   <string name="rename_server_fail_msg">Rename could not be completed</string>
+   <string name="sync_file_fail_msg">Remote file could not be checked</string>
+   <string name="sync_file_nothing_to_do_msg">File contents already synchronised</string>
+   <string name="create_dir_fail_msg">Directory could not be created</string>
+   <string name="wait_a_moment">Wait a moment</string>
+   <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_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>
+   <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">Organisation:</string>
+   <string name="ssl_validator_label_OU">Organisational 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="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="placeholder_media_time">12:23:45</string>
+   <string name="instant_upload_on_wifi">Upload pictures via WiFi only</string>
+   <string name="instant_upload_path">/InstantUpload</string>
+   <string name="conflict_title">Update conflict</string>
+   <string name="conflict_message">Remote file %s is not synchronised 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>
+   <string name="preview_image_description">Image preview</string>
+   <string name="preview_image_error_unknown_format">This image cannot 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>
+   <string name="failed_upload_headline_hint">Summary of all failed instant uploads</string>
+   <string name="failed_upload_all_cb">select all</string>
+   <string name="failed_upload_headline_retryall_btn">retry all selected</string>
+   <string name="failed_upload_headline_delete_all_btn">delete all  selected from uploadqueue</string>
+   <string name="failed_upload_retry_text">retry uploading the image: </string>
+   <string name="failed_upload_load_more_images">Load more Pictures</string>
+   <string name="failed_upload_retry_do_nothing_text">do nothing you are not online for instant upload</string>
+   <string name="failed_upload_failure_text">Failure Message: </string>
+   <string name="failed_upload_quota_exceeded_text">Please check your server configuration, perhaps your quota is exceeded.</string>
+ </resources>
diff --cc res/values-eo/strings.xml
index 0773df7f,4ff647d7..cf705a68
--- a/res/values-eo/strings.xml
+++ b/res/values-eo/strings.xml
@@@ -3,7 -3,8 +3,7 @@@
    <string name="main_password">Pasvorto:</string>
    <string name="main_login">Uzantonomo:</string>
    <string name="main_button_login">Ensaluti</string>
--  <string name="main_welcome">Bonvenon al via ownCloud</string>
++  <string name="main_welcome">Bonvenon</string>
    <string name="main_files">Dosieroj</string>
    <string name="main_music">Muziko</string>
    <string name="main_contacts">Kontaktoj</string>
@@@ -11,7 -12,7 +11,7 @@@
    <string name="main_bookmarks">Legosignoj</string>
    <string name="main_settings">Agordo</string>
    <string name="main_tit_accsetup">Agordi konton</string>
--  <string name="main_wrn_accsetup">Estas neniu konto de ownCloud en via aparato. Por povi uzi ĉi tiun aplikaĵon, vi devas krei iun.</string>
++  <string name="main_wrn_accsetup">Estas neniu konto en via aparato. Por povi uzi ĉi tiun aplikaĵon, vi devas krei iun.</string>
    <string name="actionbar_upload">Alŝuti dosieron</string>
    <string name="actionbar_upload_from_apps">Enhavo el aliaj aplikaĵoj</string>
    <string name="actionbar_upload_files">Dosieroj</string>
@@@ -25,13 -26,13 +25,13 @@@
    <string name="prefs_select_oc_account">Elekti konton</string>
    <string name="prefs_summary_select_oc_account">Elektu kiun el viaj kontoj la aplikaĵo uzu.</string>
    <string name="prefs_trackmydevice">Spurado de aparato</string>
--  <string name="prefs_trackmydevice_summary_off">Kapabligi ownCloud-on spuri la lokon de via aparato</string>
++  <string name="prefs_trackmydevice_summary_off">Kapabligi spuri la lokon de via aparato</string>
    <string name="prefs_trackmydevice_interval">Ĝisdatiga intervalo</string>
    <string name="prefs_trackmydevice_interval_summary">Ĝisdatigi je ĉiuj %1$s minutoj</string>
    <string name="prefs_accounts">Kontoj</string>
    <string name="prefs_manage_accounts">Administri kontojn</string>
--  <string name="prefs_pincode">PIN de ownCloud-aplikaĵo</string>
--  <string name="prefs_pincode_summary">Protekti vian ownCloud-klienton</string>
++  <string name="prefs_pincode">PIN de App-aplikaĵo</string>
++  <string name="prefs_pincode_summary">Protekti vian klienton</string>
    <string name="prefs_instant_upload">Kapabligi tujan alŝuton</string>
    <string name="prefs_instant_upload_summary">Tuje alŝuti fotojn faritajn per fotilo</string>
    <string name="auth_host_url">Servila adreso</string>
@@@ -45,16 -46,16 +45,16 @@@
    <string name="setup_hint_password">Pasvorto</string>
    <string name="setup_hint_address">TTT-adreso</string>
    <string name="setup_hint_show_password">Ĉu montri la pasvorton?</string>
--  <string name="setup_title">Konekti al via ownCloud</string>
++  <string name="setup_title">Konekti al via $1%s</string>
    <string name="setup_btn_connect">Konekti</string>
    <string name="uploader_btn_upload_text">Alŝuti</string>
    <string name="uploader_wrn_no_account_title">Neniu konto troviĝis</string>
--  <string name="uploader_wrn_no_account_text">Estas neniu ownCloud-konto en via aparato. Bonvolu agordi konton unue.</string>
++  <string name="uploader_wrn_no_account_text">Estas neniu $1%s-konto en via aparato. Bonvolu agordi konton unue.</string>
    <string name="uploader_wrn_no_account_setup_btn_text">Agordi</string>
    <string name="uploader_wrn_no_account_quit_btn_text">Forlasi</string>
    <string name="uploader_wrn_no_content_title">Neniu enhavo alŝutota</string>
    <string name="uploader_wrn_no_content_text">Neniu enhavo riceviĝis. Nenio alŝutota.</string>
--  <string name="uploader_error_forbidden_content">ownCloud ne estas permesata aliri la kunhavigitan enhavon</string>
++  <string name="uploader_error_forbidden_content">$1%s ne estas permesata aliri la kunhavigitan enhavon</string>
    <string name="uploader_info_uploading">Alŝutante</string>
    <string name="uploader_btn_create_dir_text">Krei dosierujon por alŝuto</string>
    <string name="file_list_empty">Neniu dosiero estas en ĉi tiu dosierujo.\nNovajn dosierojn vi povas aldoni per la menuero “Alŝuti”.</string>
@@@ -72,7 -73,7 +72,7 @@@
    <string name="common_cancel_upload">Nuligi alŝuton</string>
    <string name="common_cancel">Nuligi</string>
    <string name="common_save_exit">Konservi kaj forlasi</string>
--  <string name="common_exit">Forlasi ownCloud-on</string>
++  <string name="common_exit">Forlasi $1%s-on</string>
    <string name="common_error">Eraro</string>
    <string name="common_error_unknown">Nekonata eraro</string>
    <string name="about_title">Pri</string>
@@@ -104,16 -105,16 +104,16 @@@
    <string name="sync_fail_in_favourites_ticker">Malsukcesis ada sinkronigo de dosieroj</string>
    <string name="sync_fail_in_favourites_content">Enhavoj de %1$d dosieroj ne povis sinkroniĝi (%2$d konfliktas)</string>
    <string name="use_ssl">Uzi sekuran konekton</string>
--  <string name="location_no_provider">ownCloud ne povas spuri vian aparaton. Bonvolu kontroli vian lokagordon.</string>
++  <string name="location_no_provider">$1%s ne povas spuri vian aparaton. Bonvolu kontroli vian lokagordon.</string>
    <string name="pincode_enter_pin_code">Bonvolu enigi vian PIN-on de aplikaĵo</string>
    <string name="pincode_enter_new_pin_code">Bonvolu enigi vian novan PIN-on de aplikaĵo</string>
--  <string name="pincode_configure_your_pin">Enigu PIN-on de ownCloud-aplikaĵo</string>
--  <string name="pincode_reenter_your_pincode">Bonvolu reenigi PIN-on de ownCloud-aplikaĵo</string>
--  <string name="pincode_remove_your_pincode">Forigu vian PIN-on de ownCloud-aplikaĵo</string>
--  <string name="pincode_mismatch">La du PIN-oj de ownCloud-aplikaĵo malsamas</string>
--  <string name="pincode_wrong">Malĝusta PIN de ownCloud-aplikaĵo</string>
--  <string name="pincode_removed">PIN de ownCloud-aplikaĵo foriĝis</string>
--  <string name="pincode_stored">PIN de ownCloud-aplikaĵo konserviĝis</string>
++  <string name="pincode_configure_your_pin">Enigu PIN-on de aplikaĵo</string>
++  <string name="pincode_reenter_your_pincode">Bonvolu reenigi PIN-on de aplikaĵo</string>
++  <string name="pincode_remove_your_pincode">Forigu vian PIN-on de aplikaĵo</string>
++  <string name="pincode_mismatch">La du PIN-oj de aplikaĵo malsamas</string>
++  <string name="pincode_wrong">Malĝusta PIN de aplikaĵo</string>
++  <string name="pincode_removed">PIN de aplikaĵo foriĝis</string>
++  <string name="pincode_stored">PIN de aplikaĵo konserviĝis</string>
    <string-array name="prefs_trackmydevice_intervall_keys">
      <item>15 minutoj</item>
      <item>30 minutoj</item>
@@@ -131,17 -132,17 +131,17 @@@
    <string name="auth_nossl_plain_ok_title">Sekura konekto ne haveblas.</string>
    <string name="auth_connection_established">Konekto stariĝis</string>
    <string name="auth_testing_connection">Testante konekton...</string>
--  <string name="auth_not_configured_title">Malĝuste formita ownCloud-agordo</string>
++  <string name="auth_not_configured_title">Malĝuste formita servilo-agordo</string>
    <string name="auth_unknown_error_title">Nekonata eraro okazis</string>
    <string name="auth_unknown_error_message">Nekonata eraro okazis. Bonvolu kontakti verkintojn kaj inkluzivigi registrojn el via aparato.</string>
    <string name="auth_unknown_host_title">Ne eblis trovi gastigon</string>
--  <string name="auth_incorrect_path_title">Apero de ownCloud ne troviĝis</string>
--  <string name="auth_incorrect_path_message">La aplikaĵo ne povis trovi ownCloud-aperon en la vojo donita. Bonvolu kontroli vian vojon kaj provi denove.</string>
++  <string name="auth_incorrect_path_title">Apero de servilo ne troviĝis</string>
++  <string name="auth_incorrect_path_message">La aplikaĵo ne povis trovi servilo-aperon en la vojo donita. Bonvolu kontroli vian vojon kaj provi denove.</string>
    <string name="auth_timeout_title">La servilo tro malfruis por respondi</string>
    <string name="auth_incorrect_address_title">Malĝuste formita URL</string>
    <string name="auth_ssl_general_error_title">SSL-ekigo malsukcesis</string>
    <string name="auth_ssl_unverified_server_title">Nekontrolita idento de SSL-servilo</string>
--  <string name="auth_bad_oc_version_title">Nerekonita eldono de ownCloud-servilo</string>
++  <string name="auth_bad_oc_version_title">Nerekonita eldono de servilo</string>
    <string name="auth_wrong_connection_title">Ne eblis starigi konekton</string>
    <string name="auth_secure_connection">Sekura konekto stariĝis</string>
    <string name="auth_not_found">Malĝusta vojo doniĝis</string>
diff --cc res/values-fr/strings.xml
index b65ad316,0a2384af..6d6c29ae
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@@ -1,7 -1,8 +1,7 @@@
  <?xml version='1.0' encoding='UTF-8'?>
  <resources>
 -  <string name="app_name">ownCloud</string>
    <string name="main_password">Mot de passe : </string>
-   <string name="main_login">Utilisateur : </string>
+   <string name="main_login">Nom d\'utilisateur</string>
    <string name="main_button_login">Connexion</string>
    <string name="main_welcome">Bienvenue</string>
    <string name="main_files">Fichiers</string>
@@@ -190,9 -194,10 +193,10 @@@
    <string name="auth_incorrect_address_title">Adresse invalide</string>
    <string name="auth_ssl_general_error_title">Échec de l\'initialisation SSL</string>
    <string name="auth_ssl_unverified_server_title">L\'identité SSL du serveur n\'a pu être vérifiée</string>
 -  <string name="auth_bad_oc_version_title">La version ownCloud du serveur n\'est pas reconnue</string>
 +  <string name="auth_bad_oc_version_title">La version du serveur n\'est pas reconnue</string>
    <string name="auth_wrong_connection_title">Impossible d\'établir la connexion</string>
    <string name="auth_secure_connection">Connexion sécurisée établie</string>
+   <string name="auth_unauthorized">Nom d\'utilisateur ou mot de passe invalide</string>
    <string name="auth_oauth_error">Echec d\'autorisation</string>
    <string name="auth_oauth_error_access_denied">Accès refusé par le serveur d\'autorisation</string>
    <string name="auth_not_found">Le chemin fourni est erroné</string>
diff --cc res/values-ko/strings.xml
index 12ab64f9,55058ea9..1817074c
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@@ -11,7 -12,10 +11,10 @@@
    <string name="main_bookmarks">책갈피</string>
    <string name="main_settings">설정</string>
    <string name="main_tit_accsetup">계정 설정</string>
 -  <string name="main_wrn_accsetup">이 장치에 ownCloud 계정이 설정되어 있지 않습니다. 이 앱을 사용하려면 계정을 설정하십시오.</string>
 +  <string name="main_wrn_accsetup">이 장치에 계정이 설정되어 있지 않습니다. 이 앱을 사용하려면 계정을 설정하십시오.</string>
+   <string name="about_android">%1$s 안드로이드 앱</string>
+   <string name="about_version">버전 %1$s</string>
+   <string name="actionbar_sync">계정 새로고침</string>
    <string name="actionbar_upload">업로드</string>
    <string name="actionbar_upload_from_apps">다른 앱의 콘텐츠</string>
    <string name="actionbar_upload_files">파일</string>
diff --cc res/values-lt-rLT/strings.xml
index b91e390d,f5d986c5..93e21f2f
--- a/res/values-lt-rLT/strings.xml
+++ b/res/values-lt-rLT/strings.xml
@@@ -23,11 -25,15 +24,15 @@@
    <string name="prefs_create_img_thumbnails">Sukurti paveikslėlių miniatiūras</string>
    <string name="prefs_select_oc_account">Pasirinkite paskyrą</string>
    <string name="prefs_summary_select_oc_account">Pasirinkite kurias jūsų paskyras programa turėtų naudoti.</string>
+   <string name="prefs_trackmydevice">Įrenginio sekimas</string>
+   <string name="prefs_trackmydevice_summary_off">Leisti šiai programai sekti Jūsų įrenginio buvimo vietą</string>
    <string name="prefs_trackmydevice_interval">Atnaujinimo intervalas</string>
+   <string name="prefs_trackmydevice_interval_summary">Atnaujinti kas %1$s min.</string>
    <string name="prefs_accounts">Paskyros</string>
    <string name="prefs_manage_accounts">Tvarkyti paskyras</string>
-   <string name="prefs_pincode">Programos PIN kodas</string>
 -  <string name="prefs_pincode">ownCloud programos PIN kodas</string>
 -  <string name="prefs_pincode_summary">Apsaugokite savo ownCloud klientą</string>
++  <string name="prefs_pincode">App programos PIN kodas</string>
 +  <string name="prefs_pincode_summary">Apsaugokite savo klientą</string>
+   <string name="prefs_instant_upload">Įjungti momentinius įkėlimus</string>
    <string name="prefs_instant_upload_summary">Iš karto nusiųsti nufotografuotas nuotraukas</string>
    <string name="auth_host_url">Serverio adresas</string>
    <string name="auth_username">Prisijungimo vardas</string>
@@@ -40,13 -46,18 +45,18 @@@
    <string name="setup_hint_password">Slaptažodis</string>
    <string name="setup_hint_address">Web adresas</string>
    <string name="setup_hint_show_password">Rodyti slaptažodį?</string>
 -  <string name="setup_title">Prisijunkite prie savo ownCloud</string>
 +  <string name="setup_title">Prisijunkite prie savo %1$s</string>
    <string name="setup_btn_connect">Prisijungti</string>
    <string name="uploader_btn_upload_text">Įkelti</string>
+   <string name="uploader_top_message">Nustatyti įkėlimų katalogą.</string>
    <string name="uploader_wrn_no_account_title">Paskyrų nerasta</string>
+   <string name="uploader_wrn_no_account_setup_btn_text">Nustatymai</string>
    <string name="uploader_wrn_no_account_quit_btn_text">IÅ¡eiti</string>
+   <string name="uploader_wrn_no_content_title">Nėra įkeltino turinio</string>
+   <string name="uploader_wrn_no_content_text">nebuvo gauta turinio. Nėra įkeltino turinio</string>
    <string name="uploader_info_uploading">Išsiunčiama</string>
    <string name="uploader_btn_create_dir_text">Kurti aplanką išsiuntimui</string>
+   <string name="filedetails_select_file">Palieskite failą, kad parodyti papildomą informaciją.</string>
    <string name="filedetails_size">Dydis:</string>
    <string name="filedetails_type">Tipas:</string>
    <string name="filedetails_created">Sukurta:</string>
@@@ -75,18 -98,30 +97,30 @@@
    <string name="common_choose_account">Pasirinkite paskyrą</string>
    <string name="sync_string_contacts">Kontaktai</string>
    <string name="sync_fail_ticker">Sinchronizacija nepavyko</string>
+   <string name="sync_conflicts_in_favourites_ticker">Rastas konfliktas</string>
+   <string name="sync_foreign_files_forgotten_ticker">Keli vietiniai failai buvo užmiršti</string>
+   <string name="foreign_files_move">Perkelti visus</string>
+   <string name="foreign_files_success">Visi failai buvo perkelti</string>
+   <string name="foreign_files_local_text">Vietinis: %1$s</string>
+   <string name="foreign_files_remote_text">Nuotolinis: %1$s</string>
    <string name="use_ssl">Naudoti saugų prisijungimą</string>
 -  <string name="location_no_provider">ownCloud negali sekti jūsų prietaiso. Patinkrinkite vietos nustatymo paslaugas</string>
 +  <string name="location_no_provider">%1$s negali sekti jūsų prietaiso. Patinkrinkite vietos nustatymo paslaugas</string>
    <string name="pincode_enter_pin_code">Prašome įvesti savo programos PIN kodą</string>
    <string name="pincode_enter_new_pin_code">Prašome įvesti naują programos PIN kodą</string>
 -  <string name="pincode_configure_your_pin">Įveskite ownCloud programos PIN kodą</string>
 +  <string name="pincode_configure_your_pin">Įveskite taikymas programos PIN kodą</string>
    <string name="pincode_configure_your_pin_explanation">PIN bus prašomas kiekvieną kartą paleidus programą</string>
 -  <string name="pincode_reenter_your_pincode">Prašome pakartoti ownCloud PIN kodą</string>
 -  <string name="pincode_remove_your_pincode">Pašalinti ownCloud programos PIN kodą</string>
 -  <string name="pincode_mismatch">Abu ownCloud programos PIN kodai nesutampa</string>
 -  <string name="pincode_wrong">Neteisingas ownCloud programos PIN kodas</string>
 -  <string name="pincode_removed">ownCloud programos PIN kodas pašalintas</string>
 -  <string name="pincode_stored">ownCloud programos PIN kodas išsaugotas</string>
 +  <string name="pincode_reenter_your_pincode">Prašome pakartoti taikymas PIN kodą</string>
 +  <string name="pincode_remove_your_pincode">Pašalinti taikymas programos PIN kodą</string>
 +  <string name="pincode_mismatch">Abu taikymas programos PIN kodai nesutampa</string>
 +  <string name="pincode_wrong">Neteisingas taikymas programos PIN kodas</string>
 +  <string name="pincode_removed">Taikymas programos PIN kodas pašalintas</string>
-   <string name="pincode_stored">taikymas programos PIN kodas išsaugotas</string>
++  <string name="pincode_stored">Taikymas programos PIN kodas išsaugotas</string>
+   <string name="media_notif_ticker">%1$s muzikos grotuvas</string>
+   <string name="media_state_playing">%1$s (grojama)</string>
+   <string name="media_state_loading">%1$s (įkeliama)</string>
+   <string name="media_event_done">%1$s sąrašas baigtas</string>
+   <string name="media_err_nothing_to_play">Nerasta medija failų</string>
+   <string name="media_err_no_account">Nenurodyta paskyra</string>
    <string-array name="prefs_trackmydevice_intervall_keys">
      <item>15 Minučių</item>
      <item>30 Minučių</item>
@@@ -103,14 -138,18 +137,18 @@@
    <string name="auth_nossl_plain_ok_title">Saugus prisijungimas negalimas.</string>
    <string name="auth_connection_established">Ryšys užmegztas</string>
    <string name="auth_testing_connection">IÅ¡bandomas prisijungimas...</string>
 -  <string name="auth_not_configured_title">Sugadinta ownCloud konfigūracija</string>
 +  <string name="auth_not_configured_title">Sugadinta serverio konfigūracija</string>
    <string name="auth_unknown_error_title">Įvyko nežinoma klaida!</string>
+   <string name="auth_unknown_host_title">Nepavyko rasti mazgo</string>
    <string name="auth_timeout_title">Serveris per ilgai neatsako</string>
    <string name="auth_incorrect_address_title">URL adrese yra klaidų</string>
    <string name="auth_ssl_general_error_title">Nepavyko aktyvuoti SSL</string>
 +  <string name="auth_bad_oc_version_title">Nežinoma serverio versija</string>
+   <string name="auth_ssl_unverified_server_title">Nepatikrinta SSL serverio tapatybė</string>
 -  <string name="auth_bad_oc_version_title">Nežinoma ownCloud serverio versija</string>
    <string name="auth_wrong_connection_title">Nepavyko užmegzti ryšio</string>
    <string name="auth_secure_connection">Užmegztas saugus ryšys</string>
+   <string name="auth_not_found">Duotas neteisingas kelias</string>
+   <string name="auth_internal">Vidinė serverio klaida, kodas %1$d</string>
    <string name="crashlog_message">Programa netikėtai sustojo. Ar norite nusiųsti šio lūžimo ataskaitą programos kūrėjams?</string>
    <string name="crashlog_send_report">Siųsti ataskaitą </string>
    <string name="crashlog_dont_send_report">Nesiųsti ataskaitos</string>
diff --cc res/values-sk-rSK/strings.xml
index 1aeb4be6,2dd402f0..68c756f7
--- a/res/values-sk-rSK/strings.xml
+++ b/res/values-sk-rSK/strings.xml
@@@ -34,11 -36,16 +35,16 @@@
    <string name="prefs_trackmydevice_interval_summary">Aktualizácia každých %1$s minút</string>
    <string name="prefs_accounts">Účty</string>
    <string name="prefs_manage_accounts">Správa účtov</string>
 -  <string name="prefs_pincode">PIN aplikácie ownCloud</string>
 -  <string name="prefs_pincode_summary">Chrániť klienta ownCloud</string>
 +  <string name="prefs_pincode">PIN aplikácie</string>
 +  <string name="prefs_pincode_summary">Chrániť klienta aplikácie</string>
    <string name="prefs_instant_upload">Zapnúť okamžité odosielanie</string>
    <string name="prefs_instant_upload_summary">Okamžite odosielať fotky z fotoaparátu</string>
+   <string name="prefs_log_title">Povoliť logovanie</string>
+   <string name="prefs_log_summary">Toto je použité pre logovanie problémov</string>
+   <string name="prefs_log_title_history">História logovania</string>
+   <string name="prefs_log_summary_history">Toto zobrazuje zaznamenané logy</string>
    <string name="prefs_log_delete_history_button">Zmazať históriu</string>
+   <string name="auth_check_server">Skontrolovať Server</string>
    <string name="auth_host_url">Adresa servera</string>
    <string name="auth_username">Používateľské meno</string>
    <string name="auth_password">Heslo</string>
diff --cc res/values-tr/strings.xml
index 70d61cab,2eadbdbe..e49b6e13
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@@ -11,7 -12,10 +11,10 @@@
    <string name="main_bookmarks">Yer Ä°mleri</string>
    <string name="main_settings">Ayarlar</string>
    <string name="main_tit_accsetup">Kurulum Hesabi</string>
 -  <string name="main_wrn_accsetup">Cihazınızda ownCloud hesabı bulunmamaktadır. Bu uygulamayı kullanabilmeniz için ownCloud hesabı oluşturmalısınız.</string>
 +  <string name="main_wrn_accsetup">Cihazınızda App hesabı bulunmamaktadır. Bu uygulamayı kullanabilmeniz için App hesabı oluşturmalısınız.</string>
+   <string name="about_android">%1$s Android Uygulaması</string>
+   <string name="about_version">sürüm %1$s</string>
+   <string name="actionbar_sync">Hesabı yenile</string>
    <string name="actionbar_upload">Dosya yükle</string>
    <string name="actionbar_upload_from_apps">Diğer uygulamalardan içerik</string>
    <string name="actionbar_upload_files">Dosyalar</string>
@@@ -169,11 -194,17 +193,17 @@@
    <string name="auth_incorrect_address_title">Hatalı biçimlendirilmiş URL</string>
    <string name="auth_ssl_general_error_title">SSL başlatılmasında hata</string>
    <string name="auth_ssl_unverified_server_title">Doğrulanmamış SSL sunucu kimliğini</string>
 -  <string name="auth_bad_oc_version_title">Bilinmeyen ownCloud sunucu sürümü</string>
 +  <string name="auth_bad_oc_version_title">Bilinmeyen sunucu sürümü</string>
    <string name="auth_wrong_connection_title">Bağlantı kurulamadı</string>
    <string name="auth_secure_connection">Güvenli bağlantı sağlandı.</string>
+   <string name="auth_unauthorized">Hatalı kullanıcı adı veya parola</string>
+   <string name="auth_oauth_error">Kimlik doğrulama başarısız oldu</string>
+   <string name="auth_oauth_error_access_denied">Erişim, kimlik doğrulama sunucusu tarafından reddedildi</string>
    <string name="auth_not_found">Hatalı dosya yolu</string>
    <string name="auth_internal">İç sunucu hatası, kod %1$d</string>
+   <string name="auth_wtf_reenter_URL">Beklenmedik durum. Lütfen, sunucu URL\'sini yeniden girin</string>
+   <string name="auth_expired_oauth_token_toast">Kimlik doğrulamanızın süresi doldu.\nLütfen tekrar kimlik doğrulayın</string>
+   <string name="auth_expired_basic_auth_toast">Lütfen mevcut parolanızı girin</string>
    <string name="crashlog_message">Uygulama umulmadık bir şekilde sonlandı. Hata raporunu göndermek ister misiniz ?</string>
    <string name="crashlog_send_report">Rapor gönder</string>
    <string name="crashlog_dont_send_report">Rapor gönderme</string>
diff --cc res/values-uk/strings.xml
index a421e0bd,6800b75a..02d3cb9d
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@@ -74,8 -75,9 +74,9 @@@
    <string name="common_cancel_upload">Перервати завантаження</string>
    <string name="common_cancel">Відмінити</string>
    <string name="common_save_exit">Зберегти &amp; Вихід</string>
 -  <string name="common_exit">Вийти з ownCloud</string>
 +  <string name="common_exit">Вийти з %1$s</string>
    <string name="common_error">Помилка</string>
+   <string name="common_error_unknown">Невідома помилка</string>
    <string name="about_title">Про</string>
    <string name="change_password">Змінити пароль</string>
    <string name="delete_account">Видалити запис</string>