X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/46b5e21ef540659c7db2113a72ab7f77ea723343..efb3989ee67b2d7d7bb16725d7b5bfd172b5d134:/res/values-uk/strings.xml

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 4c07d79b..d036312f 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -19,12 +19,19 @@
   </string-array>
   <!--TODO re-enable when server-side folder size calculation is available   
     	<item>Biggest - Smallest</item>-->
+  <!--TODO re-enable when "Accounts" is available in Navigation Drawer-->
+  <!--<string name="drawer_item_accounts">Accounts</string>-->
+  <string name="drawer_item_all_files">Ð£ÑÑ ÑÐ°Ð¹Ð»Ð¸</string>
+  <!--TODO re-enable when "On Device" is available
+    <string name="drawer_item_on_device">On device</string>-->
+  <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>
   <string name="prefs_manage_accounts">Ð£Ð¿ÑÐ°Ð²Ð»ÑÐ½Ð½Ñ Ð¾Ð±Ð»ÑÐºÐ¾Ð²Ð¸Ð¼Ð¸ Ð·Ð°Ð¿Ð¸ÑÐ°Ð¼Ð¸</string>
-  <string name="prefs_pincode">App Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð½Ð¸Ð¹ PIN</string>
-  <string name="prefs_pincode_summary">ÐÐ°ÑÐ¸ÑÑ ÐÐ°ÑÐ¾Ð³ App ÐºÐ»ÑÑÐ½ÑÐ°</string>
   <string name="prefs_instant_upload">ÐÐ¸ÑÑÑÐ²Ñ Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð½Ñ</string>
   <string name="prefs_instant_upload_summary">ÐÐ¸ÑÑÑÐ²Ñ Ð·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð½Ñ Ð· ÐºÐ°Ð¼ÐµÑÐ¸</string>
   <string name="prefs_instant_video_upload">ÐÐ¸ÑÑÑÐ²Ñ Ð²ÑÐ´ÐµÐ¾</string>
@@ -38,6 +45,8 @@
   <string name="prefs_recommend">ÐÐ¾ÑÐ°Ð´Ð¸ÑÐ¸ ÑÐ¾Ð²Ð°ÑÐ¸ÑÑ</string>
   <string name="prefs_feedback">ÐÐ²Ð¾ÑÐ¾ÑÐ½ÑÐ¹ Ð·Ð²\'ÑÐ·Ð¾Ðº</string>
   <string name="prefs_imprint">ÐÑÐ´Ð±Ð¸ÑÐ¾Ðº</string>
+  <string name="prefs_remember_last_share_location">ÐÐ°Ð¿Ð°Ð¼\'ÑÑÐ°ÑÐ¸ Ð¿Ð¾Ð·Ð¸ÑÑÑ</string>
+  <string name="prefs_remember_last_upload_location_summary">ÐÐ°Ð¿Ð°Ð¼\'ÑÑÐ°ÑÐ¸ Ð¾ÑÑÐ°Ð½Ð½ÑÐ¹ Ð¾Ð¿ÑÐ±Ð»ÑÐºÐ¾Ð²Ð°Ð½Ð¸Ð¹ ÑÐ»ÑÑ Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ</string>
   <string name="recommend_subject">Ð¡Ð¿ÑÐ¾Ð±ÑÐ¹ÑÐµ %1$s Ð½Ð° ÑÐ²Ð¾ÑÐ¼Ñ ÑÐ¼Ð°ÑÑÑÐ¾Ð½Ñ!</string>
   <string name="recommend_text">ÐÑÐ¾Ð¿Ð¾Ð½ÑÑ Ð²Ð°Ð¼ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ¸ÑÑ %1$s Ð½Ð° Ð²Ð°ÑÐ¾Ð¼Ñ ÑÐ¼Ð°ÑÑÑÐ¾Ð½Ñ!\nÐÐ°Ð²Ð°Ð½ÑÐ°Ð¶Ð¸ÑÐ¸ Ð¼Ð¾Ð¶Ð½Ð° Ð·Ð° Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½ÑÐ¼: %2$s</string>
   <string name="auth_check_server">ÐÐµÑÐµÐ²ÑÑÐ¸ÑÐ¸ ÑÐµÑÐ²ÐµÑ</string>
