X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fvalues-ru%2Fstrings.xml;h=d89f32d78b9f32faca33eca5c7a12ed1fc069513;hb=c51155ed36754975d2b8673e37e58df6201702b8;hp=2f0ae60c0655196450e47ad4c9363d43a10d0d22;hpb=dc36dea65a4eb37496fb1ecbbd9f8e1906f50216;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 2f0ae60c..d89f32d7 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -50,7 +50,7 @@
     <string name="error">ÐÑÐ¸Ð±ÐºÐ°:\u0020 %1$s</string>
     <string name="apply">ÐÑÐ¸Ð¼ÐµÐ½Ð¸ÑÑ</string>
 
-    <!-- Loading Blocklists. -->
+    <!-- Loading Filter Lists. -->
     <string name="loading_easylist">ÐÐ°Ð³ÑÑÐ·ÐºÐ° EasyList</string>
     <string name="loading_easyprivacy">ÐÐ°Ð³ÑÑÐ·ÐºÐ° EasyPrivacy</string>
     <string name="loading_fanboys_annoyance_list">ÐÐ°Ð³ÑÑÐ·ÐºÐ° Fanboyâs Annoyance List</string>
@@ -285,32 +285,7 @@
         <string name="blocked">ÐÐ»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°Ð½</string>
         <string name="request_blocked">%1$d. ÐÐ»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°Ð½</string>
         <string name="blocked_plural">ÐÐ»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°Ð½Ð¾</string>
-    <string name="blocklist">Ð¡Ð¿Ð¸ÑÐ¾Ðº Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²ÐºÐ¸</string>
     <string name="sublist">ÐÐ¾Ð´ÑÐ¿Ð¸ÑÐ¾Ðº</string>
