X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fvalues%2Fstrings.xml;h=22542592d3eb3cb30198991507a023f8a9fe0c55;hp=f52a84ddec106154e0ef6683cec380e7b58215e2;hb=54153efaffb2447307fbd8be569529d0118b823d;hpb=0a5d2eabceeafb49a957598538aa74d4f11dfce0

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f52a84dd..22542592 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2015-2018 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2015-2019 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -23,9 +23,12 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="MissingTranslation" >
 
+    <!-- Providers. -->
+    <string name="file_provider" translatable="false">com.stoutner.privacybrowser.fileprovider.standard</string>
+
     <!-- Activities. -->
     <string name="privacy_browser">Privacy Browser</string>
-    <string name="privacy_browser_settings">Privacy Browser Settings</string>
+    <string name="short_name">Privacy</string>
     <!-- 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>
 
@@ -39,8 +42,8 @@
     <string name="third_party_cookies_disabled">Third-Party Cookies disabled</string>
     <string name="dom_storage_enabled">DOM Storage enabled</string>
     <string name="dom_storage_disabled">DOM Storage disabled</string>
-    <string name="form_data_enabled">Form Data enabled</string>
-    <string name="form_data_disabled">Form Data disabled</string>
+    <string name="form_data_enabled">Form Data enabled</string>  <!-- The form data strings can be removed once the minimum API >= 26. -->
+    <string name="form_data_disabled">Form Data disabled</string>  <!-- The form data strings can be removed once the minimum API >= 26. -->
     <string name="cookies_deleted">Cookies deleted</string>
     <string name="dom_storage_deleted">DOM Storage deleted</string>
     <string name="form_data_deleted">Form Data deleted</string>
@@ -48,6 +51,21 @@
     <string name="close_navigation_drawer">Close Navigation Drawer</string>
     <string name="no_title">No title</string>
     <string name="unrecognized_url">Unrecognized URL:</string>
+    <string name="open_with">Open with</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:</string>
+    <string name="apply">Apply</string>
+
+    <!-- Loading Blocklists. -->
+    <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>
+    <string name="loading_fanboys_social_blocking_list">Loading Fanboy’s Social Blocking List</string>
+    <string name="loading_ultralist">Loading UltraList</string>
+    <string name="loading_ultraprivacy">Loading UltraPrivacy</string>
 
     <!-- Save As. -->
     <string name="save_as">Save As</string>
@@ -71,6 +89,7 @@
     <string name="close">Close</string>
     <string name="domain">Domain</string>
     <string name="domain_label">Domain:</string>
+    <string name="ip_addresses">IP Addresses:</string>
     <string name="issued_to">Issued To</string>
     <string name="issued_by">Issued By</string>
     <string name="common_name">Common Name (CN):</string>
@@ -92,11 +111,11 @@
     <string name="url">URL</string>
     <string name="url_label">URL:</string>
 
-    <!-- Pinned SSL Certificate Mismatch. -->
-    <string name="update_ssl">Update SSL</string>
-    <string name="ssl_certificate_mismatch">SSL Certificate Mismatch</string>
-    <string name="current_ssl">Current SSL</string>
-    <string name="pinned_ssl">Pinned SSL</string>
+    <!-- Pinned Mismatch. -->
+    <string name="pinned_mismatch">Pinned Mismatch</string>
+    <string name="update">Update</string>
+    <string name="current">Current</string>
+    <string name="pinned">Pinned</string>
 
     <!-- HTTP Authentication. -->
     <string name="http_authentication">HTTP Authentication</string>
@@ -104,20 +123,22 @@
     <string name="username">Username</string>
     <string name="password">Password</string>
 
-    <!-- MainWebViewActivity Navigation Drawer. -->
+    <!-- MainWebViewActivity Navigation Menu. -->
     <string name="navigation_drawer">Navigation Drawer</string>
     <string name="navigation">Navigation</string>
+    <string name="clear_and_exit">Clear and Exit</string>
     <string name="home">Home</string>
     <string name="back">Back</string>
     <string name="forward">Forward</string>
     <string name="history">History</string>
         <string name="clear_history">Clear History</string>
-    <string name="bookmarks">Bookmarks</string>
+    <string name="open">Open</string>
     <string name="downloads">Downloads</string>
     <string name="settings">Settings</string>
+    <string name="import_export">Import/Export</string>
+    <string name="logcat">Logcat</string>
     <string name="guide">Guide</string>
     <string name="about">About</string>
-    <string name="clear_and_exit">Clear and Exit</string>
 
     <!-- MainWebViewActivity Options Menu. -->
     <string name="javascript">JavaScript</string>