@@ -48,6 +57,7 @@
   <string name="sync_string_files">Ð¤Ð°Ð¹Ð»Ð¸</string>
   <string name="setup_btn_connect">Ð\'ÑÐ´Ð½Ð°ÑÐ¸</string>
   <string name="uploader_btn_upload_text">ÐÑÐ´Ð²Ð°Ð½ÑÐ°Ð¶Ð¸ÑÐ¸</string>
+  <string name="uploader_btn_new_folder_text">ÐÐ¾Ð²Ð° ÑÐµÐºÐ°</string>
   <string name="uploader_top_message">ÐÐ±ÐµÑÑÑÑ ÑÐµÐºÑ Ð´Ð»Ñ Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ:</string>
   <string name="uploader_wrn_no_account_title">ÐÐµ Ð·Ð½Ð°Ð¹Ð´ÐµÐ½Ð¾ Ð¾Ð±Ð»ÑÐºÐ¾Ð²Ð¾Ð³Ð¾ Ð·Ð°Ð¿Ð¸ÑÑ</string>
   <string name="uploader_wrn_no_account_text">ÐÐ° ÐÐ°ÑÐ¾Ð¼Ñ Ð¿ÑÐ¸ÑÑÑÐ¾Ñ Ð²ÑÐ´ÑÑÑÐ½Ñ Ð¾Ð±Ð»ÑÐºÐ¾Ð²Ñ Ð·Ð°Ð¿Ð¸ÑÐ¸ %1$s. ÐÑÐ´Ñ Ð»Ð°ÑÐºÐ°, ÑÐ¿Ð¾ÑÐ°ÑÐºÑ ÑÑÐ²Ð¾ÑÑÑÑ Ð·Ð°Ð¿Ð¸Ñ.</string>
@@ -59,12 +69,8 @@
   <string name="uploader_info_uploading">ÐÐ°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ</string>
   <string name="file_list_seconds_ago">ÑÐµÐºÑÐ½Ð´Ð¸ ÑÐ¾Ð¼Ñ</string>
   <string name="file_list_empty">Ð¢ÑÑ Ð½ÑÑÐ¾Ð³Ð¾ Ð½ÐµÐ¼Ð°Ñ. ÐÑÐ´Ð²Ð°Ð½ÑÐ°Ð¶ÑÐµ ÑÐ¾-Ð½ÐµÐ±ÑÐ´Ñ!</string>
-  <string name="file_list_loading">ÐÐ°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ...</string>
+  <string name="file_list_loading">ÐÐ°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñâ¦</string>
   <string name="local_file_list_empty">Ð ÑÑÐ¹ ÑÐµÑÑ Ð½ÐµÐ¼Ð°Ñ ÑÐ°Ð¹Ð»ÑÐ².</string>
-  <string name="file_list_folder">ÑÐµÐºÐ°</string>
-  <string name="file_list_folders">ÑÐµÐºÐ¸</string>
-  <string name="file_list_file">ÑÐ°Ð¹Ð»</string>
-  <string name="file_list_files">ÑÐ°Ð¹Ð»Ð¸</string>
   <string name="filedetails_select_file">ÐÐ°ÑÐ¸ÑÐ½ÑÑÑ Ð½Ð° ÑÐ°Ð¹Ð»Ñ Ð´Ð»Ñ Ð²ÑÐ´Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð½Ñ Ð´Ð¾Ð´Ð°ÑÐºÐ¾Ð²Ð¾Ñ ÑÐ½ÑÐ¾ÑÐ¼Ð°ÑÑÑ</string>
   <string name="filedetails_size">Ð Ð¾Ð·Ð¼ÑÑ:</string>
   <string name="filedetails_type">Ð¢Ð¸Ð¿:</string>
@@ -98,7 +104,7 @@
   <string name="uploader_upload_failed_ticker">ÐÐ¾Ð¼Ð¸Ð»ÐºÐ° Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ</string>
   <string name="uploader_upload_failed_content_single">ÐÐ°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ %1$s Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð·Ð°Ð²ÐµÑÑÐ¸ÑÐ¸ÑÑ</string>
   <string name="uploader_upload_failed_credentials_error">ÐÐ°Ð²Ð°Ð½ÑÐ°Ð¶Ð¸ÑÐ¸ Ð½Ðµ Ð²Ð´Ð°Ð»Ð¾ÑÑ, Ð½ÐµÐ¾Ð±ÑÑÐ´Ð½Ð¾ Ð¿Ð¾Ð²ÑÐ¾ÑÐ¸ÑÐ¸ Ð²ÑÑÐ´</string>
