X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fvalues%2Fstrings.xml;h=782677751374378066e2e9abcfb240d751940a80;hp=9264fbf66d9107b00317f1c7928fdfe83f8be4e2;hb=298ddb5aeffe0e18e84c7551c55ff8164b238080;hpb=0fb7991532a1633a4377b27b1704fa525d35aa87

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9264fbf6..78267775 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-2017 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2015-2017 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -64,9 +64,11 @@
     <!-- View SSL Certificate. -->
     <string name="view_ssl_certificate">View SSL Certificate</string>
     <string name="unencrypted_website">Unencrypted Website</string>
-    <string name="no_ssl_certificate">Communication with this website is not encrypted by an SSL certificate.</string>
+    <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,7 +90,19 @@
     <string name="url">URL</string>
     <string name="url_label">URL:</string>
 
-    <!-- MainWebView Navigation Drawer. -->
+    <!-- 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>
     <string name="home">Home</string>
@@ -103,8 +117,10 @@
     <string name="about">About</string>
     <string name="clear_and_exit">Clear and Exit</string>
 
-    <!-- MainWebView Options Menu. -->
+    <!-- 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>
@@ -121,10 +137,11 @@
         <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="find_on_page">Find on Page</string>
+    <string name="display_images">Display Images</string>
     <string name="share">Share</string>
-    <string name="add_to_home_screen">Add to Home Screen</string>
+    <string name="find_on_page">Find on Page</string>
     <string name="print">Print</string>
+    <string name="add_to_home_screen">Add to Home Screen</string>
         <string name="privacy_browser_web_page">Privacy Browser Web Page</string>
     <string name="refresh">Refresh</string>
 
@@ -160,9 +177,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>
@@ -183,24 +197,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_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>
@@ -218,34 +251,64 @@
         <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 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="block_ads">Block ads</string>
@@ -257,76 +320,65 @@
     <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_javascript_disabled_search">Tor JavaScript-disabled search</string>
-        <string-array name="tor_javascript_disabled_search_entries">
-            <item>DuckDuckGo</item>
+        <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_javascript_disabled_search_entry_values" translatable="false">  <!-- None of the items in this `string-array` should be translated. -->
+        <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>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_javascript_disabled_search_custom_url">Tor JavaScript-disabled search custom URL</string>
-        <string name="tor_javascript_enabled_search">Tor JavaScript-enabled search</string>
-        <string-array name="tor_javascript_enabled_search_entries">
-            <item>DuckDuckGo</item>
-            <item>Custom</item>
-        </string-array>
-        <string-array name="tor_javascript_enabled_search_entry_values" translatable="false">  <!-- None of the items in this `string-array` should be translated. -->
             <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. -->
+            <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_javascript_enabled_search_custom_url">Tor JavaScript-enabled search custom URL</string>
+        <string name="tor_search_custom_url">Tor search custom URL</string>
     <string name="search">Search</string>
-        <string name="javascript_disabled_search">JavaScript-disabled search</string>
-        <string-array name="javascript_disabled_search_entries">
-            <item>DuckDuckGo</item>
+        <string-array name="search_entries">
+            <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</item>
-            <item>Qwant</item>
+            <item>Yahoo - JavaScript disabled</item>
+            <item>Yahoo - JavaScript enabled</item>
             <item>Custom</item>
         </string-array>
-        <string-array name="javascript_disabled_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://duckduckgo.com/html/?q=</item>
-            <item>https://www.startpage.com/do/search?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>
-            <item>https://lite.qwant.com/?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="javascript_disabled_search_custom_url">JavaScript-disabled search custom URL</string>
-        <string name="javascript_enabled_search">JavaScript-enabled search</string>
-        <string-array name="javascript_enabled_search_entries">
-            <item>DuckDuckGo</item>
-            <item>StartPage</item>
-            <item>Google</item>
-            <item>Bing</item>
-            <item>Yahoo</item>
-            <item>Qwant</item>
-            <item>Custom</item>
-        </string-array>
-        <string-array name="javascript_enabled_search_entry_values" translatable="false">  <!-- None of the items in this `string-array` should be translated. -->
             <item>https://duckduckgo.com/?q=</item>
-            <item>https://www.startpage.com/do/search?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>
             <item>https://search.yahoo.com/mobile/s?p=</item>
-            <item>https://www.qwant.com/?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="javascript_enabled_search_custom_url">JavaScript-enabled search custom URL</string>
+        <string name="search_custom_url">Search custom URL</string>
         <string name="custom_url">Custom URL</string>
     <string name="full_screen">Full Screen</string>
-        <string name="enable_full_screen_browsing_mode">Enable full screen browsing mode</string>
-        <string name="enable_full_screen_browsing_mode_summary">Double-tap to toggle full screen browsing mode.</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="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="clear_everything">Clear everything</string>
+    <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_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>
@@ -350,10 +402,38 @@
             <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_enabled">Swipe to refresh</string>
-        <string name="swipe_to_refresh_enabled_summary">Some websites don\'t work well if swipe to refresh is enabled.</string>
+        <string name="swipe_to_refresh_enabled_summary">Some websites don’t work well if swipe to refresh is enabled.</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="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>
 
     <!-- Orbot. -->
     <string name="orbot_proxy_not_installed">Orbot proxy will not work unless Orbot is installed.</string>