@@ -126,33 +147,53 @@
     <string name="first_party_cookies">First-Party Cookies</string>
     <string name="third_party_cookies">Third-Party Cookies</string>
     <string name="dom_storage">DOM Storage</string>
-    <string name="form_data">Form Data</string>
+    <string name="form_data">Form Data</string>  <!-- The form data strings can be removed once the minimum API >= 26. -->
     <string name="clear_data">Clear Data</string>
         <string name="clear_cookies">Clear Cookies</string>
         <string name="clear_dom_storage">Clear DOM Storage</string>
-        <string name="clear_form_data">Clear Form Data</string>
-    <string name="layout">Layout</string>
-        <string name="font_size">Font Size</string>
-            <string name="twenty_five_percent">25%</string>
-            <string name="fifty_percent">50%</string>
-            <string name="seventy_five_percent">75%</string>
-            <string name="one_hundred_percent">100%</string>
-            <string name="one_hundred_twenty_five_percent">125%</string>
-            <string name="one_hundred_fifty_percent">150%</string>
-            <string name="one_hundred_seventy_five_percent">175%</string>
-            <string name="two_hundred_percent">200%</string>
+        <string name="clear_form_data">Clear Form Data</string>  <!-- The form data strings can be removed once the minimum API >= 26. -->
+        <string name="options_fanboys_annoyance_list">Fanboy’s Annoyance List</string>
+        <string name="options_fanboys_social_blocking_list">Fanboy’s Social Blocking List</string>
+        <string name="options_block_all_third_party_requests">Block All Third-Party Requests</string>
+    <string name="page">Page</string>
+        <string name="options_user_agent">User Agent</string>
+            <string name="user_agent_privacy_browser">Privacy Browser</string>
+            <string name="user_agent_webview_default">WebView Default</string>
+            <string name="user_agent_firefox_on_android">Firefox on Android</string>
+            <string name="user_agent_chrome_on_android">Chrome on Android</string>
+            <string name="user_agent_safari_on_ios">Safari on iOS</string>
+            <string name="user_agent_firefox_on_linux">Firefox on Linux</string>
+            <string name="user_agent_chromium_on_linux">Chromium on Linux</string>
+            <string name="user_agent_firefox_on_windows">Firefox on Windows</string>
+            <string name="user_agent_chrome_on_windows">Chrome on Windows</string>
+            <string name="user_agent_edge_on_windows">Edge on Windows</string>
+            <string name="user_agent_internet_explorer_on_windows">Internet Explorer on Windows</string>
+            <string name="user_agent_safari_on_macos">Safari on macOS</string>
+            <string name="user_agent_custom">Custom</string>
         <string name="swipe_to_refresh_options_menu">Swipe to Refresh</string>
+        <string name="wide_viewport">Wide Viewport</string>
         <string name="display_images">Display Images</string>
+        <string name="options_night_mode">Night Mode</string>
+        <string name="font_size">Font Size</string>
+        <string name="find_on_page">Find on Page</string>
+        <string name="print">Print</string>
+            <string name="privacy_browser_web_page">Privacy Browser Web Page</string>
+        <string name="save">Save</string>
+            <string name="save_as_archive">Save as Archive</string>
+            <string name="save_as_image">Save as Image</string>
+        <string name="add_to_home_screen">Add to Home Screen</string>
         <string name="view_source">View Source</string>
     <string name="share">Share</string>
-    <string name="find_on_page">Find on Page</string>
-    <string name="print">Print</string>
-        <string name="privacy_browser_web_page">Privacy Browser Web Page</string>
-    <string name="add_to_home_screen">Add to Home Screen</string>
+        <string name="share_url">Share URL</string>
+        <string name="open_with_app">Open with App</string>
+        <string name="open_with_browser">Open with Browser</string>
     <string name="refresh">Refresh</string>
+    <string name="stop">Stop</string>
 
     <!-- Context Menus. -->
-    <string name="load_url">Load URL</string>
+    <string name="open_in_new_tab">Open in New Tab</string>
+    <string name="open_in_background">Open in Background</string>
+    <string name="open_image_in_new_tab">Open Image in New Tab</string>
     <string name="copy_url">Copy URL</string>
     <string name="download_url">Download URL</string>
     <string name="email_address">Email Address</string>
@@ -166,6 +207,16 @@
     <string name="previous">Previous</string>
     <string name="next">Next</string>
 