-  <string name="downloader_download_in_progress_ticker">ÐÐºÐ°ÑÑÐ²Ð°Ð½Ð½Ñ â¦</string>
+  <string name="downloader_download_in_progress_ticker">Ð¡ÐºÐ°ÑÑÐ²Ð°Ð½Ð½Ñ â¦</string>
   <string name="downloader_download_in_progress_content">%1$d%% ÐÐºÐ°ÑÑÐ²Ð°Ð½Ð½Ñ %2$s</string>
   <string name="downloader_download_succeeded_ticker">Ð£ÑÐ¿ÑÑÐ½Ð¾ Ð·ÐºÐ°ÑÐ°Ð½Ð¾</string>
   <string name="downloader_download_succeeded_content">%1$s ÑÑÐ¿ÑÑÐ½Ð¾ Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð¾</string>
@@ -125,15 +131,6 @@
   <string name="foreign_files_local_text">ÐÐ¾ÐºÐ°Ð»ÑÐ½Ð¾: %1$s</string>
   <string name="foreign_files_remote_text">ÐÑÐ´Ð´Ð°Ð»ÐµÐ½Ð¾: %1$s</string>
   <string name="upload_query_move_foreign_files">ÐÐµÐ´Ð¾ÑÑÐ°ÑÐ½ÑÐ¾ Ð¼ÑÑÑÑ Ð´Ð»Ñ ÐºÐ¾Ð¿ÑÑÐ²Ð°Ð½Ð½Ñ Ð¾Ð±ÑÐ°Ð½Ð¸Ñ ÑÐ°Ð¹Ð»ÑÐ² Ñ ÑÐµÐºÑ %1$s. Ð§Ð¸ Ð±Ð°Ð¶Ð°ÑÑÐµ Ð²Ð¸ Ð¿ÐµÑÐµÐ¼ÑÑÑÐ¸ÑÐ¸ ÑÑ Ð·Ð°Ð¼ÑÑÑÑ ÐºÐ¾Ð¿ÑÑÐ²Ð°Ð½Ð½Ñ?</string>
-  <string name="pincode_enter_pin_code">ÐÑÐ´Ñ Ð»Ð°ÑÐºÐ°, Ð²Ð²ÐµÐ´ÑÑÑ ÑÐ²ÑÐ¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð½Ð¸Ð¹ PIN</string>
-  <string name="pincode_configure_your_pin">ÐÐ²ÐµÐ´ÑÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð½Ð¸Ð¹ PIN</string>
-  <string name="pincode_configure_your_pin_explanation">PIN Ð½ÐµÐ¾Ð±ÑÑÐ´Ð½Ð¾ Ð±ÑÐ´Ðµ Ð²Ð²Ð¾Ð´Ð¸ÑÐ¸ ÑÐ¾ÑÐ°Ð·Ñ Ð¿ÑÐ¸ Ð·Ð°Ð¿ÑÑÐºÑ ÑÑÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¸</string>
-  <string name="pincode_reenter_your_pincode">ÐÐ¾Ð²ÑÐ¾ÑÐ½Ð¾ Ð²Ð²ÐµÐ´ÑÑÑ App Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð½Ð¸Ð¹ PIN, Ð±ÑÐ´Ñ Ð»Ð°ÑÐºÐ°</string>
-  <string name="pincode_remove_your_pincode">ÐÐ¸Ð´Ð°Ð»Ð¸ÑÐ¸ ÑÐ²ÑÐ¹ App Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð½Ð¸Ð¹ PIN</string>
-  <string name="pincode_mismatch">ÐÐ±Ð¸Ð´Ð²Ð° App Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð½Ð¸Ñ PIN Ð½Ðµ Ð¾Ð´Ð½Ð°ÐºÐ¾Ð²Ñ</string>
-  <string name="pincode_wrong">ÐÐµ Ð²ÑÑÐ½Ð¸Ð¹ App Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð½Ð¸Ð¹ PIN</string>
-  <string name="pincode_removed">App Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð½Ð¸Ð¹ PIN Ð²Ð¸Ð´Ð°Ð»ÐµÐ½Ð¾</string>
-  <string name="pincode_stored">App Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð½Ð¸Ð¹ PIN Ð·Ð±ÐµÑÐµÐ¶ÐµÐ½Ð¾</string>
   <string name="media_notif_ticker">%1$s Ð¼ÑÐ·Ð¸ÑÐ½Ð¸Ð¹ Ð¿Ð»ÐµÑÑ</string>
   <string name="media_state_playing">%1$s (Ð²ÑÐ´ÑÐ²Ð¾ÑÐµÐ½Ð½Ñ)</string>
   <string name="media_state_loading">%1$s (Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ)</string>
