X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/7239b9eb9dd2a4fd9d254f3ea7aad181f86ced37..0ab729b8c15ebeee4ac377101f2d7afc4bb46706:/res/values-uk/strings.xml?ds=sidebyside

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index b7f4c4d4..e3413270 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -13,7 +13,7 @@
   <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="about_message">%1$s Android ÐºÐ»ÑÑÐ½Ñ\n\nÐ²ÐµÑÑÑÑ: %2$s</string>
   <string name="actionbar_sync">ÐÐ½Ð¾Ð²Ð¸ÑÐ¸</string>
   <string name="actionbar_upload">ÐÑÐ´Ð²Ð°Ð½ÑÐ°Ð¶Ð¸ÑÐ¸</string>
   <string name="actionbar_upload_from_apps">ÐÐ¼ÑÑÑ ÑÐ· ÑÐ½ÑÐ¸Ñ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼</string>
@@ -21,8 +21,8 @@
   <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,7 +31,7 @@
   <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>
@@ -98,17 +98,26 @@
   <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="sync_foreign_files_forgotten_explanation">\"ÐÐ¾ÑÐ¸Ð½Ð°ÑÑÐ¸ Ð· Ð²ÐµÑÑÑÑ 1.3.16, ÑÐ°Ð¹Ð»Ð¸, Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ñ Ð· ÑÑÐ¾Ð³Ð¾ Ð¿ÑÐ¸ÑÑÑÐ¾Ñ ÐºÐ¾Ð¿ÑÑÑÑÑÑÑ Ð² Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ñ Ð¿Ð°Ð¿ÐºÑ %1$s Ð´Ð»Ñ Ð·Ð°Ð¿Ð¾Ð±ÑÐ³Ð°Ð½Ð½Ñ Ð²ÑÑÐ°ÑÐ¸ Ð´Ð°Ð½Ð¸Ñ Ð¿ÑÐ´ ÑÐ°Ñ ÑÐ¸Ð½ÑÑÐ¾Ð½ÑÐ·Ð°ÑÑÑ Ð¾Ð´Ð½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ñ Ð· ÐºÑÐ»ÑÐºÐ¾Ð¼Ð° Ð¾Ð±Ð»ÑÐºÐ¾Ð²Ð¸Ð¼Ð¸ Ð·Ð°Ð¿Ð¸ÑÐ°Ð¼Ð¸.\n\nÐ£ Ð·Ð²\'ÑÐ·ÐºÑ Ð· ÑÑÑÑ Ð·Ð¼ÑÐ½Ð¾Ñ, Ð²ÑÑ ÑÐ°Ð¹Ð»Ð¸, Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ñ Ð² Ð¿Ð¾Ð¿ÐµÑÐµÐ´Ð½ÑÑ Ð²ÐµÑÑÑÑÑ ÑÑÐ¾Ð³Ð¾ Ð´Ð¾Ð´Ð°ÑÐºÑ Ð±ÑÐ»Ð¸ ÑÐºÐ¾Ð¿ÑÐ¹Ð¾Ð²Ð°Ð½Ñ Ð² ÑÐµÐºÑ %2$s. ÐÐ´Ð½Ð°Ðº ÑÑÐ°Ð»Ð°ÑÑ Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿ÑÐ¸ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð½Ñ ÑÑÑÑ Ð¾Ð¿ÐµÑÐ°ÑÑÑ Ð¿ÑÐ´ ÑÐ°Ñ ÑÐ¸Ð½ÑÑÐ¾Ð½ÑÐ·Ð°ÑÑÑ. ÐÐ¸ Ð¼Ð¾Ð¶ÐµÑÐµ Ð°Ð±Ð¾ Ð·Ð°Ð»Ð¸ÑÐ¸ÑÐ¸ ÑÐ°Ð¹Ð»(Ð¸) ÑÐº Ñ ÑÐ° Ð²Ð¸Ð´Ð°Ð»Ð¸ÑÐ¸ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð° %3$s, Ð°Ð±Ð¾ Ð¿ÐµÑÐµÐ¼ÑÑÑÐ¸ÑÐ¸ ÑÐ°Ð¹Ð»(Ð¸) Ð² Ð´Ð¸ÑÐµÐºÑÐ¾ÑÑÑ %1$s Ñ Ð·Ð±ÐµÑÐµÐ³ÑÐ¸ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð° %4$s.\n\nÐÐ¸Ð¶ÑÐµ Ð½Ð°Ð²ÐµÐ´ÐµÐ½Ñ Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ñ ÑÐ°Ð¹Ð»(Ð¸) ÑÐ° Ð²ÑÐ´Ð´Ð°Ð»ÐµÐ½Ñ ÑÐ°Ð¹Ð»(Ð¸) Ñ %5$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>
@@ -208,7 +217,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 +225,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>
