X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/ac07e35d8ab68bf94d5cd8b45680ea69247fcc9f..86f7f0cc3c316fc9f1caeedc5ba63ccfb7a0ffd7:/res/values-uk/strings.xml

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index b7f4c4d4..5250cd03 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -13,16 +13,14 @@
   <string name="main_settings">ÐÐ°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ</string>
   <string name="main_tit_accsetup">ÐÐ°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ Ð¾Ð±Ð»ÑÐºÐ¾Ð²Ð¾Ð³Ð¾ Ð·Ð°Ð¿Ð¸ÑÑ</string>
   <string name="main_wrn_accsetup">ÐÐ° ÐÐ°ÑÐ¾Ð¼Ñ Ð¿ÑÐ¸ÑÑÑÐ¾Ñ Ð²ÑÐ´ÑÑÑÐ½Ñ Ð¾Ð±Ð»ÑÐºÐ¾Ð²Ñ Ð·Ð°Ð¿ÑÐ¸ ownCloud. ÐÐ»Ñ ÑÐ¾Ð³Ð¾, ÑÐ¾Ð± ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ¸ÑÑ ÑÐ¸Ð¼ ÐÐ, ÐÐ°Ð¼ Ð¿Ð¾ÑÑÑÐ±Ð½Ð¾ ÑÑÐ²Ð¾ÑÐ¸ÑÐ¸ Ð¾Ð±Ð»ÑÐºÐ¾Ð²Ð¸Ð¹ Ð·Ð°Ð¿Ð¸Ñ.</string>
-  <string name="about_message">ownCloud Android ÐºÐ»ÑÑÐ½Ñ\n\nÐ²ÐµÑÑÑÑ: %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_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_category_trackmydevice">Ð¡ÑÐµÐ¶ÐµÐ½Ð½Ñ Ð·Ð° Ð¿ÑÐ¸ÑÑÑÐ¾ÑÐ¼</string>
   <string name="prefs_add_session">ÐÐ¾Ð´Ð°ÑÐ¸ Ð½Ð¾Ð²Ñ ÑÐµÑÑÑ</string>
   <string name="prefs_create_img_thumbnails">Ð¡ÑÐ²Ð¾ÑÐ¸ÑÐ¸ Ð²ÑÐ´Ð±Ð¸ÑÐºÐ¸ Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ñ</string>
   <string name="prefs_select_oc_account">ÐÐ±ÑÐ°ÑÐ¸ Ð¾Ð±Ð»ÑÐºÐ¾Ð²Ð¸Ð¹ Ð·Ð°Ð¿Ð¸Ñ</string>
@@ -31,17 +29,16 @@
   <string name="prefs_trackmydevice_summary_off">ÐÐ¾Ð·Ð²Ð¾Ð»Ð¸ÑÐ¸ ownCloud ÑÑÐµÐ¶Ð¸ÑÐ¸ Ð·Ð° Ð¼ÑÑÑÐµÐ·Ð½Ð°ÑÐ¾Ð´Ð¶ÐµÐ½Ð½ÑÐ¼ ÐÐ°ÑÐ¾Ð³Ð¾ Ð¿ÑÐ¸ÑÑÑÐ¾Ñ</string>
   <string name="prefs_trackmydevice_summary_on">ÐÐ°Ñ ownCloud ÑÑÐµÐ¶Ð¸ÑÑ Ð·Ð° ÑÐ¸Ð¼ Ð¿ÑÐ¸ÑÑÑÐ¾ÑÐ¼</string>
   <string name="prefs_trackmydevice_interval">ÐÐ½ÑÐµÑÐ²Ð°Ð» Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ</string>
-  <string name="prefs_trackmydevice_interval_summary">ÐÐ½Ð¾Ð²Ð»ÑÐ²Ð°ÑÐ¸ ÐºÐ¾Ð¶Ð½Ñ %1$ ÑÐ²Ð¸Ð»Ð¸Ð½</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_instant_upload">ÐÐºÐ»ÑÑÐ¸ÑÐ¸ Ð½ÐµÐ³Ð°Ð¹Ð½Ðµ Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ</string>
   <string name="prefs_instant_upload_summary">ÐÐµÐ³Ð°Ð¹Ð½Ð¾ Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÑÐ²Ð°ÑÐ¸ ÑÐ¾ÑÐ¾, Ð·ÑÐ¾Ð±Ð»ÐµÐ½Ñ ÐºÐ°Ð¼ÐµÑÐ¾Ñ</string>