@@ -158,7 +155,7 @@
   <string name="auth_no_net_conn_title">ÐÑÐ´ÑÑÑÐ½Ñ Ð¿ÑÐ´ÐºÐ»ÑÑÐµÐ½Ð½Ñ Ð´Ð¾ Ð¼ÐµÑÐµÐ¶Ñ</string>
   <string name="auth_nossl_plain_ok_title">ÐÐµÐ·Ð¿ÐµÑÐ½Ðµ Ð·\'ÑÐ´Ð½Ð°Ð½Ð½Ñ Ð½Ðµ Ð´Ð¾ÑÑÑÐ¿Ð½Ðµ.</string>
   <string name="auth_connection_established">Ð\'ÑÐ´Ð½Ð°Ð½Ð½Ñ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾</string>
-  <string name="auth_testing_connection">ÐÐµÑÐµÐ²ÑÑÐºÐ° Ð·\'ÑÐ´Ð½Ð°Ð½Ð½Ñâ¦</string>
+  <string name="auth_testing_connection">ÐÐµÑÐµÐ²ÑÑÐºÐ° Ð·\'ÑÐ´Ð½Ð°Ð½Ð½Ñ</string>
   <string name="auth_not_configured_title">ÐÐµ Ð²ÑÑÐ½Ñ Ð½Ð°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ ÑÐµÑÐ²ÐµÑ </string>
   <string name="auth_account_not_new">Ð¢Ð°ÐºÐ¸Ð¹ Ð¾Ð±Ð»ÑÐºÐ¾Ð²Ð¸Ð¹ Ð·Ð°Ð¿Ð¸Ñ Ð²Ð¶Ðµ ÑÑÐ½ÑÑ Ð½Ð° Ð¿ÑÐ¸ÑÑÑÐ¾Ñ</string>
   <string name="auth_account_not_the_same">ÐÐ²ÐµÐ´ÐµÐ½Ð¸Ð¹ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°Ñ Ð½Ðµ Ð²ÑÐ´Ð¿Ð¾Ð²ÑÐ´Ð°Ñ Ð¾Ð±Ð»ÑÐºÐ¾Ð²Ð¾Ð¼Ñ Ð·Ð°Ð¿Ð¸ÑÑ</string>
@@ -185,15 +182,14 @@
   <string name="auth_fail_get_user_name">ÐÐ°Ñ ÑÐµÑÐ²ÐµÑ Ð½Ðµ Ð¿Ð¾Ð²ÐµÑÑÐ°Ñ ÐºÐ¾ÑÐµÐºÑÐ½Ð¸Ð¹ ÑÐ´ÐµÐ½ÑÐ¸ÑÑÐºÐ°ÑÐ¾Ñ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ°, Ð±ÑÐ´Ñ Ð»Ð°ÑÐºÐ° Ð·Ð²ÐµÑÐ½ÑÑÑÑÑ Ð´Ð¾ Ð°Ð´Ð¼ÑÐ½ÑÑÑÑÐ°ÑÐ¾ÑÐ°
 â¥</string>
   <string name="auth_can_not_auth_against_server">ÐÑÑÐµÐ½ÑÐ¸ÑÑÐºÐ°ÑÑÑ Ð½Ð° ÑÑÐ¾Ð¼Ñ ÑÐµÑÐ²ÐµÑÑ Ð½ÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð°</string>