-        <string name="main_whitelist">ÐÑÐ½Ð¾Ð²Ð½Ð¾Ð¹ Ð±ÐµÐ»ÑÐ¹ ÑÐ¿Ð¸ÑÐ¾Ðº</string>
-        <string name="final_whitelist">ÐÐ¾Ð½ÐµÑ Ð±ÐµÐ»Ð¾Ð³Ð¾ ÑÐ¿Ð¸ÑÐºÐ°</string>
-        <string name="domain_whitelist">ÐÐµÐ»ÑÐ¹ ÑÐ¿Ð¸ÑÐ¾Ðº Ð´Ð¾Ð¼ÐµÐ½Ð¾Ð²</string>
-        <string name="domain_initial_whitelist">ÐÐ°ÑÐ°Ð»Ð¾ Ð±ÐµÐ»Ð¾Ð³Ð¾ ÑÐ¿Ð¸ÑÐºÐ° Ð´Ð¾Ð¼ÐµÐ½Ð¾Ð²</string>
-        <string name="domain_final_whitelist">ÐÐ¾Ð½ÐµÑ Ð±ÐµÐ»Ð¾Ð³Ð¾ ÑÐ¿Ð¸ÑÐºÐ° Ð´Ð¾Ð¼ÐµÐ½Ð¾Ð²</string>
-        <string name="third_party_whitelist">Ð¡ÑÐ¾ÑÐ¾Ð½Ð½Ð¸Ð¹ Ð±ÐµÐ»ÑÐ¹ ÑÐ¿Ð¸ÑÐ¾Ðº</string>
-        <string name="third_party_domain_whitelist">Ð¡ÑÐ¾ÑÐ¾Ð½Ð½Ð¸Ð¹ Ð±ÐµÐ»ÑÐ¹ ÑÐ¿Ð¸ÑÐ¾Ðº Ð´Ð¾Ð¼ÐµÐ½Ð¾Ð²</string>
-        <string name="third_party_domain_initial_whitelist">ÐÐ°ÑÐ°Ð»Ð¾ ÑÑÐ¾ÑÐ¾Ð½Ð½ÐµÐ³Ð¾ Ð±ÐµÐ»Ð¾Ð³Ð¾ ÑÐ¿Ð¸ÑÐºÐ° Ð´Ð¾Ð¼ÐµÐ½Ð¾Ð²</string>
-        <string name="main_blacklist">ÐÑÐ½Ð¾Ð²Ð½Ð¾Ð¹ ÑÐµÑÐ½ÑÐ¹ ÑÐ¿Ð¸ÑÐ¾Ðº</string>
-        <string name="initial_blacklist">ÐÐ°ÑÐ°Ð»Ð¾ ÑÐµÑÐ½Ð¾Ð³Ð¾ ÑÐ¿Ð¸ÑÐºÐ°</string>
-        <string name="final_blacklist">ÐÐ¾Ð½ÐµÑ ÑÐµÑÐ½Ð¾Ð³Ð¾ ÑÐ¿Ð¸ÑÐºÐ°</string>
-        <string name="domain_blacklist">Ð§ÐµÑÐ½ÑÐ¹ ÑÐ¿Ð¸ÑÐ¾Ðº Ð´Ð¾Ð¼ÐµÐ½Ð¾Ð²</string>
-        <string name="domain_initial_blacklist">ÐÐ°ÑÐ°Ð»Ð¾ ÑÐµÑÐ½Ð¾Ð³Ð¾ ÑÐ¿Ð¸ÑÐºÐ° Ð´Ð¾Ð¼ÐµÐ½Ð¾Ð²</string>
-        <string name="domain_final_blacklist">ÐÐ¾Ð½ÐµÑ ÑÐµÑÐ½Ð¾Ð³Ð¾ ÑÐ¿Ð¸ÑÐºÐ° Ð´Ð¾Ð¼ÐµÐ½Ð¾Ð²</string>
-        <string name="domain_regular_expression_blacklist">Ð ÐµÐ³ÑÐ»ÑÑÐ½ÑÐµ Ð²ÑÑÐ°Ð¶ÐµÐ½Ð¸Ñ ÑÐµÑÐ½Ð¾Ð³Ð¾ ÑÐ¿Ð¸ÑÐºÐ° Ð´Ð¾Ð¼ÐµÐ½Ð¾Ð²</string>
-        <string name="third_party_blacklist">Ð¡ÑÐ¾ÑÐ¾Ð½Ð½Ð¸Ð¹ ÑÐµÑÐ½ÑÐ¹ ÑÐ¿Ð¸ÑÐ¾Ðº</string>
-        <string name="third_party_initial_blacklist">ÐÐ°ÑÐ°Ð»Ð¾ ÑÑÐ¾ÑÐ¾Ð½Ð½ÐµÐ³Ð¾ ÑÐµÑÐ½Ð¾Ð³Ð¾ ÑÐ¿Ð¸ÑÐºÐ° Ð´Ð¾Ð¼ÐµÐ½Ð¾Ð²</string>
-        <string name="third_party_domain_blacklist">Ð¡ÑÐ¾ÑÐ¾Ð½Ð½Ð¸Ð¹ ÑÐµÑÐ½ÑÐ¹ ÑÐ¿Ð¸ÑÐ¾Ðº Ð´Ð¾Ð¼ÐµÐ½Ð¾Ð²</string>
-        <string name="third_party_domain_initial_blacklist">ÐÐ°ÑÐ°Ð»Ð¾ ÑÑÐ¾ÑÐ¾Ð½Ð½ÐµÐ³Ð¾ ÑÐµÑÐ½Ð¾Ð³Ð¾ ÑÐ¿Ð¸ÑÐºÐ° Ð´Ð¾Ð¼ÐµÐ½Ð¾Ð²</string>
-        <string name="third_party_regular_expression_blacklist">Ð ÐµÐ³ÑÐ»ÑÑÐ½ÑÐµ Ð²ÑÑÐ°Ð¶ÐµÐ½Ð¸Ñ ÑÑÐ¾ÑÐ¾Ð½Ð½ÐµÐ³Ð¾ ÑÐµÑÐ½Ð¾Ð³Ð¾ ÑÐ¿Ð¸ÑÐºÐ°</string>
-        <string name="third_party_domain_regular_expression_blacklist">Ð ÐµÐ³ÑÐ»ÑÑÐ½ÑÐµ Ð²ÑÑÐ°Ð¶ÐµÐ½Ð¸Ñ ÑÑÐ¾ÑÐ¾Ð½Ð½ÐµÐ³Ð¾ ÑÐµÑÐ½Ð¾Ð³Ð¾ ÑÐ¿Ð¸ÑÐºÐ° Ð´Ð¾Ð¼ÐµÐ½Ð¾Ð²</string>
-        <string name="regular_expression_blacklist">Ð ÐµÐ³ÑÐ»ÑÑÐ½ÑÐµ Ð²ÑÑÐ°Ð¶ÐµÐ½Ð¸Ñ ÑÐµÑÐ½Ð¾Ð³Ð¾ ÑÐ¿Ð¸ÑÐºÐ°</string>
-    <string name="blocklist_entries">ÐÐ°Ð¿Ð¸ÑÐ¸ ÑÐ¿Ð¸ÑÐºÐ° Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²ÐºÐ¸</string>
-    <string name="blocklist_original_entry">ÐÑÑÐ¾Ð´Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑ ÑÐ¿Ð¸ÑÐºÐ° Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²ÐºÐ¸</string>
 
     <!-- Domains. -->
     <string name="domains">ÐÐ¾Ð¼ÐµÐ½Ñ</string>
