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

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 4ef6bf11..fdad0bef 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -27,6 +27,7 @@
   <string name="drawer_item_settings">ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸</string>
   <string name="drawer_item_logs">ÐÑÑÐ½Ð°Ð»Ñ</string>
   <string name="drawer_close">ÐÐ°ÐºÑÑÑÑ</string>
+  <string name="drawer_open">ÐÑÐºÑÑÑÑ</string>
   <string name="prefs_category_general">ÐÑÐ½Ð¾Ð²Ð½ÑÐµ</string>
   <string name="prefs_category_more">ÐÐ¾Ð»ÑÑÐµ</string>
   <string name="prefs_accounts">Ð£ÑÑÑÐ½ÑÐµ Ð·Ð°Ð¿Ð¸ÑÐ¸</string>
@@ -201,9 +202,7 @@
   <string name="confirmation_remove_alert">ÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ ÑÐ´Ð°Ð»Ð¸ÑÑ %1$s?</string>
   <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="confirmation_remove_folder_local">Ð¢Ð¾Ð»ÑÐºÐ¾ Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð¾</string>
   <string name="remove_success_msg">Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¾</string>
   <string name="remove_fail_msg">ÐÑÐ¸Ð±ÐºÐ° ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ñ</string>
   <string name="rename_dialog_title">ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð½Ð¾Ð²Ð¾Ðµ Ð¸Ð¼Ñ</string>
@@ -255,6 +254,8 @@
   <string name="instant_upload_on_wifi">ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð¸Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ð¹ ÑÐ¾Ð»ÑÐºÐ¾ ÑÐµÑÐµÐ· Wi-Fi</string>
   <string name="instant_video_upload_on_wifi">ÐÐ°Ð³ÑÑÐ·ÐºÐ° Ð²Ð¸Ð´ÐµÐ¾ ÑÐ¾Ð»ÑÐºÐ¾ ÑÐµÑÐµÐ· WiFi</string>
   <string name="instant_upload_path">/InstantUpload</string>
+  <string name="conflict_title">ÐÐ¾Ð½ÑÐ»Ð¸ÐºÑ ÑÐ°Ð¹Ð»Ð¾Ð²</string>
+  <string name="conflict_message">ÐÐ°ÐºÐ¸Ðµ ÑÐ°Ð¹Ð»Ñ ÐÑ ÑÐ¾ÑÐ¸ÑÐµ ÑÐ¾ÑÑÐ°Ð½Ð¸ÑÑ? ÐÑÐ¸ Ð²ÑÐ±Ð¾ÑÐµ Ð¾Ð±ÐµÐ¸Ñ Ð²ÐµÑÑÐ¸Ð¹, Ðº Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð° Ð±ÑÐ´ÐµÑ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð° ÑÐ¸ÑÑÐ°</string>
   <string name="conflict_keep_both">Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ Ð¾Ð±Ð°</string>
   <string name="preview_image_description">ÐÑÐµÐ´Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑ</string>
   <string name="preview_image_error_unknown_format">Ð­ÑÐ¾ Ð¸Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ðµ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¾</string>
@@ -310,6 +311,7 @@
   <string name="shared_subject_header">Ð¿Ð¾Ð´ÐµÐ»Ð¸Ð»ÑÑ</string>
   <string name="with_you_subject_header">Ñ Ð²Ð°Ð¼Ð¸</string>
   <string name="subject_token">%1$s Ð¿ÑÐµÐ´Ð¾ÑÑÐ°Ð²Ð¸Ð» Ð²Ð°Ð¼ Ð´Ð¾ÑÑÑÐ¿ Ðº \"%2$s\"</string>
+  <string name="saml_subject_token">ÐÐ°Ð¼ Ð¿ÑÐµÐ´Ð¾ÑÑÐ°Ð²Ð»ÐµÐ½ Ð´Ð¾ÑÑÑÐ¿ Ðº \"%1$s\"</string>
   <string name="auth_refresh_button">ÐÐ±Ð½Ð¾Ð²Ð¸ÑÑ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ</string>
   <string name="auth_host_address">ÐÐ´ÑÐµÑ ÑÐµÑÐ²ÐµÑÐ°</string>
   <string name="common_error_out_memory">ÐÐµÐ´Ð¾ÑÑÐ°ÑÐ¾ÑÐ½Ð¾ Ð¿Ð°Ð¼ÑÑÐ¸</string>
