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

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 8d58f738..9596738f 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -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>
@@ -82,6 +82,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 +110,15 @@
   <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 Ð´Ð»Ñ Ð¿ÑÐµÐ´Ð¾ÑÐ²ÑÐ°ÑÐµÐ½Ð¸Ñ Ð¿Ð¾ÑÐµÑÐ¸ Ð´Ð°Ð½ÑÑ, ÐºÐ¾Ð³Ð´Ð° Ð¾Ð´Ð¸Ð½ ÑÐ°Ð¹Ð» ÑÐ¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°Ð½ Ñ Ð¼Ð½Ð¾Ð¶ÐµÑÑÐ²Ð¾Ð¼ Ð°ÐºÐºÐ°ÑÐ½ÑÐ¾Ð². Ð ÑÐ²ÑÐ·Ð¸ Ñ ÑÑÐ¸Ð¼ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸ÐµÐ¼, Ð²ÑÐµ ÑÐ°Ð¹Ð»Ñ, Ð·Ð°Ð³ÑÑÐ¶ÐµÐ½Ð½ÑÐµ Ð² Ð¿ÑÐµÐ´ÑÐ´ÑÑÐ¸Ñ Ð²ÐµÑÑÐ¸ÑÑ ÑÑÐ¾Ð³Ð¾ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ, Ð±ÑÐ»Ð¸ ÑÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ñ Ð² Ð¿Ð°Ð¿ÐºÑ %2$s. Ð¢ÐµÐ¼ Ð½Ðµ Ð¼ÐµÐ½ÐµÐµ, Ð¾ÑÐ¸Ð±ÐºÐ° Ð¿Ð¾Ð¼ÐµÑÐ°Ð»Ð° Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¸Ñ ÑÑÐ¾Ð¹ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¸ Ð² Ð¿ÑÐ¾ÑÐµÑÑÐµ ÑÐ¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð°ÑÐ¸Ð¸ Ð°ÐºÐºÐ°ÑÐ½ÑÐ°. ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ Ð¾ÑÑÐ°Ð²Ð¸ÑÑ ÑÐ°Ð¹Ð»(Ñ) ÐºÐ°Ðº ÐµÑÑÑ Ð¸ ÑÐ´Ð°Ð»Ð¸ÑÑ ÑÑÑÐ»ÐºÑ Ð½Ð° %3$s, Ð¸Ð»Ð¸ Ð¿ÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ ÑÐ°Ð¹Ð»(Ñ) Ð² Ð¿Ð°Ð¿ÐºÑ %1$s Ð¸ ÑÐ¾ÑÑÐ°Ð½Ð¸ÑÑ ÑÑÑÐ»ÐºÑ Ð½Ð° %4$s. ÐÐ¸Ð¶Ðµ Ð¿ÐµÑÐµÑÐ¸ÑÐ»ÐµÐ½ÑÐµ Ð»Ð¾ÐºÐ°Ð»ÑÐ½ÑÐ¹ ÑÐ°Ð¹Ð»(Ñ), Ð¸ ÑÐ´Ð°Ð»ÐµÐ½Ð½ÑÐ¹ ÑÐ°Ð¹Ð» (Ñ) Ð² 5% $ Ñ ÑÐ²ÑÐ·Ð°Ð½Ñ.</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 +218,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 +226,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>