-  <string name="auth_host_url">ownCloud URL</string>
+  <string name="auth_host_url">ÐÐ´ÑÐµÑÐ° ÑÐµÑÐ²ÐµÑÐ°</string>
   <string name="auth_username">ÐÐ¼\'Ñ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ°</string>
   <string name="auth_password">ÐÐ°ÑÐ¾Ð»Ñ</string>
-  <string name="auth_register">Ð¯ Ð½Ð¾Ð²Ð°ÑÐ¾Ðº Ð² ownCloud</string>
   <string name="new_session_uri_error">ÐÐ°Ð´Ð°Ð½Ð¾ Ð½ÐµÐ²ÑÑÐ½Ð¸Ð¹ URL</string>
   <string name="new_session_session_name_error">ÐÐµÐ²ÑÑÐ½Ðµ ÑÐ¼\'Ñ ÑÐµÑÑÑ</string>
   <string name="sync_string_files">Ð¤Ð°Ð¹Ð»Ð¸</string>
@@ -69,9 +66,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_open">ÐÑÐ´ÐºÑÐ¸ÑÐ¸</string>
   <string name="filedetails_renamed_in_upload_msg">Ð¤Ð°Ð¹Ð» Ð±ÑÐ² Ð¿ÐµÑÐµÑÐ¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ð¹ Ð² %1$s Ð¿ÑÐ¾ÑÑÐ³Ð¾Ð¼ Ð²Ð¸Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ</string>
   <string name="common_yes">Ð¢Ð°Ðº</string>
   <string name="common_no">ÐÑ</string>
@@ -83,6 +78,7 @@
   <string name="common_exit">ÐÐ¸Ð¹ÑÐ¸ Ð· ownCloud</string>
   <string name="common_error">ÐÐ¾Ð¼Ð¸Ð»ÐºÐ°</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>
@@ -98,17 +94,25 @@
   <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$ ÑÑÐ¿ÑÑÐ½Ð¾ Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð¾</string>
+  <string name="downloader_download_succeeded_content">%1$s ÑÑÐ¿ÑÑÐ½Ð¾ Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð¾</string>
   <string name="downloader_download_failed_ticker">ÐÐ°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾ÑÑ</string>
-  <string name="downloader_download_failed_content">ÐÐ°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ %1$ Ð½Ðµ Ð²Ð´Ð°ÑÑÑÑÑ Ð·Ð°Ð²ÐµÑÑÐ¸ÑÐ¸</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_ticker">ÐÐ¾Ð¼Ð¸Ð»ÐºÐ° ÑÐ¸Ð½ÑÑÐ¾Ð½ÑÐ·Ð°ÑÑÑ</string>
-  <string name="sync_fail_content">Ð¡Ð¸Ð½ÑÑÐ¾Ð½ÑÐ·Ð°ÑÑÑ %1$Ð½Ðµ Ð²Ð´Ð°Ð»Ð°ÑÑ</string>
+  <string name="sync_fail_content">Ð¡Ð¸Ð½ÑÑÐ¾Ð½ÑÐ·Ð°ÑÑÑ %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="foreign_files_move">ÐÐµÑÐµÐ¼ÑÑÑÐ¸ÑÐ¸ Ð²ÑÐµ</string>
+  <string name="foreign_files_success">ÐÑÑ ÑÐ°Ð¹Ð»Ð¸ Ð±ÑÐ»Ð¸ Ð¿ÐµÑÐµÐ¼ÑÑÐµÐ½Ñ</string>
+  <string name="foreign_files_fail">ÐÐµÑÐºÑ ÑÐ°Ð¹Ð»Ð¸ Ð½Ðµ Ð¼Ð¾Ð¶ÑÑÑ Ð±ÑÑÐ¸ Ð¿ÐµÑÐµÐ¼ÑÑÐµÐ½Ñ</string>
+  <string name="foreign_files_local_text">ÐÐ¾ÐºÐ°Ð»ÑÐ½Ð¾: %1$s</string>
+  <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="pincode_enter_pin_code">ÐÑÐ´Ñ Ð»Ð°ÑÐºÐ°, Ð²Ð²ÐµÐ´ÑÑÑ ÑÐ²ÑÐ¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð½Ð¸Ð¹ PIN</string>
@@ -154,8 +158,6 @@
   <string name="auth_bad_oc_version_title">ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð²Ð¸Ð·Ð½Ð°ÑÐ¸ÑÐ¸ Ð²ÐµÑÑÑÑ ownCloud ÑÐµÑÐ²ÐµÑÑ</string>
   <string name="auth_wrong_connection_title">ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÐ¸ Ð·\'ÑÐ´Ð½Ð°Ð½Ð½Ñ</string>
   <string name="auth_secure_connection">ÐÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾ Ð·Ð°ÑÐ¸ÑÐµÐ½Ðµ Ð·\'ÑÐ´Ð½Ð°Ð½Ð½Ñ</string>