@@ -368,8 +343,8 @@
     <string name="export">Ð­ÐºÑÐ¿Ð¾ÑÑ</string>
     <string name="import_button">ÐÐ¼Ð¿Ð¾ÑÑ</string>  <!-- `import` is a reserved word and cannot be used as the name. -->
     <string name="decrypt">Ð Ð°ÑÑÐ¸ÑÑÐ¾Ð²Ð°ÑÑ</string>
-    <string name="privacy_browser_settings_pbs">ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ Privacy Browser %1$s.pbs</string>
-    <string name="privacy_browser_settings_pbs_aes">ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ Privacy Browser %1$s.pbs.aes</string>
+    <string name="privacy_browser_settings_pbs">Privacy Browser Android %1$s ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ - Ð¡ÑÐµÐ¼Ð° %2$d.pbs</string>
+    <string name="privacy_browser_settings_pbs_aes">Privacy Browser Android %1$s ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸ - Ð¡ÑÐµÐ¼Ð° %2$d.pbs.aes</string>
     <string name="export_successful">Ð­ÐºÑÐ¿Ð¾ÑÑ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½.</string>
     <string name="export_failed">Ð¡Ð±Ð¾Ð¹ Ð¿ÑÐ¸ ÑÐºÑÐ¿Ð¾ÑÑÐµ:\u0020 %1$s</string>
     <string name="import_failed">Ð¡Ð±Ð¾Ð¹ Ð¿ÑÐ¸ Ð¸Ð¼Ð¿Ð¾ÑÑÐµ:\u0020 %1$s</string>
@@ -379,7 +354,7 @@
     <string name="copy_string">ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ</string>
     <string name="clear">ÐÑÐ¸ÑÑÐ¸ÑÑ</string>
     <string name="logcat_copied">Logcat ÑÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½.</string>
-    <string name="privacy_browser_logcat_txt">Privacy Browser %1$s Logcat.txt</string>
+    <string name="privacy_browser_logcat_txt">Privacy Browser Android %1$s Logcat.txt</string>
     <string name="saved">%1$s ÑÐ¾ÑÑÐ°Ð½ÐµÐ½.</string>
     <string name="error_saving_logcat">ÐÑÐ¸Ð±ÐºÐ° ÑÐ¾ÑÑÐ°Ð½ÐµÐ½Ð¸Ñ logcat:\u0020 %1$s</string>
 
@@ -446,8 +421,8 @@
             <string name="serial_number">Ð¡ÐµÑÐ¸Ð¹Ð½ÑÐ¹ Ð½Ð¾Ð¼ÐµÑ: \u0020</string>
             <string name="signature_algorithm">ÐÐ»Ð³Ð¾ÑÐ¸ÑÐ¼ Ð¿Ð¾Ð´Ð¿Ð¸ÑÐ¸: \u0020</string>
         <string name="version_info_copied">ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ Ð¾ Ð²ÐµÑÑÐ¸Ð¸ ÑÐºÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°Ð½Ð°.</string>
