X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fvalues%2Fstrings.xml;h=a34c6dfdc9e99be879ebb1967661891160b66ced;hb=dc36dea65a4eb37496fb1ecbbd9f8e1906f50216;hp=824d3d62210140f896fe7e9c1a05def532a9f604;hpb=153a29723774971e62fa0102db87393f1afef193;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 824d3d62..a34c6dfd 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-2023 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
 
@@ -33,7 +33,8 @@
     <!-- For translations, `android_asset_path` should be the localization abbreviation.  For example, Spanish is `es`.  This should not be translated unless the Guide and About sections are localized. -->
     <string name="android_asset_path">en</string>
 
-    <!-- MainWebView. -->
+    <!-- MainWebView.  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.  <https://developer.android.com/reference/kotlin/java/util/Formatter> -->
     <string name="privacy_mode">Privacy Mode</string>
     <string name="javascript_enabled">JavaScript enabled</string>
     <string name="javascript_disabled">JavaScript disabled</string>
@@ -49,12 +50,12 @@
     <string name="open_navigation_drawer">Open navigation drawer</string>
     <string name="close_navigation_drawer">Close navigation drawer</string>
     <string name="pin_drawer">Pin drawer</string>
-    <string name="unrecognized_url">Unrecognized URL:</string>
+    <string name="unrecognized_url">Unrecognized URL:\u0020 %1$s</string>
     <string name="add_tab">Add tab</string>
     <string name="close_tab">Close tab</string>
     <string name="new_tab">New tab</string>
     <string name="loading">Loading…</string>
-    <string name="error">Error:</string>
+    <string name="error">Error:\u0020 %1$s</string>
     <string name="apply">Apply</string>
 
     <!-- Loading Blocklists. -->
@@ -69,25 +70,25 @@
     <string name="favorite_icon">Favorite Icon</string>
     <string name="url_or_search_terms">URL or Search Terms</string>
 
-    <!-- View SSL Certificate. -->
+    <!-- View SSL Certificate. Android removes double spaces, but extra spaces can be manually specified with the Unicode `\u0020` formatting. -->
     <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. 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="ip_addresses">IP Addresses:</string>
+    <string name="domain_label">Domain: \u0020</string>
+    <string name="ip_addresses">IP Addresses: \u0020</string>
     <string name="issued_to">Issued To</string>
     <string name="issued_by">Issued By</string>
-    <string name="common_name">Common Name (CN):</string>
-    <string name="organization">Organization (O):</string>
-    <string name="organizational_unit">Organizational Unit (OU):</string>
+    <string name="common_name">Common Name (CN): \u0020</string>
+    <string name="organization">Organization (O): \u0020</string>
+    <string name="organizational_unit">Organizational Unit (OU): \u0020</string>
     <string name="valid_dates">Valid Dates</string>
-    <string name="start_date">Start Date:</string>
-    <string name="end_date">End Date:</string>
+    <string name="start_date">Start Date: \u0020</string>
+    <string name="end_date">End Date: \u0020</string>
 
-    <!-- SSL Certificate Error. -->
+    <!-- SSL Certificate Error.  Android removes double spaces, but extra spaces can be manually specified with the Unicode `\u0020` formatting. -->
     <string name="ssl_certificate_error">SSL Certificate Error</string>
     <string name="proceed">Proceed</string>
     <string name="future_certificate">The certificate start date is in the future</string>
@@ -97,7 +98,7 @@
     <string name="invalid_date">The date on the certificate is invalid</string>
     <string name="invalid_certificate">The certificate is invalid</string>
     <string name="url">URL</string>
-    <string name="url_label">URL:</string>
+    <string name="url_label">URL: \u0020</string>
 
     <!-- Pinned Mismatch. -->
     <string name="pinned_mismatch">Pinned Mismatch</string>
@@ -105,9 +106,9 @@
     <string name="current">Current</string>
     <string name="pinned">Pinned</string>
 
-    <!-- HTTP Authentication. -->
+    <!-- HTTP Authentication. Android removes double spaces, but extra spaces can be manually specified with the Unicode `\u0020` formatting. -->
     <string name="http_authentication">HTTP Authentication</string>
-    <string name="host">Host:</string>
+    <string name="host">Host: \u0020</string>
     <string name="username">Username</string>
     <string name="password">Password</string>
 
@@ -196,8 +197,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.  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> -->
+    <!-- Save Dialog.  Android removes double spaces, but extra spaces can be manually specified with the Unicode `\u0020` formatting.  `%%` writes a literal `%`.
+        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="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>
@@ -208,10 +209,12 @@
     <string name="bytes">bytes</string>
     <string name="unknown_size">unknown size</string>
     <string name="invalid_url">invalid URL</string>
