X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fvalues%2Fstrings.xml;h=0c96a418a49d735bc58bc1287c43153c1833191d;hp=822b87880360248c96e81793a85a94c215e98c19;hb=6d4644db8bed024d0f4d4cfb7cc8d1dcef3789fe;hpb=12042264a50769030361cf51b0ac197050209f0f

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 822b8788..0c96a418 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -33,7 +33,8 @@
     <!-- For translations, `android_asset_path` should be the localization abbreviation.  For example, Spanish is `es`.  This should not be translated unless the Guide and About sections are localized. -->
     <string name="android_asset_path">en</string>
 
-    <!-- MainWebView.  Android removes double spaces, but extra spaces can be manually specified with the Unicode `\u0020` formatting. -->
+    <!-- MainWebView.  Android removes double spaces, but extra spaces can be manually specified with the Unicode `\u0020` formatting.
+        The `%1$s` code inserts variables into the displayed text and should be preserved in translation.  <https://developer.android.com/reference/kotlin/java/util/Formatter> -->
     <string name="privacy_mode">Privacy Mode</string>
     <string name="javascript_enabled">JavaScript enabled</string>
     <string name="javascript_disabled">JavaScript disabled</string>
@@ -49,15 +50,15 @@
     <string name="open_navigation_drawer">Open navigation drawer</string>
     <string name="close_navigation_drawer">Close navigation drawer</string>
     <string name="pin_drawer">Pin drawer</string>
-    <string name="unrecognized_url">Unrecognized URL: \u0020</string>
+    <string name="unrecognized_url">Unrecognized URL:\u0020 %1$s</string>
     <string name="add_tab">Add tab</string>
     <string name="close_tab">Close tab</string>
     <string name="new_tab">New tab</string>
     <string name="loading">Loading…</string>
-    <string name="error">Error: \u0020</string>
+    <string name="error">Error:\u0020 %1$s</string>
     <string name="apply">Apply</string>
 
-    <!-- Loading Blocklists. -->
+    <!-- Loading Filter Lists. -->
     <string name="loading_easylist">Loading EasyList</string>
     <string name="loading_easyprivacy">Loading EasyPrivacy</string>
     <string name="loading_fanboys_annoyance_list">Loading Fanboy’s Annoyance List</string>
@@ -208,12 +209,12 @@
     <string name="bytes">bytes</string>
     <string name="unknown_size">unknown size</string>
     <string name="invalid_url">invalid URL</string>
-    <string name="saving_file">Saving file: \u0020 %1$d%% - %2$s</string>
-    <string name="saving_file_progress">Saving file: \u0020 %1$s bytes - %2$s</string>
-    <string name="saving_file_percentage_progress">Saving file: \u0020 %1$d%% - %2$s bytes / %3$s bytes - %4$s</string>
+    <string name="saving_file">Saving file:\u0020 %1$d%% - %2$s</string>
+    <string name="saving_file_progress">Saving file:\u0020 %1$s bytes - %2$s</string>
+    <string name="saving_file_percentage_progress">Saving file:\u0020 %1$d%% - %2$s bytes / %3$s bytes - %4$s</string>
     <string name="saved">%1$s saved.</string>
-    <string name="processing_image">Processing image: \u0020 %1$s</string>
-    <string name="error_saving_file">Error saving %1$s: \u0020 %2$s</string>
+    <string name="processing_image">Processing image:\u0020 %1$s</string>
+    <string name="error_saving_file">Error saving %1$s:\u0020 %2$s</string>
     <string name="unknown_error">Unknown error</string>
 
     <!-- View Source. -->
@@ -256,14 +257,15 @@
     <string name="move_to_folder">Move to Folder</string>
     <string name="move">Move</string>
 
-    <!-- Bookmarks Contextual App Bar.  Android removes double spaces, but extra spaces can be manually specified with the Unicode `\u0020` formatting. -->
-    <string name="selected">Selected: \u0020</string>  <!--This is a plural adjective.-->
+    <!-- Bookmarks Contextual App Bar.  Android removes double spaces, but extra spaces can be manually specified with the Unicode `\u0020` formatting.
+        The `%1$d` code inserts variables into the displayed text and should be preserved in translation.  <https://developer.android.com/reference/kotlin/java/util/Formatter> -->
+    <string name="selected">Selected:\u0020 %1$d</string>
     <string name="move_up">Move Up</string>
     <string name="move_down">Move Down</string>
     <string name="edit">Edit</string>
     <string name="delete">Delete</string>
     <string name="select_all">Select All</string>