-        <string name="privacy_browser_version_txt">ÐÐµÑÑÐ¸Ñ Privacy Browser %1$s.txt</string>
-        <string name="privacy_browser_version_png">ÐÐµÑÑÐ¸Ñ Privacy Browser %1$s.png</string>
+        <string name="privacy_browser_version_txt">Privacy Browser Android %1$s ÐÐµÑÑÐ¸Ñ.txt</string>
+        <string name="privacy_browser_version_png">Privacy Browser Android %1$s ÐÐµÑÑÐ¸Ñ.png</string>
     <string name="permissions">Ð Ð°Ð·ÑÐµÑÐµÐ½Ð¸Ñ</string>
     <string name="privacy_policy">ÐÐ¾Ð»Ð¸ÑÐ¸ÐºÐ° ÐºÐ¾Ð½ÑÐ¸Ð´ÐµÐ½ÑÐ¸Ð°Ð»ÑÐ½Ð¾ÑÑÐ¸</string>
     <string name="changelog">ÐÑÑÐ¾ÑÐ¸Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹</string>
@@ -500,19 +475,12 @@
             Ð ÑÐµÐ¶Ð¸Ð¼Ðµ Ð¸Ð½ÐºÐ¾Ð³Ð½Ð¸ÑÐ¾ Ð½Ð°Ð¶Ð°ÑÐ¸Ðµ ÐºÐ½Ð¾Ð¿ÐºÐ¸ ÐÐ°Ð·Ð°Ð´ Ð¿ÑÐ¸Ð²ÐµÐ´ÐµÑ Ðº Ð·Ð°ÐºÑÑÑÐ¸Ñ Ð²ÐºÐ»Ð°Ð´ÐºÐ¸ (Ð¸Ð»Ð¸ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ, ÐµÑÐ»Ð¸ Ð¾ÑÐºÑÑÑÐ° ÑÐ¾Ð»ÑÐºÐ¾ Ð¾Ð´Ð½Ð° Ð²ÐºÐ»Ð°Ð´ÐºÐ°).</string>
         <string name="allow_screenshots">Ð Ð°Ð·ÑÐµÑÐ¸ÑÑ ÑÐºÑÐ¸Ð½ÑÐ¾ÑÑ</string>
         <string name="allow_screenshots_summary">Ð Ð°Ð·ÑÐµÑÐ¸ÑÑ ÑÐºÑÐ¸Ð½ÑÐ¾ÑÑ, Ð·Ð°Ð¿Ð¸ÑÑ Ð²Ð¸Ð´ÐµÐ¾ Ð¸ Ð¿ÑÐ¾ÑÐ¼Ð¾ÑÑ Ð½Ð° Ð½ÐµÐ·Ð°ÑÐ¸ÑÐµÐ½Ð½ÑÑ Ð´Ð¸ÑÐ¿Ð»ÐµÑÑ. ÐÑÐ¸ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¸ ÑÑÐ¾Ð³Ð¾ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ° Privacy Browser Ð±ÑÐ´ÐµÑ Ð¿ÐµÑÐµÐ·Ð°Ð¿ÑÑÐµÐ½.</string>
-    <string name="blocklists">Ð¡Ð¿Ð¸ÑÐºÐ¸ Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²ÐºÐ¸</string>
         <string name="easylist">EasyList</string>
-        <string name="easylist_summary">ÐÑÐ½Ð¾Ð²Ð½Ð¾Ð¹ ÑÐ¿Ð¸ÑÐ¾Ðº Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²ÐºÐ¸ ÑÐµÐºÐ»Ð°Ð¼Ñ.</string>
         <string name="easyprivacy">EasyPrivacy</string>
