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

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 44fc8b32..e9aa20c4 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -258,8 +258,8 @@
   <string name="conflict_title">ÐÐ¾Ð½ÑÐ»Ð¸ÐºÑ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ</string>
   <string name="conflict_message">Ð£Ð´Ð°Ð»ÐµÐ½Ð½ÑÐ¹ ÑÐ°Ð¹Ð» %s Ð½Ðµ ÑÐ¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°Ð½ Ñ Ð»Ð¾ÐºÐ°Ð»ÑÐ½ÑÐ¼. ÐÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ðµ Ð¿ÑÐ¸Ð²ÐµÐ´ÐµÑ Ðº Ð·Ð°Ð¼ÐµÐ½Ðµ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð° Ð½Ð° ÑÐµÑÐ²ÐµÑÐµ.</string>
   <string name="conflict_keep_both">Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ Ð¾Ð±Ð°</string>
-  <string name="conflict_use_local_version">ÐÐµÑÐµÐ·Ð°Ð¿Ð¸ÑÐ°ÑÑ</string>
-  <string name="conflict_use_server_version">ÐÐµ Ð·Ð°Ð³ÑÑÐ¶Ð°ÑÑ</string>
+  <string name="conflict_overwrite">ÐÐµÑÐµÐ·Ð°Ð¿Ð¸ÑÐ°ÑÑ</string>
+  <string name="conflict_dont_upload">ÐÐµ Ð·Ð°Ð³ÑÑÐ¶Ð°ÑÑ</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>
