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

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 8d58f738..e713b7a5 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/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>
@@ -38,7 +36,7 @@
   <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</string>
+  <string name="auth_host_url">ÐÐ´ÑÐµÑ ÑÐµÑÐ²ÐµÑÐ°</string>
   <string name="auth_username">ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ</string>
   <string name="auth_password">ÐÐ°ÑÐ¾Ð»Ñ</string>
   <string name="auth_register">Ð¯ Ð½Ð¾Ð²Ð¸ÑÑÐº Ð² ownCloud</string>
@@ -69,9 +67,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>
@@ -82,6 +78,7 @@
   <string name="common_save_exit">Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ &amp; ÐÑÐ¹ÑÐ¸</string>
   <string name="common_exit">ÐÑÐ¹ÑÐ¸ Ð¸Ð· ownCloud</string>
   <string name="common_error">ÐÑÐ¸Ð±ÐºÐ°</string>
+  <string name="common_error_unknown">ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½Ð°Ñ Ð¾ÑÐ¸Ð±ÐºÐ°</string>
   <string name="about_title">Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ</string>
   <string name="delete_account">Ð£Ð´Ð°Ð»Ð¸ÑÑ Ð°ÐºÐºÐ°ÑÐ½Ñ</string>
   <string name="create_account">Ð¡Ð¾Ð·Ð´Ð°ÑÑ Ð°ÐºÐºÐ°ÑÐ½Ñ</string>
@@ -109,6 +106,14 @@
   <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>
@@ -131,14 +136,12 @@
     <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">ÐÐµÐ²ÐµÑÐ½Ð°Ñ ÐºÐ¾Ð½ÑÐ¸Ð³ÑÑÐ°ÑÐ¸Ñ ownCloud</string>
   <string name="auth_not_configured_message">ÐÐ¾ÑÐ¾Ð¶Ðµ ÑÑÐ¾ Ð²Ð°Ñ ÑÐºÐ·ÐµÐ¼Ð¿Ð»ÑÑ ownCloud Ð½Ðµ Ð±ÑÐ» ÐºÐ¾ÑÑÐµÐºÑÐ½Ð¾ ÑÐºÐ¾Ð½ÑÐ¸Ð³ÑÑÐ¸ÑÐ¾Ð²Ð°Ð½. ÐÐ±ÑÐ°ÑÐ¸ÑÐµÑÑ Ð·Ð° Ð´ÐµÑÐ°Ð»ÑÐ¼Ð¸ Ðº Ð²Ð°ÑÐµÐ¼Ñ Ð°Ð´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ°ÑÐ¾ÑÑ.</string>
   <string name="auth_unknown_error_title">ÐÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð½ÐµÐ¸Ð·Ð²ÐµÑÑÐ½Ð°Ñ Ð¾ÑÐ¸Ð±ÐºÐ°!</string>
@@ -154,8 +157,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 +209,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 +217,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>