+    <!-- Save Webpage. -->
+    <string name="save_webpage" translatable="false">Save Webpage</string>  <!-- This string is used to tag the save dialog.  It is never displayed to the user. -->
+    <string name="save_archive">Save Archive</string>
+    <string name="save_image">Save Image</string>
+    <string name="webpage_mht">Webpage.mht</string>
+    <string name="webpage_png">Webpage.png</string>
+    <string name="saving_image">Saving image…</string>
+    <string name="image_saved">Image saved.</string>
+    <string name="error_saving_image">Error saving image:</string>
+
     <!-- View Source. -->
     <string name="request_headers">Request Headers</string>
     <string name="response_message">Response Message</string>
@@ -180,10 +231,13 @@
     <!-- Create Home Screen Shortcut Alert Dialog. -->
     <string name="create_shortcut">Create Shortcut</string>
     <string name="shortcut_name">Shortcut name</string>
+    <string name="open_with_default_browser">Open with default browser.</string>
+    <string name="open_with_privacy_browser">Open with Privacy Browser.</string>
     <string name="cancel">Cancel</string>
     <string name="create">Create</string>
 
     <!-- Bookmarks. -->
+    <string name="bookmarks">Bookmarks</string>
     <string name="database_view">Database View</string>
     <string name="create_bookmark">Create Bookmark</string>
     <string name="create_folder">Create Folder</string>
@@ -199,28 +253,69 @@
     <string name="edit_folder">Edit Folder</string>
     <string name="move_to_folder">Move to Folder</string>
     <string name="move">Move</string>
-    <string name="save">Save</string>
 
     <!-- Bookmarks Contextual App Bar. -->
-    <string name="one_selected">1 Selected</string>
-    <string name="selected">Selected</string>  <!--This is a plural adjective.-->
+    <string name="selected">Selected:</string>  <!--This is a plural adjective.-->
     <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="one_bookmark_deleted">1 Bookmark Deleted</string>
-    <string name="bookmarks_deleted">Bookmarks Deleted</string>
+    <string name="bookmarks_deleted">Bookmarks Deleted:</string>
     <string name="undo">Undo</string>
 
     <!-- Bookmarks Database View. -->
     <string name="bookmarks_database_view">Bookmarks Database View</string>
     <string name="all_folders">All Folders</string>
     <string name="home_folder">Home Folder</string>
+    <string name="sort">Sort</string>
+        <string name="sorted_by_database_id">Sorted by database ID.</string>
+        <string name="sorted_by_display_order">Sorted by display order.</string>
     <string name="database_id">Database ID:</string>
     <string name="folder">Folder:</string>
     <string name="parent_folder">Parent folder:</string>
     <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. -->
+    <string name="requests">Requests</string>
+    <string name="request_details">Request details</string>
+    <string name="disposition">Disposition</string>
+        <string name="all">All</string>
+        <string name="default_label">Default</string>
+        <string name="default_allowed">Default - Allowed</string>
+        <string name="allowed">Allowed</string>
+        <string name="allowed_plural">Allowed</string>
+        <string name="third_party_plural">Third-party</string>
+        <string name="third_party_blocked">Third-party - Blocked</string>
+        <string name="blocked">Blocked</string>
+        <string name="blocked_plural">Blocked</string>
+    <string name="blocklist">Blocklist</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>
 
     <!-- Domains. -->
     <string name="domains">Domains</string>
@@ -231,6 +326,10 @@
     <string name="domain_name">Domain name</string>
     <string name="domain_deleted">Domain deleted</string>
     <string name="domain_name_instructions">*. may be prepended to a domain to include all subdomains (eg. *.stoutner.com)</string>
+    <string-array name="font_size_array">
+        <item>System default</item>
+        <item>Custom font size</item>
+    </string-array>
     <string-array name="swipe_to_refresh_array">
         <item>System default</item>
         <item>Swipe to refresh enabled</item>
@@ -241,35 +340,134 @@
         <item>Night mode enabled</item>
         <item>Night mode disabled</item>
     </string-array>
+    <string-array name="wide_viewport_array">
+        <item>System default</item>
+        <item>Wide viewport enabled</item>
+        <item>Wide viewport disabled</item>
+    </string-array>
     <string-array name="display_webpage_images_array">
         <item>System default</item>
         <item>Images enabled</item>
         <item>Images disabled</item>
     </string-array>
     <string name="pinned_ssl_certificate">Pinned SSL certificate</string>
