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

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1f9ff1aa..824d3d62 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -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>
@@ -45,11 +46,12 @@
     <string name="cookies_deleted">Cookies deleted</string>
     <string name="dom_storage_deleted">DOM Storage deleted</string>
     <string name="form_data_deleted">Form Data deleted</string>
-    <string name="open_navigation_drawer">Open Navigation Drawer</string>
-    <string name="close_navigation_drawer">Close Navigation Drawer</string>
+    <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="add_tab">Add tab</string>
-    <string name="close_tab">Close 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>
@@ -194,7 +196,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>
@@ -206,10 +209,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>
@@ -236,7 +239,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>
@@ -356,7 +358,7 @@
         <string name="saved_ip_addresses">Saved IP addresses</string>
         <string name="current_ip_addresses">Current IP addresses</string>
 
-    <!-- Import/Export. -->
+    <!-- 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> -->
     <string name="encryption">Encryption</string>
     <string-array name="encryption_type">
         <item>None</item>
@@ -370,17 +372,18 @@
     <string name="export">Export</string>
     <string name="import_button">Import</string>  <!-- `import` is a reserved word and cannot be used as the name. -->
     <string name="decrypt">Decrypt</string>
+    <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:</string>
-    <string name="import_failed">Import failed:</string>
+    <string name="export_failed">Export failed:  %1$s</string>
+    <string name="import_failed">Import failed:  %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.-->
+        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. -->
@@ -389,6 +392,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. -->
@@ -400,10 +404,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>
@@ -413,7 +417,7 @@
             <string name="radio">Radio:</string>
         <string name="software">Software</string>
             <string name="android">Android:</string>
-            <string name="api">API</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>
@@ -421,8 +425,8 @@
             <string name="webview_version">WebView Version:</string>
             <string name="orbot">Orbot:</string>
             <string name="i2p">I2P:</string>
-                <string name="fdroid_flavor">(F-Droid flavor)</string>
-                <string name="google_play_flavor">(Google Play flavor)</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>
@@ -511,15 +515,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: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/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>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 (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 (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>
         <string name="custom_user_agent">Custom user agent</string>
@@ -618,7 +622,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 do not honor Privacy Browser’s proxy settings and do 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>
@@ -677,6 +682,7 @@
     <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="general_category_key" translatable="false">general</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>