X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/blobdiff_plain/4a737cb71cffad9a3ddd2d513920d537514b59f6..8a4a9f02bb8dbb1df1b536b6ba747d6498db2ecc:/res/values-ru/strings.xml

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index f65acc43..8d58f738 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="hello">ÐÑÐ¸Ð²ÐµÑ ÐÐ¸Ñ, ÐÐ»Ð°Ð²Ð½Ð¾ÐµÐÐºÐ½Ð¾OwnCloud!</string>
   <string name="app_name">ownCloud</string>
   <string name="main_password">ÐÐ°ÑÐ¾Ð»Ñ:</string>
   <string name="main_login">ÐÐ¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»Ñ:</string>
@@ -14,6 +13,7 @@
   <string name="main_settings">ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸</string>
   <string name="main_tit_accsetup">ÐÐ°ÑÑÑÐ¾Ð¸ÑÑ Ð°ÐºÐºÐ°ÑÐ½Ñ</string>
   <string name="main_wrn_accsetup">ÐÐ° Ð²Ð°ÑÐµÐ¼ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ðµ Ð½ÐµÑ ownCloud Ð°ÐºÐºÐ°ÑÐ½ÑÐ¾Ð². ÐÐ°Ð¼ Ð½ÑÐ¶Ð½Ð¾ ÑÐ¾Ð·Ð´Ð°ÑÑ Ð°ÐºÐºÐ°ÑÐ½Ñ, ÑÑÐ¾Ð±Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑÑÑ ÑÑÐ¸Ð¼ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¼.</string>
+  <string name="about_message">ownCloud ÐºÐ»Ð¸ÐµÐ½Ñ Ð´Ð»Ñ Android\n\nÐ²ÐµÑÑÐ¸Ñ: %1$s</string>
   <string name="actionbar_sync">ÐÐ±Ð½Ð¾Ð²Ð¸ÑÑ</string>
   <string name="actionbar_upload">ÐÐ°Ð³ÑÑÐ·ÐºÐ°</string>
   <string name="actionbar_upload_from_apps">Ð¡Ð¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ðµ Ð¾Ñ Ð´ÑÑÐ³Ð¸Ñ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ð¹</string>
@@ -62,17 +62,22 @@
   <string name="uploader_error_forbidden_content">ownCloud Ð½Ðµ Ð¸Ð¼ÐµÐµÑ Ð´Ð¾ÑÑÑÐ¿Ð° Ðº Ð¾Ð¿ÑÐ±Ð»Ð¸ÐºÐ¾Ð²Ð°Ð½Ð½ÑÐ¼ Ð´Ð°Ð½Ð½ÑÐ¼</string>
   <string name="uploader_info_uploading">ÐÐ°Ð³ÑÑÐ·ÐºÐ°</string>
   <string name="uploader_btn_create_dir_text">Ð¡Ð¾Ð·Ð´Ð°Ð¹ÑÐµ Ð´Ð¸ÑÐµÐºÑÐ¾ÑÐ¸Ñ Ð´Ð»Ñ Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸</string>
+  <string name="file_list_empty">Ð ÑÑÐ¾Ð¹ Ð¿Ð°Ð¿ÐºÐµ Ð½ÐµÑ ÑÐ°Ð¹Ð»Ð¾Ð².\nÐÐ¾Ð²ÑÐµ ÑÐ°Ð¹Ð»Ñ Ð¼Ð¾Ð³ÑÑ Ð±ÑÑÑ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ñ Ñ Ð¿Ð¾Ð¼Ð¾ÑÑÑ Ð¿ÑÐ½ÐºÑÐ° Ð¼ÐµÐ½Ñ \"ÐÐ°Ð³ÑÑÐ·Ð¸ÑÑ\".</string>
   <string name="filedetails_select_file">ÐÐ°Ð¶Ð¼Ð¸ÑÐµ Ð½Ð° ÑÐ°Ð¹Ð» Ð´Ð»Ñ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»ÑÐ½Ð¾Ð¹ Ð¸Ð½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ð¸.</string>
   <string name="filedetails_size">Ð Ð°Ð·Ð¼ÐµÑ:</string>
   <string name="filedetails_type">Ð¢Ð¸Ð¿:</string>
   <string name="filedetails_created">Ð¡Ð¾Ð·Ð´Ð°Ð½:</string>
   <string name="filedetails_modified">ÐÐ·Ð¼ÐµÐ½ÑÐ½:</string>
   <string name="filedetails_download">Ð¡ÐºÐ°ÑÐ°ÑÑ</string>