-    <string name="saved_ssl_certificate">Saved SSL certificate</string>
-    <string name="current_website_ssl_certificate">Current website SSL certificate</string>
-    <string name="load_an_encrypted_website">Load an encrypted website before opening Domain Settings to populate the current website SSL certificate.</string>
+        <string name="saved_ssl_certificate">Saved SSL certificate</string>
+        <string name="current_website_ssl_certificate">Current website SSL certificate</string>
+        <string name="load_an_encrypted_website">Load an encrypted website before opening Domain Settings to populate the current website SSL certificate.</string>
+    <string name="pinned_ip_addresses">Pinned IP addresses</string>
+        <string name="saved_ip_addresses">Saved IP addresses</string>
+        <string name="current_ip_addresses">Current IP addresses</string>
+
+    <!-- Import/Export. -->
+    <string name="encryption">Encryption</string>
+    <string-array name="encryption_type">
+        <item>None</item>
+        <item>Password</item>
+        <item>OpenPGP</item>
+    </string-array>
+    <string name="kitkat_password_encryption_message">Password encryption does not work on Android KitKat.</string>
+    <string name="openkeychain_required">OpenPGP encryption requires that OpenKeychain be installed.</string>
+    <string name="openkeychain_import_instructions">The unencrypted file will have to be imported in a separate step after it is decrypted.</string>
+    <string name="settings_pbs">Settings.pbs</string>
+    <string name="file_location">File Location</string>
+    <string name="browse">Browse</string>
+    <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="export_successful">Export successful.</string>
+    <string name="export_failed">Export failed:</string>
+    <string name="import_failed">Import failed:</string>
+    <string name="storage_permission">Storage Permission</string>
+    <string name="storage_permission_message">Privacy Browser needs the storage permission to access public directories. If it is denied, the app’s directories can still be used.</string>
+    <string name="storage_permission_explanation">Accessing files in public directories requires the storage permission. Otherwise, only app directories will work.</string>
+    <string name="cannot_use_location">This location cannot be used because the storage permission has not been granted.</string>
+
+    <!-- Logcat. -->
+    <string name="copy_string">Copy</string>  <!-- `copy` is a reserved word and should not be used as the name. -->
+    <string name="logcat_copied">Logcat copied.</string>
+    <string name="clear">Clear</string>
+    <string name="save_logcat">Save logcat</string>
+    <string name="privacy_browser_logcat_txt">Privacy Browser Logcat.txt</string>
+    <string name="file_saved_successfully">File saved successfully.</string>
+    <string name="save_failed">Save failed:</string>
 
     <!-- Guide. -->
-    <string name="privacy_browser_guide">Privacy Browser Guide</string>
     <string name="overview">Overview</string>
     <string name="local_storage">Local Storage</string>
     <string name="ssl_certificates">SSL Certificates</string>
+    <string name="proxies">Proxies</string>
     <string name="tracking_ids">Tracking IDs</string>
 
+    <!-- Download Location -->
+    <string name="download_location">Download Location</string>
+    <string name="download_location_message">Privacy Browser needs the storage permission to use the public download directory. If it is denied, the app’s download directory will be used instead.</string>
+    <string name="ok">OK</string>
+
+    <!-- Proxy. -->
+    <string name="proxy_not_installed_dialog" translatable="false">Proxy not installed dialog</string>  <!-- This string is used to tag the proxy not installed dialog.  It is never displayed to the user. -->
+    <string name="waiting_for_proxy_dialog" translatable="false">Waiting for proxy dialog</string>  <!-- This string is used to tag the waiting for proxy dialog.  It is never displayed to the user. -->
+    <string name="orbot_not_installed_title">Orbot Not Installed</string>
+    <string name="orbot_not_installed_message">Proxying through Orbot will not work unless the Orbot app is installed.</string>
+    <string name="i2p_not_installed_title">I2P Not Installed</string>
+    <string name="i2p_not_installed_message">Proxying through I2P will not work unless the I2P app is installed.</string>
+    <string name="waiting_for_orbot">Waiting for Orbot to connect.</string>
+    <string name="custom_proxy_invalid">The custom proxy URL is invalid.</string>
+    <string name="socks_proxies_do_not_work_on_kitkat">SOCKS proxies do not work on Android KitKat.</string>
+
+    <!-- About Activity. -->
+    <string name="about_privacy_browser">About Privacy Browser</string>
+    <string name="version">Version</string>
+    <string name="version_code">version code</string>
+    <string name="hardware">Hardware</string>
+    <string name="brand">Brand:</string>
+    <string name="manufacturer">Manufacturer:</string>
+    <string name="model">Model:</string>
+    <string name="device">Device:</string>
+    <string name="bootloader">Bootloader:</string>
+    <string name="radio">Radio:</string>
+    <string name="software">Software</string>
+    <string name="android">Android:</string>
+    <string name="api">API</string>
+    <string name="build">Build:</string>
+    <string name="security_patch">Security Patch:</string>
+    <string name="webview_provider">WebView Provider:</string>
+    <string name="webview_version">WebView Version:</string>
+    <string name="orbot">Orbot:</string>
+    <string name="i2p">I2P:</string>
+    <string name="openkeychain">OpenKeychain:</string>
+    <string name="easylist_label">EasyList:</string>
+    <string name="easyprivacy_label">EasyPrivacy:</string>
+    <string name="fanboy_annoyance_label">Fanboy’s Annoyance List:</string>
+    <string name="fanboy_social_label">Fanboy’s Social Blocking List:</string>
+    <string name="ultralist_label">UltraList:</string>
+    <string name="ultraprivacy_label">UltraPrivacy:</string>
+    <string name="package_signature">Package Signature</string>
+    <string name="issuer_dn">Issuer DN:</string>
+    <string name="subject_dn">Subject DN:</string>
+    <string name="certificate_version">Certificate Version:</string>
+    <string name="serial_number">Serial Number:</string>
+    <string name="signature_algorithm">Signature Algorithm:</string>
+    <string name="permissions">Permissions</string>
+    <string name="privacy_policy">Privacy Policy</string>
+    <string name="changelog">Changelog</string>
+    <string name="licenses">Licenses</string>
+    <string name="contributors">Contributors</string>
+    <string name="links">Links</string>
+
     <!-- Preferences. -->
     <string name="privacy">Privacy</string>
