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

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index e9aa20c4..3c5b4edd 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -255,11 +255,11 @@
   <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">Ð£Ð´Ð°Ð»ÐµÐ½Ð½ÑÐ¹ ÑÐ°Ð¹Ð» %s Ð½Ðµ ÑÐ¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°Ð½ Ñ Ð»Ð¾ÐºÐ°Ð»ÑÐ½ÑÐ¼. ÐÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ðµ Ð¿ÑÐ¸Ð²ÐµÐ´ÐµÑ Ðº Ð·Ð°Ð¼ÐµÐ½Ðµ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð° Ð½Ð° ÑÐµÑÐ²ÐµÑÐµ.</string>
+  <string name="conflict_title">ÐÐ¾Ð½ÑÐ»Ð¸ÐºÑ ÑÐ°Ð¹Ð»Ð¾Ð²</string>
+  <string name="conflict_message">ÐÐ°ÐºÐ¸Ðµ ÑÐ°Ð¹Ð»Ñ ÐÑ ÑÐ¾ÑÐ¸ÑÐµ ÑÐ¾ÑÑÐ°Ð½Ð¸ÑÑ? ÐÑÐ¸ Ð²ÑÐ±Ð¾ÑÐµ Ð¾Ð±ÐµÐ¸Ñ Ð²ÐµÑÑÐ¸Ð¹, Ðº Ð½Ð°Ð·Ð²Ð°Ð½Ð¸Ñ Ð»Ð¾ÐºÐ°Ð»ÑÐ½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð° Ð±ÑÐ´ÐµÑ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð° ÑÐ¸ÑÑÐ°</string>
   <string name="conflict_keep_both">Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ Ð¾Ð±Ð°</string>
-  <string name="conflict_overwrite">ÐÐµÑÐµÐ·Ð°Ð¿Ð¸ÑÐ°ÑÑ</string>
-  <string name="conflict_dont_upload">ÐÐµ Ð·Ð°Ð³ÑÑÐ¶Ð°ÑÑ</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>
@@ -314,6 +314,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>