-        <string name="easyprivacy_summary">ÐÑÐ½Ð¾Ð²Ð½Ð¾Ð¹ ÑÐ¿Ð¸ÑÐ¾Ðº Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²ÐºÐ¸ Ð¾ÑÑÐ»ÐµÐ¶Ð¸Ð²Ð°Ð½Ð¸Ñ.</string>
         <string name="fanboys_annoyance_list">Fanboyâs annoyance list</string>
-        <string name="fanboys_annoyance_list_summary">ÐÐ»Ð¾ÐºÐ¸ÑÑÐµÑ ÑÐ°Ð·Ð´ÑÐ°Ð¶Ð°ÑÑÐ¸Ðµ Ð²ÑÐ¿Ð»ÑÐ²Ð°ÑÑÐ¸Ðµ Ð¾ÐºÐ½Ð° Ð¸ ÑÑÑÐ»ÐºÐ¸.  ÐÐºÐ»ÑÑÐ°ÐµÑ Ð² ÑÐµÐ±Ñ Fanboyâs social blocking lists.</string>
         <string name="fanboys_social_blocking_list">Fanboyâs social blocking list</string>
-        <string name="fanboys_social_blocking_list_summary">ÐÐ»Ð¾ÐºÐ¸ÑÑÐµÑ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ðµ ÑÐ¾ÑÐ¸Ð°Ð»ÑÐ½ÑÑ ÑÐµÑÐµÐ¹.</string>
         <string name="ultralist">UltraList</string>
-        <string name="ultralist_summary">UltraList Ð±Ð»Ð¾ÐºÐ¸ÑÑÐµÑ ÑÐµÐºÐ»Ð°Ð¼Ñ, ÐºÐ¾ÑÐ¾ÑÑÑ Ð¿ÑÐ¾Ð¿ÑÑÐºÐ°ÐµÑ EasyList, ÑÐ°Ðº ÐºÐ°Ðº Ð±Ð»Ð¾ÐºÐ¸ÑÐ¾Ð²ÐºÐ° Ð¼Ð¾Ð¶ÐµÑ ÑÐ»Ð¾Ð¼Ð°ÑÑ ÑÐ°Ð¹ÑÑ.</string>
         <string name="ultraprivacy">UltraPrivacy</string>
-        <string name="ultraprivacy_summary">UltraPrivacy Ð±Ð»Ð¾ÐºÐ¸ÑÑÐµÑ ÑÑÐµÐºÐµÑÑ, ÐºÐ¾ÑÐ¾ÑÑÐµ Ð¿ÑÐ¾Ð¿ÑÑÐºÐ°ÐµÑ EasyPrivacy, ÑÑÐ¾Ð±Ñ Ð½Ðµ Ð»Ð¾Ð¼Ð°ÑÑ Ð²ÐµÐ±-ÑÐ°Ð¹ÑÑ.</string>
         <string name="block_all_third_party_requests">ÐÐ»Ð¾ÐºÐ¸ÑÐ¾Ð²Ð°ÑÑ Ð²ÑÐµ ÑÑÐ¾ÑÐ¾Ð½Ð½Ð¸Ðµ Ð·Ð°Ð¿ÑÐ¾ÑÑ</string>
         <string name="block_all_third_party_requests_summary">ÐÐ»Ð¾ÐºÐ¸ÑÐ¾Ð²ÐºÐ° Ð²ÑÐµÑ ÑÑÐ¾ÑÐ¾Ð½Ð½Ð¸Ñ Ð·Ð°Ð¿ÑÐ¾ÑÐ¾Ð² Ð¿Ð¾Ð²ÑÑÐ°ÐµÑ ÐºÐ¾Ð½ÑÐ¸Ð´ÐµÐ½ÑÐ¸Ð°Ð»ÑÐ½Ð¾ÑÑÑ, Ð½Ð¾ Ð»Ð¾Ð¼Ð°ÐµÑ Ð¼Ð½Ð¾Ð³Ð¸Ðµ Ð²ÐµÐ±-ÑÐ°Ð¹ÑÑ.</string>
     <string name="url_modification">ÐÐ¾Ð´Ð¸ÑÐ¸ÐºÐ°ÑÐ¸Ñ URL</string>