-        <string name="javascript_preference">Enable JavaScript by default</string>
+        <string name="javascript_preference">JavaScript</string>
         <string name="javascript_preference_summary">JavaScript allows websites to run programs (scripts) on the device.</string>
-        <string name="first_party_cookies_preference">Enable first-party cookies by default</string>
-        <string name="first_party_cookies_preference_summary">Devices with versions of Android older than Lollipop (version 5.0) will also enable third-party cookies with this setting.</string>
-        <string name="third_party_cookies_preference">Enable third-party cookies by default</string>
+        <string name="first_party_cookies_preference">First-party cookies</string>
+        <string name="first_party_cookies_preference_summary">Because first-party cookies are an app level setting, when the active tab has cookies enabled,
+            any network requests made in the background by other tabs will also include any stored cookies for their domains.
+            Android KitKat (version 4.4.x) does not differentiate between first and third-party cookies and will enable them both with this setting.</string>
+        <string name="third_party_cookies_preference">Third-party cookies</string>
         <string name="third_party_cookies_summary">This setting requires Android Lollipop (version 5.0) or higher.  It has no effect if first-party cookies are disabled.</string>
-        <string name="dom_storage_preference">Enable DOM storage by default</string>
+        <string name="dom_storage_preference">DOM storage</string>
         <string name="dom_storage_preference_summary">JavaScript must be enabled for DOM storage to function.</string>
-        <string name="save_form_data_preference">Enable saving of form data by default</string>
-        <string name="save_form_data_preference_summary">Saved form data can auto-populate fields on websites.</string>
+        <string name="save_form_data_preference">Form data</string>  <!-- The form data strings can be removed once the minimum API >= 26. -->
+        <string name="save_form_data_preference_summary">Saved form data can auto-populate fields on websites.</string>  <!-- The form data strings can be removed once the minimum API >= 26. -->
         <string name="user_agent">User agent</string>
         <string-array name="translated_user_agent_names">
             <item>Privacy Browser</item>
@@ -320,16 +518,16 @@
         <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 8.1.0; Mobile; rv:60.0) Gecko/60.0 Firefox/60.0</item>
-            <item>Mozilla/5.0 (Linux; Android 8.1.0; Pixel 2 XL Build/OPM4.171019.016.B1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.158 Mobile Safari/537.36</item>
-            <item>Mozilla/5.0 (iPhone; CPU iPhone OS 11_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.0 Mobile/15E148 Safari/604.1</item>
-            <item>Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Firefox/52.0</item>
-            <item>Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.89 Safari/537.36</item>
-            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:60.0) Gecko/20100101 Firefox/60.0</item>
-            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/66.0.3359.170 Safari/537.36</item>
-            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.140 Safari/537.36 Edge/17.17134</item>
+            <item>Mozilla/5.0 (Android 10; Mobile; rv:68.0) Gecko/68.0 Firefox/68.0</item>
+            <item>Mozilla/5.0 (Linux; Android 10; Pixel 2 XL) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.93 Mobile Safari/537.36</item>
+            <item>Mozilla/5.0 (iPhone; CPU iPhone OS 13_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.0.4 Mobile/15E148 Safari/604.1</item>
+            <item>Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Firefox/68.0</item>
+            <item>Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/76.0.3809.100 Safari/537.36</item>
+            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:71.0) Gecko/20100101 Firefox/71.0</item>
+            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.88 Safari/537.36</item>
+            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.102 Safari/537.36 Edge/18.18363</item>
             <item>Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; rv:11.0) like Gecko</item>
