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?ds=inline;hp=-c

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 --combined res/values-ar/strings.xml
index d7f66432,5d015580..89af930f
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@@ -1,5 -1,6 +1,5 @@@
  <?xml version='1.0' encoding='UTF-8'?>
  <resources>
 -  <string name="app_name">ownCloud</string>
    <string name="main_password">كلمة السر: </string>
    <string name="main_login">اسم المستخدم</string>
    <string name="main_button_login">تسجيل الدخول</string>
@@@ -12,6 -13,8 +12,8 @@@
    <string name="main_settings">تعديلات</string>
    <string name="main_tit_accsetup">إعداد حساب</string>
    <string name="main_wrn_accsetup">لا يوجد أي حساب على الجهاز الخاص بك. من اجل استخدام هذا التطبيق، تحتاج إلى إنشاء واحد.</string>
+   <string name="about_android">%1$s تطبيق أندرويد</string>
+   <string name="about_version">الإصدار %1$s</string>
    <string name="actionbar_upload">رفع</string>
    <string name="actionbar_upload_from_apps">محتويات من تطبيقات أخرى</string>
    <string name="actionbar_upload_files">الملفات</string>
@@@ -27,10 -30,12 +29,12 @@@
    <string name="prefs_trackmydevice_summary_off">تمكين هذا التطبيق لتتبع مكان الجهاز</string>
    <string name="prefs_trackmydevice_summary_on">هذا التطبيق يتتبع هذا الجهاز</string>
    <string name="prefs_trackmydevice_interval"> الفاصل الزمني للتحديث</string>
+   <string name="prefs_trackmydevice_interval_summary">حدث كل  %1$s دقيقة</string>
    <string name="prefs_accounts">حسابات</string>
    <string name="auth_host_url">عنوان الخادم</string>
    <string name="auth_username">إسم المستخدم</string>
    <string name="auth_password">كلمات السر</string>
+   <string name="auth_register">جديد لـ %1$s ؟</string>
    <string name="new_session_uri_error">العنوان المعطى غير صحيحة</string>
    <string name="new_session_session_name_error"> اسم الدورة غير  صحيح</string>
    <string name="sync_string_files">الملفات</string>
@@@ -39,43 -44,65 +43,65 @@@
    <string name="setup_hint_password">كلمات السر</string>
    <string name="setup_hint_address">عنوان ويب</string>
    <string name="setup_hint_show_password">إظهار كلمة السر</string>
+   <string name="setup_title">الأتصال بـ %1$s الخاص بك </string>
    <string name="setup_btn_connect">اتصال</string>
    <string name="uploader_btn_upload_text">إرفع</string>
    <string name="uploader_wrn_no_account_title">لم يتم العثور أي حساب</string>
+   <string name="uploader_wrn_no_account_text">لا يوجد جسابات للـ %1$s في جهازك. يرجى إعداد حساب أولاَ.</string>
    <string name="uploader_wrn_no_account_setup_btn_text">إعداد</string>
    <string name="uploader_wrn_no_account_quit_btn_text">خروج</string>
    <string name="uploader_wrn_no_content_title">لا يوجد محتويات للرفع</string>
    <string name="uploader_wrn_no_content_text">لم يتم استلام أي محتويات.</string>
+   <string name="uploader_error_forbidden_content">%1$s  غير مسموح له بالوصول للمحتوى المشترك</string>
    <string name="uploader_info_uploading">يتم الرفع</string>
    <string name="filedetails_select_file">اضغظ على الملف ليتم عرض خيارات أكثر</string>
    <string name="filedetails_size">الحجم</string>
    <string name="filedetails_type">النوع</string>
    <string name="filedetails_modified">عُدل</string>
    <string name="filedetails_download">انزال</string>
+   <string name="filedetails_renamed_in_upload_msg">تم تغيير اسم الملف إلى  %1$s أثناء الرفع</string>
    <string name="common_yes">نعم</string>
    <string name="common_no">لا</string>
    <string name="common_ok">تم</string>
    <string name="common_cancel_upload">إلغاء رفع الملفات</string>
    <string name="common_cancel">الغاء</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>
    <string name="create_account">حساب جديد</string>
    <string name="upload_chooser_title">رفع من</string>
    <string name="uploader_upload_in_progress_ticker">يتم الرفع</string>
+   <string name="uploader_upload_in_progress_content">%1$d%% رفع %2$s</string>
    <string name="uploader_upload_succeeded_ticker">تم الرفع بنجاح</string>
+   <string name="uploader_upload_succeeded_content_single">تم رفع %1$s  بنجاح </string>
+   <string name="uploader_upload_succeeded_content_multiple">تم رفع ملفات %1$d  بنجاح </string>
    <string name="uploader_upload_failed_ticker">عملية الرفع فشلت</string>
+   <string name="uploader_upload_failed_content_single">رفع %1$s قد لا يكون كاملاً</string>
    <string name="downloader_download_in_progress_ticker">يتم التحميل</string>
+   <string name="downloader_download_in_progress_content">%1$d%% تنزيل  %2$s</string>
+   <string name="downloader_download_succeeded_content">تم تحميل %1$s  بنجاح </string>
    <string name="downloader_download_failed_ticker">فشل التحميل</string>
+   <string name="downloader_download_failed_content"> تحميل %1$s قد لا يكون كاملاَ</string>
    <string name="common_choose_account">اختر حساب</string>
    <string name="sync_string_contacts">المعارف</string>
+   <string name="sync_fail_content">تعذر إكمال التزامن لـ %1$s  </string>
+   <string name="sync_fail_content_unauthorized">كلمة السر غير صالحة لـ %1$s</string>
+   <string name="sync_fail_in_favourites_content"> جهات الاتصال لـ %1$d لا يمكن مزامنتها ( %2$d تعارض) </string>
    <string name="foreign_files_move">نقل الكل</string>
    <string name="foreign_files_success">تم نقل جميع الملفات</string>
    <string name="foreign_files_fail">بعض الملفات لا يمكن نقلها</string>
+   <string name="upload_query_move_foreign_files">لا يوجد مساحة كافية لنسخ الملفات المحددة لمجلد  %1$s . هل ترغب بنقلهم للمجلد بدلاَ من ذلك؟</string>
    <string name="use_ssl">استخدم اتصال آمن</string>
+   <string name="location_no_provider">%1$s  لا يستطيع تقفي أثر جهازك. يرجى التحقق من إعدادات موقعك.</string>
    <string name="pincode_enter_pin_code">فضلا, ادخل كلمة السر</string>
    <string name="pincode_enter_new_pin_code">فضلا, ادخل كلمة كلمة سر جديدة</string>
+   <string name="media_notif_ticker">%1$s مشغل الموسيقى</string>
+   <string name="media_state_playing">%1$s  (عرض)</string>
+   <string name="media_state_loading">%1$s (تحميل)</string>
+   <string name="media_event_done">تم الانتهاء من تشغيل %1$s </string>
    <string name="auth_no_net_conn_title">لا يتوفر اتصال</string>
    <string name="auth_connect_anyway">اتصل على أية حال</string>
    <string name="auth_nossl_plain_ok_title">الاتصال الآمن غير متاح</string>
@@@ -83,15 -110,19 +109,19 @@@
    <string name="auth_unknown_error_title">حدث خطأ غير معروف</string>
    <string name="auth_wrong_connection_title">لا يمكن إنشاء اتصال</string>
    <string name="auth_secure_connection">تم إنشاء اتصال آمن</string>
+   <string name="auth_internal">خطأ في الخادم الداخلي، الرمز %1$d</string>
    <string name="crashlog_dont_send_report">لا ترسل تقرير</string>
    <string name="common_share">شارك</string>
    <string name="common_rename">إعادة تسميه</string>
    <string name="common_remove">الغى</string>
+   <string name="confirmation_remove_alert">هل تود حقاَ إزالة %1$s ؟ </string>
+   <string name="confirmation_remove_folder_alert">هل ترغب في إزالة %1$s و جهات الاتصال التابعة له؟ </string>
    <string name="confirmation_remove_remote">حذف من الخادم</string>
    <string name="remove_success_msg">يتم الحذف بنجاح</string>
    <string name="remove_fail_msg">لقد فشل الحذف</string>
    <string name="wait_a_moment">فضلاً, انتظر</string>
    <string name="filedisplay_no_file_selected">لم يتم اختيار أي ملف</string>
+   <string name="oauth_code_validation_message">يرجى فتح متصفح الأنترنت و الذهاب إلى :⏎\n%1$s.⏎\nو من ثم التحقق من هذا الرمز هناك :⏎\n%2$s</string>
    <string name="ssl_validator_title">تحذير</string>
    <!--we need to improve the communication of errors to the user-->
  </resources>
diff --combined 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 --combined res/values-eo/strings.xml
index 0773df7f,4ff647d7..cf705a68
--- a/res/values-eo/strings.xml
+++ b/res/values-eo/strings.xml
@@@ -1,9 -1,10 +1,9 @@@
  <?xml version='1.0' encoding='UTF-8'?>
  <resources>
 -  <string name="app_name">ownCloud</string>
    <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 --combined res/values-es/strings.xml
index e6015003,065e95b1..ff58d92b
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@@ -1,5 -1,6 +1,5 @@@
  <?xml version='1.0' encoding='UTF-8'?>
  <resources>
 -  <string name="app_name">ownCloud</string>
    <string name="main_password">Contraseña:</string>
    <string name="main_login">Nombre de usuario:</string>
    <string name="main_button_login">Inicio de sesión</string>
@@@ -202,7 -203,7 +202,7 @@@
    <string name="auth_not_found">Ruta errónea</string>
    <string name="auth_internal">Error interno en el servidor, código %1$d</string>
    <string name="auth_wtf_reenter_URL">Estado inesperado; por favor, introduzca la URL del servidor de nuevo</string>
-   <string name="auth_expired_oauth_token_toast">Su autorización ha expirado. Por favor, autorice de nuevo</string>
+   <string name="auth_expired_oauth_token_toast">Su autorización ha expirado.\nPor favor, autorice de nuevo</string>
    <string name="auth_expired_basic_auth_toast">Por favor, introduzca la contraseña actual.</string>
    <string name="crashlog_message">La aplicación finalizó inesperadamente. ¿Desea enviar un reporte de error?</string>
    <string name="crashlog_send_report">Enviar reporte</string>
diff --combined res/values-eu/strings.xml
index b4c6e2e0,f59d11e7..313d83ee
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@@ -1,9 -1,10 +1,9 @@@
  <?xml version='1.0' encoding='UTF-8'?>
  <resources>
 -  <string name="app_name">ownCloud</string>
    <string name="main_password">Pasahitza:</string>
    <string name="main_login">Erabiltzaile izena:</string>
    <string name="main_button_login">Saioa hasi</string>
 -  <string name="main_welcome">Ongi etorria zure ownCloudera</string>
 +  <string name="main_welcome">Ongi etorri</string>
    <string name="main_files">Fitxategiak</string>
    <string name="main_music">Musika</string>
    <string name="main_contacts">Kontaktuak</string>
@@@ -11,7 -12,7 +11,7 @@@
    <string name="main_bookmarks">Laster-markak</string>
    <string name="main_settings">Ezarpenak</string>
    <string name="main_tit_accsetup">Konfiguratu kontua</string>
 -  <string name="main_wrn_accsetup"> Ez dago ownCloud konturik zure gailuan. Programa hau erabiltzeko, kontu bat sortu behar duzu.</string>
 +  <string name="main_wrn_accsetup"> Ez dago konturik zure gailuan. Programa hau erabiltzeko, kontu bat sortu behar duzu.</string>
    <string name="about_android">%1$s Android Aplikazioa</string>
    <string name="about_version">%1$s bertsioa</string>
    <string name="actionbar_sync">Freskatu kontua</string>
@@@ -29,14 -30,14 +29,14 @@@
    <string name="prefs_select_oc_account">Aukeratu kontu bat</string>
    <string name="prefs_summary_select_oc_account">Aukeratu aplikazioak ze kontu erabiliko duen. </string>
    <string name="prefs_trackmydevice">Gailuaren jarraipena</string>
 -  <string name="prefs_trackmydevice_summary_off">Gaitu ownCloud zure gailuaren kokapena jarraitzeari</string>
 -  <string name="prefs_trackmydevice_summary_on">ownCloudek gailu honen jarraipena egiten du</string>
 +  <string name="prefs_trackmydevice_summary_off">Gaitu zure gailuaren kokapena jarraitzeari</string>
 +  <string name="prefs_trackmydevice_summary_on">Gailu honen jarraipena egiten du</string>
    <string name="prefs_trackmydevice_interval">Eguneraketa tartea</string>
    <string name="prefs_trackmydevice_interval_summary">Eguneratu %1$s minuturo</string>
    <string name="prefs_accounts">Kontuak</string>
    <string name="prefs_manage_accounts">Kontuak kudeatu</string>
 -  <string name="prefs_pincode">ownCloud App PIN</string>
 -  <string name="prefs_pincode_summary">Babestu zure ownCloud bezeroa</string>
 +  <string name="prefs_pincode">App PIN</string>
 +  <string name="prefs_pincode_summary">Babestu zure bezeroa</string>
    <string name="prefs_instant_upload">Gaitu berehalako igoera</string>
    <string name="prefs_instant_upload_summary">Igo berehala kamerak ateratako argazkiak</string>
    <string name="prefs_log_title">Gaitu erregistroa</string>
@@@ -57,12 -58,12 +57,12 @@@
    <string name="setup_hint_password">Pasahitza</string>
    <string name="setup_hint_address">Web helbidea</string>
    <string name="setup_hint_show_password">Bistaratu pasahitza?</string>
 -  <string name="setup_title">Konektatu zure ownCloudera</string>
 +  <string name="setup_title">Konektatu zure %1$sera</string>
    <string name="setup_btn_connect">Konektatu</string>
    <string name="uploader_btn_upload_text">Igo</string>
    <string name="uploader_top_message">Hautatu igoera direktorioa:</string>
    <string name="uploader_wrn_no_account_title">Ez da konturik aurkitu</string>
 -  <string name="uploader_wrn_no_account_text">Zure gailuan ez dago ownCloud konturik. Mesedez konfiguratu kontu bat lehenengo.</string>
 +  <string name="uploader_wrn_no_account_text">Zure gailuan ez dago %1$s konturik. Mesedez konfiguratu kontu bat lehenengo.</string>
    <string name="uploader_wrn_no_account_setup_btn_text">Konfiguratu</string>
    <string name="uploader_wrn_no_account_quit_btn_text">Irten</string>
    <string name="uploader_wrn_no_content_title">Ez dago igotzeko edukirik</string>