-  <string name="auth_login_details">ÐÐ°Ð½Ñ Ð´Ð»Ñ Ð²ÑÐ¾Ð´Ñ</string>
-  <string name="auth_unauthorized">ÐÐµÐ²ÑÑÐ½Ð¸Ð¹ ÐÐ¾Ð³ÑÐ½ / ÐÐ°ÑÐ¾Ð»Ñ</string>
   <string name="auth_not_found">ÐÐºÐ°Ð·Ð°Ð½Ð¾ Ð½ÐµÐ²ÑÑÐ½Ð¸Ð¹ ÑÐ»ÑÑ</string>
   <string name="auth_internal">ÐÐ½ÑÑÑÑÑÐ½Ñ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° ÑÐµÑÐ²ÐµÑÑ, ÐºÐ¾Ð´ %1$d</string>
   <string name="crashlog_message">ÐÑÐ¾Ð³ÑÐ°Ð¼Ð° Ð½ÐµÑÐ¿Ð¾Ð´ÑÐ²Ð°Ð½Ð¾ Ð·Ð°ÐºÑÐ¸Ð»Ð°ÑÑ. Ð§Ð¸ Ð±Ð°Ð¶Ð°ÑÑÐµ ÐÐ¸ Ð½Ð°Ð´ÑÑÐ»Ð°ÑÐ¸ Ð´Ð¾Ð¿Ð¾Ð²ÑÐ´Ñ Ð¿ÑÐ¾ Ð°Ð²Ð°ÑÑÑ?</string>
@@ -208,7 +210,7 @@
   <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="text_placeholder">Ð¦Ðµ Ð·Ð°Ð¿Ð¾Ð²Ð½ÑÐ²Ð°Ñ</string>
+  <string name="placeholder_sentence">Ð¦Ðµ Ð·Ð°Ð¿Ð¾Ð²Ð½ÑÐ²Ð°Ñ</string>
   <string name="instant_upload_on_wifi">ÐÐ°Ð²Ð°Ð½ÑÐ°Ð¶ÑÐ²Ð°ÑÐ¸ Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð½Ñ ÑÑÐ»ÑÐºÐ¸ ÑÐµÑÐµÐ· WiFi</string>
   <string name="instant_upload_path">/InstantUpload</string>
   <string name="conflict_title">ÐÐ¾Ð½ÑÐ»ÑÐºÑ Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ</string>
@@ -216,4 +218,6 @@
   <string name="conflict_keep_both">ÐÐ°Ð»Ð¸ÑÐ¸ÑÐ¸ Ð¾Ð±Ð¸Ð´Ð²Ð°</string>
   <string name="conflict_overwrite">ÐÐ°Ð¼ÑÐ½Ð¸ÑÐ¸</string>
   <string name="conflict_dont_upload">ÐÐµ Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÑÐ²Ð°ÑÐ¸</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>
 </resources>
