X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fvalues%2Fstrings.xml;h=9d6a9bd1963a1abb5d33d7357d59c5c235de417b;hp=91df074d01aabc4982bce5519cbfe4f7d330b8c1;hb=e69b54578d1566e5fc7ea813a0834f1213a2f4f1;hpb=fd8556e4e7c0db9f58e1cf14a2e0c6590f91305e

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 91df074d..9d6a9bd1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -161,15 +161,12 @@
         <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="dark_webview">Dark WebView</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_url">Save URL</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>
@@ -194,24 +191,28 @@
     <string name="previous">Previous</string>
     <string name="next">Next</string>
 
-    <!-- Save. -->
+    <!-- Save Dialogs. -->
     <string name="save_dialog" translatable="false">Save Dialog</string>  <!-- This string is used to tag the save dialog.  It is never displayed to the user. -->
-    <string name="file_name">File name</string>
+    <string name="save_url">Save URL</string>
     <string name="save_archive">Save Archive</string>
+    <string name="save_text">Save Text</string>
     <string name="save_image">Save Image</string>
+    <string name="save_logcat">Save Logcat</string>
+    <string name="file_name">File name</string>
     <string name="webpage_mht">Webpage.mht</string>
     <string name="webpage_png">Webpage.png</string>
+    <string name="privacy_browser_logcat_txt">Privacy Browser Logcat.txt</string>
+    <string name="privacy_browser_version_txt">Privacy Browser Version.txt</string>
+    <string name="privacy_browser_version_png">Privacy Browser Version.png</string>
     <string name="file">File</string>
     <string name="bytes">bytes</string>
     <string name="unknown_size">unknown size</string>
     <string name="invalid_url">invalid URL</string>
     <string name="ok">OK</string>
     <string name="saving_file">Saving file:</string>
-    <string name="saving_image">Saving image…</string>
+    <string name="processing_image">Processing image… :</string>
     <string name="file_saved">File saved:</string>
-    <string name="image_saved">Image saved.</string>
     <string name="error_saving_file">Error saving file:</string>
-    <string name="error_saving_image">Error saving image:</string>
 
     <!-- View Source. -->
     <string name="request_headers">Request Headers</string>
@@ -330,10 +331,10 @@
         <item>Swipe to refresh enabled</item>
         <item>Swipe to refresh disabled</item>
     </string-array>
-    <string-array name="night_mode_array">
+    <string-array name="webview_theme_array">
         <item>System default</item>
-        <item>Night mode enabled</item>
-        <item>Night mode disabled</item>
+        <item>Light WebView theme</item>
+        <item>Dark WebView theme</item>
     </string-array>
     <string-array name="wide_viewport_array">
         <item>System default</item>
@@ -365,7 +366,6 @@
     <string name="file_exists_warning">The file already exists.  If you proceed it will be overwritten.</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>
@@ -383,10 +383,6 @@
     <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="overview">Overview</string>
@@ -409,36 +405,46 @@
     <!-- 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="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="memory_usage">Memory Usage</string>
+            <string name="app_consumed_memory">App Consumed Memory:</string>
+            <string name="app_available_memory">App Available Memory:</string>
+            <string name="app_total_memory">App Total Memory:</string>
+            <string name="app_maximum_memory">App Maximum Memory:</string>
+            <string name="system_consumed_memory">System Consumed Memory:</string>
+            <string name="system_available_memory">System Available Memory:</string>
+            <string name="system_total_memory">System Total Memory:</string>
+            <string name="mebibyte">MiB</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="version_info_copied">Version info copied.</string>
     <string name="permissions">Permissions</string>
     <string name="privacy_policy">Privacy Policy</string>
     <string name="changelog">Changelog</string>
@@ -511,15 +517,15 @@
             <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 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/80.0.3987.149 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 (Linux; Android 10; Pixel 2 XL) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.125 Mobile Safari/537.36</item>
+            <item>Mozilla/5.0 (iPhone; CPU iPhone OS 13_6 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.1.2 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/80.0.3987.132 Safari/537.36</item>
-            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:74.0) Gecko/20100101 Firefox/74.0</item>
-            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149 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 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.116 Safari/537.36</item>
+            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:79.0) Gecko/20100101 Firefox/79.0</item>
+            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.125 Safari/537.36</item>
+            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/84.0.4147.125 Safari/537.36 Edg/84.0.522.59</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_3) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.0.3 Safari/605.1.15</item>
+            <item>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_5) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/13.1.1 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>
@@ -607,13 +613,15 @@
         <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_everything_summary">Clears cookies, DOM storage, form data, the logcat, 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>  <!-- 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_logcat_preference">Clear logcat</string>
+        <string name="clear_logcat_summary">Clears the logcat.</string>
         <string name="clear_cache">Clear cache</string>
         <string name="clear_cache_summary">Clears WebView’s cache.</string>
     <string name="general">General</string>
@@ -640,7 +648,7 @@
         <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="display_additional_app_bar_icons_summary">Display icons in the app bar for refreshing the WebView and, if there is room, for opening the bookmarks drawer and toggling cookies.</string>
         <string name="app_theme">App theme</string>
         <string-array name="app_theme_entries">
             <item>System default</item>
@@ -652,25 +660,40 @@
             <item>Light</item>
             <item>Dark</item>
         </string-array>
-        <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="webview_theme">WebView theme</string>
+        <string-array name="webview_theme_entries">
+            <item>System default</item>
+            <item>Light</item>
+            <item>Dark</item>
+        </string-array>
+        <string-array name="webview_theme_entry_values" translatable="false">  <!-- None of the items in this string array should be translated. -->
+            <item>System default</item>
+            <item>Light</item>
+            <item>Dark</item>
+        </string-array>
         <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>
 
+    <!-- Non-translatable preference keys. -->
+    <string name="allow_screenshots_key" translatable="false">allow_screenshots</string>
+    <string name="clear_logcat_key" translatable="false">clear_logcat</string>
+    <string name="display_additional_app_bar_icons_key" translatable="false">display_additional_app_bar_icons</string>
+
     <!-- Non-translatable preference default values. -->
-    <string name="user_agent_default_value" translatable="false">Privacy Browser</string>
+    <string name="app_theme_default_value" translatable="false">System default</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="download_location_default_value" translatable="false">Auto</string>
     <string name="download_custom_location_default_value" translatable="false" />
+    <string name="download_location_default_value" translatable="false">Auto</string>
     <string name="font_size_default_value" translatable="false">100</string>
-    <string name="app_theme_default_value" translatable="false">System default</string>
+    <string name="homepage_default_value" translatable="false">https://www.startpage.com/</string>
+    <string name="proxy_custom_url_default_value" translatable="false">http://localhost:8118</string>
+    <string name="proxy_default_value" translatable="false">None</string>
+    <string name="search_custom_url_default_value" translatable="false" />
+    <string name="search_default_value" translatable="false">https://www.startpage.com/do/search?query=</string>
+    <string name="user_agent_default_value" translatable="false">Privacy Browser</string>
+    <string name="webview_theme_default_value" translatable="false">System default</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="google_app_id" translatable="false">Null</string>