-    <string name="saving_file">Saving file:</string>
+    <string name="saving_file">Saving file:\u0020 %1$d%% - %2$s</string>
+    <string name="saving_file_progress">Saving file:\u0020 %1$s bytes - %2$s</string>
+    <string name="saving_file_percentage_progress">Saving file:\u0020 %1$d%% - %2$s bytes / %3$s bytes - %4$s</string>
     <string name="saved">%1$s saved.</string>
-    <string name="processing_image">Processing image… :</string>
-    <string name="error_saving_file">Error saving %1$s: \u0020 %2$s</string>
+    <string name="processing_image">Processing image:\u0020 %1$s</string>
+    <string name="error_saving_file">Error saving %1$s:\u0020 %2$s</string>
     <string name="unknown_error">Unknown error</string>
 
     <!-- View Source. -->
@@ -254,14 +257,15 @@
     <string name="move_to_folder">Move to Folder</string>
     <string name="move">Move</string>
 
-    <!-- Bookmarks Contextual App Bar. -->
-    <string name="selected">Selected:</string>  <!--This is a plural adjective.-->
+    <!-- Bookmarks Contextual App Bar.  Android removes double spaces, but extra spaces can be manually specified with the Unicode `\u0020` formatting.
+        The `%1$d` code inserts variables into the displayed text and should be preserved in translation.  <https://developer.android.com/reference/kotlin/java/util/Formatter> -->
+    <string name="selected">Selected:\u0020 %1$d</string>
     <string name="move_up">Move Up</string>
     <string name="move_down">Move Down</string>
     <string name="edit">Edit</string>
     <string name="delete">Delete</string>
     <string name="select_all">Select All</string>
-    <string name="bookmarks_deleted">Bookmarks Deleted:</string>
+    <string name="bookmarks_deleted">Bookmarks Deleted:\u0020 %1$d</string>
     <string name="undo">Undo</string>
 
     <!-- Bookmarks Database View. -->
@@ -277,7 +281,7 @@
     <string name="display_order">Display order:</string>
     <string name="cannot_deselect_bookmark">A bookmark cannot be deselected while the parent folder is selected.</string>
 
-    <!-- Requests. -->
+    <!-- Requests.  The `%1$d` code inserts variables into the displayed text and should be preserved in translation.  <https://developer.android.com/reference/kotlin/java/util/Formatter> -->
     <string name="requests">Requests</string>
     <string name="request_details">Request details</string>
     <string name="disposition">Disposition</string>
@@ -285,10 +289,12 @@
         <string name="default_label">Default</string>
         <string name="default_allowed">Default - Allowed</string>
         <string name="allowed">Allowed</string>
+        <string name="request_allowed">%1$d. Allowed</string>
         <string name="allowed_plural">Allowed</string>
         <string name="third_party_plural">Third-party</string>
         <string name="third_party_blocked">Third-party - Blocked</string>
         <string name="blocked">Blocked</string>
+        <string name="request_blocked">%1$d. Blocked</string>
         <string name="blocked_plural">Blocked</string>
     <string name="blocklist">Blocklist</string>
     <string name="sublist">Sublist</string>
@@ -358,7 +364,8 @@
         <string name="saved_ip_addresses">Saved IP addresses</string>
         <string name="current_ip_addresses">Current IP addresses</string>
 
-    <!-- Import/Export.  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> -->
+    <!-- Import/Export.  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.  <https://developer.android.com/reference/kotlin/java/util/Formatter> -->
     <string name="encryption">Encryption</string>
     <string-array name="encryption_type">
         <item>None</item>
@@ -375,8 +382,8 @@
     <string name="privacy_browser_settings_pbs">Privacy Browser Settings %1$s.pbs</string>
     <string name="privacy_browser_settings_pbs_aes">Privacy Browser Settings %1$s.pbs.aes</string>
     <string name="export_successful">Export successful.</string>
-    <string name="export_failed">Export failed:  %1$s</string>
-    <string name="import_failed">Import failed:  %1$s</string>
+    <string name="export_failed">Export failed:\u0020 %1$s</string>
+    <string name="import_failed">Import failed:\u0020 %1$s</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.  <https://developer.android.com/reference/kotlin/java/util/Formatter> -->
@@ -384,7 +391,7 @@
     <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="error_saving_logcat">Error saving logcat: \u0020 %1$s</string>
+    <string name="error_saving_logcat">Error saving logcat:\u0020 %1$s</string>
 
     <!-- Guide. -->
     <string name="overview">Overview</string>