-  <string name="fd_keep_in_sync">ÐÐ½Ð¾Ð²Ð»ÑÐ²Ð°ÑÐ¸ ÑÐ°Ð¹Ð»</string>
+  <string name="auth_account_does_not_exist">ÐÐ¾ÑÐ¸ÑÑÐ²Ð°ÑÐ° Ð² Ð¿ÑÐ¸ÑÑÑÐ¾Ñ Ð½Ðµ ÑÑÐ½ÑÐµ</string>
+  <string name="favorite">Ð£Ð»ÑÐ±Ð»ÐµÐ½Ð¸Ð¹</string>
   <string name="common_rename">ÐÐµÑÐµÐ¹Ð¼ÐµÐ½ÑÐ²Ð°ÑÐ¸</string>
   <string name="common_remove">ÐÐ¸Ð´Ð°Ð»Ð¸ÑÐ¸</string>
   <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>
@@ -203,11 +199,13 @@
   <string name="sync_file_nothing_to_do_msg">ÐÐ¼ÑÑÑ ÑÐ°Ð¹Ð»Ñ Ð²Ð¶Ðµ ÑÐ¸Ð½ÑÑÐ¾Ð½ÑÐ·Ð¾Ð²Ð°Ð½Ð¾</string>
   <string name="create_dir_fail_msg">ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ ÑÑÐ²Ð¾ÑÐ¸ÑÐ¸ ÑÐµÐºÑ</string>
   <string name="filename_forbidden_characters">ÐÐ°Ð±Ð¾ÑÐ¾Ð½ÐµÐ½Ñ ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¸: / \\ &lt; &gt; : \" | ? *</string>
+  <string name="filename_forbidden_charaters_from_server">ÐÐ¼âÑ ÑÐ°Ð¹Ð»Ñ Ð¼ÑÑÑÐ¸ÑÑ Ð¿ÑÐ¸Ð½Ð°Ð¹Ð¼Ð½Ñ Ð¾Ð´Ð¸Ð½ Ð½ÐµÐºÐ¾ÑÐµÐºÑÐ½Ð¸Ð¹ ÑÐ¸Ð¼Ð²Ð¾Ð»</string>
   <string name="filename_empty"> ÐÐ¼\'Ñ ÑÐ°Ð¹Ð»Ñ Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±ÑÑÐ¸ Ð¿Ð¾ÑÐ¾Ð¶Ð½ÑÐ¼.</string>
   <string name="wait_a_moment">ÐÐ°ÑÐµÐºÐ°Ð¹ÑÐµ ÑÐ²Ð¸Ð»Ð¸Ð½ÐºÑ</string>
   <string name="filedisplay_unexpected_bad_get_content">ÐÐµÑÐ¿Ð¾Ð´ÑÐ²Ð°Ð½Ñ Ð¿ÑÐ¾Ð±Ð»ÐµÐ¼Ð¸ ; Ð±ÑÐ´Ñ Ð»Ð°ÑÐºÐ°, ÑÐ¿ÑÐ¾Ð±ÑÐ¹ÑÐµ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ°ÑÐ¸ ÑÐ½ÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ñ Ð´Ð»Ñ Ð²Ð¸Ð±Ð¾ÑÑ ÑÐ°Ð¹Ð»Ñ</string>
   <string name="filedisplay_no_file_selected">ÐÐµ Ð¾Ð±ÑÐ°Ð½Ð¾ ÑÐ°Ð¹Ð»</string>
   <string name="activity_chooser_title">ÐÐ°Ð´ÑÑÐ»Ð°ÑÐ¸ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ...</string>
+  <string name="wait_for_tmp_copy_from_private_storage">ÐÐ¾Ð¿ÑÑÐ²Ð°Ð½Ð½Ñ ÑÐ°Ð¹Ð»Ñ Ð· Ð¿ÑÐ¸Ð²Ð°ÑÐ½Ð¾Ð³Ð¾ ÑÑÐ¾Ð²Ð¸ÑÐ°</string>
   <string name="oauth_check_onoff">Ð£Ð²ÑÐ¹ÑÐ¸ ÑÐµÑÐµÐ· oAuth2</string>
   <string name="oauth_login_connection">ÐÑÐ´ÐºÐ»ÑÑÐµÐ½Ð½Ñ Ð´Ð¾ ÑÐµÑÐ²ÐµÑÑ oAuth2...</string>
   <string name="ssl_validator_header">ÐÐµ Ð²Ð´Ð°Ð»Ð¾ÑÑ Ð¿ÐµÑÐµÐ²ÑÑÐ¸ÑÐ¸ ÑÐ´ÐµÐ½ÑÐ¸ÑÑÐºÐ°ÑÑÑ ÑÐ°Ð¹ÑÐ°</string>