@@@ -87,7 -88,7 +87,7 @@@
    <string name="common_cancel_upload">Ezeztatu igoera</string>
    <string name="common_cancel">Ezeztatu</string>
    <string name="common_save_exit">Gorde eta Irten</string>
 -  <string name="common_exit">Utzi ownCloud</string>
 +  <string name="common_exit">Utzi %1$s</string>
    <string name="common_error">Errorea</string>
    <string name="common_loading">Kargatzen ...</string>
    <string name="common_error_unknown">Errore ezezaguna</string>
@@@ -130,17 -131,17 +130,17 @@@
    <string name="foreign_files_remote_text">Urrunekoa: %1$s</string>
    <string name="upload_query_move_foreign_files">Ez dago leku nahikorik hautatutako fitxategiak %1$s karpetan kopiatzeko. Nahi al duzu kopiatu ordez bertara mugitzea?</string>
    <string name="use_ssl">Erabili konexio segurua</string>
 -  <string name="location_no_provider">ownCloudek ezin du zure gailua jarraitu. Mesedez begiratu zure kokapen ezarpenak</string>
 +  <string name="location_no_provider">%1$sek ezin du zure gailua jarraitu. Mesedez begiratu zure kokapen ezarpenak</string>
    <string name="pincode_enter_pin_code">Mesedez, sartu zure aplikazioaren PINa</string>
    <string name="pincode_enter_new_pin_code">Mesedez, sartu zure aplikazioaren PIN berria</string>
 -  <string name="pincode_configure_your_pin">Sartu ownCloud aplikazioaren PINa</string>
 +  <string name="pincode_configure_your_pin">Sartu aplikazioaren PINa</string>
    <string name="pincode_configure_your_pin_explanation">PINa aplikazioa abiarazten den bakoitzean eskatuko da</string>
 -  <string name="pincode_reenter_your_pincode">Sartu berriz ownCloud aplikazioarenPINa, mesedez</string>
 -  <string name="pincode_remove_your_pincode">Ezabatu zure ownCloud aplikazioaren PINa</string>
 -  <string name="pincode_mismatch">ownCloud aplikazioko bi PINak ez dira berdinak</string>
 -  <string name="pincode_wrong">ownCloud aplikazioaren PINa ezda zuzena</string>
 -  <string name="pincode_removed">ownCloud aplikazioaren PINa kendu da</string>
 -  <string name="pincode_stored">ownCloud aplikazioaren PINa gorde da</string>
 +  <string name="pincode_reenter_your_pincode">Sartu berriz aplikazioarenPINa, mesedez</string>
 +  <string name="pincode_remove_your_pincode">Ezabatu zure aplikazioaren PINa</string>
 +  <string name="pincode_mismatch">Aplikazioko bi PINak ez dira berdinak</string>
 +  <string name="pincode_wrong">Aplikazioaren PINa ezda zuzena</string>
 +  <string name="pincode_removed">Aplikazioaren PINa kendu da</string>
 +  <string name="pincode_stored">Aplikazioaren PINa gorde da</string>
    <string name="media_notif_ticker">%1$s musika erreproduzigailua</string>
    <string name="media_state_playing">%1$s (jotzen)</string>
    <string name="media_state_loading">%1$s (kargatzen)</string>
@@@ -180,19 -181,19 +180,19 @@@
    <string name="auth_nossl_plain_ok_message">Aplikazioak ezin izan du zerbitzariarekin konexio seguru bat ezarri. Hala ere konexio ez segurua egin daiteke. Jarraitu edo ezeztatu dezakezu.</string>
    <string name="auth_connection_established">Konexioa ezarri da</string>
    <string name="auth_testing_connection">Konexioa probatzen...</string>
 -  <string name="auth_not_configured_title">gaizki egindako ownCloud konfigurazioa</string>
 -  <string name="auth_not_configured_message">Badirudi zure ownCloud instantzia ez dagoela ongi konfiguratuta. Jarri zure harremanetan administradorearkin informazio gehiago izateko.</string>
 +  <string name="auth_not_configured_title">gaizki egindako server konfigurazioa</string>
 +  <string name="auth_not_configured_message">Badirudi zure server instantzia ez dagoela ongi konfiguratuta. Jarri zure harremanetan administradorearkin informazio gehiago izateko.</string>
    <string name="auth_unknown_error_title">Errore ezezagun bat gertatu da</string>
    <string name="auth_unknown_error_message">Errore ezezagun bat gertatu da. Mezedez jarri harremanetan egileekin eta zure gailuko log-ak erantsi.</string>
    <string name="auth_unknown_host_title">Ezin izan da hostalaria aurkitu</string>
    <string name="auth_unknown_host_message">Ezin da sartutako hostalaria aurkitu. Mezedez egiaztatu hostalari izena eta zerbitzariaren eskuragarritasuna eta saiatu berriz.</string>
 -  <string name="auth_incorrect_path_title">ez da ownClouden instalaziorik aurkitu</string>
 -  <string name="auth_incorrect_path_message">Programak ezin du ownCloud instantzia aurkitu emandako bidean. Mesedez egiaztatu bidea eta saiatu berriz.</string>
 +  <string name="auth_incorrect_path_title">ez da serveren instalaziorik aurkitu</string>
 +  <string name="auth_incorrect_path_message">Programak ezin du server instantzia aurkitu emandako bidean. Mesedez egiaztatu bidea eta saiatu berriz.</string>
    <string name="auth_timeout_title">Zerbitzariak denbora asko hartu du erantzuteko</string>
    <string name="auth_incorrect_address_title">Gaizki sortutako URLa</string>
    <string name="auth_ssl_general_error_title">SSL abiaratzeak huts egin du</string>
    <string name="auth_ssl_unverified_server_title">Egiaztatu gabeko SSL zerbitzariaren identitaea</string>
 -  <string name="auth_bad_oc_version_title">ownCloud zerbitzari bertsio ezezaguna</string>
 +  <string name="auth_bad_oc_version_title">server zerbitzari bertsio ezezaguna</string>
    <string name="auth_wrong_connection_title">Ezin izan da konexioa egin</string>
    <string name="auth_secure_connection">Konexio segurua ezarri da</string>
    <string name="auth_unauthorized">Okerreko erabiltzaile izen edo pasahitza</string>
@@@ -207,7 -208,7 +207,7 @@@
    <string name="crashlog_send_report">Bidali txostena</string>
    <string name="crashlog_dont_send_report">Ez bidali txostena</string>
    <string name="extensions_avail_title">Hedapenak eskuragarri!</string>
 -  <string name="extensions_avail_message">Badirudi zure ownCloud instantziak aukera aurreratuak eskuragarri dituela. Nahiko zenuke aukera horiek zure androidean ikustea?</string>
 +  <string name="extensions_avail_message">Badirudi zure server instantziak aukera aurreratuak eskuragarri dituela. Nahiko zenuke aukera horiek zure androidean ikustea?</string>
    <string name="fd_keep_in_sync">Mantendu fitxategia eguneratuta</string>
    <string name="common_share">Elkarbanatu</string>
    <string name="common_rename">Berrizendatu</string>
@@@ -284,6 -285,7 +284,7 @@@
    <string name="failed_upload_headline_delete_all_btn">kendu hautatutakoak igoera-ilaratik</string>
    <string name="failed_upload_retry_text">Berriz saiatu irudia igotzen:</string>
    <string name="failed_upload_load_more_images">Kargatu irudi gehiago</string>
+   <string name="failed_upload_retry_do_nothing_text">ez egin ezer ez zaude on-line uneko igoerarentzat</string>
    <string name="failed_upload_failure_text">Hutsegite mezua:</string>
    <string name="failed_upload_quota_exceeded_text">Egiaztatu zure konfigurazioa, agian zure kuota muga gainditu  duzu.</string>
  </resources>
diff --combined res/values-fi-rFI/strings.xml
index da6e3c15,5094c1f2..42febd6e
--- a/res/values-fi-rFI/strings.xml
+++ b/res/values-fi-rFI/strings.xml
@@@ -1,9 -1,10 +1,9 @@@
  <?xml version='1.0' encoding='UTF-8'?>
  <resources>
 -  <string name="app_name">ownCloud</string>
    <string name="main_password">Salasana:</string>
    <string name="main_login">Käyttäjätunnus:</string>
    <string name="main_button_login">Kirjaudu</string>
 -  <string name="main_welcome">Tervetuloa ownCloudiin</string>
 +  <string name="main_welcome">Tervetuloa </string>
    <string name="main_files">Tiedostot</string>
    <string name="main_music">Musiikki</string>
    <string name="main_contacts">Yhteystiedot</string>
@@@ -11,7 -12,7 +11,7 @@@
    <string name="main_bookmarks">Kirjanmerkit</string>
    <string name="main_settings">Asetukset</string>
    <string name="main_tit_accsetup">Aseta tili</string>
 -  <string name="main_wrn_accsetup">Laitteessasi ei ole ownCloud-tilejä. Luo tili käyttääksesi tätä sovellusta.</string>
 +  <string name="main_wrn_accsetup">Laitteessasi ei ole tilejä. Luo tili käyttääksesi tätä sovellusta.</string>
    <string name="about_android">%1$s-Android-sovellus</string>
    <string name="about_version">versio %1$s</string>
    <string name="actionbar_sync">Päivitä tili</string>
@@@ -29,14 -30,14 +29,14 @@@
    <string name="prefs_select_oc_account">Valitse tili</string>
    <string name="prefs_summary_select_oc_account">Valitse sovelluksen käyttämät tilit.</string>
    <string name="prefs_trackmydevice">Laitteen jäljitys</string>
 -  <string name="prefs_trackmydevice_summary_off">Salli ownCloudin jäljittää laitteesi sijainti</string>
 -  <string name="prefs_trackmydevice_summary_on">ownCloud jäljittää tätä laitetta</string>
 +  <string name="prefs_trackmydevice_summary_off">Salli jäljittää laitteesi sijainti</string>
 +  <string name="prefs_trackmydevice_summary_on">Jäljittää tätä laitetta</string>
    <string name="prefs_trackmydevice_interval">Päivitysväli</string>
    <string name="prefs_trackmydevice_interval_summary">Päivitä %1$s minuutin välein</string>
    <string name="prefs_accounts">Tilit</string>
    <string name="prefs_manage_accounts">Tilien hallinta</string>
 -  <string name="prefs_pincode">ownCloud-sovelluksen PIN-koodi</string>
 -  <string name="prefs_pincode_summary">Suojaa ownCloud-asiakasohjelmasi</string>
 +  <string name="prefs_pincode">Sovelluksen PIN-koodi</string>
 +  <string name="prefs_pincode_summary">Suojaa Asiakasohjelmasi</string>
    <string name="prefs_instant_upload">Käytä välitöntä lähetystä</string>
    <string name="prefs_instant_upload_summary">Lähetä kameralla otetut kuvat välittömästi</string>
    <string name="prefs_log_delete_history_button">Poista historia</string>
@@@ -52,17 -53,17 +52,17 @@@
    <string name="setup_hint_password">Salasana</string>
    <string name="setup_hint_address">Verkko-osoite</string>
    <string name="setup_hint_show_password">Näytä salasana</string>
 -  <string name="setup_title">Yhdistä omaan ownCloudiin</string>
 +  <string name="setup_title">Yhdistä omaan %1$siin</string>
    <string name="setup_btn_connect">Yhdistä</string>
    <string name="uploader_btn_upload_text">Lähetä</string>
    <string name="uploader_top_message">Valitse lähetyskansio:</string>
    <string name="uploader_wrn_no_account_title">Tiliä ei löytynyt</string>
 -  <string name="uploader_wrn_no_account_text">Laitteelle ei ole asetettu ownCloud-tiliä. Luo tili ensin.</string>
 +  <string name="uploader_wrn_no_account_text">Laitteelle ei ole asetettu %1$s-tiliä. Luo tili ensin.</string>
    <string name="uploader_wrn_no_account_setup_btn_text">Asetukset</string>
    <string name="uploader_wrn_no_account_quit_btn_text">Lopeta</string>
    <string name="uploader_wrn_no_content_title">Ei sisältöä ladattavaksi</string>
    <string name="uploader_wrn_no_content_text">Sisältöä ei saatu. Ei lähetettävää palvelimelle.</string>
 -  <string name="uploader_error_forbidden_content">ownCloudilla ei ole oikeuksia jaettuun sisältöön</string>
 +  <string name="uploader_error_forbidden_content">%1$silla ei ole oikeuksia jaettuun sisältöön</string>
    <string name="uploader_info_uploading">Lähetetään</string>
    <string name="uploader_btn_create_dir_text">Luo kansio latausta varten</string>
    <string name="file_list_empty">Tässä kansiossa ei ole tiedostoja.\nUusia tiedostoja voi lisätä käyttäen valikon \"Lähetä\"-toimintoa.</string>
@@@ -82,7 -83,7 +82,7 @@@
    <string name="common_cancel_upload">Peru lähetys</string>
    <string name="common_cancel">Peru</string>
    <string name="common_save_exit">Tallenna ja poistu</string>
 -  <string name="common_exit">Jätä ownCloud</string>
 +  <string name="common_exit">Jätä %1$s</string>
    <string name="common_error">Virhe</string>
    <string name="common_loading">Ladataan…</string>
    <string name="common_error_unknown">Tuntematon virhe</string>
@@@ -120,17 -121,17 +120,17 @@@
    <string name="foreign_files_local_text">Paikallinen: %1$s</string>
    <string name="foreign_files_remote_text">Etä: %1$s</string>
    <string name="use_ssl">Käytä salattua yhteyttä</string>
 -  <string name="location_no_provider">ownCloud ei voi jäljittää laitettasi. Tarkista laitteesi sijaintiasetukset</string>
 +  <string name="location_no_provider">%1$s ei voi jäljittää laitettasi. Tarkista laitteesi sijaintiasetukset</string>
    <string name="pincode_enter_pin_code">Aseta sovelluksesi PIN</string>
    <string name="pincode_enter_new_pin_code">Anna uuden sovelluksesi PIN-koodi</string>
 -  <string name="pincode_configure_your_pin">Anna ownCloud-sovelluksen PIN</string>
 +  <string name="pincode_configure_your_pin">Anna sovelluksen PIN</string>
    <string name="pincode_configure_your_pin_explanation">PIN kysytään joka kerta, kun sovellus käynnistetään</string>
 -  <string name="pincode_reenter_your_pincode">Anna ownCloud-sovelluksen PIN uudestaan</string>
 -  <string name="pincode_remove_your_pincode">Poista ownCloud-sovelluksen PIN</string>
 -  <string name="pincode_mismatch">ownCloud-sovelluksen PIN-koodit eivät täsmää</string>
 -  <string name="pincode_wrong">Väärä ownCloud-sovelluksen PIN</string>
 -  <string name="pincode_removed">ownCloud-sovelluksen PIN poistettu</string>
 -  <string name="pincode_stored">ownCloud-sovelluksen PIN-koodi tallennettu</string>
 +  <string name="pincode_reenter_your_pincode">Anna sovelluksen PIN uudestaan</string>
 +  <string name="pincode_remove_your_pincode">Poista sovelluksen PIN</string>
 +  <string name="pincode_mismatch">Sovelluksen PIN-koodit eivät täsmää</string>
 +  <string name="pincode_wrong">Väärä sovelluksen PIN</string>
 +  <string name="pincode_removed">Sovelluksen PIN poistettu</string>
 +  <string name="pincode_stored">Sovelluksen PIN-koodi tallennettu</string>
    <string name="media_state_playing">%1$s (toistetaan)</string>
    <string name="media_state_loading">%1$s (ladataan)</string>
    <string name="media_err_nothing_to_play">Mediatiedostoa ei löytynyt</string>