-            <item>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_4) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.1 Safari/605.1.15</item>
+            <item>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_3) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.0.3 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>
@@ -340,52 +538,49 @@
         <string name="do_not_track_summary">Send the Do Not Track header, which politely suggests that web servers not track this browser.</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="block_lists">Block Lists</string>
+    <string name="blocklists">Blocklists</string>
         <string name="easylist">EasyList</string>
         <string name="easylist_summary">Main ad blocking list.</string>
         <string name="easyprivacy">EasyPrivacy</string>
         <string name="easyprivacy_summary">Main tracker blocking list.</string>
-        <string name="fanboy_annoyance_list">Fanboy’s annoyance list</string>
-        <string name="fanboy_annoyance_list_summary">Block annoying popups and links.  Includes Fanboy’s social blocking lists.</string>
-        <string name="fanboy_social_blocking_list">Fanboy’s social blocking list</string>
-        <string name="fanboy_social_blocking_list_summary">Blocks third-party social media content.</string>
-    <string name="tor">Tor</string>
-        <string name="proxy_through_orbot">Proxy through Orbot</string>
-        <string name="proxy_through_orbot_summary">Proxy all web traffic through Orbot on localhost:8118.</string>
-        <string name="tor_homepage">Tor homepage</string>
-        <string name="tor_search">Tor search</string>
-        <string-array name="tor_search_entries">
-            <item>DuckDuckGo - JavaScript disabled</item>
-            <item>DuckDuckGo - JavaScript enabled</item>
-            <item>Custom</item>
-        </string-array>
-        <string-array name="tor_search_entry_values" translatable="false">  <!-- None of the items in this `string-array` should be translated. -->
-            <item>https://3g2upl4pq6kufc4m.onion/html/?q=</item>
-            <item>https://3g2upl4pq6kufc4m.onion/?q=</item>
-            <item>Custom URL</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="tor_search_custom_url">Tor search custom URL</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_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="ultralist">UltraList</string>
+        <string name="ultralist_summary">UltraList blocks 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="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>
+        <string name="google_analytics">Google Analytics</string>
+        <string name="google_analytics_summary">Remove “?utm_” and “&amp;utm_” and anything after them from URLs.</string>
+        <string name="facebook_click_ids">Facebook Click IDs</string>
+        <string name="facebook_click_ids_summary">Remove “?fbclid=”, “&amp;fbclid=”, “?fbadid=”, and “&amp;fbadid=” and anything after them from URLs.</string>
+        <string name="twitter_amp_redirects">Twitter AMP redirects</string>
+        <string name="twitter_amp_redirects_summary">Remove “?amp=1” and anything after it from URLs.</string>
     <string name="search">Search</string>
         <string-array name="search_entries">
+            <item>Startpage</item>
+            <item>Searx</item>
             <item>DuckDuckGo - JavaScript disabled</item>
             <item>DuckDuckGo - JavaScript enabled</item>
-            <item>StartPage</item>
             <item>Qwant - JavaScript disabled</item>
             <item>Qwant - JavaScript enabled</item>
-            <item>Searx</item>
             <item>Google</item>
             <item>Bing</item>
             <item>Yahoo - JavaScript disabled</item>
             <item>Yahoo - JavaScript enabled</item>
             <item>Custom</item>
         </string-array>
-        <string-array name="search_entry_values" translatable="false">  <!-- None of the items in this `string-array` should be translated. -->
+        <string-array name="search_entry_values" translatable="false">  <!-- None of the items in this string array should be translated. -->
+            <item>https://www.startpage.com/do/search?query=</item>
+            <item>https://searx.me/?q=</item>
             <item>https://duckduckgo.com/html/?q=</item>
             <item>https://duckduckgo.com/?q=</item>
-            <item>https://www.startpage.com/do/search?query=</item>
             <item>https://lite.qwant.com/?q=</item>
             <item>https://www.qwant.com/?q=</item>
-            <item>https://searx.me/?q=</item>
             <item>https://www.google.com/search?q=</item>
             <item>https://www.bing.com/search?q=</item>
             <item>https://search.yahoo.com/mobile/s?nojs=1&amp;p=</item>
@@ -394,126 +589,79 @@
         </string-array>
         <string name="search_custom_url">Search custom URL</string>
         <string name="custom_url">Custom URL</string>
