X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fvalues%2Fstrings.xml;h=6f0a5d8f5a7d7055b7dd99c8eb14e9ddb370291a;hp=e5fb3c7f8babeb275332052396749db079261b86;hb=59c4102ba387c8a4104923eba9c90124c3e9e481;hpb=9432d4b52d5bdb9e550bdd30bbd17b5a652bd211

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e5fb3c7f..6f0a5d8f 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-2022 Soren Stoutner <soren@stoutner.com>.
+  Copyright 2015-2022 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
 
@@ -25,6 +25,7 @@
 
     <!-- Providers. -->
     <string name="file_provider" translatable="false">com.stoutner.privacybrowser.fileprovider.standard</string>
+    <string name="file_provider_directory" translatable="false">file_provider</string>
 
     <!-- Activities. -->
     <string name="privacy_browser">Privacy Browser</string>
@@ -123,6 +124,7 @@
     <string name="settings">Settings</string>
     <string name="import_export">Import/Export</string>
     <string name="logcat">Logcat</string>
+    <string name="webview_devtools">WebView DevTools</string>
     <string name="guide">Guide</string>
     <string name="about">About</string>
 
@@ -193,7 +195,8 @@
     <string name="file_is_mht">The file is an MHT web archive.</string>
     <string name="mht_checkbox_explanation">Sometimes MIME Encapsulated HTML (MHT) web archives need to be manually specified to be opened correctly.</string>
 
-    <!-- Save Dialog. -->
+    <!-- Save Dialog.  Android removes double spaces, but extra spaces can be manually specified with the Unicode `\u0020` formatting.
+        The `%*$s` code inserts variables into the displayed text and should be preserved in translation.  <https://developer.android.com/reference/kotlin/java/util/Formatter> -->
     <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="save_url">Save URL</string>
     <string name="save_archive">Save Archive</string>
@@ -205,10 +208,10 @@
     <string name="unknown_size">unknown size</string>
     <string name="invalid_url">invalid URL</string>
     <string name="saving_file">Saving file:</string>
-    <string name="file_saved">File saved:</string>
+    <string name="saved">%1$s saved.</string>
     <string name="processing_image">Processing image… :</string>
-    <string name="image_saved">Image saved:</string>
-    <string name="error_saving_file">Error saving file:</string>
+    <string name="error_saving_file">Error saving %1$s: \u0020 %2$s</string>
+    <string name="unknown_error">Unknown error</string>
 
     <!-- View Source. -->
     <string name="request_headers">Request Headers</string>
@@ -235,7 +238,6 @@
     <!-- Bookmarks. -->
     <string name="bookmarks">Bookmarks</string>
     <string name="database_view">Database View</string>
-    <string name="bookmark_opened_in_background">The bookmark was opened in a background tab.</string>
     <string name="create_bookmark">Create Bookmark</string>
     <string name="create_folder">Create Folder</string>
     <string name="current_bookmark_icon">Current bookmark icon</string>
@@ -374,12 +376,11 @@
     <string name="import_failed">Import failed:</string>
 
     <!-- Logcat.  Android removes double spaces, but extra spaces can be manually specified with the Unicode `\u0020` formatting.
-        The `%1$s` code inserts variables into the displayed text and should be preserved in translation.-->
+        The `%1$s` code inserts variables into the displayed text and should be preserved in translation.  <https://developer.android.com/reference/kotlin/java/util/Formatter> -->
     <string name="copy_string">Copy</string>
     <string name="clear">Clear</string>
     <string name="logcat_copied">Logcat copied.</string>
     <string name="privacy_browser_logcat_txt">Privacy Browser %1$s Logcat.txt</string>
-    <string name="saved">%1$s saved.</string>
     <string name="error_saving_logcat">Error saving logcat: \u0020 %1$s</string>
 
     <!-- Guide. -->
@@ -388,6 +389,7 @@
     <string name="ssl_certificates">SSL Certificates</string>
     <string name="proxies">Proxies</string>
     <string name="tracking_ids">Tracking IDs</string>
+    <string name="gui">Interface</string>
 
     <!-- Proxy. -->
     <string name="proxy_not_installed_dialog" translatable="false">Proxy not installed dialog</string>  <!-- This string is used to tag the proxy not installed dialog.  It is never displayed to the user. -->
