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

diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 9adae738..56508240 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -257,8 +257,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>