+    <string name="proxy">Proxy</string>
+        <string name="proxy_none">None</string>
+        <string name="proxy_tor">Tor</string>
+        <string name="proxy_i2p">I2P</string>
+        <string name="proxy_custom">Custom</string>
+        <string-array name="proxy_entries">
+            <item>None</item>
+            <item>Tor</item>
+            <item>I2P</item>
+            <item>Custom</item>
+        </string-array>
+        <string-array name="proxy_entry_values" translatable="false">  <!-- None of the items in this string array should be translated. They are referenced in the code and are never displayed on the screen.-->
+            <item>None</item>
+            <item>Tor</item>
+            <item>I2P</item>
+            <item>Custom</item>
+        </string-array>
+        <string name="no_proxy_enabled">None - connect directly to the internet.</string>
+        <string name="tor_enabled">Tor - connect through socks://localhost:9050.</string>
+        <string name="tor_enabled_kitkat">Tor - connect through http://localhost:8118.</string>
+        <string name="i2p_enabled">I2P - connect through http://localhost:4444.</string>
+        <string name="custom_proxy">Custom proxy</string>
+        <string name="proxy_custom_url">Proxy custom URL</string>
     <string name="full_screen">Full Screen</string>
         <string name="full_screen_browsing_mode">Full screen browsing mode</string>
         <string name="full_screen_browsing_mode_summary">Double-tap to toggle full screen browsing mode.</string>
-        <string name="hide_system_bars">Hide system bars</string>
-        <string name="hide_system_bars_summary">Hide the status and navigation bars in full screen browsing mode.
-            This doesn’t work well if the keyboard is displayed during full screen browsing mode.</string>
-        <string name="translucent_navigation_bar">Translucent navigation bar</string>
-        <string name="translucent_navigation_bar_summary">Make the navigation bar translucent in full screen browsing mode.</string>
+        <string name="hide_app_bar">Hide the app bar</string>
+        <string name="hide_app_bar_summary">Hide the app bar that contains the URL.</string>
     <string name="clear_everything">Clear everything</string>
+        <!-- The form data part of this string can be removed once the minimum API >= 26. -->
         <string name="clear_everything_summary">Clears cookies, DOM storage, form data, and WebView’s cache.  Then manually deletes the entire “app_webview” and “cache” directories.</string>
         <string name="clear_cookies_preference">Clear cookies</string>
         <string name="clear_cookies_summary">Clears first and third-party cookies.</string>
         <string name="clear_dom_storage_preference">Clear DOM storage</string>
         <string name="clear_dom_storage_summary">Clears DOM storage.</string>
-        <string name="clear_form_data_preference">Clear form data</string>
-        <string name="clear_form_data_summary">Clears form data.</string>
+        <string name="clear_form_data_preference">Clear form data</string>  <!-- The form data strings can be removed once the minimum API >= 26. -->
+        <string name="clear_form_data_summary">Clears form data.</string>  <!-- The form data strings can be removed once the minimum API >= 26. -->
         <string name="clear_cache">Clear cache</string>
         <string name="clear_cache_summary">Clears WebView’s cache.</string>
     <string name="general">General</string>
         <string name="homepage">Homepage</string>
-        <string name="default_font_size">Default font size</string>
-        <string-array name="default_font_size_entries">
-            <item>25%</item>
-            <item>50%</item>
-            <item>75%</item>
-            <item>100%</item>
-            <item>125%</item>
-            <item>150%</item>
-            <item>175%</item>
-            <item>200%</item>
-        </string-array>
-        <string-array name="default_font_size_entry_values" translatable="false">  <!-- None of the items in this `string-array` should be translated. -->
-            <item>25</item>
-            <item>50</item>
-            <item>75</item>
-            <item>100</item>
-            <item>125</item>
-            <item>150</item>
-            <item>175</item>
-            <item>200</item>
-        </string-array>
-            <string-array name="domain_settings_font_size_entries">
-                <item>System default</item>
-                <item>25%</item>
-                <item>50%</item>
-                <item>75%</item>
-                <item>100%</item>
-                <item>125%</item>
-                <item>150%</item>
-                <item>175%</item>
-                <item>200%</item>
-            </string-array>
-            <string-array name="domain_settings_font_size_entry_values" translatable="false">  <!-- None of the items in this `string-array` should be translated. -->
-                <item>0</item>
-                <item>25</item>
-                <item>50</item>
-                <item>75</item>
-                <item>100</item>
-                <item>125</item>
-                <item>150</item>
-                <item>175</item>
-                <item>200</item>
-            </string-array>
-        <string name="swipe_to_refresh_preference">Swipe to refresh</string>
+        <string name="font_size_preference">Font size</string>
+        <string name="open_intents_in_new_tab">Open intents in new tab</string>
+        <string name="open_intents_in_new_tab_summary">Intents are links sent from other apps.</string>
+        <string name="swipe_to_refresh">Swipe to refresh</string>
         <string name="swipe_to_refresh_summary">Some websites don’t work well if swipe to refresh is enabled.</string>
