X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/b694fee63d7bdb8b93e9d46d28303eff094923fe..8c19d0fa50c2601e4a8ea82d9e89e30145cacf90:/res/values-uk/strings.xml

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 390b4e3b..c3bd6a09 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/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>
@@ -188,9 +189,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>
@@ -242,11 +241,7 @@
   <string name="instant_upload_on_wifi">ÐÐ°Ð²Ð°Ð½ÑÐ°Ð¶ÑÐ²Ð°ÑÐ¸ Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð½Ñ ÑÑÐ»ÑÐºÐ¸ ÑÐµÑÐµÐ· WiFi</string>
   <string name="instant_video_upload_on_wifi">ÐÐ°Ð²Ð°Ð½ÑÐ°Ð¶ÑÐ²Ð°ÑÐ¸ Ð²ÑÐ´ÐµÐ¾ ÑÑÐ»ÑÐºÐ¸ ÑÐµÑÐµÐ· 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>
@@ -293,6 +288,7 @@
   <string name="move_file_invalid_overwrite">Ð¤Ð°Ð¹Ð» Ð²Ð¶Ðµ ÑÑÐ½ÑÑ Ð² ÑÐµÑÑ Ð¿ÑÐ¸Ð·Ð½Ð°ÑÐµÐ½Ð½Ñ</string>
   <string name="move_file_error">ÐÐ¸Ð½Ð¸ÐºÐ»Ð° Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿ÑÐ¸ ÑÐ¿ÑÐ¾Ð±Ñ Ð¿ÐµÑÐµÐ¼ÑÑÑÐ¸ÑÐ¸ ÑÐ°Ð¹Ð» Ð°Ð±Ð¾ ÑÐµÐºÑ</string>
   <string name="forbidden_permissions_move">Ð¿ÐµÑÐµÐ¼ÑÑÑÐ¸ÑÐ¸ ÑÐµÐ¹ ÑÐ°Ð¹Ð»</string>
+  <string name="copy_file_invalid_overwrite">Ð¤Ð°Ð¹Ð» Ð²Ð¶Ðµ ÑÑÐ½ÑÑ Ð² ÑÐµÑÑ Ð¿ÑÐ¸Ð·Ð½Ð°ÑÐµÐ½Ð½Ñ</string>
   <string name="prefs_category_instant_uploading">ÐÐ¸ÑÑÑÐ²Ð¾ Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ</string>
   <string name="prefs_category_security">ÐÐµÐ·Ð¿ÐµÐºÐ°</string>
   <string name="prefs_instant_video_upload_path_title">Ð¨Ð»ÑÑ Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ Ð²ÑÐ´ÐµÐ¾</string>
