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

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 8bc19971..390b4e3b 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -245,8 +245,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>