-    <string name="bookmarks_deleted">Bookmarks Deleted: \u0020</string>
+    <string name="bookmarks_deleted">Bookmarks Deleted:\u0020 %1$d</string>
     <string name="undo">Undo</string>
 
     <!-- Bookmarks Database View. -->
@@ -279,7 +281,7 @@
     <string name="display_order">Display order:</string>
     <string name="cannot_deselect_bookmark">A bookmark cannot be deselected while the parent folder is selected.</string>
 
-    <!-- Requests. -->
+    <!-- Requests.  The `%1$d` code inserts variables into the displayed text and should be preserved in translation.  <https://developer.android.com/reference/kotlin/java/util/Formatter> -->
     <string name="requests">Requests</string>
     <string name="request_details">Request details</string>
     <string name="disposition">Disposition</string>
@@ -294,32 +296,32 @@
         <string name="blocked">Blocked</string>
         <string name="request_blocked">%1$d. Blocked</string>
         <string name="blocked_plural">Blocked</string>
-    <string name="blocklist">Blocklist</string>
+    <string name="filterlist">Filter list</string>
     <string name="sublist">Sublist</string>
-        <string name="main_whitelist">Main whitelist</string>
-        <string name="final_whitelist">Final whitelist</string>
-        <string name="domain_whitelist">Domain whitelist</string>
-        <string name="domain_initial_whitelist">Domain initial whitelist</string>
-        <string name="domain_final_whitelist">Domain final whitelist</string>
-        <string name="third_party_whitelist">Third-party whitelist</string>
-        <string name="third_party_domain_whitelist">Third-party domain whitelist</string>
-        <string name="third_party_domain_initial_whitelist">Third-party domain initial whitelist</string>
-        <string name="main_blacklist">Main blacklist</string>
-        <string name="initial_blacklist">Initial blacklist</string>
-        <string name="final_blacklist">Final blacklist</string>
-        <string name="domain_blacklist">Domain blacklist</string>
-        <string name="domain_initial_blacklist">Domain initial blacklist</string>
-        <string name="domain_final_blacklist">Domain final blacklist</string>
-        <string name="domain_regular_expression_blacklist">Domain regular expression blacklist</string>
-        <string name="third_party_blacklist">Third-party blacklist</string>
-        <string name="third_party_initial_blacklist">Third-party initial blacklist</string>
-        <string name="third_party_domain_blacklist">Third-party domain blacklist</string>
-        <string name="third_party_domain_initial_blacklist">Third-party domain initial blacklist</string>
-        <string name="third_party_regular_expression_blacklist">Third-party regular expression blacklist</string>
-        <string name="third_party_domain_regular_expression_blacklist">Third-party domain regular expression blacklist</string>
-        <string name="regular_expression_blacklist">Regular expression blacklist</string>
-    <string name="blocklist_entries">Blocklist entries</string>
-    <string name="blocklist_original_entry">Blocklist original entry</string>
+        <string name="main_allowlist">Main allow list</string>
+        <string name="final_allowlist">Final allow list</string>
+        <string name="domain_allowlist">Domain allow list</string>
+        <string name="domain_initial_allowlist">Domain initial allow list</string>
+        <string name="domain_final_allowlist">Domain final allow list</string>
+        <string name="third_party_allowlist">Third-party allow list</string>
+        <string name="third_party_domain_allowlist">Third-party domain allow list</string>
+        <string name="third_party_domain_initial_allowlist">Third-party domain initial allow list</string>
+        <string name="main_blocklist">Main block list</string>
+        <string name="initial_blocklist">Initial block list</string>
+        <string name="final_blocklist">Final block list</string>
+        <string name="domain_blocklist">Domain block list</string>
+        <string name="domain_initial_blocklist">Domain initial block list</string>
+        <string name="domain_final_blocklist">Domain final block list</string>
+        <string name="domain_regular_expression_blocklist">Domain regular expression block list</string>
+        <string name="third_party_blocklist">Third-party block list</string>
+        <string name="third_party_initial_blocklist">Third-party initial block list</string>
+        <string name="third_party_domain_blocklist">Third-party domain block list</string>
+        <string name="third_party_domain_initial_blocklist">Third-party domain initial block list</string>
+        <string name="third_party_regular_expression_blocklist">Third-party regular expression block list</string>
+        <string name="third_party_domain_regular_expression_blocklist">Third-party domain regular expression block list</string>
+        <string name="regular_expression_blocklist">Regular expression block list</string>
+    <string name="filterlist_entries">Filter list entries</string>
+    <string name="filterlist_original_entry">Filter list original entry</string>
 
     <!-- Domains. -->
     <string name="domains">Domains</string>
