X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fvalues%2Fstrings.xml;h=dd6b75fc88e09b68f0849424f6b943a5b1f23962;hp=fa3ef176214ff6fbc0e6f988ff813a8416d6fd5c;hb=96cf5fae34ebc2ae7ca05322837a859943e19ba0;hpb=2bb01fc27d480292f2e618f0ee5ca1a6277a66e2

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fa3ef176..dd6b75fc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -47,6 +47,7 @@
     <string name="open_navigation_drawer">Open Navigation Drawer</string>
     <string name="close_navigation_drawer">Close Navigation Drawer</string>
     <string name="no_title">No title</string>
+    <string name="unrecognized_url">Unrecognized URL:</string>
 
     <!-- Save As. -->
     <string name="save_as">Save As</string>
@@ -151,6 +152,7 @@
     <!-- Context Menus. -->
     <string name="load_url">Load URL</string>
     <string name="copy_url">Copy URL</string>
+    <string name="download_url">Download URL</string>
     <string name="email_address">Email Address</string>
     <string name="copy_email_address">Copy Email Address</string>
     <string name="write_email">Write Email</string>
@@ -262,71 +264,71 @@
         <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="user_agent">User agent</string>
-        <string-array name="user_agent_entries">
-            <item>Privacy Browser 1.0</item>
+        <string-array name="translated_user_agent_names">
+            <item>Privacy Browser</item>
             <item>WebView Default</item>
-            <item>Firefox 56 on Android 8.0.0</item>
-            <item>Chrome 62 on Android 8.0.0</item>
-            <item>Safari 11 on iOS 11.1</item>
-            <item>Firefox 52 on Linux</item>
-            <item>Chromium 61 on Linux</item>
-            <item>Firefox 56 on Windows 10</item>
-            <item>Chrome 62 on Windows 10</item>
-            <item>Edge 16 on Windows 10</item>
-            <item>Internet Explorer 11 on Windows 10</item>
-            <item>Safari 11.0.1 on macOS 10.13.1</item>
+            <item>Firefox on Android</item>
+            <item>Chrome on Android</item>
+            <item>Safari on iOS</item>
+            <item>Firefox on Linux</item>
+            <item>Chromium on Linux</item>
+            <item>Firefox on Windows</item>
+            <item>Chrome on Windows</item>
+            <item>Edge on Windows</item>
+            <item>Internet Explorer on Windows</item>
+            <item>Safari on macOS</item>
             <item>Custom</item>
         </string-array>
-        <string-array name="user_agent_entry_values" translatable="false">  <!-- None of the items in this `string-array` should be translated. -->
+        <string-array name="translated_domain_settings_user_agent_names">  <!-- The translated names of the user agents with a System Default option for the domains spinner. -->
+            <item>System default</item>
+            <item>Privacy Browser</item>
+            <item>WebView Default</item>
+            <item>Firefox on Android</item>
+            <item>Chrome on Android</item>
+            <item>Safari on iOS</item>
+            <item>Firefox on Linux</item>
+            <item>Chromium on Linux</item>
+            <item>Firefox on Windows</item>
+            <item>Chrome on Windows</item>
+            <item>Edge on Windows</item>
+            <item>Internet Explorer on Windows</item>
+            <item>Safari on macOS</item>
+            <item>Custom</item>
+        </string-array>
+        <string-array name="user_agent_names" translatable="false">  <!-- The non-translated persistent names of the user agents.  These should not be translated because they are referenced in code.-->
+            <item>Privacy Browser</item>
+            <item>WebView Default</item>
+            <item>Firefox on Android</item>
+            <item>Chrome on Android</item>
+            <item>Safari on iOS</item>
+            <item>Firefox on Linux</item>
+            <item>Chromium on Linux</item>
+            <item>Firefox on Windows</item>
+            <item>Chrome on Windows</item>
+            <item>Edge on Windows</item>
+            <item>Internet Explorer on Windows</item>
+            <item>Safari on macOS</item>
+            <item>Custom user agent</item>
+        </string-array>
+        <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.0.0; Mobile; rv:56.0) Gecko/56.0 Firefox/56.0</item>
-            <item>Mozilla/5.0 (Linux; Android 8.0.0; Nexus 6P Build/OPR5.170623.011) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.84 Mobile Safari/537.36</item>
+            <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_1 like Mac OS X) AppleWebKit/604.3.5 (KHTML, like Gecko) Version/11.0 Mobile/15B92 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/61.0.3163.100 Safari/537.36</item>
-            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:56.0) Gecko/20100101 Firefox/56.0</item>
-            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) 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) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36 Edge/16.16299</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 (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_1) AppleWebKit/604.3.4 (KHTML, like Gecko) Version/11.0.1 Safari/604.3.4</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-array name="domain_settings_user_agent_entries">
-                <item>System default</item>
-                <item>Privacy Browser 1.0</item>
-                <item>WebView Default</item>
-                <item>Firefox 56 on Android 8.0.0</item>
-                <item>Chrome 62 on Android 8.0.0</item>
-                <item>Safari 11 on iOS 11.1</item>
-                <item>Firefox 52 on Linux</item>
-                <item>Chromium 61 on Linux</item>
-                <item>Firefox 56 on Windows 10</item>
-                <item>Chrome 62 on Windows 10</item>
-                <item>Edge 16 on Windows 10</item>
-                <item>Internet Explorer 11 on Windows 10</item>
-                <item>Safari 11.0.1 on macOS 10.13.1</item>
-                <item>Custom</item>
-            </string-array>
-            <string-array name="domain_settings_user_agent_entry_values" translatable="false">  <!-- None of the items in this `string-array` should be translated. -->
-                <item>System 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>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.0.0; Mobile; rv:56.0) Gecko/56.0 Firefox/56.0</item>
-                <item>Mozilla/5.0 (Linux; Android 8.0.0; Nexus 6P Build/OPR5.170623.011) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/62.0.3202.84 Mobile Safari/537.36</item>
-                <item>Mozilla/5.0 (iPhone; CPU iPhone OS 11_1 like Mac OS X) AppleWebKit/604.3.5 (KHTML, like Gecko) Version/11.0 Mobile/15B92 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/61.0.3163.100 Safari/537.36</item>
-                <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:56.0) Gecko/20100101 Firefox/56.0</item>
-                <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) 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) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36 Edge/16.16299</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_1) AppleWebKit/604.3.4 (KHTML, like Gecko) Version/11.0.1 Safari/604.3.4</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>
+        <string name="system_default_user_agent" translatable="false">System default user agent</string>  <!-- This item is referenced in code.  It is never displayed on the screen. -->
         <string name="incognito_mode">Incognito Mode</string>
-        <string name="incognito_mode_summary">Clear the history and cache after each webpage finishes loading.</string>
+        <string name="incognito_mode_summary">Clear the history and cache after each webpage finishes loading. Forward and back do not work in Incognito Mode.</string>
         <string name="do_not_track">Do Not Track</string>
         <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="block_lists">Block Lists</string>