X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fvalues%2Fstrings.xml;h=6f0414784789d9c6fe25846af3db6a168aaffa3b;hp=b8bc4f5200456f2e15546cddd7e7a425ddd76d43;hb=e181e7bccc149dc4a839697a6e0417d7b9c54948;hpb=ba40295dffd761ccdc95d3b46ca7acbad1f00d5e

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b8bc4f52..6f041478 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -51,6 +51,9 @@
     <string name="no_title">No title</string>
     <string name="unrecognized_url">Unrecognized URL:</string>
     <string name="open_with">Open with</string>
+    <string name="new_tab">New tab</string>
+    <string name="add_tab">Add tab</string>
+    <string name="loading">Loading…</string>
 
     <!-- Save As. -->
     <string name="save_as">Save As</string>
@@ -108,9 +111,11 @@
     <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="close_tab">Close Tab</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>
@@ -122,7 +127,6 @@
     <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>
@@ -140,18 +144,20 @@
     <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="layout">Layout</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="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="font_size">Font Size</string>
             <string name="twenty_five_percent">25%</string>
             <string name="fifty_percent">50%</string>
@@ -163,6 +169,7 @@
             <string name="two_hundred_percent">200%</string>
         <string name="swipe_to_refresh_options_menu">Swipe to Refresh</string>
         <string name="display_images">Display Images</string>
+        <string name="options_night_mode">Night Mode</string>
         <string name="view_source">View Source</string>
     <string name="share">Share</string>
         <string name="share_url">Share URL</string>
@@ -176,7 +183,7 @@
     <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="copy_url">Copy URL</string>
     <string name="download_url">Download URL</string>
     <string name="email_address">Email Address</string>
@@ -204,6 +211,8 @@
     <!-- 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>
 
@@ -386,7 +395,8 @@
     <string name="api">API</string>
     <string name="build">Build:</string>
     <string name="security_patch">Security Patch:</string>
-    <string name="webview">WebView:</string>
+    <string name="webview_provider">WebView Provider:</string>
+    <string name="webview_version">WebView Version:</string>
     <string name="orbot">Orbot:</string>
     <string name="openkeychain">OpenKeychain:</string>
     <string name="easylist_label">EasyList:</string>
@@ -409,15 +419,17 @@
 
     <!-- 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>  <!-- The form data strings can be removed once the minimum API >= 26. -->
+        <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">
@@ -469,14 +481,14 @@
         <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 9; Mobile; rv:63.0) Gecko/63.0 Firefox/63.0</item>
-            <item>Mozilla/5.0 (Linux; Android 9; Pixel 2 XL) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.110 Mobile Safari/537.36</item>
+            <item>Mozilla/5.0 (Android 9; Mobile; rv:66.0) Gecko/66.0 Firefox/66.0</item>
+            <item>Mozilla/5.0 (Linux; Android 9; Pixel 2 XL) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.90 Mobile Safari/537.36</item>
             <item>Mozilla/5.0 (iPhone; CPU iPhone OS 12_1_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.0 Mobile/15E148 Safari/604.1</item>
             <item>Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/60.0</item>
-            <item>Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.67 Safari/537.36</item>
-            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:63.0) Gecko/20100101 Firefox/63.0</item>
-            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.80 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 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.75 Safari/537.36</item>
+            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:66.0) Gecko/20100101 Firefox/66.0</item>
+            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/74.0.3729.108 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/18.17763</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_14_2) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.0.2 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. -->
@@ -502,6 +514,11 @@
         <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_” or “&amp;utm_” and anything after it from URLs.</string>
+        <string name="facebook_click_ids">Facebook Click IDs</string>
+        <string name="facebook_click_ids_summary">Remove “?fbclid=” or “&amp;fbclid=” and anything after it from URLs.</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>
@@ -552,11 +569,8 @@
     <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>
@@ -613,12 +627,16 @@
                 <item>175</item>
                 <item>200</item>
             </string-array>
+        <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="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="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 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>
@@ -626,7 +644,7 @@
         <string name="display_webpage_images">Display webpage images</string>
         <string name="display_webpage_images_summary">Disable to conserve bandwidth.</string>
 
-    <!-- Non-translatable preference items. -->
+    <!-- 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="tor_homepage_default_value" translatable="false">http://ulrn6sryqaifefld.onion/</string>