@@@ -158,31 -159,32 +158,32 @@@
    <string name="auth_nossl_plain_ok_message">Sovellus ei voinut luoda salattua yhteyttä palvelimeen. Kuitenkin salaamaton yhteys on olemassa. Jatka sitä käyttäen tai lopeta tähän.</string>
    <string name="auth_connection_established">Yhteys muodostettu</string>
    <string name="auth_testing_connection">Testataan yhteyttä...</string>
 -  <string name="auth_not_configured_title">Väärin tehdyt ownCloud-asetukset</string>
 -  <string name="auth_not_configured_message">Vaikuttaa ettei ownCloud ole oikein määritetty. Ota yhteyttä ylläpitäjään.</string>
 +  <string name="auth_not_configured_title">Väärin tehdyt palvelin-asetukset</string>
 +  <string name="auth_not_configured_message">Vaikuttaa ettei palvelin ole oikein määritetty. Ota yhteyttä ylläpitäjään.</string>
    <string name="auth_unknown_error_title">Tuntematon virhe</string>
    <string name="auth_unknown_error_message">Tuntematon virhe tapahtui. Ota yhteyttä tekijöihin ja liitä mukaan lokitiedostot laitteestasi.</string>
    <string name="auth_unknown_host_title">Isäntää ei löydy</string>
    <string name="auth_unknown_host_message">Annettua isäntää ei löydy. Tarkista nimi ja onko palvelin käytettävissä, yritä sitten uudestaan.</string>
 -  <string name="auth_incorrect_path_title">ownCloud-instanssia ei löydetty</string>
 -  <string name="auth_incorrect_path_message">Sovellus ei löydä ownCloud-instanssia annetusta polusta. Tarkista polku ja yritä uudestaan.</string>
 +  <string name="auth_incorrect_path_title">Palvelin-instanssia ei löydetty</string>
 +  <string name="auth_incorrect_path_message">Sovellus ei löydä palvelin-instanssia annetusta polusta. Tarkista polku ja yritä uudestaan.</string>
    <string name="auth_timeout_title">Palvelimen vastaus viipyy liian kauan</string>
    <string name="auth_incorrect_address_title">Väärin annettu osoite</string>
    <string name="auth_ssl_general_error_title">SSL:n alustus epäonnistui</string>
    <string name="auth_ssl_unverified_server_title">SSL-palvelimen identiteettiä ei voida varmistaa</string>
 -  <string name="auth_bad_oc_version_title">Tuntematon ownCloud-palvelimen versio</string>
 +  <string name="auth_bad_oc_version_title">Tuntematon palvelimen versio</string>
    <string name="auth_wrong_connection_title">Yhteyden muodostus epäonnistui</string>
    <string name="auth_secure_connection">Salattu yhteys muodostettu</string>
    <string name="auth_unauthorized">Väärä käyttäjätunnus tai salasana</string>
    <string name="auth_not_found">Väärä polku</string>
    <string name="auth_internal">Sisäinen palvelinvirhe, koodi %1$d</string>
    <string name="auth_wtf_reenter_URL">Odottamaton tila; anna palvelimen osoite uudelleen</string>
+   <string name="auth_expired_oauth_token_toast">Kirjautumisesi on vanhentunut.\nKirjaudu uudelleen</string>
    <string name="auth_expired_basic_auth_toast">Anna nykyinen salasana</string>
    <string name="crashlog_message">Sovellus sulkeutui yllättäen. Haluatko lähettää vikailmoituksen?</string>
    <string name="crashlog_send_report">Lähetä ilmoitus</string>
    <string name="crashlog_dont_send_report">Älä lähetä ilmoitusta</string>
    <string name="extensions_avail_title">Laajennuksia saatavilla!</string>
 -  <string name="extensions_avail_message">ownCloud-instanssisi näyttäisi tukevan laajennuksia. Haluatko nähdä Androidille saatavilla olevat laajennukset?</string>
 +  <string name="extensions_avail_message">Palvelin-instanssisi näyttäisi tukevan laajennuksia. Haluatko nähdä Androidille saatavilla olevat laajennukset?</string>
    <string name="fd_keep_in_sync">Pidä tiedosto ajan tasalla</string>
    <string name="common_share">Jaa</string>
    <string name="common_rename">Nimeä uudelleen</string>
diff --combined 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>
@@@ -11,11 -12,11 +11,11 @@@
    <string name="main_bookmarks">Marque-pages</string>
    <string name="main_settings">Paramètres</string>
    <string name="main_tit_accsetup">Paramètres du compte</string>
 -  <string name="main_wrn_accsetup">Aucun compte ownCloud n\'est encore paramétré. Pour utiliser cette application, il vous faut en ajouter un.</string>
 +  <string name="main_wrn_accsetup">Aucun compte n\'est encore paramétré. Pour utiliser cette application, il vous faut en ajouter un.</string>
    <string name="about_android">%1$s Android App</string>
    <string name="about_version">version %1$s</string>
    <string name="actionbar_sync">Actualiser le compte</string>
-   <string name="actionbar_upload">Téléverser un fichier</string>
+   <string name="actionbar_upload">Téléverser</string>
    <string name="actionbar_upload_from_apps">Contenu d\'une autre application</string>
    <string name="actionbar_upload_files">Fichiers</string>
    <string name="actionbar_open_with">Ouvrir avec</string>
@@@ -23,20 -24,20 +23,20 @@@
    <string name="actionbar_search">Rechercher</string>
    <string name="actionbar_settings">Paramètres</string>
    <string name="actionbar_see_details">Détails</string>
-   <string name="prefs_category_general">Généraux</string>
+   <string name="prefs_category_general">Général</string>
    <string name="prefs_add_session">Ajouter une nouvelle session</string>
-   <string name="prefs_create_img_thumbnails">Créer les miniatures</string>
+   <string name="prefs_create_img_thumbnails">Créer les miniatures d\'images</string>
    <string name="prefs_select_oc_account">Sélectionnez un compte</string>
    <string name="prefs_summary_select_oc_account">Choisissez quel compte utiliser</string>
    <string name="prefs_trackmydevice">Traçage de l\'appareil</string>
 -  <string name="prefs_trackmydevice_summary_off">Permettre à ownCloud de suivre votre position</string>
 -  <string name="prefs_trackmydevice_summary_on">Votre ownCloud trace actuellement cet appareil</string>
 +  <string name="prefs_trackmydevice_summary_off">Permettre à l\'application de suivre votre position</string>
 +  <string name="prefs_trackmydevice_summary_on">Votre application trace actuellement cet appareil</string>
    <string name="prefs_trackmydevice_interval">Intervalle de mise à jour</string>
    <string name="prefs_trackmydevice_interval_summary">Mettre à jour toutes les %1$s minutes</string>
    <string name="prefs_accounts">Comptes</string>
    <string name="prefs_manage_accounts">Gestion des comptes utilisateur</string>
 -  <string name="prefs_pincode">Utilisation d\'un code de sécurité ownCloud</string>
 -  <string name="prefs_pincode_summary">Protéger l\'accès aux données maniplulées par le client ownCloud</string>
 +  <string name="prefs_pincode">Utilisation d\'un code de sécurité</string>
 +  <string name="prefs_pincode_summary">Protéger l\'accès aux données maniplulées par le client</string>
    <string name="prefs_instant_upload">Activer le téléversement instantané</string>
    <string name="prefs_instant_upload_summary">Import instantané des photos prises par la caméra</string>
    <string name="prefs_log_title">Activer les logs</string>
@@@ -44,9 -45,11 +44,11 @@@
    <string name="prefs_log_title_history">Historique des logs</string>
    <string name="prefs_log_summary_history">Cela affiche les logs enregistrés</string>
    <string name="prefs_log_delete_history_button">Supprimer l\'historique</string>
+   <string name="auth_check_server">Vérifier le serveur</string>
    <string name="auth_host_url">Adresse du serveur</string>
    <string name="auth_username">Nom d\'utilisateur</string>
    <string name="auth_password">Mot de passe</string>
+   <string name="auth_register">Nouveau dans %1$s ?</string>
    <string name="new_session_uri_error">L\'URL spécifiée n\'est pas correcte</string>
    <string name="new_session_session_name_error">Le nom de session spécifié n\'est pas correct</string>
    <string name="sync_string_files">Fichiers</string>
@@@ -55,17 -58,17 +57,17 @@@
    <string name="setup_hint_password">Mot de passe</string>
    <string name="setup_hint_address">Adresse web</string>
    <string name="setup_hint_show_password">Afficher le mot de passe ?</string>
 -  <string name="setup_title">Me connecter à mon ownCloud</string>
 +  <string name="setup_title">Me connecter à mon %1$s</string>
    <string name="setup_btn_connect">Connecter</string>
    <string name="uploader_btn_upload_text">Téléverser</string>
    <string name="uploader_top_message">Choisissez le répertoire de destination:</string>
    <string name="uploader_wrn_no_account_title">Aucun compte n\'a été trouvé</string>
 -  <string name="uploader_wrn_no_account_text">Aucun compte ownCloud n\'a été trouvé. Veuillez commencer par en configurer un.</string>
 +  <string name="uploader_wrn_no_account_text">Aucun compte %1$s n\'a été trouvé. Veuillez commencer par en configurer un.</string>
    <string name="uploader_wrn_no_account_setup_btn_text">Paramètres</string>
    <string name="uploader_wrn_no_account_quit_btn_text">Quitter</string>
    <string name="uploader_wrn_no_content_title">Rien à envoyer</string>
    <string name="uploader_wrn_no_content_text">Aucun contenu reçu. Rien à envoyer</string>
 -  <string name="uploader_error_forbidden_content">ownCloud n\'est pas autorisé à accéder au contenu partagé</string>
 +  <string name="uploader_error_forbidden_content">%1$s n\'est pas autorisé à accéder au contenu partagé</string>
    <string name="uploader_info_uploading">Téléversement</string>
    <string name="uploader_btn_create_dir_text">Créer un répertoire pour le téléversement</string>
    <string name="file_list_empty">Ce répertoire ne contient aucun fichier.\nDe nouveaux fichiers peuvent être importés en cliquant sur le bouton « Téléverser un fichier » du menu des options</string>
@@@ -85,7 -88,7 +87,7 @@@
    <string name="common_cancel_upload">Annuler l\'envoi</string>
    <string name="common_cancel">Annuler</string>
    <string name="common_save_exit">Sauvegarder &amp; Quitter</string>
 -  <string name="common_exit">Quitter ownCloud</string>
 +  <string name="common_exit">Quitter %1$s</string>
    <string name="common_error">Erreur</string>
    <string name="common_loading">Chargement ...</string>
    <string name="common_error_unknown">Erreur Inconnue </string>
@@@ -114,6 -117,7 +116,7 @@@
    <string name="sync_string_contacts">Contacts</string>
    <string name="sync_fail_ticker">La synchronisation a échoué</string>
    <string name="sync_fail_content">La synchronisation de %1$s ne peut pas être complétée</string>
+   <string name="sync_fail_content_unauthorized">Mot de passe invalide pour %1$s</string>
    <string name="sync_conflicts_in_favourites_ticker">Des conflits ont été trouvés</string>
    <string name="sync_conflicts_in_favourites_content">%1$d fichiers à garder synchronisés n\'ont put être synchronisé</string>
    <string name="sync_fail_in_favourites_ticker">La synchronisation des fichiers a échoué</string>
@@@ -128,17 -132,17 +131,17 @@@
    <string name="foreign_files_remote_text">Distant: %1$s</string>
    <string name="upload_query_move_foreign_files">Il n\'y a pas assez de place disponible pour copier les fichiers sélectionnés dans le dossier %1$s. Voulez-vous les déplacer à la place ?</string>
    <string name="use_ssl">Utiliser une connexion sécurisée</string>
 -  <string name="location_no_provider">ownCloud ne peut pister votre appareil, veuillez vérifier vos paramètres de localisation</string>
 +  <string name="location_no_provider">%1$s ne peut pister votre appareil, veuillez vérifier vos paramètres de localisation</string>
    <string name="pincode_enter_pin_code">Veuillez saisir votre code de sécurité</string>
    <string name="pincode_enter_new_pin_code">Veuillez saisir votre nouveau code de sécurité</string>
 -  <string name="pincode_configure_your_pin">Veuillez saisir votre code de sécurité ownCloud</string>
 +  <string name="pincode_configure_your_pin">Veuillez saisir votre code de sécurité </string>
    <string name="pincode_configure_your_pin_explanation">Le code PIN vous sera demandé à chaque lancement de l\'application</string>
 -  <string name="pincode_reenter_your_pincode">Veuillez saisir à nouveau votre code de sécurité ownCloud</string>
 -  <string name="pincode_remove_your_pincode">Retirer le code de sécurité ownCloud</string>
 +  <string name="pincode_reenter_your_pincode">Veuillez saisir à nouveau votre code de sécurité</string>
 +  <string name="pincode_remove_your_pincode">Retirer le code de sécurité</string>
    <string name="pincode_mismatch">Les deux codes saisis ne concordent pas</string>
 -  <string name="pincode_wrong">code de sécurité ownCloud incorrect</string>
 -  <string name="pincode_removed">code de sécurité ownCloud retiré</string>
 -  <string name="pincode_stored">code de sécurité ownCloud enregistré</string>
 +  <string name="pincode_wrong">Code de sécurité incorrect</string>
 +  <string name="pincode_removed">Code de sécurité retiré</string>
 +  <string name="pincode_stored">Code de sécurité enregistré</string>
    <string name="media_notif_ticker">%1$s lecteur de musique</string>
    <string name="media_state_playing">%1$s (lecture)</string>
    <string name="media_state_loading">%1$s (chargement)</string>
