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

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b07d8e90..e5fb3c7f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2015-2021 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2015-2022 Soren Stoutner <soren@stoutner.com>.
 
-  This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
+  This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
 
-  Privacy Browser is free software: you can redistribute it and/or modify
+  Privacy Browser Android is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
 
-  Privacy Browser is distributed in the hope that it will be useful,
+  Privacy Browser Android is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
 
   You should have received a copy of the GNU General Public License
-  along with Privacy Browser.  If not, see <http://www.gnu.org/licenses/>. -->
+  along with Privacy Browser Android.  If not, see <http://www.gnu.org/licenses/>. -->
 
 <!-- `tools:ignore="MissingTranslation"` allows release APKs to be built if translation strings are missing.  The missing strings will fall back to English. -->
 <resources
@@ -28,7 +28,7 @@
 
     <!-- Activities. -->
     <string name="privacy_browser">Privacy Browser</string>
-    <string name="short_name">Privacy</string>
+    <string name="short_name">Browser</string>
     <!-- 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>
 
@@ -167,6 +167,7 @@
         <string name="add_to_home_screen">Add to Home Screen</string>
         <string name="view_source">View Source</string>
     <string name="share">Share</string>
+        <string name="share_message">Share Message</string>
         <string name="share_url">Share URL</string>
         <string name="open_with_app">Open with App</string>
         <string name="open_with_browser">Open with Browser</string>
@@ -192,17 +193,13 @@
     <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 Dialogs. -->
+    <!-- Save Dialog. -->
     <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>
     <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="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>
@@ -365,7 +362,6 @@
         <item>Password</item>
         <item>OpenPGP</item>
     </string-array>
-    <string name="kitkat_password_encryption_message">Password encryption does not work on Android KitKat.</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="file_location">File Location</string>
@@ -377,10 +373,14 @@
     <string name="export_failed">Export failed:</string>
     <string name="import_failed">Import failed:</string>
 
-    <!-- Logcat. -->
-    <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>
+    <!-- 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.-->
+    <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. -->
     <string name="overview">Overview</string>
@@ -398,9 +398,8 @@
     <string name="i2p_not_installed_message">Proxying through I2P will not work unless the I2P app is installed.</string>
     <string name="waiting_for_orbot">Waiting for Orbot to connect.</string>
     <string name="custom_proxy_invalid">The custom proxy URL is invalid.</string>
-    <string name="socks_proxies_do_not_work_on_kitkat">SOCKS proxies do not work on Android KitKat.</string>
 
-    <!-- About Activity. -->
+    <!-- About Activity.  The `%1$s` code inserts variables into the displayed text and should be preserved in translation. -->
     <string name="about_privacy_browser">About Privacy Browser</string>
     <string name="version">Version</string>
         <string name="version_code">version code</string>
@@ -443,6 +442,8 @@
             <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="privacy_browser_version_txt">Privacy Browser Version %1$s.txt</string>
+        <string name="privacy_browser_version_png">Privacy Browser Version %1$s.png</string>
     <string name="permissions">Permissions</string>
     <string name="privacy_policy">Privacy Policy</string>
     <string name="changelog">Changelog</string>
@@ -471,7 +472,6 @@
             <item>Firefox on Windows</item>
             <item>Chrome on Windows</item>
             <item>Edge on Windows</item>
-            <item>Internet Explorer on Windows</item>
             <item>Safari on macOS</item>
             <item>Custom</item>
         </string-array>
@@ -487,7 +487,6 @@
             <item>Firefox on Windows</item>
             <item>Chrome on Windows</item>
             <item>Edge on Windows</item>
-            <item>Internet Explorer on Windows</item>
             <item>Safari on macOS</item>
             <item>Custom</item>
         </string-array>
@@ -502,23 +501,21 @@
             <item>Firefox on Windows</item>
             <item>Chrome on Windows</item>
             <item>Edge on Windows</item>
-            <item>Internet Explorer on Windows</item>
             <item>Safari on macOS</item>
             <item>Custom user agent</item>
         </string-array>
         <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 11; Mobile; rv:88.0) Gecko/88.0 Firefox/88.0</item>
-            <item>Mozilla/5.0 (Linux; Android 11; Pixel 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.210 Mobile Safari/537.36</item>
-            <item>Mozilla/5.0 (iPhone; CPU iPhone OS 14_4_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.0.3 Mobile/15E148 Safari/604.1</item>
-            <item>Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Firefox/78.0</item>
-            <item>Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/89.0.4389.114 Safari/537.36</item>
-            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:88.0) Gecko/20100101 Firefox/88.0</item>
-            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.212 Safari/537.36</item>
-            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.212 Safari/537.36 Edg/90.0.818.62</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_15_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.0.2 Safari/605.1.15</item>
+            <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 (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>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>
@@ -552,27 +549,19 @@
     <string name="search">Search</string>
         <string-array name="search_entries">
             <item>Mojeek</item>
-            <item>Startpage</item>
             <item>Monocles</item>
-            <item>Metager</item>
-            <item>DuckDuckGo - JavaScript disabled</item>
-            <item>DuckDuckGo - JavaScript enabled</item>
+            <item>MetaGer</item>
             <item>Google</item>
             <item>Bing</item>
-            <item>Yahoo - JavaScript disabled</item>
-            <item>Yahoo - JavaScript enabled</item>
+            <item>Yahoo</item>
             <item>Custom</item>
         </string-array>
         <string-array name="search_entry_values" translatable="false">  <!-- None of the items in this string array should be translated. -->
             <item>https://www.mojeek.com/search?q=</item>
-            <item>https://www.startpage.com/do/search?query=</item>
             <item>https://monocles.de/search?q=</item>
             <item>https://metager.org/meta/meta.ger3?eingabe=</item>
-            <item>https://duckduckgo.com/html/?q=</item>
-            <item>https://duckduckgo.com/?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>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>
@@ -597,7 +586,6 @@
         </string-array>
         <string name="no_proxy_enabled">None - connect directly to the internet.</string>
         <string name="tor_enabled">Tor - connect through socks://localhost:9050.</string>
-        <string name="tor_enabled_kitkat">Tor - connect through http://localhost:8118.</string>
         <string name="i2p_enabled">I2P - connect through http://localhost:4444.</string>
         <string name="custom_proxy">Custom proxy</string>
         <string name="proxy_custom_url">Proxy custom URL</string>
@@ -631,7 +619,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="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="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="app_theme">App theme</string>
@@ -668,13 +656,15 @@
     <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="display_additional_app_bar_icons_key" translatable="false">display_additional_app_bar_icons</string>
+    <string name="proxy_custom_url_key" translatable="false">proxy_custom_url</string>
+    <string name="scroll_app_bar_key" translatable="false">scroll_app_bar</string>
 
     <!-- Non-translatable preference default values. -->
     <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="font_size_default_value" translatable="false">100</string>
     <string name="homepage_default_value" translatable="false">https://www.mojeek.com/</string>
-    <string name="proxy_custom_url_default_value" translatable="false">http://localhost:8118</string>
+    <string name="proxy_custom_url_default_value" translatable="false">socks://localhost:9050</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.mojeek.com/search?q=</string>