+  <string name="filedetails_sync_file">ÐÐ±Ð½Ð¾Ð²Ð¸ÑÑ</string>
   <string name="filedetails_redownload">Ð¡ÐºÐ°ÑÐ°ÑÑ Ð·Ð°Ð½Ð¾Ð²Ð¾</string>
   <string name="filedetails_open">ÐÑÐºÑÑÑÑ</string>
+  <string name="filedetails_renamed_in_upload_msg">Ð¤Ð°Ð¹Ð» Ð±ÑÐ» Ð¿ÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½ Ð² %1$s Ð²Ð¾ Ð²ÑÐµÐ¼Ñ Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸</string>
   <string name="common_yes">ÐÐ°</string>
   <string name="common_no">ÐÐµÑ</string>
   <string name="common_ok">ÐÐ</string>
+  <string name="common_cancel_download">ÐÑÐ¼ÐµÐ½Ð¸ÑÑ ÑÐºÐ°ÑÐ¸Ð²Ð°Ð½Ð¸Ðµ</string>
+  <string name="common_cancel_upload">ÐÑÐ¼ÐµÐ½Ð° Ð·Ð°Ð³ÑÑÐ·ÐºÐ¸</string>
   <string name="common_cancel">ÐÑÐ¼ÐµÐ½Ð°</string>
   <string name="common_save_exit">Ð¡Ð¾ÑÑÐ°Ð½Ð¸ÑÑ &amp; ÐÑÐ¹ÑÐ¸</string>
   <string name="common_exit">ÐÑÐ¹ÑÐ¸ Ð¸Ð· ownCloud</string>
@@ -100,11 +105,16 @@
   <string name="sync_string_contacts">ÐÐ¾Ð½ÑÐ°ÐºÑÑ</string>
   <string name="sync_fail_ticker">Ð¡Ð¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð°ÑÐ¸Ñ Ð¿ÑÐ¾ÑÐ»Ð° Ð½ÐµÑÐ´Ð°ÑÐ½Ð¾</string>
   <string name="sync_fail_content">Ð¡Ð¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð°ÑÐ¸Ñ %1$s Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð°</string>
+  <string name="sync_conflicts_in_favourites_ticker">ÐÐ±Ð½Ð°ÑÑÐ¶ÐµÐ½Ñ ÐºÐ¾Ð½ÑÐ»Ð¸ÐºÑÑ</string>
+  <string name="sync_conflicts_in_favourites_content">%1$d ÑÐ°Ð¹Ð»Ñ, ÐºÐ¾ÑÐ¾ÑÑÐµ Ð´Ð¾Ð»Ð¶Ð½Ñ Ð±ÑÑÑ ÑÐ¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐ¼Ð¸ Ð½Ðµ Ð¼Ð¾Ð³ÑÑ ÑÐ¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°ÑÑÑÑ</string>
+  <string name="sync_fail_in_favourites_ticker">ÐÐµ ÑÐ´Ð°Ð»Ð¾ÑÑ ÑÐ¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°ÑÑ ÑÐ°Ð¹Ð»Ñ</string>
+  <string name="sync_fail_in_favourites_content">Ð¡Ð¾Ð´ÐµÑÐ¶Ð°Ð½Ð¸Ðµ %1$d ÑÐ°Ð¹Ð»Ð°(Ð¾Ð²) Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ ÑÐ¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°Ð½Ð¾ (%2$d ÐºÐ¾Ð½ÑÐ»Ð¸ÐºÑÐ°(Ð¾Ð²))</string>
   <string name="use_ssl">ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑ Ð·Ð°ÑÐ¸ÑÑÐ½Ð½Ð¾Ðµ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ</string>
   <string name="location_no_provider">ownCloud Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð¾ÑÑÐ»ÐµÐ¶Ð¸Ð²Ð°ÑÑ Ð²Ð°ÑÐµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾. ÐÑÐ¾Ð²ÐµÑÑÑÐµ Ð½Ð°ÑÑÑÐ¾Ð¹ÐºÐ¸ Ð²Ð°ÑÐµÐ³Ð¾ Ð¼ÐµÑÑÐ¾Ð¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ</string>
   <string name="pincode_enter_pin_code">ÐÑÑÐ°Ð²ÑÑÐµ PIN Ð²Ð°ÑÐµÐ³Ð¾ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ</string>
   <string name="pincode_enter_new_pin_code">ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð½Ð¾Ð²ÑÐ¹ ownCloud App PIN</string>
   <string name="pincode_configure_your_pin">ÐÐ²ÐµÐ´Ð¸ÑÐµ ownCloud App PIN</string>