@@@ -178,32 -182,34 +181,34 @@@
    <string name="auth_nossl_plain_ok_message">L\'application ne peut établir de connexion sécurisée avec le serveur. Cependant, une connexion non sécurisée est disponible. Vous pouvez continuer en utilisant celle-ci ou annuler.</string>
    <string name="auth_connection_established">Connexion établie</string>
    <string name="auth_testing_connection">Test de la connexion…</string>
 -  <string name="auth_not_configured_title">Configuration ownCloud erronée</string>
 -  <string name="auth_not_configured_message">Il semblerait que votre instance ownCloud ne soit pas correctement configurée. Veuillez contacter votre administrateur pour plus de détails.</string>
 +  <string name="auth_not_configured_title">Configuration du serveur erronée</string>
 +  <string name="auth_not_configured_message">Il semblerait que votre instance du serveur ne soit pas correctement configurée. Veuillez contacter votre administrateur pour plus de détails.</string>
    <string name="auth_unknown_error_title">Une erreur inconnue s\'est produite</string>
    <string name="auth_unknown_error_message">Une erreur inconnue s\'est produite, merci de bien vouloir contacter les auteurs du programme en y incluant les messages d\'erreurs.</string>
    <string name="auth_unknown_host_title">Impossible de trouver l\'hôte</string>
    <string name="auth_unknown_host_message">Impossible de trouver l\'hôte spécifié. Veuillez vérifier le nom du serveur, qu\'il est disponible, et essayer à nouveau.</string>
 -  <string name="auth_incorrect_path_title">Aucune instance ownCloud n\'a été trouvée</string>
 -  <string name="auth_incorrect_path_message">L\'application n\'a pu trouver une instance ownCloud à cette adresse. Veuillez vérifier l\'adresse et essayez à nouveau</string>
 +  <string name="auth_incorrect_path_title">Aucune instance du serveur n\'a été trouvée</string>
 +  <string name="auth_incorrect_path_message">L\'application n\'a pu trouver une instance du serveur à cette adresse. Veuillez vérifier l\'adresse et essayez à nouveau</string>
    <string name="auth_timeout_title">Le serveur met trop longtemps à répondre</string>
    <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>
    <string name="auth_internal">Erreur interne du serveur, code %1$d</string>
    <string name="auth_wtf_reenter_URL">État inattendu ; veuillez entrer à nouveau l\'URL du serveur</string>
    <string name="auth_expired_oauth_token_toast">Votre autorisation a expiré.\nVeuillez procéder à nouveau à une autorisation</string>
+   <string name="auth_expired_basic_auth_toast">Veuillez saisir le mot de passe courant</string>
    <string name="crashlog_message">L\'application s\'est fermée de façon inattendue, voulez-vous envoyer un rapport d\'erreur ?</string>
    <string name="crashlog_send_report">Envoyer un rapport</string>
    <string name="crashlog_dont_send_report">Ne rien envoyer</string>
    <string name="extensions_avail_title">Des extensions sont disponibles !</string>
 -  <string name="extensions_avail_message">Il semblerait que votre ownCloud supporte les extensions avancées. Voulez-vous afficher les extensions disponibles pour android ?</string>
 +  <string name="extensions_avail_message">Il semblerait que votre du serveur supporte les extensions avancées. Voulez-vous afficher les extensions disponibles pour android ?</string>
    <string name="fd_keep_in_sync">Maintenir le fichier à jour</string>
    <string name="common_share">Partager</string>
    <string name="common_rename">Renommer</string>
diff --combined res/values-ko/strings.xml
index 12ab64f9,55058ea9..1817074c
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@@ -1,5 -1,6 +1,5 @@@
  <?xml version='1.0' encoding='UTF-8'?>
  <resources>
 -  <string name="app_name">ownCloud</string>
    <string name="main_password">암호:</string>
    <string name="main_login">사용자 이름:</string>
    <string name="main_button_login">로그인</string>
@@@ -11,20 -12,25 +11,25 @@@
    <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>
+   <string name="actionbar_open_with">로 열기</string>
    <string name="actionbar_mkdir">디렉터리 만들기</string>
    <string name="actionbar_search">검색</string>
    <string name="actionbar_settings">설정</string>
+   <string name="actionbar_see_details">세부내용</string>
    <string name="prefs_category_general">일반</string>
    <string name="prefs_add_session">새 세션 추가</string>
    <string name="prefs_create_img_thumbnails">미리 보기 그림 만들기</string>
    <string name="prefs_select_oc_account">계정 선택</string>
    <string name="prefs_summary_select_oc_account">이 앱에서 사용할 계정을 선택하십시오.</string>
    <string name="prefs_trackmydevice">장치 추적</string>
 -  <string name="prefs_trackmydevice_summary_off">ownCloud에서 현재 위치 추적하기</string>
 +  <string name="prefs_trackmydevice_summary_off">에서 현재 위치 추적하기</string>
    <string name="prefs_trackmydevice_summary_on">이 앱에서 장치 위치를 추적합니다</string>
    <string name="prefs_trackmydevice_interval">업데이트 주기</string>
    <string name="prefs_trackmydevice_interval_summary">%1$s분마다 업데이트</string>
@@@ -34,9 -40,16 +39,16 @@@
    <string name="prefs_pincode_summary">내 클라이언트 보호</string>
    <string name="prefs_instant_upload">자동 업로드 사용</string>
    <string name="prefs_instant_upload_summary">카메라로 촬영한 사진 자동 업로드</string>
+   <string name="prefs_log_title">로깅 허용</string>
+   <string name="prefs_log_summary">이건 로그 문제에 사용됩니다</string>
+   <string name="prefs_log_title_history">로그 기록</string>
+   <string name="prefs_log_summary_history">여기서 기록된 로그를 보여줍니다</string>
+   <string name="prefs_log_delete_history_button">역사 삭제하기</string>
+   <string name="auth_check_server">서버 확인</string>
    <string name="auth_host_url">서버 주소</string>
    <string name="auth_username">사용자 이름</string>
    <string name="auth_password">암호</string>
+   <string name="auth_register">%1$s의 새로운 사용자입니까?</string>
    <string name="new_session_uri_error">잘못된 주소를 입력하였습니다</string>
    <string name="new_session_session_name_error">세션 이름이 잘못되었습니다</string>
    <string name="sync_string_files">파일</string>
@@@ -48,6 -61,7 +60,7 @@@
    <string name="setup_title">내 %1$s에 접속</string>
    <string name="setup_btn_connect">접속</string>
    <string name="uploader_btn_upload_text">업로드</string>
+   <string name="uploader_top_message">업로드할 디렉터리를 선택해주세요:</string>
    <string name="uploader_wrn_no_account_title">계정 없음</string>
    <string name="uploader_wrn_no_account_text">이 장치에 %1$s 계정이 없습니다. 먼저 계정을 설정하십시오.</string>
    <string name="uploader_wrn_no_account_setup_btn_text">설정</string>
@@@ -64,6 -78,7 +77,7 @@@
    <string name="filedetails_created">만든 날짜:</string>
    <string name="filedetails_modified">수정한 날짜:</string>
    <string name="filedetails_download">다운로드</string>
+   <string name="filedetails_sync_file">파일 새로고침</string>
    <string name="filedetails_redownload">다시 다운로드</string>
    <string name="filedetails_renamed_in_upload_msg">업로드 중 파일 이름을 %1$s(으)로 변경하였습니다</string>
    <string name="common_yes">예</string>
@@@ -75,6 -90,8 +89,8 @@@
    <string name="common_save_exit">저장하고 끝내기</string>
    <string name="common_exit">%1$s 떠나기</string>
    <string name="common_error">오류</string>
+   <string name="common_loading">불러오는 중...</string>
+   <string name="common_error_unknown">알수없는 오류</string>
    <string name="about_title">정보</string>
    <string name="change_password">암호 변경</string>
    <string name="delete_account">계정 삭제</string>
@@@ -95,16 -112,19 +111,19 @@@
    <string name="downloader_download_succeeded_content">%1$s을(를) 다운로드하였습니다</string>
    <string name="downloader_download_failed_ticker">다운로드 실패</string>
    <string name="downloader_download_failed_content">%1$s을(를) 다운로드할 수 없었습니다</string>
+   <string name="downloader_not_downloaded_yet">아직 다운로드 되지 않았습니다</string>
    <string name="common_choose_account">계정 선택</string>
    <string name="sync_string_contacts">연락처</string>
    <string name="sync_fail_ticker">동기화 실패</string>
    <string name="sync_fail_content">%1$s와(과) 동기화할 수 없었습니다</string>
+   <string name="sync_fail_content_unauthorized">%1$s에 대한 비밀번호가 틀립니다</string>
    <string name="sync_conflicts_in_favourites_ticker">충돌하는 항목 발견됨</string>
    <string name="sync_conflicts_in_favourites_content">동기화된 파일 중 %1$d개를 동기화할 수 없었습니다</string>
    <string name="sync_fail_in_favourites_ticker">파일을 동기화할 수 없었습니다</string>
    <string name="sync_fail_in_favourites_content">파일 %1$d개의 내용을 동기화할 수 없었습니다 (충돌 %2$d개)</string>
    <string name="sync_foreign_files_forgotten_ticker">몇몇 로컬 파일이 사라졌습니다.</string>
    <string name="sync_foreign_files_forgotten_content">%1$d 파일을 %2$s 디렉토리에 복사하지 못하였습니다.</string>
+   <string name="sync_foreign_files_forgotten_explanation">1.3.16 버전에서, 파일 업로드는 다수의 계정이 동시에 접속될때 데이터 유실을 피하기 위해 로컬 %1$s 폴더로 복사됩니다.⏎\n⏎\n이 변화로 인해, 예전 버전으로 올리신 파일들은 %2$s 폴더로 복사되었습니다. 그러나, 계정 동기화중 오류로 인해 작업을 완료하지 못할수 있습니다. 파일을 남기시고 %3$s로 연결되는 링크를 지우시거나, 혹은 파일을 %1$s 폴더로 이동시키고, %4$s에 링크를 유지시킬수 있습니다.⏎\n⏎\n아래에는 로컬 파일과 더불어, %5$s로 링크된 리모트 파일들의 목록이 있습니다.\n</string>
    <string name="foreign_files_move">모두 옮김</string>
    <string name="foreign_files_success">모든 파일 옮김</string>
    <string name="foreign_files_fail">몇몇 파일을 옮기지 못했습니다.</string>
@@@ -123,6 -143,27 +142,27 @@@
    <string name="pincode_wrong">앱 암호가 잘못되었습니다</string>
    <string name="pincode_removed">앱 암호가 삭제되었습니다</string>
    <string name="pincode_stored">앱 암호가 저장되었습니다</string>
+   <string name="media_notif_ticker">%1$s 음악 재생기</string>
+   <string name="media_state_playing">%1$s (재생중)</string>
+   <string name="media_state_loading">%1$s (불러오는 중)</string>
+   <string name="media_event_done">%1$s 재생 완료됨</string>
+   <string name="media_err_nothing_to_play">미디어 파일을 찾을수 없습니다</string>
+   <string name="media_err_no_account">준비된 계정이 없습니다</string>
+   <string name="media_err_not_in_owncloud">유효한 계정의 파일이 아닙니다</string>
+   <string name="media_err_unsupported">지원하지 않는 미디어 코덱</string>
+   <string name="media_err_io">미디어 파일을 읽을수 </string>
+   <string name="media_err_malformed">미디어 파일이 제대로 인코드 되지 않았습니다</string>
+   <string name="media_err_timeout">재생하기에 시간이 너무 많이 걸립니다</string>
+   <string name="media_err_invalid_progressive_playback">미디어 파일을 스트리밍 할수 없습니다</string>
+   <string name="media_err_unknown">내장된 미디어 플레이어에서는 이 미디어 파일을 재생할수 없습니다</string>
+   <string name="media_err_security_ex">%1$s 를 재생하는 중에 보안오류가 발생함</string>
+   <string name="media_err_io_ex">%1$s 를 재생하는 중에 입력 에러가 발생함</string>
+   <string name="media_err_unexpected">%1$s 를 재생하던 중에 알수 없는 오류가 발생함</string>
+   <string name="media_previous_description">전 트랙으로 이동 버튼</string>
+   <string name="media_rewind_description">되감기 버튼</string>
+   <string name="media_play_pause_description">재생 혹은 일시정지 버튼</string>
+   <string name="media_forward_description">빨리감기 버튼</string>
+   <string name="media_next_description">다음 트랙 버튼</string>
    <string-array name="prefs_trackmydevice_intervall_keys">
      <item>15분</item>
      <item>30분</item>
@@@ -133,12 -174,14 +173,14 @@@
      <item>30</item>
      <item>60</item>
    </string-array>
+   <string name="auth_trying_to_login">로그인 중...</string>
    <string name="auth_no_net_conn_title">네트워크에 연결할 수 없습니다</string>
    <string name="auth_no_net_conn_message">네트워크 연결을 시도할 수 없습니다. 인터넷 연결을 확인하고 다시 시도하십시오.</string>
    <string name="auth_connect_anyway">그래도 접속하기</string>
    <string name="auth_nossl_plain_ok_title">암호화된 연결을 사용할 수 없습니다.</string>
    <string name="auth_nossl_plain_ok_message">서버와 암호화된 통신을 시도할 수 없었습니다. 암호화되지 않은 연결을 사용할 수 있습니다. 그래도 접속하거나 취소할 수 있습니다.</string>
    <string name="auth_connection_established">연결됨</string>
+   <string name="auth_testing_connection">연결 테스트 중...</string>
    <string name="auth_not_configured_title">서버 설정이 잘못됨</string>
    <string name="auth_not_configured_message">서버 인스턴스가 잘못 설정된 것 같습니다. 서버 관리자에게 문의하십시오.</string>
    <string name="auth_unknown_error_title">알 수 없는 오류가 발생하였습니다!</string>
@@@ -154,8 -197,14 +196,14 @@@
    <string name="auth_bad_oc_version_title">확인할 수 없는 서버 버전</string>
    <string name="auth_wrong_connection_title">연결을 수립할 수 없음</string>
    <string name="auth_secure_connection">암호화된 연결 사용 중</string>
+   <string name="auth_unauthorized">잘못된 로그인/암호</string>
+   <string name="auth_oauth_error">권한부여가 성공적으로 이뤄지지 않았습니다</string>
+   <string name="auth_oauth_error_access_denied">권한 서버로 부터 접근이 거부되었습니다</string>
    <string name="auth_not_found">경로가 잘못되었습니다</string>
    <string name="auth_internal">내부 서버 오류, 코드 %1$d</string>