@@ -399,10 +401,10 @@
     <string name="waiting_for_orbot">Waiting for Orbot to connect.</string>
     <string name="custom_proxy_invalid">The custom proxy URL is invalid.</string>
 
-    <!-- About Activity.  The `%1$s` code inserts variables into the displayed text and should be preserved in translation. -->
+    <!-- About Activity.  The `%*$*` code inserts variables into the displayed text and should be preserved in translation.  <https://developer.android.com/reference/kotlin/java/util/Formatter> -->
     <string name="about_privacy_browser">About Privacy Browser</string>
     <string name="version">Version</string>
-        <string name="version_code">version code</string>
+        <string name="version_code">Version %1$s (version code %2$d)</string>
         <string name="hardware">Hardware</string>
             <string name="brand">Brand:</string>
             <string name="manufacturer">Manufacturer:</string>
@@ -412,13 +414,16 @@
             <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="api">%1$s (API %2$d)</string>
             <string name="security_patch">Security Patch:</string>
+            <string name="build">Build:</string>
+            <string name="kernel">Kernel:</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="fdroid_flavor">%1$s (F-Droid flavor)</string>
+                <string name="google_play_flavor">%1$s (Google Play flavor)</string>
             <string name="openkeychain">OpenKeychain:</string>
         <string name="memory_usage">Memory Usage</string>
             <string name="app_consumed_memory">App Consumed Memory:</string>
@@ -431,8 +436,8 @@
             <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="fanboys_annoyance_label">Fanboy’s Annoyance List:</string>
+            <string name="fanboys_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>
@@ -507,15 +512,15 @@
         <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 12; Mobile; rv:97.0) Gecko/97.0 Firefox/97.0</item>
