X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/0ccb092abbb8aae874b7e84c6d31ae95df3c46f3..8586416423ccffc7d779b0bb24a3e8b26e83ea2b:/res/values-ru/strings.xml?ds=inline

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 5e4e3e36..a0128b5a 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -203,6 +203,8 @@
   <string name="confirmation_remove_folder_alert">ÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ ÑÐ´Ð°Ð»Ð¸ÑÑ %1$s Ð¸ ÐµÐ³Ð¾ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ðµ?</string>
   <string name="confirmation_remove_local">Ð¢Ð¾Ð»ÑÐºÐ¾ Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð¾</string>
   <string name="confirmation_remove_folder_local">Ð¢Ð¾Ð»ÑÐºÐ¾ Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð¾</string>
+  <string name="confirmation_remove_remote">ÐÑ ÑÐµÑÐ²ÐµÑÐ°</string>
+  <string name="confirmation_remove_remote_and_local">Ð£Ð´Ð°Ð»ÐµÐ½Ð½Ð¾ Ð¸ Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð¾</string>
   <string name="remove_success_msg">Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¾</string>
   <string name="remove_fail_msg">ÐÑÐ¸Ð±ÐºÐ° ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ñ</string>
   <string name="rename_dialog_title">ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð½Ð¾Ð²Ð¾Ðµ Ð¸Ð¼Ñ</string>
@@ -257,6 +259,8 @@
   <string name="conflict_title">ÐÐ¾Ð½ÑÐ»Ð¸ÐºÑ ÑÐ°Ð¹Ð»Ð¾Ð²</string>
   <string name="conflict_message">ÐÐ°ÐºÐ¸Ðµ ÑÐ°Ð¹Ð»Ñ ÐÑ ÑÐ¾ÑÐ¸ÑÐµ ÑÐ¾ÑÑÐ°Ð½Ð¸ÑÑ? ÐÑÐ¸ Ð²ÑÐ±Ð¾ÑÐµ Ð¾Ð±ÐµÐ¸Ñ Ð²ÐµÑÑÐ¸Ð¹, Ðº Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð° Ð±ÑÐ´ÐµÑ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð° ÑÐ¸ÑÑÐ°</string>
   <string name="conflict_keep_both">Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ Ð¾Ð±Ð°</string>
+  <string name="conflict_use_local_version">Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð°Ñ Ð²ÐµÑÑÐ¸Ñ</string>
+  <string name="conflict_use_server_version">ÑÐ´Ð°Ð»ÐµÐ½Ð½Ð°Ñ Ð²ÐµÑÑÐ¸Ñ</string>
   <string name="preview_image_description">ÐÑÐµÐ´Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑ</string>
   <string name="preview_image_error_unknown_format">Ð­ÑÐ¾ Ð¸Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ðµ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¾</string>
   <string name="error__upload__local_file_not_copied">%1$s Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ Ð² Ð»Ð¾ÐºÐ°Ð»ÑÐ½ÑÐ¹ ÐºÐ°ÑÐ°Ð»Ð¾Ð³ %2$s </string>
@@ -304,7 +308,11 @@
   <string name="move_file_invalid_overwrite">Ð¤Ð°Ð¹Ð» ÑÐ¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ Ð² ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ðµ Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ</string>
   <string name="move_file_error">ÐÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ° Ð¿ÑÐ¸ Ð¿Ð¾Ð¿ÑÑÐºÐµ Ð¿ÐµÑÐµÐ¼ÐµÑÐµÐ½Ð¸Ñ ÑÑÐ¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð° Ð¸Ð»Ð¸ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ð°</string>
   <string name="forbidden_permissions_move">Ð´Ð»Ñ Ð¿ÐµÑÐµÐ¼ÐµÑÐµÐ½Ð¸Ñ ÑÑÐ¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð°</string>
+  <string name="copy_file_not_found">ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ Ð¿ÑÐ¾Ð¸Ð·Ð²ÐµÑÑÐ¸ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ. ÐÐ¾Ð¶Ð°Ð»ÑÐ¹ÑÑÐ° Ð¿ÑÐ¾Ð²ÐµÑÑÑÐµ ÑÑÑÐµÑÑÐ²Ð¾Ð²Ð°Ð½Ð¸Ðµ ÑÐ°Ð¹Ð»Ð°</string>
+  <string name="copy_file_invalid_into_descendent">ÐÐµÐ»ÑÐ·Ñ Ð¿ÑÐ¾Ð¸Ð·Ð²ÐµÑÑÐ¸ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ Ð¿Ð°Ð¿ÐºÐ¸ Ð² ÑÐ½Ð°ÑÐ»ÐµÐ´Ð¾Ð²Ð°Ð½Ð½ÑÑ Ð¿Ð°Ð¿ÐºÑ</string>
   <string name="copy_file_invalid_overwrite">Ð¤Ð°Ð¹Ð» ÑÐ¶Ðµ ÑÑÑÐµÑÑÐ²ÑÐµÑ Ð² ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ðµ Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð¸Ñ</string>
+  <string name="copy_file_error">ÐÑÐ¾Ð¸Ð·Ð¾ÑÐ»Ð° Ð¾ÑÐ¸Ð±ÐºÐ° Ð²Ð¾ Ð²ÑÐµÐ¼Ñ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ ÑÑÐ¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð° Ð¸Ð»Ð¸ Ð¿Ð°Ð¿ÐºÐ¸</string>
+  <string name="forbidden_permissions_copy">Ð´Ð»Ñ ÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð¸Ñ ÑÑÐ¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð°</string>
   <string name="prefs_category_instant_uploading">ÐÐ³Ð½Ð¾Ð²ÐµÐ½Ð½ÑÐµ Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸</string>
   <string name="prefs_category_security">ÐÐµÐ·Ð¾Ð¿Ð°ÑÐ½Ð¾ÑÑÑ</string>
   <string name="prefs_instant_video_upload_path_title">ÐÑÑÑ Ð´Ð»Ñ Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸ ÐÐ¸Ð´ÐµÐ¾</string>