@@ -243,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>
@@ -257,6 +251,8 @@
   <string name="share_link_file_error">ÐÐ¸Ð½Ð¸ÐºÐ»Ð° Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿ÑÐ¸ ÑÐ¿ÑÐ¾Ð±Ñ Ð¿Ð¾Ð´ÑÐ»Ð¸ÑÐ¸ÑÑ ÑÐ°Ð¹Ð»Ð¾Ð¼ Ð°Ð±Ð¾ ÑÐµÐºÐ¾Ñ</string>
   <string name="unshare_link_file_no_exist">ÐÐµÐ¼Ð¾Ð¶Ð»Ð¸Ð²Ð¾ Ð·Ð°Ð±Ð¾ÑÐ¾Ð½Ð¸ÑÐ¸ Ð´Ð¾ÑÑÑÐ¿. ÐÑÐ´Ñ Ð»Ð°ÑÐºÐ°, Ð¿ÐµÑÐµÐ²ÑÑÑÐµ, ÑÐ¸ ÑÑÐ½ÑÑ ÑÐ°Ð¹Ð»</string>
   <string name="unshare_link_file_error">ÐÐ¸Ð½Ð¸ÐºÐ»Ð° Ð¿Ð¾Ð¼Ð¸Ð»ÐºÐ° Ð¿ÑÐ¸ ÑÐ¿ÑÐ¾Ð±Ñ Ð·Ð°Ð±Ð¾ÑÐ¾Ð½Ð¸ÑÐ¸ Ð´Ð¾ÑÑÑÐ¿ Ð´Ð¾ ÑÐ°Ð¹Ð»Ñ Ð°Ð±Ð¾ ÑÐµÐºÐ¸</string>
+  <string name="share_link_password_title">ÐÐ²ÐµÑÑÐ¸ Ð¿Ð°ÑÐ¾Ð»Ñ</string>
+  <string name="share_link_empty_password">ÐÐ¸ Ð¿Ð¾Ð²Ð¸Ð½Ð½Ñ Ð²Ð²ÐµÑÑÐ¸ Ð¿Ð°ÑÐ¾Ð»Ñ</string>
   <string name="activity_chooser_send_file_title">ÐÐ°Ð´ÑÑÐ»Ð°ÑÐ¸</string>
   <string name="copy_link">ÐÐ¾Ð¿ÑÑÐ²Ð°ÑÐ¸ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ð½Ñ</string>
   <string name="clipboard_text_copied">Ð¡ÐºÐ¾Ð¿ÑÐ¹Ð¾Ð²Ð°Ð½Ð¾ Ð² Ð±ÑÑÐµÑ Ð¾Ð±Ð¼ÑÐ½Ñ</string>
@@ -279,6 +275,9 @@
   <string name="auth_redirect_non_secure_connection_title">ÐÐµÐ·Ð¿ÐµÑÐ½Ðµ Ð¿ÑÐ´ÐºÐ»ÑÑÐµÐ½Ð½Ñ Ð¿ÐµÑÐµÐ½Ð°Ð¿ÑÐ°Ð²Ð»ÑÑÑÑÑÑ ÑÐµÑÐµÐ· Ð½ÐµÐ·Ð°Ð±ÐµÐ·Ð¿ÐµÑÐµÐ½Ð¸Ð¹ Ð¼Ð°ÑÑÑÑÑ.</string>
   <string name="actionbar_logger">ÐÑÑÐ½Ð°Ð»Ð¸</string>
   <string name="log_send_history_button">ÐÐ°Ð´ÑÑÐ»Ð°ÑÐ¸ ÑÑÑÐ¾ÑÑÑ</string>