@@ -363,7 +365,7 @@
         <string name="current_ip_addresses">Current IP addresses</string>
 
     <!-- Import/Export.  Android removes double spaces, but extra spaces can be manually specified with the Unicode `\u0020` formatting.
-      The `%1$s` code inserts variables into the displayed text and should be preserved in translation.  <https://developer.android.com/reference/kotlin/java/util/Formatter> -->
+      The `%1$*` code inserts variables into the displayed text and should be preserved in translation.  <https://developer.android.com/reference/kotlin/java/util/Formatter> -->
     <string name="encryption">Encryption</string>
     <string-array name="encryption_type">
         <item>None</item>
@@ -377,19 +379,19 @@
     <string name="export">Export</string>
     <string name="import_button">Import</string>  <!-- `import` is a reserved word and cannot be used as the name. -->
     <string name="decrypt">Decrypt</string>
-    <string name="privacy_browser_settings_pbs">Privacy Browser Settings %1$s.pbs</string>
-    <string name="privacy_browser_settings_pbs_aes">Privacy Browser Settings %1$s.pbs.aes</string>
+    <string name="privacy_browser_settings_pbs">Privacy Browser Android %1$s Settings - Schema %2$d.pbs</string>
+    <string name="privacy_browser_settings_pbs_aes">Privacy Browser Android %1$s Settings - Schema %2$d.pbs.aes</string>
     <string name="export_successful">Export successful.</string>
-    <string name="export_failed">Export failed: \u0020 %1$s</string>
-    <string name="import_failed">Import failed: \u0020 %1$s</string>
+    <string name="export_failed">Export failed:\u0020 %1$s</string>
+    <string name="import_failed">Import failed:\u0020 %1$s</string>
 
     <!-- Logcat.  Android removes double spaces, but extra spaces can be manually specified with the Unicode `\u0020` formatting.
         The `%1$s` code inserts variables into the displayed text and should be preserved in translation.  <https://developer.android.com/reference/kotlin/java/util/Formatter> -->
     <string name="copy_string">Copy</string>
     <string name="clear">Clear</string>
     <string name="logcat_copied">Logcat copied.</string>
-    <string name="privacy_browser_logcat_txt">Privacy Browser %1$s Logcat.txt</string>
-    <string name="error_saving_logcat">Error saving logcat: \u0020 %1$s</string>
+    <string name="privacy_browser_logcat_txt">Privacy Browser Android %1$s Logcat.txt</string>
+    <string name="error_saving_logcat">Error saving logcat:\u0020 %1$s</string>
 
     <!-- Guide. -->
     <string name="overview">Overview</string>
@@ -456,8 +458,8 @@
             <string name="serial_number">Serial Number: \u0020</string>
             <string name="signature_algorithm">Signature Algorithm: \u0020</string>
         <string name="version_info_copied">Version info copied.</string>
-        <string name="privacy_browser_version_txt">Privacy Browser Version %1$s.txt</string>
-        <string name="privacy_browser_version_png">Privacy Browser Version %1$s.png</string>
+        <string name="privacy_browser_version_txt">Privacy Browser Android %1$s Version.txt</string>
+        <string name="privacy_browser_version_png">Privacy Browser Android %1$s Version.png</string>
     <string name="permissions">Permissions</string>
     <string name="privacy_policy">Privacy Policy</string>
     <string name="changelog">Changelog</string>
@@ -521,15 +523,15 @@
         <string-array name="user_agent_data" translatable="false">  <!-- The data used to populate the actual user agents.  They should not be translated because they are referenced in code.-->
             <item>PrivacyBrowser/1.0</item>
             <item>WebView default user agent</item>  <!-- This item must not be translated into other languages because it is referenced in code.  It is never displayed on the screen. -->