+  <string name="pincode_configure_your_pin_explanation">ÐÐÐ-ÐºÐ¾Ð´ Ð±ÑÐ´ÐµÑ Ð·Ð°Ð¿ÑÐ°ÑÐ¸Ð²Ð°ÑÑÑÑ ÐºÐ°Ð¶Ð´ÑÐ¹ ÑÐ°Ð·, ÐºÐ¾Ð³Ð´Ð° Ð²Ñ Ð·Ð°Ð¿ÑÑÐºÐ°ÐµÑÐµ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ.</string>
   <string name="pincode_reenter_your_pincode">ÐÐ¾Ð²ÑÐ¾ÑÐ¸ÑÐµ ownCloud App PIN</string>
   <string name="pincode_remove_your_pincode">Ð£Ð´Ð°Ð»Ð¸ÑÑ ownCloud App PIN</string>
   <string name="pincode_mismatch">ÐÐ²Ð° ownCloud App PIN Ð½Ðµ ÑÐ¾Ð²Ð¿Ð°Ð´Ð°ÑÑ</string>
@@ -145,6 +155,9 @@
   <string name="auth_wrong_connection_title">ÐÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ</string>
   <string name="auth_secure_connection">ÐÐ°ÑÐ¸ÑÑÐ½Ð½Ð¾Ðµ ÑÐ¾ÐµÐ´Ð¸Ð½ÐµÐ½Ð¸Ðµ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾</string>
   <string name="auth_login_details">ÐÐµÑÐ°Ð»Ð¸ Ð²ÑÐ¾Ð´Ð°</string>
+  <string name="auth_unauthorized">ÐÐµÐ¿ÑÐ°Ð²Ð¸Ð»ÑÐ½ÑÐ¹ Ð»Ð¾Ð³Ð¸Ð½ / Ð¿Ð°ÑÐ¾Ð»Ñ</string>
+  <string name="auth_not_found">Ð£ÐºÐ°Ð·Ð°Ð½ Ð½ÐµÐ²ÐµÑÐ½ÑÐ¹ Ð¿ÑÑÑ</string>
+  <string name="auth_internal">ÐÐ½ÑÑÑÐµÐ½Ð½ÑÑ Ð¾ÑÐ¸Ð±ÐºÐ° ÑÐµÑÐ²ÐµÑÐ°, ÐºÐ¾Ð´ %1$d</string>
   <string name="crashlog_message">ÐÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð·Ð°Ð²ÐµÑÑÐ¸Ð»Ð¾ÑÑ Ð½ÐµÐ¾Ð¶Ð¸Ð´Ð°Ð½Ð½Ð¾. Ð¥Ð¾ÑÐ¸ÑÐµ Ð¾ÑÐ¿ÑÐ°Ð²Ð¸ÑÑ Ð°Ð²Ð°ÑÐ¸Ð¹Ð½ÑÐ¹ Ð¾ÑÑÑÑ?</string>
   <string name="crashlog_send_report">ÐÑÐ¿ÑÐ°Ð²Ð¸ÑÑ Ð¾ÑÑÑÑ</string>
   <string name="crashlog_dont_send_report">ÐÐµ Ð¾ÑÐ¿ÑÐ°Ð²Ð»ÑÑÑ Ð¾ÑÑÑÑ</string>
@@ -155,13 +168,18 @@
   <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="remove_success_msg">Ð£ÑÐ¿ÐµÑÐ½Ð¾Ðµ ÑÐ´Ð°Ð»ÐµÐ½Ð¸Ðµ</string>
   <string name="remove_fail_msg">Ð£Ð´Ð°Ð»ÐµÐ½Ð¸Ðµ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¾</string>
+  <string name="rename_dialog_title">ÐÐ²ÐµÐ´Ð¸ÑÐµ Ð½Ð¾Ð²Ð¾Ðµ Ð¸Ð¼Ñ</string>
   <string name="rename_local_fail_msg">ÐÐ¾ÐºÐ°Ð»ÑÐ½Ð°Ñ ÐºÐ¾Ð¿Ð¸Ñ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¿ÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð°; Ð¿Ð¾Ð¿ÑÐ¾Ð±ÑÐ¹ÑÐµ Ð´ÑÑÐ³Ð¾Ðµ Ð¸Ð¼Ñ</string>
   <string name="rename_server_fail_msg">ÐÐµÑÐµÐ¸Ð¼ÐµÐ½Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð·Ð°Ð²ÐµÑÑÐµÐ½Ð¾</string>
