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

diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index f46965d9..4bc0267b 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -248,8 +248,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>