-            <item>Mozilla/5.0 (Android 13; Mobile; rv:108.0) Gecko/108.0 Firefox/108.0</item>
-            <item>Mozilla/5.0 (Linux; Android 13; Pixel 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Mobile Safari/537.36</item>
-            <item>Mozilla/5.0 (iPhone; CPU iPhone OS 16_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.1 Mobile/15E148 Safari/604.1</item>
+            <item>Mozilla/5.0 (Android 13; Mobile; rv:109.0) Gecko/112.0 Firefox/112.0</item>
+            <item>Mozilla/5.0 (Linux; Android 13; Pixel 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Mobile Safari/537.36</item>
+            <item>Mozilla/5.0 (iPhone; CPU iPhone OS 16_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.4 Mobile/15E148 Safari/604.1</item>
             <item>Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Firefox/102.0</item>
-            <item>Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36</item>
-            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:108.0) Gecko/20100101 Firefox/108.0</item>
-            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36</item>
-            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36 Edg/108.0.1462.54</item>
-            <item>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.0 Safari/605.1.15</item>
+            <item>Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/537.36</item>
+            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/112.0</item>
+            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/537.36</item>
+            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/112.0.0.0 Safari/537.36 Edg/112.0.1722.68</item>
+            <item>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.4 Safari/605.1.15</item>
             <item>Custom user agent</item>  <!-- This item must not be translated into other languages because it is referenced in code.  It is never displayed on the screen. -->
         </string-array>
         <string name="custom_user_agent">Custom user agent</string>
@@ -538,19 +540,19 @@
         <string name="incognito_mode_summary">Clear the history and cache after each webpage finishes loading. In Incognito Mode, back closes the tab (or the app if there is only one tab).</string>
         <string name="allow_screenshots">Allow screenshots</string>
         <string name="allow_screenshots_summary">Allow screenshots, video recording, and viewing on non-secure displays. Changing this setting will restart Privacy Browser.</string>
-    <string name="blocklists">Blocklists</string>
+    <string name="filterlists">Filter Lists</string>
         <string name="easylist">EasyList</string>
-        <string name="easylist_summary">Main ad blocking list.</string>
+        <string name="easylist_summary">Main ad filter list.</string>
         <string name="easyprivacy">EasyPrivacy</string>
-        <string name="easyprivacy_summary">Main tracker blocking list.</string>
+        <string name="easyprivacy_summary">Main tracker filter list.</string>
         <string name="fanboys_annoyance_list">Fanboy’s annoyance list</string>
-        <string name="fanboys_annoyance_list_summary">Block annoying popups and links.  Includes Fanboy’s social blocking lists.</string>
+        <string name="fanboys_annoyance_list_summary">Filter annoying popups and links.  Includes 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">Blocks third-party social media content.</string>
+        <string name="fanboys_social_blocking_list_summary">Filters third-party social media content.</string>
         <string name="ultralist">UltraList</string>
-        <string name="ultralist_summary">UltraList blocks ads that EasyList doesn’t because doing so can break websites.</string>
+        <string name="ultralist_summary">UltraList filters ads that EasyList doesn’t because doing so can break websites.</string>
         <string name="ultraprivacy">UltraPrivacy</string>
-        <string name="ultraprivacy_summary">UltraPrivacy blocks trackers that EasyPrivacy doesn’t because doing so can break websites.</string>
+        <string name="ultraprivacy_summary">UltraPrivacy filters trackers that EasyPrivacy doesn’t because doing so can break websites.</string>
         <string name="block_all_third_party_requests">Block all third-party requests</string>
         <string name="block_all_third_party_requests_summary">Blocking all third-party requests increases privacy, but it breaks many websites.</string>
     <string name="url_modification">URL Modification</string>
@@ -635,7 +637,8 @@
         <string name="bottom_app_bar">Bottom app bar</string>
         <string name="bottom_app_bar_summary">Move the app bar to the bottom of the screen. Changing this setting will restart Privacy Browser.</string>
         <string name="display_additional_app_bar_icons">Display additional app bar icons</string>
-        <string name="display_additional_app_bar_icons_summary">Display icons in the app bar for refreshing the WebView and, if there is room, for opening the bookmarks drawer and toggling cookies.</string>
+        <string name="display_additional_app_bar_icons_summary">Display icons in the app bar for refreshing the WebView and, if there is room, for opening the bookmarks drawer and toggling cookies.
+            Changing this setting will restart Privacy Browser.</string>
         <string name="app_theme">App theme</string>
         <string-array name="app_theme_entries">
             <item>System default</item>