+  <string name="sync_file_fail_msg">Ð£Ð´Ð°Ð»ÐµÐ½Ð½ÑÐ¹ ÑÐ°Ð¹Ð» Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ Ð¿ÑÐ¾Ð²ÐµÑÐµÐ½</string>
+  <string name="sync_file_nothing_to_do_msg">Ð¡Ð¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ðµ ÑÐ°Ð¹Ð»Ð° ÑÐ¶Ðµ ÑÐ¸Ð½ÑÑÐ¾Ð½Ð¸Ð·Ð¸ÑÐ¾Ð²Ð°Ð½Ð¾</string>
   <string name="create_dir_fail_msg">ÐÐ¸ÑÐµÐºÑÐ¾ÑÐ¸Ñ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ ÑÐ¾Ð·Ð´Ð°Ð½Ð°</string>
   <string name="wait_a_moment">ÐÐ¾Ð´Ð¾Ð¶Ð´Ð¸ÑÐµ Ð½ÐµÐ¼Ð½Ð¾Ð³Ð¾</string>
   <string name="filedisplay_unexpected_bad_get_content">ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½Ð°Ñ Ð¾ÑÐ¸Ð±ÐºÐ°; Ð¿Ð¾Ð¿ÑÐ¾Ð±ÑÐ¹ÑÐµ Ð´ÑÑÐ³Ð¾Ðµ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð´Ð»Ñ Ð²ÑÐ±Ð¾ÑÐ° ÑÐ°Ð¹Ð»Ð°</string>
@@ -175,6 +193,27 @@
   <string name="ssl_validator_certificate_not_available">Ð¡ÐµÑÑÐ¸ÑÐ¸ÐºÐ°Ñ ÑÐµÑÐ²ÐµÑÐ° Ð½Ðµ Ð´Ð¾ÑÑÑÐ¿ÐµÐ½</string>
   <string name="ssl_validator_question">ÐÑÐµ-ÑÐ°Ð²Ð½Ð¾ Ð´Ð¾Ð²ÐµÑÑÑÑ Ð´Ð°Ð½Ð½Ð¾Ð¼Ñ ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÑ?</string>
   <string name="ssl_validator_not_saved">Ð¡ÐµÑÑÐ¸ÑÐ¸ÐºÐ°Ñ Ð½Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð±ÑÑÑ ÑÐ¾ÑÑÐ°Ð½ÑÐ½</string>
+  <string name="ssl_validator_btn_details_see">ÐÐµÑÐ°Ð»Ð¸</string>
+  <string name="ssl_validator_btn_details_hide">Ð¡Ð¿ÑÑÑÐ°ÑÑ</string>
+  <string name="ssl_validator_label_subject">ÐÑÐ´Ð°Ð½Ð¾ Ð´Ð»Ñ:</string>
+  <string name="ssl_validator_label_issuer">ÐÑÐ´Ð°Ð½:</string>
+  <string name="ssl_validator_label_CN">ÐÐ¼Ñ:</string>
+  <string name="ssl_validator_label_O">ÐÑÐ³Ð°Ð½Ð¸Ð·Ð°ÑÐ¸Ñ:</string>
+  <string name="ssl_validator_label_OU">ÐÑÐ³Ð°Ð½Ð¸Ð·Ð°ÑÐ¸Ð¾Ð½Ð½Ð¾Ðµ Ð¿Ð¾Ð´ÑÐ°Ð·Ð´ÐµÐ»ÐµÐ½Ð¸Ðµ:</string>
+  <string name="ssl_validator_label_C">Ð¡ÑÑÐ°Ð½Ð°:</string>
+  <string name="ssl_validator_label_ST">Ð¡ÑÐ°ÑÑÑ:</string>
+  <string name="ssl_validator_label_L">ÐÐµÑÑÐ¾Ð½Ð°ÑÐ¾Ð¶Ð´ÐµÐ½Ð¸Ðµ:</string>
+  <string name="ssl_validator_label_validity">Ð¡ÑÐ¾Ðº Ð´ÐµÐ¹ÑÑÐ²Ð¸Ñ:</string>
+  <string name="ssl_validator_label_validity_from">ÐÑ:</string>
+  <string name="ssl_validator_label_validity_to">ÐÐ¾:</string>
+  <string name="ssl_validator_label_signature">ÐÐ¾Ð´Ð¿Ð¸ÑÑ:</string>
+  <string name="ssl_validator_label_signature_algorithm">ÐÐ»Ð³Ð¾ÑÐ¸ÑÐ¼:</string>
   <string name="text_placeholder">Ð­ÑÐ¾ Ð·Ð°Ð¿Ð¾Ð»Ð½Ð¸ÑÐµÐ»Ñ</string>
   <string name="instant_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>
 </resources>