@@ -404,51 +411,52 @@
     <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 `%*$*` code inserts variables into the displayed text and should be preserved in translation.  <https://developer.android.com/reference/kotlin/java/util/Formatter> -->
+    <!-- About Activity.  Android removes double spaces, but extra spaces can be manually specified with the Unicode `\u0020` formatting.
+        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 %1$s (version code %2$d)</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="brand">Brand: \u0020</string>
+            <string name="manufacturer">Manufacturer: \u0020</string>
+            <string name="model">Model: \u0020</string>
+            <string name="device">Device: \u0020</string>
+            <string name="bootloader">Bootloader: \u0020</string>
+            <string name="radio">Radio: \u0020</string>
         <string name="software">Software</string>
-            <string name="android">Android:</string>
+            <string name="android">Android: \u0020</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="security_patch">Security Patch: \u0020</string>
+            <string name="build">Build: \u0020</string>
+            <string name="kernel">Kernel: \u0020</string>
+            <string name="webview_provider">WebView Provider: \u0020</string>
+            <string name="webview_version">WebView Version: \u0020</string>
+            <string name="orbot">Orbot: \u0020</string>
+            <string name="i2p">I2P: \u0020</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="openkeychain">OpenKeychain: \u0020</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="app_consumed_memory">App Consumed Memory: \u0020</string>
+            <string name="app_available_memory">App Available Memory: \u0020</string>
+            <string name="app_total_memory">App Total Memory: \u0020</string>
+            <string name="app_maximum_memory">App Maximum Memory: \u0020</string>
+            <string name="system_consumed_memory">System Consumed Memory: \u0020</string>
+            <string name="system_available_memory">System Available Memory: \u0020</string>
+            <string name="system_total_memory">System Total Memory: \u0020</string>
             <string name="mebibyte">MiB</string>
-            <string name="easylist_label">EasyList:</string>
-            <string name="easyprivacy_label">EasyPrivacy:</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="easylist_label">EasyList: \u0020</string>
+            <string name="easyprivacy_label">EasyPrivacy: \u0020</string>
+            <string name="fanboys_annoyance_label">Fanboy’s Annoyance List: \u0020</string>
+            <string name="fanboys_social_label">Fanboy’s Social Blocking List: \u0020</string>
+            <string name="ultralist_label">UltraList: \u0020</string>
+            <string name="ultraprivacy_label">UltraPrivacy: \u0020</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="issuer_dn">Issuer DN: \u0020</string>
+            <string name="subject_dn">Subject DN: \u0020</string>
+            <string name="certificate_version">Certificate Version: \u0020</string>
+            <string name="serial_number">Serial Number: \u0020</string>
+            <string name="signature_algorithm">Signature Algorithm: \u0020</string>
         <string name="version_info_copied">Version info copied.</string>
         <string name="privacy_browser_version_txt">Privacy Browser Version %1$s.txt</string>
         <string name="privacy_browser_version_png">Privacy Browser Version %1$s.png</string>
@@ -515,14 +523,14 @@
         <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 13; Mobile; rv:106.0) Gecko/106.0 Firefox/106.0</item>
-            <item>Mozilla/5.0 (Linux; Android 13; Pixel 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Mobile Safari/537.36</item>
+            <item>Mozilla/5.0 (Android 13; Mobile; rv:108.0) Gecko/108.0 Firefox/108.0</item>
+            <item>Mozilla/5.0 (Linux; Android 13; Pixel 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Mobile Safari/537.36</item>
             <item>Mozilla/5.0 (iPhone; CPU iPhone OS 16_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.1 Mobile/15E148 Safari/604.1</item>
             <item>Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Firefox/102.0</item>
-            <item>Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36</item>
-            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:106.0) Gecko/20100101 Firefox/106.0</item>
-            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36</item>
-            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/107.0.0.0 Safari/537.36 Edg/107.0.1418.35</item>
+            <item>Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36</item>
+            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:108.0) Gecko/20100101 Firefox/108.0</item>
+            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36</item>
+            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36 Edg/108.0.1462.54</item>
             <item>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.0 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>
@@ -629,7 +637,8 @@
         <string name="bottom_app_bar">Bottom app bar</string>
         <string name="bottom_app_bar_summary">Move the app bar to the bottom of the screen. Changing this setting will restart Privacy Browser.</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 opening the bookmarks drawer and toggling cookies.</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.
+            Changing this setting will restart Privacy Browser.</string>
         <string name="app_theme">App theme</string>
         <string-array name="app_theme_entries">
             <item>System default</item>