+   <string name="auth_wtf_reenter_URL">뜻밖의 상태; 다시 서버 주소를 입력해주십시오</string>
+   <string name="auth_expired_oauth_token_toast">인증이 만료되었습니다⏎\n다시 인증해주세요</string>
+   <string name="auth_expired_basic_auth_toast">현재 암호를 </string>
    <string name="crashlog_message">프로그램이 예상치 못하게 종료되었습니다. 충돌 보고서를 전송하시겠습니까?</string>
    <string name="crashlog_send_report">보고서 보내기</string>
    <string name="crashlog_dont_send_report">보내지 않기</string>
@@@ -182,6 -231,11 +230,11 @@@
    <string name="wait_a_moment">잠시 기다려 주십시오</string>
    <string name="filedisplay_unexpected_bad_get_content">예상하지 못한 오류입니다. 다른 앱에서 파일을 선택하십시오</string>
    <string name="filedisplay_no_file_selected">선택한 파일 없음</string>
+   <string name="oauth_host_url">oAuth2 URL</string>
+   <string name="oauth_check_onoff">oAuth2로 로그인하기</string>
+   <string name="oauth_login_connection">oAuth2 서버에 연결중...</string>
+   <string name="oauth_code_validation_message">웹 브라우저를 여신후 이 주소로 가십시오:⏎\n%1$s.⏎\n유효한 코드는 여기에 있습니다:⏎\n%2$s</string>
+   <string name="oauth_connection_url_unavailable">접속하신 이 URL은 유효하지 않습니다</string>
    <string name="ssl_validator_title">경고</string>
    <string name="ssl_validator_header">사이트 인증서를 확인할 수 없었습니다</string>
    <string name="ssl_validator_reason_cert_not_trusted">- 서버 인증서를 신뢰할 수 없습니다</string>
@@@ -206,6 -260,12 +259,12 @@@
    <string name="ssl_validator_label_validity_to">끝:</string>
    <string name="ssl_validator_label_signature">서명:</string>
    <string name="ssl_validator_label_signature_algorithm">알고리즘:</string>
+   <string name="placeholder_sentence">이것은 플레이스홀더입니다</string>
+   <string name="placeholder_filename">placeholder.txt</string>
+   <string name="placeholder_filetype">PNG 파일</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">WiFi 사용 중일때만 사진 업로드</string>
    <string name="instant_upload_path">/InstantUpload</string>
    <string name="conflict_title">업데이트 충돌</string>
@@@ -213,6 -273,19 +272,19 @@@
    <string name="conflict_keep_both">모두 저장</string>
    <string name="conflict_overwrite">덮어쓰기</string>
    <string name="conflict_dont_upload">업로드하지 않음</string>
+   <string name="preview_image_description">그림 미리보기</string>
+   <string name="preview_image_error_unknown_format">이 그림을 볼수 없습니다</string>
+   <string name="preview_image_error_out_of_memory">\"그림을 보이기에 충분한 메모리가 부족하여</string>
    <!--we need to improve the communication of errors to the user-->
    <string name="error__upload__local_file_not_copied">%1$s를 %2$s 로컬 디렉토리로 복사하지 못했습니다.</string>
+   <string name="actionbar_failed_instant_upload">자동 업로드가 실패했습니다\"</string>
+   <string name="failed_upload_headline_text">자동 업로드 실패함</string>
+   <string name="failed_upload_headline_hint">실패된 자동 업로드 전체 요약</string>
+   <string name="failed_upload_all_cb">전체 선택</string>
+   <string name="failed_upload_headline_retryall_btn">전체 선택 재시도</string>
+   <string name="failed_upload_headline_delete_all_btn">선택된 업로드 큐 전체 삭제</string>
+   <string name="failed_upload_retry_text">이미지 업로드 재시도:</string>
+   <string name="failed_upload_load_more_images">더 많은 사진 불러오기</string>
+   <string name="failed_upload_failure_text">실패 메시지:</string>
+   <string name="failed_upload_quota_exceeded_text">서버 설정을 확인해주세요, 아마 업로드 제한을 초과하셨을겁니다.</string>
  </resources>
diff --combined res/values-lt-rLT/strings.xml
index b91e390d,f5d986c5..93e21f2f
--- a/res/values-lt-rLT/strings.xml
+++ b/res/values-lt-rLT/strings.xml
@@@ -1,9 -1,10 +1,9 @@@
  <?xml version='1.0' encoding='UTF-8'?>
  <resources>
 -  <string name="app_name">ownCloud</string>
    <string name="main_password">Slaptažodis:</string>
    <string name="main_login">Prisijungimo vardas:</string>
    <string name="main_button_login">Prisijungti</string>
 -  <string name="main_welcome">Sveiki prisijungę prie savo OwnCloud</string>
 +  <string name="main_welcome">Sveiki prisijungę</string>
    <string name="main_files">Failai</string>
    <string name="main_music">Muzika</string>
    <string name="main_contacts">Kontaktai</string>
@@@ -11,23 -12,28 +11,28 @@@
    <string name="main_bookmarks">Žymekliai</string>
    <string name="main_settings">Nustatymai</string>
    <string name="main_tit_accsetup">Nustatyti paskyrą</string>
 -  <string name="main_wrn_accsetup">Jūsų prietaise nėra nė vienos ownCloud paskyros. Kad galėtumėte naudoti šią programą, turite sukurti paskyrą.</string>
 +  <string name="main_wrn_accsetup">Jūsų prietaise nėra nė vienos paskyros. Kad galėtumėte naudoti šią programą, turite sukurti paskyrą.</string>
    <string name="actionbar_upload">Įkelti</string>
    <string name="actionbar_upload_from_apps">Turinys iš kitų programų</string>
    <string name="actionbar_upload_files">Failai</string>
    <string name="actionbar_mkdir">Kurti aplanką</string>
    <string name="actionbar_search">Paieška</string>
    <string name="actionbar_settings">Nustatymai</string>
+   <string name="actionbar_see_details">Informacija</string>
    <string name="prefs_category_general">Bendras</string>
    <string name="prefs_add_session">Pridėti naują sesiją</string>
    <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>
@@@ -59,7 -70,10 +69,10 @@@
    <string name="common_cancel_download">Atšaukti parsiuntimą</string>
    <string name="common_cancel_upload">Atšaukti siuntimą</string>
    <string name="common_cancel">Atšaukti</string>
+   <string name="common_save_exit">IÅ¡saugoti ir IÅ¡eiti</string>
+   <string name="common_exit">Palikti %1$s</string>
    <string name="common_error">Klaida</string>
+   <string name="common_loading">Įkeliama...</string>
    <string name="common_error_unknown">Neatpažinta klaida</string>
    <string name="about_title">Apie</string>
    <string name="change_password">Pakeisti slaptažodį</string>
@@@ -68,25 -82,46 +81,46 @@@
    <string name="upload_chooser_title">Įkelti iš ...</string>
    <string name="uploader_info_dirname">Aplanko pavadinimas</string>
    <string name="uploader_upload_in_progress_ticker">Įkeliama ...</string>
+   <string name="uploader_upload_in_progress_content">%1$d%% Siunčiama %2$s</string>
+   <string name="uploader_upload_succeeded_ticker">Nusiuntimas pavyko</string>
+   <string name="uploader_upload_succeeded_content_single">%1$s buvo sėkmingai nusiųstas</string>
+   <string name="uploader_upload_succeeded_content_multiple">%1$d failai buvo sėkmingai nusiųsti</string>
    <string name="uploader_upload_failed_ticker">Nusiuntimas nepavyko</string>
+   <string name="uploader_upload_failed_content_single">Nepavyko baigti %1$s nusiuntimo</string>
    <string name="downloader_download_in_progress_ticker">Atsiunčiama...</string>
+   <string name="downloader_download_in_progress_content">%1$d%% Atsiunčiama %2$s</string>
    <string name="downloader_download_succeeded_ticker">Atsiuntimas pavyko</string>
+   <string name="downloader_download_succeeded_content">%1$s buvo sėkmingai atsiųstas</string>
    <string name="downloader_download_failed_ticker">Atsiuntimas nepavyko</string>
+   <string name="downloader_download_failed_content">Nepavyko baigti %1$s atsiuntimo</string>
+   <string name="downloader_not_downloaded_yet">Dar neatsiųsta</string>
    <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,26 -138,38 +137,38 @@@
    <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>
    <string name="extensions_avail_title">Yra naujų papildinių!</string>
+   <string name="fd_keep_in_sync">Laikyti failą naujinamą</string>
    <string name="common_share">Dalintis</string>
    <string name="common_rename">Pervadinti</string>
    <string name="common_remove">Pašalinti</string>
+   <string name="confirmation_remove_alert">Ar tikrai norite pašalinti %1$s ?</string>
+   <string name="confirmation_remove_local">Tik vietiniai</string>
+   <string name="confirmation_remove_folder_local">Tik vietinis turinys</string>
    <string name="confirmation_remove_remote">Pašalinti iš serverio</string>
+   <string name="confirmation_remove_remote_and_local">Nutolę ir vietiniai</string>
    <string name="remove_success_msg">Pašalinta sėkmingai</string>
    <string name="remove_fail_msg">Pašalinti nepavyko</string>
+   <string name="rename_dialog_title">Įveskite naują pavadinimą</string>
    <string name="rename_local_fail_msg">Lokalios kopijos pervadinti nepavyko, pabandykite kitą pavadinimą</string>
    <string name="rename_server_fail_msg">Pervadinti nepavyko</string>
+   <string name="sync_file_fail_msg">Nutolę failai negalėjo būti patikrinti</string>
+   <string name="sync_file_nothing_to_do_msg">Failo turinys jau sunchronizuotas</string>
    <string name="create_dir_fail_msg">Aplanko sukurti nepavyko</string>
    <string name="wait_a_moment">Truputį palaukite</string>
    <string name="filedisplay_no_file_selected">Joks failas nebuvo pasirinktas</string>
@@@ -134,6 -181,11 +180,11 @@@
    <string name="ssl_validator_certificate_not_available">Negalima gauti serverio sertifikato</string>
    <string name="ssl_validator_question">Ar vis tiek norite priimti šį sertifikatą?</string>
    <string name="ssl_validator_not_saved">Sertifikatas negali būti išsaugotas</string>
+   <string name="ssl_validator_btn_details_see">Informacija</string>
+   <string name="ssl_validator_btn_details_hide">Slėpti</string>
+   <string name="ssl_validator_label_subject">IÅ¡duota kam:</string>
+   <string name="ssl_validator_label_issuer">Išdavė:</string>
+   <string name="ssl_validator_label_CN">Bendras pavadinimas:</string>
    <string name="ssl_validator_label_O">Organizacija:</string>
    <string name="ssl_validator_label_OU">Organizacijos padalinys:</string>
    <string name="ssl_validator_label_C">Å alis:</string>
@@@ -145,6 -197,7 +196,7 @@@
    <string name="ssl_validator_label_signature">Parašas:</string>
    <string name="ssl_validator_label_signature_algorithm">Algoritmas:</string>
    <string name="instant_upload_on_wifi">Įkelti nuotraukas tik kai prisijungiama per WiFi</string>
+   <string name="conflict_title">Atnaujinimo konfliktas</string>
    <string name="conflict_keep_both">Palikti abu</string>
    <string name="conflict_overwrite">Perrašyti</string>
    <string name="conflict_dont_upload">Nebesiųsti</string>
diff --combined res/values-sk-rSK/strings.xml
index 1aeb4be6,2dd402f0..68c756f7
--- a/res/values-sk-rSK/strings.xml
+++ b/res/values-sk-rSK/strings.xml
@@@ -1,9 -1,10 +1,9 @@@
  <?xml version='1.0' encoding='UTF-8'?>
  <resources>
 -  <string name="app_name">ownCloud</string>
    <string name="main_password">Heslo:</string>
    <string name="main_login">Meno:</string>
    <string name="main_button_login">Prihlásenie</string>
 -  <string name="main_welcome">Vitajte vo svojom ownCloud</string>
 +  <string name="main_welcome">Vitajte</string>
    <string name="main_files">Súbory</string>
    <string name="main_music">Hudba</string>
    <string name="main_contacts">Kontakty</string>
@@@ -14,6 -15,7 +14,7 @@@
    <string name="main_wrn_accsetup">Vo vašom zariadení nie sú žiadne účty. Vytvorte si účet ak chcete používať túto aplikáciu.</string>
    <string name="about_android">%1$s Android App</string>
    <string name="about_version">verzia %1$s</string>
+   <string name="actionbar_sync">Obnoviť účet</string>
    <string name="actionbar_upload">Nahraj súbor</string>
    <string name="actionbar_upload_from_apps">Obsah z inej aplikácie</string>
    <string name="actionbar_upload_files">Súbory</string>
@@@ -29,19 -31,25 +30,25 @@@
    <string name="prefs_summary_select_oc_account">Vyberte účet pre túto aplikáciu.</string>
    <string name="prefs_trackmydevice">Sledovanie zariadenia</string>
    <string name="prefs_trackmydevice_summary_off">Povoliť sledovanie polohy zariadenia</string>
 -  <string name="prefs_trackmydevice_summary_on">Váš ownCloud sleduje vašu polohu na tomto zariadení</string>
 +  <string name="prefs_trackmydevice_summary_on">Váš aplikácie sleduje vašu polohu na tomto zariadení</string>
    <string name="prefs_trackmydevice_interval">Interval aktualizácie</string>
    <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>
+   <string name="auth_register">Ste nový v %1$s?</string>
    <string name="new_session_uri_error">Zadaná nesprávna URL</string>
    <string name="new_session_session_name_error">Nesprávny názov sedenia</string>
    <string name="sync_string_files">Súbory</string>
@@@ -50,12 -58,12 +57,12 @@@
    <string name="setup_hint_password">Heslo</string>
    <string name="setup_hint_address">Web adresa</string>
    <string name="setup_hint_show_password">Zobraziť heslo?</string>
 -  <string name="setup_title">Pripojiť k ownCloud</string>
 +  <string name="setup_title">Pripojiť k %1$s</string>
    <string name="setup_btn_connect">Pripoj</string>
    <string name="uploader_btn_upload_text">Nahrať</string>
    <string name="uploader_top_message">Vyberte priečinok pre nahrané súbory:</string>
    <string name="uploader_wrn_no_account_title">Účet sa nenašiel</string>
 -  <string name="uploader_wrn_no_account_text">Na tomto zariadení nie je zadaný žiadny ownCloud účet. Zadajte ho prosím.</string>
 +  <string name="uploader_wrn_no_account_text">Na tomto zariadení nie je zadaný žiadny %1$s účet. Zadajte ho prosím.</string>
    <string name="uploader_wrn_no_account_setup_btn_text">Nastavenie</string>
    <string name="uploader_wrn_no_account_quit_btn_text">Koniec</string>
    <string name="uploader_wrn_no_content_title">Žiadny obsah pre odoslanie</string>
