X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/6235022b5632a7d3f39c23032816dbe7dd04ad4c..efb3989ee67b2d7d7bb16725d7b5bfd172b5d134:/res/values-sr/strings.xml

diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 56508240..01dfce6c 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -27,6 +27,7 @@
   <string name="drawer_item_settings">ÐÐ¾ÑÑÐ°Ð²ÐºÐµ</string>
   <string name="drawer_item_logs">ÐÐ°Ð¿Ð¸ÑÐ½Ð¸ÑÐ¸</string>
   <string name="drawer_close">ÐÐ°ÑÐ²Ð¾ÑÐ¸</string>
+  <string name="drawer_open">ÐÑÐ²Ð¾ÑÐ¸</string>
   <string name="prefs_category_general">ÐÐ¿ÑÑÐµ</string>
   <string name="prefs_category_more">ÐÑÑÐ°Ð»Ð¾</string>
   <string name="prefs_accounts">ÐÐ°Ð»Ð¾Ð·Ð¸</string>
@@ -200,9 +201,7 @@
   <string name="confirmation_remove_alert">ÐÐµÐ»Ð¸ÑÐµ Ð´Ð° ÑÐºÐ»Ð¾Ð½Ð¸ÑÐµ %1$s?</string>
   <string name="confirmation_remove_folder_alert">ÐÐµÐ»Ð¸ÑÐµ Ð´Ð° ÑÐºÐ»Ð¾Ð½Ð¸ÑÐµ %1$s Ð¸ ÑÐµÐ½ ÑÐ°Ð´ÑÐ¶Ð°Ñ?</string>
   <string name="confirmation_remove_local">Ð¡Ð°Ð¼Ð¾ Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾</string>
-  <string name="confirmation_remove_folder_local">Ð¡Ð°Ð¼Ð¾ Ð»Ð¾ÐºÐ°Ð»Ð½Ð¸ ÑÐ°Ð´ÑÐ¶Ð°Ñ</string>
-  <string name="confirmation_remove_remote">Ð£ÐºÐ»Ð¾Ð½Ð¸ ÑÐ° ÑÐµÑÐ²ÐµÑÐ°</string>
-  <string name="confirmation_remove_remote_and_local">Ð£Ð´Ð°ÑÐµÐ½Ð¾ Ð¸ Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾</string>
+  <string name="confirmation_remove_folder_local">Ð¡Ð°Ð¼Ð¾ Ð»Ð¾ÐºÐ°Ð»Ð½Ð¾</string>
   <string name="remove_success_msg">Ð£ÐºÐ»Ð°ÑÐ°ÑÐµ ÑÑÐ¿ÐµÑÐ½Ð¾</string>
   <string name="remove_fail_msg">Ð£ÐºÐ»Ð°ÑÐ°ÑÐµ Ð½ÐµÑÑÐ¿ÐµÑÐ½Ð¾</string>
   <string name="rename_dialog_title">Ð£Ð½ÐµÑÐ¸ÑÐµ Ð½Ð¾Ð² Ð½Ð°Ð·Ð¸Ð²</string>
@@ -254,11 +253,7 @@
   <string name="instant_upload_on_wifi">ÐÑÐ¿ÑÐµÐ¼Ð°Ñ ÑÐ»Ð¸ÐºÐµ ÑÐ°Ð¼Ð¾ Ð¿ÑÑÐµÐ¼ Ð±ÐµÐ¶Ð¸ÑÐ½Ðµ Ð¼ÑÐµÐ¶Ðµ</string>
   <string name="instant_video_upload_on_wifi">ÐÑÐ¿ÑÐµÐ¼Ð°Ñ Ð²Ð¸Ð´ÐµÐ¾ ÑÐ°Ð¼Ð¾ Ð¿ÑÑÐµÐ¼ Ð±ÐµÐ¶Ð¸ÑÐ½Ðµ Ð¼ÑÐµÐ¶Ðµ</string>
   <string name="instant_upload_path">/InstantUpload</string>
-  <string name="conflict_title">ÐÐ¶ÑÑÐ¸ÑÐ°Ñ ÑÑÐºÐ¾Ð±</string>
-  <string name="conflict_message">Ð£Ð´Ð°ÑÐµÐ½Ð¸ ÑÐ°ÑÐ» %s Ð½Ð¸ÑÐµ ÑÐ¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð¾Ð²Ð°Ð½ ÑÐ° Ð»Ð¾ÐºÐ°Ð»Ð½Ð¸Ð¼. ÐÐºÐ¾ Ð½Ð°ÑÑÐ°Ð²Ð¸ÑÐµ, Ð·Ð°Ð¼ÐµÐ½Ð¸ÑÐµÑÐµ ÑÐ°ÑÐ» Ð½Ð° ÑÐµÑÐ²ÐµÑÑ.</string>
   <string name="conflict_keep_both">ÐÐ°Ð´ÑÐ¶Ð¸ Ð¾Ð±Ð°</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>