+        <string name="scroll_app_bar">Scroll the app bar</string>
+        <string name="scroll_app_bar_summary">Scroll the app bar off the top of the screen when the WebView scrolls down.</string>
         <string name="display_additional_app_bar_icons">Display additional app bar icons</string>
-        <string name="display_additional_app_bar_icons_summary">Display icons for toggling cookies, DOM storage, and form data in the app bar if there is room.</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 toggling cookies and DOM storage.</string>
+        <string name="download_with_external_app">Download with external app</string>
+        <string name="download_with_external_app_summary">Android’s download manager doesn’t work well on some devices.</string>
         <string name="dark_theme">Dark theme</string>
         <string name="dark_theme_summary">Changing the theme will restart Privacy Browser.</string>
         <string name="night_mode">Night mode</string>
         <string name="night_mode_summary">Enabling night mode will also enable JavaScript for all web pages.</string>
+        <string name="wide_viewport_preference">Wide viewport</string>
+        <string name="wide_viewport_summary">Using a wide viewport makes some webpages layout more like the desktop site.</string>
         <string name="display_webpage_images">Display webpage images</string>
         <string name="display_webpage_images_summary">Disable to conserve bandwidth.</string>
 
-    <!-- Download Location -->
-    <string name="download_location">Download Location</string>
-    <string name="download_location_message">Privacy Browser needs the storage permission to use the public download directory. If it is denied, the app’s download directory will be used instead.</string>
-    <string name="ok">OK</string>
-
-    <!-- Orbot. -->
-    <string name="orbot_proxy_not_installed">Orbot proxy will not work unless Orbot is installed.</string>
-    <string name="waiting_for_orbot">Waiting for Orbot to connect...</string>
-
-    <!-- About Activity. -->
-    <string name="about_privacy_browser">About Privacy Browser</string>
-    <string name="version">Version</string>
-        <string name="version_code">version code</string>
-        <string name="hardware">Hardware</string>
-            <string name="brand">Brand:</string>
-            <string name="manufacturer">Manufacturer:</string>
-            <string name="model">Model:</string>
-            <string name="device">Device:</string>
-            <string name="bootloader">Bootloader:</string>
-            <string name="radio">Radio:</string>
-        <string name="software">Software</string>
-            <string name="android">Android:</string>
-                <string name="api">API</string>
-            <string name="build">Build:</string>
-            <string name="security_patch">Security Patch:</string>
-            <string name="webkit">WebKit:</string>
-            <string name="chrome">Chrome:</string>
-            <string name="orbot">Orbot:</string>
-            <string name="easylist_label">EasyList:</string>
-            <string name="easyprivacy_label">EasyPrivacy:</string>
-            <string name="fanboy_annoyance_label">Fanboy’s Annoyance List:</string>
-            <string name="fanboy_social_label">Fanboy’s Social Blocking List:</string>
-        <string name="package_signature">Package Signature</string>
-            <string name="issuer_dn">Issuer DN:</string>
-            <string name="subject_dn">Subject DN:</string>
-            <string name="certificate_version">Certificate Version:</string>
-            <string name="serial_number">Serial Number:</string>
-            <string name="signature_algorithm">Signature Algorithm:</string>
-    <string name="permissions">Permissions</string>
-    <string name="privacy_policy">Privacy Policy</string>
-    <string name="changelog">Changelog</string>
-    <string name="licenses">Licenses</string>
-    <string name="contributors">Contributors</string>
-    <string name="links">Links</string>
+    <!-- Non-translatable preference default values. -->
+    <string name="user_agent_default_value" translatable="false">Privacy Browser</string>
+    <string name="custom_user_agent_default_value" translatable="false">PrivacyBrowser/1.0</string>
+    <string name="search_default_value" translatable="false">https://www.startpage.com/do/search?query=</string>
+    <string name="search_custom_url_default_value" translatable="false" />
+    <string name="proxy_default_value" translatable="false">None</string>
+    <string name="proxy_custom_url_default_value" translatable="false">http://localhost:8118</string>
+    <string name="homepage_default_value" translatable="false">https://www.startpage.com/</string>
+    <string name="font_size_default_value" translatable="false">100</string>
 
     <!-- Ad Control. There are no ads in the standard flavor, but these strings must exist because they are referenced in the code. -->
-    <string name="ad_id" translatable="false">Null</string>
+    <string name="google_app_id" translatable="false">Null</string>
+    <string name="ad_unit_id" translatable="false">Null</string>
     <string name="ad_consent">Ad Consent</string>
-</resources>
+</resources>
\ No newline at end of file