@@@ -70,6 -78,7 +77,7 @@@
    <string name="filedetails_created">Vytvorený:</string>
    <string name="filedetails_modified">Zmenený:</string>
    <string name="filedetails_download">Stiahnuť</string>
+   <string name="filedetails_sync_file">Obnoviť súbor</string>
    <string name="filedetails_redownload">Obnoviť</string>
    <string name="filedetails_renamed_in_upload_msg">Súbor bol premenovaný na %1$s počas nahrávania</string>
    <string name="common_yes">Áno</string>
@@@ -79,7 -88,7 +87,7 @@@
    <string name="common_cancel_upload">Zrušiť odosielanie</string>
    <string name="common_cancel">Zrušiť</string>
    <string name="common_save_exit">Uložiť a ukončiť</string>
 -  <string name="common_exit">Opustiť ownCloud</string>
 +  <string name="common_exit">Opustiť %1$s</string>
    <string name="common_error">Chyba</string>
    <string name="common_loading">Načítavam...</string>
    <string name="common_error_unknown">Neznáma chyba</string>
@@@ -108,6 -117,7 +116,7 @@@
    <string name="sync_string_contacts">Kontakty</string>
    <string name="sync_fail_ticker">Synchronizácia zlyhala</string>
    <string name="sync_fail_content">Synchronizáciu %1$s nemožno dokončiť</string>
+   <string name="sync_fail_content_unauthorized">Nesprávne heslo pre %1$s</string>
    <string name="sync_conflicts_in_favourites_ticker">Objavené konflikty</string>
    <string name="sync_conflicts_in_favourites_content">%1$d súborov z automatickej synchronizácie nemožno synchronizovať</string>
    <string name="sync_fail_in_favourites_ticker">Automatická synchronizácia súborov zlyhala</string>
@@@ -122,7 -132,7 +131,7 @@@
    <string name="foreign_files_remote_text">Vzdialené: %1$s</string>
    <string name="upload_query_move_foreign_files">Nie je dostatok miesta na kopírovanie vybraných súborov do priečinka %1$s. Želáte si miesto kopírovania zmeniť?</string>
    <string name="use_ssl">Použiť zabezpečené pripojenie</string>
 -  <string name="location_no_provider">ownCloud nemôže sledovať polohu vášho zariadenia. Skontrolujte nastavenia umiestnenia.</string>
 +  <string name="location_no_provider">%1$s nemôže sledovať polohu vášho zariadenia. Skontrolujte nastavenia umiestnenia.</string>
    <string name="pincode_enter_pin_code">Zadajte PIN aplikácie</string>
    <string name="pincode_enter_new_pin_code">Zadajte nový PIN aplikácie</string>
    <string name="pincode_configure_your_pin">Zadajte PIN aplikácie</string>
@@@ -143,9 -153,17 +152,17 @@@
    <string name="media_err_unsupported">Nepodporovaný kodek</string>
    <string name="media_err_io">Mediálny súbor nemožno čítať</string>
    <string name="media_err_malformed">Mediálny súbor nemá správne kódovanie</string>
+   <string name="media_err_timeout">Pokus o prehrávanie opakovaný príliš mnohokrát</string>
    <string name="media_err_invalid_progressive_playback">Mediálny súbor nemožno streamovať</string>
    <string name="media_err_unknown">Mediálny súbor nemožno prehrať s východzím prehrávačom</string>
    <string name="media_err_security_ex">Chyba zabezpečenia pri pokuse o prehranie %1$s</string>
+   <string name="media_err_io_ex">Chyba vstupu pri prehrávaní %1$s</string>
+   <string name="media_err_unexpected">Nečakaná chyba pri prehrávaní %1$s</string>
+   <string name="media_previous_description">Tlačidlo predchádzajúcej skladby</string>
+   <string name="media_rewind_description">Tlačidlo pretáčania</string>
+   <string name="media_play_pause_description">Tlačidlo prehrávania / pauzy</string>
+   <string name="media_forward_description">Tlačidlo \"rýchlo vpred\"</string>
+   <string name="media_next_description">Tlačidlo nasledujúcej skladby</string>
    <string-array name="prefs_trackmydevice_intervall_keys">
      <item>15 minút</item>
      <item>30 minút</item>
@@@ -164,14 -182,14 +181,14 @@@
    <string name="auth_nossl_plain_ok_message">Aplikácia nemôže nadviazať zabezpečené spojenie so serverom. Nezabezpečené pripojenie je k dispozícii. Môžete pokračovať alebo prerušiť spojenie.</string>
    <string name="auth_connection_established">Pripojenie vytvorené</string>
    <string name="auth_testing_connection">Testovane pripojenia...</string>
 -  <string name="auth_not_configured_title">Nesprávna konfigurácia ownCloud</string>
 -  <string name="auth_not_configured_message">Nastavenie ownCloud nie je správne. Kontaktujte administrátora pre získanie viac informácií.</string>
 +  <string name="auth_not_configured_title">Nesprávna konfigurácia servera</string>
 +  <string name="auth_not_configured_message">Nastavenie servera nie je správne. Kontaktujte administrátora pre získanie viac informácií.</string>
    <string name="auth_unknown_error_title">Nastala neznáma chyba!</string>
    <string name="auth_unknown_error_message">Nastala neznáma chyba. Kontaktujte podporu a pripojte záznam z Vášho zariadenia.</string>
    <string name="auth_unknown_host_title">Nemožno nájsť hosta</string>
    <string name="auth_unknown_host_message">Nemôžm sa pripojiť k serveru. Skontrolujte nastavenia servera, či beží a skúste to znovu.</string>
 -  <string name="auth_incorrect_path_title">ownCloud inštancia nebola nájdená</string>
 -  <string name="auth_incorrect_path_message">Aplikácia na zadanej adrese nenašla inštanciu ownCloud. Skontrolujte cestu a skúste to znovu.</string>
 +  <string name="auth_incorrect_path_title">Servera inštancia nebola nájdená</string>
 +  <string name="auth_incorrect_path_message">Aplikácia na zadanej adrese nenašla inštanciu servera. Skontrolujte cestu a skúste to znovu.</string>
    <string name="auth_timeout_title">Serveru trvá odpoveď príliš dlho</string>
    <string name="auth_incorrect_address_title">Poškodená URL</string>
    <string name="auth_ssl_general_error_title">Inicializácia SSL zlyhala</string>
@@@ -179,14 -197,19 +196,19 @@@
    <string name="auth_bad_oc_version_title">Nerozpoznaná verzia servera</string>
    <string name="auth_wrong_connection_title">Nie je možne vytvoriť spojenie</string>
    <string name="auth_secure_connection">Vytvorené zabezpečené spojenie</string>
+   <string name="auth_unauthorized">Neprávne používateľské meno alebo heslo</string>
    <string name="auth_oauth_error">Neúspešná autorizácia</string>
+   <string name="auth_oauth_error_access_denied">Prístup odmietnutý autorizačným serverom</string>
    <string name="auth_not_found">Je zadaná neplatná cesta</string>
    <string name="auth_internal">Interná chyba servera, kód %1$d</string>
+   <string name="auth_wtf_reenter_URL">Nečakaný stav; prosím, opätovne vložte URL adresu servera</string>
+   <string name="auth_expired_oauth_token_toast">Vaša autorizácia expirovala.\nProsím, autorizujte znova.</string>
+   <string name="auth_expired_basic_auth_toast">Prosím, zadajte aktuálne heslo</string>
    <string name="crashlog_message">Aplikácia neočakávane ukončila činnosť. Chcete poslať správu o chybe?</string>
    <string name="crashlog_send_report">Poslať výpis</string>
    <string name="crashlog_dont_send_report">Neposlať výpis</string>
    <string name="extensions_avail_title">Sú dostupné rozšírenia.</string>
 -  <string name="extensions_avail_message">Vaša inštancia ownCloud podporuje rozšírené nastavenia. Chcete zobraziť rozšírené nastavenia dosupné pre android?</string>
 +  <string name="extensions_avail_message">Vaša inštancia servera podporuje rozšírené nastavenia. Chcete zobraziť rozšírené nastavenia dosupné pre android?</string>
    <string name="fd_keep_in_sync">Udržiavať súbor aktuálny.</string>
    <string name="common_share">Zdieľaj</string>
    <string name="common_rename">Premenuj</string>
@@@ -211,6 -234,8 +233,8 @@@
    <string name="oauth_host_url">oAuth2 URL</string>
    <string name="oauth_check_onoff">Prihlásiť prostredníctvom oAuth2.</string>
    <string name="oauth_login_connection">Pripájam sa na oAuth2 server…</string>
+   <string name="oauth_code_validation_message">Prosím, otvorte prehliadač a choďte na:\n%1$s.\nOverte tento kód tu:\n%2$s</string>
+   <string name="oauth_connection_url_unavailable">Spojenie z danou URL adresou neúspešné.</string>
    <string name="ssl_validator_title">Upozornenie</string>
    <string name="ssl_validator_header">Identitu stránky nemožno overiť</string>
    <string name="ssl_validator_reason_cert_not_trusted">- Certifikát servera nie je overený</string>
@@@ -235,6 -260,8 +259,8 @@@
    <string name="ssl_validator_label_validity_to">Do: </string>
    <string name="ssl_validator_label_signature">Podpis:</string>
    <string name="ssl_validator_label_signature_algorithm">Algoritmus:</string>
+   <string name="placeholder_sentence">Toto je \"placeholder\"</string>
+   <string name="placeholder_filename">placeholder.txt</string>
    <string name="placeholder_filetype">PNG obrázok</string>
    <string name="placeholder_filesize">389 KB</string>
    <string name="placeholder_timestamp">2012/05/18 12:23 PM</string>
@@@ -246,9 -273,20 +272,20 @@@
    <string name="conflict_keep_both">Ponechať oba</string>
    <string name="conflict_overwrite">Prepísať</string>
    <string name="conflict_dont_upload">Nenahrávajte</string>
+   <string name="preview_image_description">Ukážka obrazu</string>
+   <string name="preview_image_error_unknown_format">Obraz nemôže byť zobrazený</string>
+   <string name="preview_image_error_out_of_memory">\"Nedostatok pamäte pre zobrazenie obrazu</string>
    <!--we need to improve the communication of errors to the user-->
    <string name="error__upload__local_file_not_copied">%1$s nemožno skopírovať do lokálneho priečinka %2$s</string>
+   <string name="actionbar_failed_instant_upload">Zlyhaný InstantnýUpload\"</string>
+   <string name="failed_upload_headline_text">Zlyhané instantné nahratia</string>
+   <string name="failed_upload_headline_hint">Zhrnutie všetkých zlyhaných nahratí</string>
    <string name="failed_upload_all_cb">vybrať všetko</string>
    <string name="failed_upload_headline_retryall_btn">opakovať všetky vybrané</string>
+   <string name="failed_upload_headline_delete_all_btn">zmazať všetky vybrané z radu pre nahratie</string>
+   <string name="failed_upload_retry_text">opakovať nahratie obrazu:</string>
+   <string name="failed_upload_load_more_images">Načítať viac Obrázkov</string>
+   <string name="failed_upload_retry_do_nothing_text">nevykonať nič, nie ste online pre instantné nahratie</string>
    <string name="failed_upload_failure_text">Chybová správa:</string>
+   <string name="failed_upload_quota_exceeded_text">Prosím skontrolujte nastavenie vášho servera, možno bola prekročená disková kvóta.</string>
  </resources>
diff --combined res/values-sr/strings.xml
index 8087d161,04bba7a4..4c569785
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@@ -1,5 -1,6 +1,5 @@@
  <?xml version='1.0' encoding='UTF-8'?>
  <resources>
 -  <string name="app_name">ownCloud</string>
    <string name="main_password">Лозинка:</string>
    <string name="main_login">Корисничко име:</string>
    <string name="main_button_login">Пријави ме</string>
@@@ -48,9 -49,12 +48,12 @@@
    <string name="filedetails_created">Направљено:</string>
    <string name="filedetails_modified">Измењено:</string>
    <string name="filedetails_download">Преузми</string>
+   <string name="filedetails_sync_file">Освежи датотеку</string>
+   <string name="filedetails_redownload">Поново преузми</string>
    <string name="common_yes">Да</string>
    <string name="common_no">Не</string>
    <string name="common_ok">У реду</string>
+   <string name="common_cancel_download">Обустави преузимање</string>
    <string name="common_cancel_upload">Прекини слање</string>
    <string name="common_cancel">Откажи</string>
    <string name="common_save_exit">Сачувај и изађи</string>
@@@ -69,12 -73,17 +72,17 @@@
    <string name="uploader_upload_failed_content_multiple">Отпремање није успело. Отпремљено датотека: %1$d/%2$d</string>
    <string name="downloader_download_in_progress_ticker">Преузимам…</string>
    <string name="downloader_download_in_progress_content">%1$d%% Преузимам %2$s</string>
+   <string name="downloader_download_succeeded_ticker">Преузимање успешно</string>
+   <string name="downloader_download_succeeded_content">%1$s је успешно преузет</string>
    <string name="downloader_download_failed_ticker">Преузимање није успело</string>
    <string name="downloader_download_failed_content">Не могу да довршим преузимање датотеке %1$s</string>
+   <string name="downloader_not_downloaded_yet">Још увек није преузето</string>
    <string name="common_choose_account">Изабери налог</string>
    <string name="sync_string_contacts">Контакти</string>
    <string name="sync_fail_ticker">Синхронизовање није успело</string>
    <string name="sync_fail_content">Не могу да довршим синхронизацију датотеке %1$s</string>
+   <string name="foreign_files_success">Све датотеке су померене</string>
+   <string name="foreign_files_fail">Неке датотеке нису могле бити померене</string>
    <string name="use_ssl">Безбедна веза</string>
    <string name="pincode_enter_pin_code">Унесите PIN апликације</string>
    <string name="pincode_enter_new_pin_code">Унесите нови PIN апликације</string>
@@@ -114,7 -123,9 +122,9 @@@
    <string name="confirmation_remove_local">Само локално</string>
    <string name="confirmation_remove_remote">Уклони са сервера</string>
    <string name="confirmation_remove_remote_and_local">Удаљено и локално</string>
+   <string name="rename_dialog_title">Унесите ново име</string>
    <string name="rename_server_fail_msg">Не могу да довршим преименовање</string>
+   <string name="sync_file_fail_msg">Удаљена датотека се не може проверити</string>
    <string name="create_dir_fail_msg">Не могу да направим фасциклу</string>
    <string name="wait_a_moment">Сачекајте тренутак</string>
    <string name="filedisplay_no_file_selected">Нисте изабрали датотеку</string>