-            <item>Mozilla/5.0 (Linux; Android 12; Pixel 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.101 Mobile Safari/537.36</item>
-            <item>Mozilla/5.0 (iPhone; CPU iPhone OS 15_3_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.3 Mobile/15E148 Safari/604.1</item>
+            <item>Mozilla/5.0 (Android 12; Mobile; rv:102.0) Gecko/102.0 Firefox/102.0</item>
+            <item>Mozilla/5.0 (Linux; Android 12; Pixel 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.0.0 Mobile Safari/537.36</item>
+            <item>Mozilla/5.0 (iPhone; CPU iPhone OS 15_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.5 Mobile/15E148 Safari/604.1</item>
             <item>Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Firefox/91.0</item>
-            <item>Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.102 Safari/537.36</item>
-            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:97.0) Gecko/20100101 Firefox/97.0</item>
-            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.102 Safari/537.36</item>
-            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.102 Safari/537.36 Edg/98.0.1108.56</item>
-            <item>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15</item>
+            <item>Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.5060.134 Safari/537.36</item>
+            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:103.0) Gecko/20100101 Firefox/103.0</item>
+            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.5060.134 Safari/537.36</item>
+            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/103.0.5060.134 Safari/537.36 Edg/103.0.1264.71</item>
+            <item>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.5 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>
@@ -540,12 +545,10 @@
         <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_” and “&amp;utm_” and anything after them from URLs.</string>
-        <string name="facebook_click_ids">Facebook Click IDs</string>
-        <string name="facebook_click_ids_summary">Remove “?fbclid=”, “&amp;fbclid=”, “?fbadid=”, and “&amp;fbadid=” and anything after them from URLs.</string>
-        <string name="twitter_amp_redirects">Twitter AMP redirects</string>
-        <string name="twitter_amp_redirects_summary">Remove “?amp=1” and anything after it from URLs.</string>
+        <string name="tracking_queries">Tracking queries</string>
+        <string name="tracking_queries_summary">Remove known tracking queries from URLs.</string>
+        <string name="amp_redirects">AMP redirects</string>
+        <string name="amp_redirects_summary">Remove known AMP (Accelerated Mobil Pages) redirect queries from URLs.</string>
     <string name="search">Search</string>
         <string-array name="search_entries">
             <item>Mojeek</item>
@@ -565,6 +568,7 @@
             <item>https://search.yahoo.com/mobile/s?p=</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="custom_url_item" translatable="false">Custom URL</string>
         <string name="custom_url">Custom URL</string>
         <string name="search_custom_url">Search custom URL</string>
     <string name="proxy">Proxy</string>
@@ -603,7 +607,7 @@
         <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">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>
@@ -615,7 +619,8 @@
         <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">Use an external app to download files.</string>
+        <string name="download_with_external_app_summary">External apps will not honor Privacy Browser’s proxy settings and will not have access to cookies
+            (meaning that it is unlikely that files downloaded from sites that require a login will work).</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="bottom_app_bar">Bottom app bar</string>
@@ -651,13 +656,48 @@
 
     <!-- Non-translatable preference keys. -->
     <string name="allow_screenshots_key" translatable="false">allow_screenshots</string>
+    <string name="amp_redirects_key" translatable="false">amp_redirects</string>
+    <string name="app_theme_key" translatable="false">app_theme</string>
+    <string name="block_all_third_party_requests_key" translatable="false">block_all_third_party_requests</string>
     <string name="bottom_app_bar_key" translatable="false">bottom_app_bar</string>
     <string name="cookies_key" translatable="false">cookies</string>
+    <string name="clear_and_exit_category_key" translatable="false">clear_and_exit</string>
+    <string name="clear_cache_key" translatable="false">clear_cache</string>
+    <string name="clear_cookies_key" translatable="false">clear_cookies</string>
+    <string name="clear_dom_storage_key" translatable="false">clear_dom_storage</string>
+    <string name="clear_everything_key" translatable="false">clear_everything</string>
+    <string name="clear_form_data_key" translatable="false">clear_form_data</string>  <!-- The clear form data string can be removed once the minimum API >= 26. -->
     <string name="clear_logcat_key" translatable="false">clear_logcat</string>
-    <string name="download_with_external_app_key" translatable="false">download_with_external_app</string>
+    <string name="custom_user_agent_key" translatable="false">custom_user_agent</string>
     <string name="display_additional_app_bar_icons_key" translatable="false">display_additional_app_bar_icons</string>
+    <string name="display_webpage_images_key" translatable="false">display_webpage_images</string>
+    <string name="dom_storage_key" translatable="false">dom_storage</string>
+    <string name="download_with_external_app_key" translatable="false">download_with_external_app</string>
+    <string name="easylist_key" translatable="false">easylist</string>
+    <string name="easyprivacy_key" translatable="false">easyprivacy</string>
+    <string name="fanboys_annoyance_list_key" translatable="false">fanboys_annoyance_list</string>
+    <string name="fanboys_social_blocking_list_key" translatable="false">fanboys_social_blocking_list</string>
+    <string name="font_size_key" translatable="false">font_size</string>
+    <string name="full_screen_browsing_mode_key" translatable="false">full_screen_browsing_mode</string>
+    <string name="hide_app_bar_key" translatable="false">hide_app_bar</string>
+    <string name="homepage_key" translatable="false">homepage</string>
+    <string name="incognito_mode_key" translatable="false">incognito_mode</string>
+    <string name="javascript_key" translatable="false">javascript</string>
+    <string name="open_intents_in_new_tab_key" translatable="false">open_intents_in_new_tab</string>
+    <string name="privacy_category_key" translatable="false">privacy</string>
+    <string name="proxy_key" translatable="false">proxy</string>
     <string name="proxy_custom_url_key" translatable="false">proxy_custom_url</string>
+    <string name="save_form_data_key" translatable="false">save_form_data</string>  <!--The form data string can be removed once the minimum API >= 26. -->
     <string name="scroll_app_bar_key" translatable="false">scroll_app_bar</string>
+    <string name="search_custom_url_key" translatable="false">search_custom_url</string>
+    <string name="search_key" translatable="false">search</string>
+    <string name="swipe_to_refresh_key" translatable="false">swipe_to_refresh</string>
+    <string name="tracking_queries_key" translatable="false">tracking_queries</string>
+    <string name="ultralist_key" translatable="false">ultralist</string>
+    <string name="ultraprivacy_key" translatable="false">ultraprivacy</string>
+    <string name="user_agent_key" translatable="false">user_agent</string>
+    <string name="webview_theme_key" translatable="false">webview_theme</string>
+    <string name="wide_viewport_key" translatable="false">wide_viewport</string>
 
     <!-- Non-translatable preference default values. -->
     <string name="app_theme_default_value" translatable="false">System default</string>
@@ -670,9 +710,4 @@
     <string name="search_default_value" translatable="false">https://www.mojeek.com/search?q=</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>
-    <string name="ad_unit_id" translatable="false">Null</string>
-    <string name="ad_consent">Ad Consent</string>
-</resources>
\ No newline at end of file
+</resources>