+  <string name="log_send_no_mail_app">ÐÐµÐ¼Ð°Ñ Ð´Ð¾Ð´Ð°ÑÐºÑ Ð´Ð»Ñ Ð²ÑÐ´Ð¿ÑÐ°Ð²ÐºÐ¸ Ð¶ÑÑÐ½Ð°Ð»ÑÐ². ÐÑÑÐ°Ð½Ð¾Ð²ÑÑÑ Ð¿Ð¾ÑÑÐ¾Ð²Ð¸Ð¹ Ð´Ð¾Ð´Ð°ÑÐ¾Ðº!</string>
+  <string name="log_send_mail_subject">%1$s Android Ð»Ð¾Ð³ Ð´Ð¾Ð´Ð°ÑÐºÑ</string>
+  <string name="log_progress_dialog_text">ÐÐ°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ Ð´Ð°Ð½Ð¸Ñ...</string>
   <string name="saml_authentication_required_text">ÐÐ¾ÑÑÑÐ±Ð½Ð° Ð°ÑÑÐµÐ½ÑÐ¸ÑÑÐºÐ°ÑÑÑ</string>
   <string name="saml_authentication_wrong_pass">ÐÐµÐ²ÑÑÐ½Ð¸Ð¹ Ð¿Ð°ÑÐ¾Ð»Ñ</string>
   <string name="actionbar_move">ÐÐµÑÐµÐ¼ÑÑÑÐ¸ÑÐ¸</string>
@@ -291,4 +290,20 @@
   <string name="forbidden_permissions_move">Ð¿ÐµÑÐµÐ¼ÑÑÑÐ¸ÑÐ¸ ÑÐµÐ¹ ÑÐ°Ð¹Ð»</string>
   <string name="prefs_category_instant_uploading">ÐÐ¸ÑÑÑÐ²Ð¾ Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ</string>
   <string name="prefs_category_security">ÐÐµÐ·Ð¿ÐµÐºÐ°</string>
+  <string name="prefs_instant_video_upload_path_title">Ð¨Ð»ÑÑ Ð·Ð°Ð²Ð°Ð½ÑÐ°Ð¶ÐµÐ½Ð½Ñ Ð²ÑÐ´ÐµÐ¾</string>
+  <string name="download_folder_failed_content">Ð¡ÐºÐ°ÑÑÐ²Ð°Ð½Ð½Ñ ÑÐµÐºÐ¸ %1$s Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð±ÑÑÐ¸ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¾</string>
+  <string name="with_you_subject_header">Ð· ÐÐ°Ð¼Ð¸</string>
+  <string name="subject_token">%1$s Ð¿Ð¾Ð´ÑÐ»Ð¸Ð²ÑÑ \"%2$s\" Ð· Ð²Ð°Ð¼Ð¸</string>
+  <string name="auth_refresh_button">ÐÐ½Ð¾Ð²Ð¸ÑÐ¸ Ð·\'ÑÐ´Ð½Ð°Ð½Ð½Ñ</string>
+  <string name="auth_host_address">ÐÑÐµÑÐ° ÑÐµÑÐ²ÐµÑÑ</string>
+  <string name="common_error_out_memory">ÐÐµÐ´Ð¾ÑÑÐ°ÑÐ½ÑÐ¾ Ð¿Ð°Ð¼\'ÑÑÑ</string>
+  <string name="username">ÐÐ¼\'Ñ ÐºÐ¾ÑÐ¸ÑÑÑÐ²Ð°ÑÐ°</string>
+  <string name="file_list__footer__folder">1 ÑÐµÐºÐ°</string>
+  <string name="file_list__footer__folders">%1$d ÑÐµÐº</string>
+  <string name="file_list__footer__file">1 ÑÐ°Ð¹Ð»</string>
+  <string name="file_list__footer__file_and_folder">1 ÑÐ°Ð¹Ð», 1 ÑÐµÐºÐ°</string>
+  <string name="file_list__footer__file_and_folders">1 ÑÐ°Ð¹Ð», %1$d ÑÐµÐº</string>
+  <string name="file_list__footer__files">%1$d ÑÐ°Ð¹Ð»ÑÐ²</string>
+  <string name="file_list__footer__files_and_folder">%1$d ÑÐ°Ð¹Ð»ÑÐ², 1 ÑÐµÐºÐ°</string>
+  <string name="file_list__footer__files_and_folders">%1$d ÑÐ°Ð¹Ð»ÑÐ², %2$d ÑÐµÐº</string>
 </resources>