diff --combined res/values-tr/strings.xml
index 70d61cab,2eadbdbe..e49b6e13
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@@ -1,9 -1,10 +1,9 @@@
  <?xml version='1.0' encoding='UTF-8'?>
  <resources>
 -  <string name="app_name">ownCloud</string>
    <string name="main_password">Parola:</string>
    <string name="main_login">Kullanıcı Adı:</string>
    <string name="main_button_login">Giriş</string>
 -  <string name="main_welcome">ownCloud\'ınıza hoşgeldiniz</string>
 +  <string name="main_welcome">karşılama</string>
    <string name="main_files">Dosyalar</string>
    <string name="main_music">Müzik</string>
    <string name="main_contacts">Kişi Rehberi</string>
@@@ -11,10 -12,14 +11,14 @@@
    <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>
+   <string name="actionbar_open_with">ile aç</string>
    <string name="actionbar_mkdir">Klasör yarat</string>
    <string name="actionbar_search">Arama</string>
    <string name="actionbar_settings">Ayarlar</string>
@@@ -25,19 -30,26 +29,26 @@@
    <string name="prefs_select_oc_account">Oturum seç</string>
    <string name="prefs_summary_select_oc_account">Uygulamanın hangi hesaplarınızı kullanması gerektiğini  seçiniz.</string>
    <string name="prefs_trackmydevice">Cihaz takibi</string>
 -  <string name="prefs_trackmydevice_summary_off">Cihazınınızın konumunu takip etmesi için ownCloud\'u aktif edin</string>
 -  <string name="prefs_trackmydevice_summary_on">ownCloud\'unuz bu cihazı takip etmektedir</string>
 +  <string name="prefs_trackmydevice_summary_off">Cihazınınızın konumunu takip etmesi için App\'u aktif edin</string>
 +  <string name="prefs_trackmydevice_summary_on">App\'unuz bu cihazı takip etmektedir</string>
    <string name="prefs_trackmydevice_interval">Güncelleme aralığı</string>
    <string name="prefs_trackmydevice_interval_summary">Her %1$s dakikada güncelle</string>
    <string name="prefs_accounts">Hesaplar</string>
    <string name="prefs_manage_accounts">Hesapları yönet</string>
 -  <string name="prefs_pincode">ownCloud App PIN</string>
 +  <string name="prefs_pincode">App PIN</string>
    <string name="prefs_pincode_summary">Ä°stemcinizi koruyun</string>
    <string name="prefs_instant_upload">Anında yükleme etkinleştir</string>
    <string name="prefs_instant_upload_summary">Anında çekilen fotoğrafları yükle</string>
+   <string name="prefs_log_title">Günlük tutmayı etkinleştir</string>
+   <string name="prefs_log_summary">Bu, sorunları günlük dosyasına kaydetmek için kullanılır</string>
+   <string name="prefs_log_title_history">Günlük geçmişi</string>
+   <string name="prefs_log_summary_history">Bu, kayıtlı günlük dosyalarını görüntüler</string>
+   <string name="prefs_log_delete_history_button">Geçmişi Sil</string>
+   <string name="auth_check_server">Sunucuyu kontrol et</string>
    <string name="auth_host_url">Sunucu Adresi</string>
    <string name="auth_username">Kullanıcı Adi:</string>
    <string name="auth_password">Şifre:</string>
+   <string name="auth_register">%1$s senin için yeni mi?</string>
    <string name="new_session_uri_error">Geçersiz URL girildi</string>
    <string name="new_session_session_name_error">Yanlış oturum ismi</string>
    <string name="sync_string_files">Dosyalar</string>
@@@ -46,17 -58,17 +57,17 @@@
    <string name="setup_hint_password">Şifre:</string>
    <string name="setup_hint_address">Web adres</string>
    <string name="setup_hint_show_password">Şifre göster?</string>
 -  <string name="setup_title">ownCloud\'nıza bağlanin</string>
 +  <string name="setup_title">%1$s\'nıza bağlanin</string>
    <string name="setup_btn_connect">Bağlan</string>
    <string name="uploader_btn_upload_text">Yükle</string>
    <string name="uploader_top_message">Yükleme dizinini seçiniz:</string>
    <string name="uploader_wrn_no_account_title">Hesap bulunamadi</string>
 -  <string name="uploader_wrn_no_account_text">Cihazınızda ownCloud hesabı bulunmamaktadır. Lütfen öncelikle bir hesap ayarı giriniz.</string>
 +  <string name="uploader_wrn_no_account_text">Cihazınızda %1$s hesabı bulunmamaktadır. Lütfen öncelikle bir hesap ayarı giriniz.</string>
    <string name="uploader_wrn_no_account_setup_btn_text">Kurulum</string>
    <string name="uploader_wrn_no_account_quit_btn_text">Çıkış</string>
    <string name="uploader_wrn_no_content_title">Yüklenecek içerik yok</string>
    <string name="uploader_wrn_no_content_text">Yüklenecek içerik yok. Yüklenecek dosya yok.</string>
 -  <string name="uploader_error_forbidden_content">ownCloud, paylaşılan içeriğe erişim izni vermiyor</string>
 +  <string name="uploader_error_forbidden_content">%1$s, paylaşılan içeriğe erişim izni vermiyor</string>
    <string name="uploader_info_uploading">Yükleniyor</string>
    <string name="uploader_btn_create_dir_text">Yükleme için dizin oluştur</string>
    <string name="file_list_empty">Klasörde dosya yok. Yeni dosyalar yükle\'ye tıklayarak eklenebilir.</string>
@@@ -66,6 -78,7 +77,7 @@@
    <string name="filedetails_created">Yaratma:</string>
    <string name="filedetails_modified">Değiştirme:</string>
    <string name="filedetails_download">Ä°ndir</string>
+   <string name="filedetails_sync_file">Dosyayı yenile</string>
    <string name="filedetails_redownload">Tekrar indir</string>
    <string name="filedetails_renamed_in_upload_msg">Dosya adı, yükleme sırasında %1$s olarak değiştirildi</string>
    <string name="common_yes">Evet</string>
@@@ -104,12 -117,14 +116,14 @@@
    <string name="sync_string_contacts">Kontaklar</string>
    <string name="sync_fail_ticker">Eşitleme başarısız</string>
    <string name="sync_fail_content">%1$s Senkronizasyonu tamamlanamadı</string>
+   <string name="sync_fail_content_unauthorized">%1$s için geçersiz parola</string>
    <string name="sync_conflicts_in_favourites_ticker">Çakışma bulundu</string>
    <string name="sync_conflicts_in_favourites_content">%1$d korumalı senkronizasyon dosyası, senkronize edilemedi</string>
    <string name="sync_fail_in_favourites_ticker">Korunan dosya senkronizasyonu başarısız</string>
    <string name="sync_fail_in_favourites_content">%1$d dosya  senkronize edilemedi  (%2$d hata)</string>
    <string name="sync_foreign_files_forgotten_ticker">Bazı yerel dosyalar unutuldu</string>
    <string name="sync_foreign_files_forgotten_content">%1$d dosyalar  %2$s dizinine kopyalanamadı</string>
+   <string name="sync_foreign_files_forgotten_explanation">1.3.16 sürümünden sonra, bu aygıttan yüklenen dosyalar bir dosya birden fazla hesapla eşitlendiğinde veri kaybının önlenebilmesi için %1$s yerel klasörüne kopyalanır.\n\nBu değişiklikten dolayı, bu uygulamanın yüklenmiş tüm önceki sürümündeki dosyalar %2$s klasörüne kopyalandı. Ancak hesap eşitlenmesi sırasında bu işlemin tamamlanmasını engelleyen bir hata oluştu. Dosyayı/dosyaları olduğu gibi bırakabilir ve %3$s bağlantısını kaldırabilirsiniz veya dosyayı/dosyaları %1$s dizinine taşıyıp %4$s bağlantılarını koruyabilirsiniz.\n\nAşağıda listelenenler yerel dosyalar ve bağlı oldukları %5$s içerisindeki uzak dosyalardır.</string>
    <string name="foreign_files_move">Tümünü taşı</string>
    <string name="foreign_files_success">Tüm dosyalar taşındı</string>
    <string name="foreign_files_fail">Bazı dosyalar taşınamadı</string>
@@@ -117,28 -132,38 +131,38 @@@
    <string name="foreign_files_remote_text">Uzak: %1$s</string>
    <string name="upload_query_move_foreign_files">Seçilen dosyaları %1$s dizinine kopyalamak için yeterli alan yok. Bunun yerine dosyayı taşımak ister misiniz?</string>
    <string name="use_ssl">Güvenli bağlanti kullan</string>
 -  <string name="location_no_provider">ownCloud cihazınızı takip edemiyor. Lütfen konum ayarlarınızı kontrol ediniz</string>
 +  <string name="location_no_provider">%1$s cihazınızı takip edemiyor. Lütfen konum ayarlarınızı kontrol ediniz</string>
    <string name="pincode_enter_pin_code">Lütfen uygulama PIN\'ınızı giriniz</string>
    <string name="pincode_enter_new_pin_code">Lütfen yeni uygulama PIN\'ınızı giriniz</string>
 -  <string name="pincode_configure_your_pin">ownCloud App PIN giriniz</string>
 +  <string name="pincode_configure_your_pin">App PIN giriniz</string>
    <string name="pincode_configure_your_pin_explanation">PIN uygulama yeniden başladığında tekrar sorulacak</string>
 -  <string name="pincode_reenter_your_pincode">Lütfen, ownCloud App PIN ni tekrar giriniz</string>
 -  <string name="pincode_remove_your_pincode">ownCloud App PIN\'nizi kaldırınız.</string>
 -  <string name="pincode_mismatch">Her iki ownCloud App PIN aynı değil.</string>
 -  <string name="pincode_wrong">Yanlış ownCloud App PIN</string>
 -  <string name="pincode_removed">ownCloud App PIN kaldırıldı</string>
 -  <string name="pincode_stored">ownCloud App PIN saklandı</string>
 +  <string name="pincode_reenter_your_pincode">Lütfen, App PIN ni tekrar giriniz</string>
 +  <string name="pincode_remove_your_pincode">App PIN\'nizi kaldırınız.</string>
 +  <string name="pincode_mismatch">Her iki App PIN aynı değil.</string>
 +  <string name="pincode_wrong">Yanlış App PIN</string>
 +  <string name="pincode_removed">App PIN kaldırıldı</string>
 +  <string name="pincode_stored">App PIN saklandı</string>
    <string name="media_notif_ticker">%1$s müzik çalar</string>
    <string name="media_state_playing">%1$s (oynatılıyor)</string>
    <string name="media_state_loading">%1$s (yükleniyor)</string>
    <string name="media_event_done">%1$s yeniden oynatım sonlandırıldı</string>
    <string name="media_err_nothing_to_play">Herhangi bir medya öğesi bulunamadı</string>
+   <string name="media_err_no_account">Tanımlı hesap yok</string>
    <string name="media_err_not_in_owncloud">Dosya doğru bir hesapta değil</string>
    <string name="media_err_unsupported">Codec desteklenmiyor</string>
    <string name="media_err_io">Medya öğesi okunamadı</string>
    <string name="media_err_malformed">Medya öğesi doğru bir şekilde kodlanmadı</string>
    <string name="media_err_timeout">Oynatmak için fazla deneme yapıldı</string>
    <string name="media_err_invalid_progressive_playback">Medya öğesi aktarılamadı</string>
+   <string name="media_err_unknown">Ortam dosyası mevcut ortam oynatıcı ile çalınamaz</string>
+   <string name="media_err_security_ex">%1$s oynatılmaya çalışılırken güvenlik hatası oluştu</string>
+   <string name="media_err_io_ex">%1$s oynatılmaya çalışılırken girdi hatası oluştu</string>
+   <string name="media_err_unexpected">%1$s oynatılmaya çalışılırken beklenmeyen bir hata oluştu</string>
+   <string name="media_previous_description">Önceki iz butonu</string>
+   <string name="media_rewind_description">Başa sar butonu</string>
+   <string name="media_play_pause_description">Oynat veya duraklat butonu</string>
+   <string name="media_forward_description">Hızlı ileri butonu</string>
+   <string name="media_next_description">Sonraki parça butonu</string>
    <string-array name="prefs_trackmydevice_intervall_keys">
      <item>15 Dakika</item>
      <item>30 Dakika</item>
@@@ -157,28 -182,34 +181,34 @@@
    <string name="auth_nossl_plain_ok_message">Uygulama sunucu ile güvenli bağlantı kuramadı. Buna rağmen güvensiz bağlantı mevcut. Devam edebilirsiniz veya iptal edebilirsiniz.</string>
    <string name="auth_connection_established">Bağlantı kuruldu</string>
    <string name="auth_testing_connection">Bağlantı kontrol ediliyor ...</string>
 -  <string name="auth_not_configured_title">Hatalı ownCloud ayarı.</string>
 -  <string name="auth_not_configured_message">Görünüşe bakılırsa ownCloud servisiniz doğru ayarlanmamış. Detaylı bilgi için sistem yöneticinize başvurunuz.</string>
 +  <string name="auth_not_configured_title">Hatalı sunucu ayarı.</string>
 +  <string name="auth_not_configured_message">Görünüşe bakılırsa sunucu servisiniz doğru ayarlanmamış. Detaylı bilgi için sistem yöneticinize başvurunuz.</string>
    <string name="auth_unknown_error_title">Bilinmeyen hata oluştu.</string>
    <string name="auth_unknown_error_message">Bilinmeyen hata oluştu. Lütfen cihazınızdaki hata kayıtlarını ekleyerek programı yazan kişiyle irtibata geçiniz.</string>
    <string name="auth_unknown_host_title">Anabilgisayar bulunamadı</string>
    <string name="auth_unknown_host_message">Girilen anabilgisayar bulunamadı. Anabilgisayaradı ve sunucu kullanılabilirliğini kontrol edin ve yeniden deneyin.</string>
 -  <string name="auth_incorrect_path_title">ownCloud servisi bulunamadı.</string>
 -  <string name="auth_incorrect_path_message">Uygulama verilen dizin yolunda ownCloud bulamadı. Lütfen dizin yolunu kontrol edin ve tekrar deneyin.</string>
 +  <string name="auth_incorrect_path_title">sunucu servisi bulunamadı.</string>
 +  <string name="auth_incorrect_path_message">Uygulama verilen dizin yolunda sunucu bulamadı. Lütfen dizin yolunu kontrol edin ve tekrar deneyin.</string>
    <string name="auth_timeout_title">Sunucu çok geç cevap veriyor</string>
    <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>
    <string name="extensions_avail_title">Eklentiler mevcut!</string>
 -  <string name="extensions_avail_message">Görünen o ki ownCloud servisiniz gelişmiş eklentileri desteklemektedir. Android için mevcut olan eklentileri görmek ister misiniz ?</string>
 +  <string name="extensions_avail_message">Görünen o ki sunucu servisiniz gelişmiş eklentileri desteklemektedir. Android için mevcut olan eklentileri görmek ister misiniz ?</string>
    <string name="fd_keep_in_sync">Dosyayı güncel tut </string>
    <string name="common_share">Paylaş</string>
    <string name="common_rename">İsim değiştir.</string>
