X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fvalues%2Fstrings.xml;h=0a196f230b9422e27d667ee36e0f5e8cec6f16c9;hp=5428730c49cc24a7baa2b8aa425438dd8384f2e6;hb=b235ba52731f112015d9058ade4c5a66abf7ed5c;hpb=81179d84ced6b43360d42a4b44eb8fb329532ff4

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5428730c..0a196f23 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -132,6 +132,7 @@
     <string name="forward">Forward</string>
     <string name="history">History</string>
         <string name="clear_history">Clear History</string>
+    <string name="open">Open</string>
     <string name="downloads">Downloads</string>
     <string name="settings">Settings</string>
     <string name="import_export">Import/Export</string>
@@ -177,7 +178,9 @@
         <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_as_image">Save as Image</string>
+        <string name="save">Save</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>
@@ -204,8 +207,11 @@
     <string name="previous">Previous</string>
     <string name="next">Next</string>
 
-    <!-- Save Webpage as Image. -->
+    <!-- Save Webpage. -->
+    <string name="save_webpage">Save Webpage</string>
+    <string name="save_archive">Save Archive</string>
     <string name="save_image">Save Image</string>
+    <string name="webpage_mht">Webpage.mht</string>
     <string name="webpage_png">Webpage.png</string>
     <string name="saving_image">Saving image…</string>
     <string name="image_saved">Image saved.</string>
@@ -247,7 +253,6 @@
     <string name="edit_folder">Edit Folder</string>
     <string name="move_to_folder">Move to Folder</string>
     <string name="move">Move</string>
-    <string name="save">Save</string>
 
     <!-- Bookmarks Contextual App Bar. -->
     <string name="selected">Selected:</string>  <!--This is a plural adjective.-->
@@ -390,6 +395,7 @@
     <string name="overview">Overview</string>
     <string name="local_storage">Local Storage</string>
     <string name="ssl_certificates">SSL Certificates</string>
+    <string name="proxies">Proxies</string>
     <string name="tracking_ids">Tracking IDs</string>
 
     <!-- Download Location -->
@@ -400,12 +406,13 @@
     <!-- 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. -->
     <string name="waiting_for_proxy_dialog" translatable="false">Waiting for proxy dialog</string>  <!-- This string is used to tag the waiting for proxy dialog.  It is never displayed to the user. -->
-    <string name="proxies">Proxies</string>
     <string name="orbot_not_installed_title">Orbot Not Installed</string>
     <string name="orbot_not_installed_message">Proxying through Orbot will not work unless the Orbot app is installed.</string>
     <string name="i2p_not_installed_title">I2P Not Installed</string>
-    <string name="i2p_not_installed_message">Proxying through I2P will not work unless the I2P app is installed</string>
+    <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. -->
     <string name="about_privacy_browser">About Privacy Browser</string>
@@ -599,12 +606,12 @@
             <item>I2P</item>
             <item>Custom</item>
         </string-array>
-        <string name="no_proxy_enabled">No proxy enabled.  Connect directly to the internet.</string>
-        <string name="tor_enabled">Tor - proxy through localhost on port 8118.</string>
-        <string name="i2p_enabled">I2P - proxy through localhost on port 4444.</string>
+        <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_host">Proxy custom host</string>
-        <string name="proxy_custom_port">Proxy custom port</string>
+        <string name="proxy_custom_url">Proxy custom URL</string>
     <string name="full_screen">Full Screen</string>
         <string name="full_screen_browsing_mode">Full screen browsing mode</string>
         <string name="full_screen_browsing_mode_summary">Double-tap to toggle full screen browsing mode.</string>
@@ -649,8 +656,7 @@
     <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_host_default_value" translatable="false" />
-    <string name="proxy_custom_port_default_value" translatable="false" />
+    <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="font_size_default_value" translatable="false">100</string>