X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fvalues%2Fstrings.xml;h=8b7f03a6f7e4e9043c5aaf1ca979ed73197827b5;hb=1664a6fbaff81fd23a12d5e51ad61616bd0f69bb;hp=359cc97edbbdafb93872ea090dc6a913b9649f05;hpb=93aa3ac5acb2e3f7c238b1052e39a305f3c9986e;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 359cc97e..8b7f03a6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -67,6 +67,8 @@
     <string name="no_ssl_certificate">Communication with this website is not encrypted. This allows third parties to intercept information, track your browsing, and inject malicious content.</string>
     <string name="ssl_certificate">SSL Certificate</string>
     <string name="close">Close</string>
+    <string name="domain">Domain</string>
+    <string name="domain_label">Domain:</string>
     <string name="issued_to">Issued To</string>
     <string name="issued_by">Issued By</string>
     <string name="common_name">Common Name (CN):</string>
@@ -88,6 +90,18 @@
     <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>
+
+    <!-- HTTP Authentication. -->
+    <string name="http_authentication">HTTP Authentication</string>
+    <string name="host">Host:</string>
+    <string name="username">Username</string>
+    <string name="password">Password</string>
+
     <!-- MainWebViewActivity Navigation Drawer. -->
     <string name="navigation_drawer">Navigation Drawer</string>
     <string name="navigation">Navigation</string>
@@ -105,13 +119,16 @@
 
     <!-- MainWebViewActivity Options Menu. -->
     <string name="javascript">JavaScript</string>
+    <string name="add_domain_settings">Add Domain Settings</string>
+    <string name="edit_domain_settings">Edit Domain Settings</string>
     <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="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="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="font_size">Font Size</string>
         <string name="twenty_five_percent">25%</string>
         <string name="fifty_percent">50%</string>
@@ -161,9 +178,6 @@
     <string name="folder_name">Folder name</string>
     <string name="bookmark_url">Bookmark URL</string>
     <string name="folder_names_must_be_unique">Folder names must be unique</string>
-    <string name="cannot_create_folder">Cannot create the folder because the name is not unique:</string>
-    <string name="cannot_save_folder">Cannot save the folder because the new name is not unique:</string>
-    <string name="cannot_move_bookmarks">Cannot move the selected bookmarks because no new folder was selected.</string>
     <string name="edit_bookmark">Edit Bookmark</string>
     <string name="edit_folder">Edit Folder</string>
     <string name="move_to_folder">Move to Folder</string>
@@ -184,29 +198,43 @@
 
     <!-- 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="database_id">Database ID:</string>
+    <string name="folder">Folder:</string>
+    <string name="parent_folder">Parent folder:</string>
+    <string name="display_order">Display order:</string>
 
     <!-- Domains. -->
     <string name="domains">Domains</string>
     <string name="domain_settings">Domain Settings</string>
     <string name="add_domain">Add Domain</string>
+    <string name="domain_name_already_exists">Domain name already exists</string>
     <string name="add">Add</string>
     <string name="domain_name">Domain name</string>
-    <string name="domain_settings_saved">Domain settings saved</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="display_website_images_array">
+    <string-array name="display_webpage_images_array">
         <item>System default</item>
         <item>Images enabled</item>
         <item>Images disabled</item>
     </string-array>
+    <string-array name="night_mode_array">
+        <item>System default</item>
+        <item>Night mode enabled</item>
+        <item>Night mode 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>
 
     <!-- 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="tracking_ids">Tracking IDs</string>
-    <string name="planned_features">Planned Features</string>
 
     <!-- Preferences. -->
     <string name="privacy">Privacy</string>
@@ -224,67 +252,63 @@
         <string-array name="user_agent_entries">
             <item>Privacy Browser 1.0</item>
             <item>WebView Default</item>
-            <item>Firefox 50 on Android 7.1.1</item>
-            <item>Chrome 55 on Android 7.1.1</item>
-            <item>Safari 10 on iOS 10.2.1</item>
-            <item>Firefox 45 on Linux</item>
-            <item>Chromium 55 on Linux</item>
-            <item>Konqueror 4.14.26 on Linux</item>
-            <item>Firefox 50 on Windows 10</item>
-            <item>Chrome 55 on Windows 10</item>
-            <item>Edge 14 on Windows 10</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 10.0.2 on macOS 10.12.2</item>
+            <item>Safari 11.0.1 on macOS 10.13.1</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. -->
             <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 7.1.1; Mobile; rv:50.0) Gecko/50.0 Firefox/50.0</item>
-            <item>Mozilla/5.0 (Linux; Android 7.1.1; Nexus 6P Build/N4F26I) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.91 Mobile Safari/537.36</item>
-            <item>Mozilla/5.0 (iPhone; CPU iPhone OS 10_2_1 like Mac OS X) AppleWebKit/602.4.6 (KHTML, like Gecko) Version/10.0 Mobile/14D27 Safari/602.1</item>
-            <item>Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Firefox/45.0</item>
-            <item>Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.75 Safari/537.36</item>
-            <item>Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/534.34 (KHTML, like Gecko) konqueror/4.14.26 Safari/534.34</item>
-            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:50.0) Gecko/20100101 Firefox/50.0</item>
-            <item>Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36</item>
-            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.79 Safari/537.36 Edge/14.14393</item>
+            <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_12_2) AppleWebKit/602.3.12 (KHTML, like Gecko) Version/10.0.2 Safari/602.3.12</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 50 on Android 7.1.1</item>
-                <item>Chrome 55 on Android 7.1.1</item>
-                <item>Safari 10 on iOS 10.2.1</item>
-                <item>Firefox 45 on Linux</item>
-                <item>Chromium 55 on Linux</item>
-                <item>Konqueror 4.14.26 on Linux</item>
-                <item>Firefox 50 on Windows 10</item>
-                <item>Chrome 55 on Windows 10</item>
-                <item>Edge 14 on Windows 10</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 10.0.2 on macOS 10.12.2</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 7.1.1; Mobile; rv:50.0) Gecko/50.0 Firefox/50.0</item>
-                <item>Mozilla/5.0 (Linux; Android 7.1.1; Nexus 6P Build/N4F26I) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.91 Mobile Safari/537.36</item>
-                <item>Mozilla/5.0 (iPhone; CPU iPhone OS 10_2_1 like Mac OS X) AppleWebKit/602.4.6 (KHTML, like Gecko) Version/10.0 Mobile/14D27 Safari/602.1</item>
-                <item>Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Firefox/45.0</item>
-                <item>Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.75 Safari/537.36</item>
-                <item>Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/534.34 (KHTML, like Gecko) konqueror/4.14.26 Safari/534.34</item>
-                <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:50.0) Gecko/20100101 Firefox/50.0</item>
-                <item>Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/55.0.2883.87 Safari/537.36</item>
-                <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.79 Safari/537.36 Edge/14.14393</item>
+                <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_12_2) AppleWebKit/602.3.12 (KHTML, like Gecko) Version/10.0.2 Safari/602.3.12</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>
@@ -407,6 +431,8 @@
         <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="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="display_webpage_images">Display webpage images</string>
         <string name="display_webpage_images_summary">Disable to conserve bandwidth.</string>