@@@ -200,6 -231,11 +230,11 @@@
    <string name="wait_a_moment">Bir süre bekleyin</string>
    <string name="filedisplay_unexpected_bad_get_content">Beklenmeyen problem ; lütfen, dosya seçmek için diğer uygulamayı deneyin</string>
    <string name="filedisplay_no_file_selected">Hiçbir dosya seçilmedi</string>
+   <string name="oauth_host_url">oAuth2 URL\'si</string>
+   <string name="oauth_check_onoff">oAuth2 ile oturum aç.</string>
+   <string name="oauth_login_connection">oAuth2 sunucusuna bağlanılıyor…</string>
+   <string name="oauth_code_validation_message">Lütfen bir web tarayıcısı açın ve şu adrese gidin:\n%1$s.\nŞu kodu açılan sayfada doğrulayın:\n%2$s</string>
+   <string name="oauth_connection_url_unavailable">Bu URL\'ye bağlantı yok.</string>
    <string name="ssl_validator_title">Uyarı</string>
    <string name="ssl_validator_header">Bu sitenin sertifikası doğrulanamadı</string>
    <string name="ssl_validator_reason_cert_not_trusted">- Sunucu sertifikası güvenilmez</string>
@@@ -224,6 -260,12 +259,12 @@@
    <string name="ssl_validator_label_validity_to">Kime:</string>
    <string name="ssl_validator_label_signature">Ä°mza:</string>
    <string name="ssl_validator_label_signature_algorithm">Algoritma:</string>
+   <string name="placeholder_sentence">Bu bir yer tutucudur</string>
+   <string name="placeholder_filename">yertutucu.txt</string>
+   <string name="placeholder_filetype">PNG Resmi</string>
+   <string name="placeholder_filesize">389 KB</string>
+   <string name="placeholder_timestamp">2012/05/18 12:23 ÖS</string>
+   <string name="placeholder_media_time">12:23:45</string>
    <string name="instant_upload_on_wifi">Resimleri sadece WiFi bağlantısında yükle</string>
    <string name="instant_upload_path">/AnındaYükle</string>
    <string name="conflict_title">Çakışmayı güncelle</string>
@@@ -231,6 -273,20 +272,20 @@@
    <string name="conflict_keep_both">Ä°kisini de koru</string>
    <string name="conflict_overwrite">Üzerine yaz</string>
    <string name="conflict_dont_upload">Yükleme</string>
+   <string name="preview_image_description">Görüntü önizleme</string>
+   <string name="preview_image_error_unknown_format">Bu resim gösterilemez</string>
+   <string name="preview_image_error_out_of_memory">\"Bu resmi göstermek için yeterli hafıza yok</string>
    <!--we need to improve the communication of errors to the user-->
    <string name="error__upload__local_file_not_copied">%1$s, %2$s yerel dizine kopyalanamadı</string>
+   <string name="actionbar_failed_instant_upload">AnındaYükleme\" başarısız</string>
+   <string name="failed_upload_headline_text">Anında yüklemeler başarısız</string>
+   <string name="failed_upload_headline_hint">Başarısız olan tüm anında yüklemelerin özeti</string>
+   <string name="failed_upload_all_cb">hepsini seç</string>
+   <string name="failed_upload_headline_retryall_btn">tüm seçili olanları tekrar dene</string>
+   <string name="failed_upload_headline_delete_all_btn">yükleme kuyruğundaki tüm seçili olanları sil</string>
+   <string name="failed_upload_retry_text">Resmi yeniden yüklemeyi dene:</string>
+   <string name="failed_upload_load_more_images">Daha fazla Görsel yükle</string>
+   <string name="failed_upload_retry_do_nothing_text">anında yükleme için çevrimiçi değilsiniz, bir şey yapma</string>
+   <string name="failed_upload_failure_text">Hata Mesajı:</string>
+   <string name="failed_upload_quota_exceeded_text">Sunucu yapılandırmanızı kontrol edin. Kotanızı aşmış olabilirsiniz.</string>
  </resources>
diff --combined res/values-uk/strings.xml
index a421e0bd,6800b75a..02d3cb9d
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@@ -1,9 -1,10 +1,9 @@@
  <?xml version='1.0' encoding='UTF-8'?>
  <resources>
 -  <string name="app_name">ownCloud</string>
    <string name="main_password">Пароль:</string>
    <string name="main_login">Ім\'я користувача</string>
    <string name="main_button_login">Логін</string>
 -  <string name="main_welcome">Вітаємо у Вашому ownCloud</string>
 +  <string name="main_welcome">Ласкаво просимо</string>
    <string name="main_files">Файли</string>
    <string name="main_music">Музика</string>
    <string name="main_contacts">Контакти</string>
@@@ -11,7 -12,7 +11,7 @@@
    <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">На Вашому пристрої відсутні облікові запси App. Для того, щоб користуватися цим ПО, Вам потрібно створити обліковий запис.</string>
    <string name="actionbar_upload">Відвантажити</string>
    <string name="actionbar_upload_from_apps">Вміст із інших програм</string>
    <string name="actionbar_upload_files">Файли</string>
@@@ -25,14 -26,14 +25,14 @@@
    <string name="prefs_select_oc_account">Обрати обліковий запис</string>
    <string name="prefs_summary_select_oc_account">Оберіть, який із облікових записів повинна використовувати програма.</string>
    <string name="prefs_trackmydevice">Стеження за пристроєм</string>
 -  <string name="prefs_trackmydevice_summary_off">Дозволити ownCloud стежити за місцезнаходженням Вашого пристрою</string>
 -  <string name="prefs_trackmydevice_summary_on">Ваш ownCloud стежить за цим пристроєм</string>
 +  <string name="prefs_trackmydevice_summary_off">Дозволити App стежити за місцезнаходженням Вашого пристрою</string>
 +  <string name="prefs_trackmydevice_summary_on">Ваш App стежить за цим пристроєм</string>
    <string name="prefs_trackmydevice_interval">Інтервал оновлення</string>
    <string name="prefs_trackmydevice_interval_summary">Оновлювати кожні %1$s хвилин</string>
    <string name="prefs_accounts">Облікові записи</string>
    <string name="prefs_manage_accounts">Управління обліковими записами</string>
 -  <string name="prefs_pincode">ownCloud програмний PIN</string>
 -  <string name="prefs_pincode_summary">Захист Вашог ownCloud клієнта</string>
 +  <string name="prefs_pincode">App програмний PIN</string>
 +  <string name="prefs_pincode_summary">Захист Вашог App клієнта</string>
    <string name="prefs_instant_upload">Включити негайне завантаження</string>
    <string name="prefs_instant_upload_summary">Негайно завантажувати фото, зроблені камерою</string>
    <string name="auth_host_url">Адреса сервера</string>
@@@ -46,16 -47,16 +46,16 @@@
    <string name="setup_hint_password">Пароль</string>
    <string name="setup_hint_address">Веб адреса</string>
    <string name="setup_hint_show_password">Показувати пароль?</string>
 -  <string name="setup_title">Підключитись до Вашого ownCloud</string>
 +  <string name="setup_title">Підключитись до Вашого %1$s</string>
    <string name="setup_btn_connect">З\'єднати</string>
    <string name="uploader_btn_upload_text">Відвантажити</string>
    <string name="uploader_wrn_no_account_title">Не знайдено облікового запису</string>
 -  <string name="uploader_wrn_no_account_text">На Вашому пристрої відсутні облікові записи ownCloud. Будь ласка, спочатку створіть запис.</string>
 +  <string name="uploader_wrn_no_account_text">На Вашому пристрої відсутні облікові записи %1$s. Будь ласка, спочатку створіть запис.</string>
    <string name="uploader_wrn_no_account_setup_btn_text">Налаштування</string>
    <string name="uploader_wrn_no_account_quit_btn_text">Вийти</string>
    <string name="uploader_wrn_no_content_title">Відсутні дані для завантаження</string>
    <string name="uploader_wrn_no_content_text">Не отримано даних. Нічого завантажувати.</string>
 -  <string name="uploader_error_forbidden_content">ownCloud не може отримати доступ до спільного контенту</string>
 +  <string name="uploader_error_forbidden_content">%1$s не може отримати доступ до спільного контенту</string>
    <string name="uploader_info_uploading">Завантаження</string>
    <string name="uploader_btn_create_dir_text">Створити теку для завантаження</string>
    <string name="file_list_empty">В цьому каталозі відсутні файли.\nНові файли можна додати через опцію меню \"Завантаження\".</string>
@@@ -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>
@@@ -113,17 -115,17 +114,17 @@@
    <string name="foreign_files_remote_text">Віддалено: %1$s</string>
    <string name="upload_query_move_foreign_files">Недостатньо місця для копіювання обраних файлів у теку %1$s. Чи бажаєте ви перемістити їх замість копіювання?</string>
    <string name="use_ssl">Використовувати безпечне з\'єднання</string>
 -  <string name="location_no_provider">ownCloud не може стежити за Вашим пристроєм. Будь ласка, перевірте свої налаштування місцезнаходження</string>
 +  <string name="location_no_provider">%1$s не може стежити за Вашим пристроєм. Будь ласка, перевірте свої налаштування місцезнаходження</string>
    <string name="pincode_enter_pin_code">Будь ласка, введіть свій програмний PIN</string>
    <string name="pincode_enter_new_pin_code">Будь ласка, введіть новий програмний PIN</string>
    <string name="pincode_configure_your_pin">Введіть програмний PIN</string>
    <string name="pincode_configure_your_pin_explanation">PIN необхідно буде вводити щоразу при запуску цієї програми</string>
 -  <string name="pincode_reenter_your_pincode">Повторно введіть ownCloud програмний PIN, будь ласка</string>
 -  <string name="pincode_remove_your_pincode">Видалити свій ownCloud програмний PIN</string>
 -  <string name="pincode_mismatch">Обидва ownCloud програмних PIN не однакові</string>
 -  <string name="pincode_wrong">Не вірний ownCloud програмний PIN</string>
 -  <string name="pincode_removed">ownCloud програмний PIN видалено</string>
 -  <string name="pincode_stored">ownCloud програмний PIN збережено</string>
 +  <string name="pincode_reenter_your_pincode">Повторно введіть App програмний PIN, будь ласка</string>
 +  <string name="pincode_remove_your_pincode">Видалити свій App програмний PIN</string>
 +  <string name="pincode_mismatch">Обидва App програмних PIN не однакові</string>
 +  <string name="pincode_wrong">Не вірний App програмний PIN</string>
 +  <string name="pincode_removed">App програмний PIN видалено</string>
 +  <string name="pincode_stored">App програмний PIN збережено</string>
    <string-array name="prefs_trackmydevice_intervall_keys">
      <item>15 хвилин</item>
      <item>30 хвилин</item>
@@@ -142,19 -144,19 +143,19 @@@
    <string name="auth_nossl_plain_ok_message">Програма не може встановити безпечне з\'єднання з сервером. Проте, не захищене з\'єднання можливе. Ви можете продовжити або відмінити.</string>
    <string name="auth_connection_established">З\'єднання встановлено</string>
    <string name="auth_testing_connection">Перевірка з\'єднання…</string>
 -  <string name="auth_not_configured_title">Не вірні налаштування ownCloud </string>
 -  <string name="auth_not_configured_message">Здається, Ваш ownCloud примірник не правильно налаштовано. Зверніться до адміністратора для більш докладної інформації.</string>
 +  <string name="auth_not_configured_title">Не вірні налаштування сервер </string>
 +  <string name="auth_not_configured_message">Здається, Ваш сервер примірник не правильно налаштовано. Зверніться до адміністратора для більш докладної інформації.</string>
    <string name="auth_unknown_error_title">Виникла невідома помилка!</string>
    <string name="auth_unknown_error_message">Виникла невідома помилка. Будь ласка, зв\'яжіться з авторами та надайте лог-файли з Вашого пристрою.</string>
    <string name="auth_unknown_host_title">Не вдалося знайти хост</string>
    <string name="auth_unknown_host_message">Не вдалося знайти визначений хост. Будь ласка, перевірте ім\'я хосту і доступність серверу та спробуйте ще.</string>
 -  <string name="auth_incorrect_path_title">Не знайдено примірник ownCloud</string>
 +  <string name="auth_incorrect_path_title">Не знайдено примірник сервер</string>
    <string name="auth_incorrect_path_message">Програмі не вдалося знайти примірник ownClound за вказаною адресою. Будь ласка, перевірте адресу та спробуйте ще.</string>
    <string name="auth_timeout_title">Сервер занадто довго не відповідає</string>
    <string name="auth_incorrect_address_title">Пошкоджений URL</string>
    <string name="auth_ssl_general_error_title">Помилка SSL ініціалізації</string>
    <string name="auth_ssl_unverified_server_title">Неперевірена SSL ідентифікація серверу</string>
 -  <string name="auth_bad_oc_version_title">Не вдалося визначити версію ownCloud серверу</string>
 +  <string name="auth_bad_oc_version_title">Не вдалося визначити версію сервер серверу</string>
    <string name="auth_wrong_connection_title">Не вдалося встановити з\'єднання</string>
    <string name="auth_secure_connection">Встановлено захищене з\'єднання</string>
    <string name="auth_not_found">Вказано невірний шлях</string>
@@@ -163,7 -165,7 +164,7 @@@
    <string name="crashlog_send_report">Надіслати доповідь</string>
    <string name="crashlog_dont_send_report">Не  відсилати доповідь</string>
    <string name="extensions_avail_title">Розширення доступні!</string>
 -  <string name="extensions_avail_message">Здається, що Ваш примірник ownCloud підтримує додаткові розширення. Чи бажаєте Ви переглянути розширення, доступні для Андроід?</string>
 +  <string name="extensions_avail_message">Здається, що Ваш примірник сервер підтримує додаткові розширення. Чи бажаєте Ви переглянути розширення, доступні для Андроід?</string>
    <string name="fd_keep_in_sync">Оновлювати файл</string>
    <string name="common_share">Поділитися</string>
    <string name="common_rename">Перейменувати</string>