X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fvalues%2Fstrings.xml;h=69cc2ff7b15e2d0ac025e81599839c03535fcd41;hb=5be7baa728da6b72d7cd104e4c30d8fe1a41c757;hp=f8a25db2c6afff8ce77ad0b8bfd15b06f117a805;hpb=0b0c40ca00cfdd80f3e215528f1b9c7f95bbcfe1;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f8a25db2..69cc2ff7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -27,13 +27,15 @@
     <string name="download_started">Download started</string>
     <string name="privacy_mode">Privacy Mode</string>
     <string name="javascript_enabled">JavaScript enabled</string>
+    <string name="javascript_disabled">JavaScript disabled</string>
     <string name="dom_storage_enabled">DOM Storage enabled</string>
-    <string name="cookies_enabled">Cookies enabled</string>
-    <string name="dom_storage_still_enabled">JavaScript disabled, DOM Storage still enabled</string>
-    <string name="cookies_still_enabled">Cookies still enabled</string>
-    <string name="both_still_enabled">JavaScript disabled, DOM Storage and Cookies still enabled</string>
-    <string name="dom_storage_deleted">DOM Storage deleted</string>
+    <string name="dom_storage_disabled">DOM Storage disabled</string>
+    <string name="first_party_cookies_enabled">First-Party Cookies enabled</string>
+    <string name="first_party_cookies_disabled">First-Party Cookies disabled</string>
+    <string name="third_party_cookies_enabled">Third-Party Cookies enabled</string>
+    <string name="third_party_cookies_disabled">Third-Party Cookies disabled</string>
     <string name="cookies_deleted">Cookies deleted</string>
+    <string name="dom_storage_deleted">DOM Storage deleted</string>
     <string name="open_navigation">Open Navigation Drawer</string>
     <string name="close_navigation">Close Navigation Drawer</string>
 
@@ -51,14 +53,16 @@
     <string name="about">About</string>
     <string name="clear_and_exit">Clear and Exit</string>
 
-    <!-- Menu. -->
+    <!-- Options Menu. -->
     <string name="javascript">JavaScript</string>
+    <string name="first_party_cookies">First-Party Cookies</string>
+    <string name="third_party_cookies">Third-Party Cookies</string>
     <string name="dom_storage">DOM Storage</string>
-    <string name="cookies">Cookies</string>
-    <string name="clear_dom_storage">Clear DOM Storage</string>
     <string name="clear_cookies">Clear Cookies</string>
+    <string name="clear_dom_storage">Clear DOM Storage</string>
     <string name="share">Share</string>
     <string name="add_to_home_screen">Add to Home Screen</string>
+    <string name="refresh">Refresh</string>
 
     <!-- Create Home Screen Shortcut Alert Dialog. -->
     <string name="shortcut_name">Shortcut name</string>
@@ -66,16 +70,56 @@
     <string name="create">Create</string>
 
     <!-- Preferences. -->
-    <string name="privacy_settings">Privacy Settings</string>
-    <string name="javascript_preference">JavaScript</string>
-    <string name="javascript_preference_summary">Enable JavaScript by default</string>
-    <string name="dom_storage_preference">DOM Storage</string>
-    <string name="dom_storage_preference_summary">Enable DOM storage by default</string>
-    <string name="cookies_preference">Cookies</string>
-    <string name="cookies_preference_summary">Enable cookies by default</string>
-    <string name="general_settings">General Settings</string>
+    <string name="privacy">Privacy</string>
+    <string name="javascript_preference">Enable JavaScript by default</string>
+    <string name="javascript_preference_summary">JavaScript allows websites to run programs (scripts) on your device.</string>
+    <string name="first_party_cookies_preference">Enable first-party cookies by default</string>
+    <string name="first_party_cookies_preference_summary">Cookies allow websites to store information on your device.
+        First-party cookies come from the server listed in the address bar.
+        Devices with versions of Android older than Lollipop (version 5.0) will also enable third-party cookies with this setting.</string>
+    <string name="third_party_cookies_preference">Enable third-party cookies by default</string>
+    <string name="third_party_cookies_summary">Third-party cookies allow parts of websites that aren\'t the main website, like advertisements, to store information on your device.
+        This setting requires Android Lollipop (version 5.0) or higher.  This setting has no effect if first-party cookies are disabled.</string>
+    <string name="dom_storage_preference">Enable DOM storage by default</string>
+    <string name="dom_storage_preference_summary">Document Object Management storage, also called web storage, is an enhanced form of cookies
+        that allows websites to store larger and more complex types of information, like pictures, on your device.</string>
+    <string name="search">Search</string>
+    <string name="javascript_disabled_search">JavaScript-disabled search</string>
+    <string-array name="javascript_disabled_search_entries">
+        <item>DuckDuckGo</item>
+        <item>Google</item>
+        <item>Bing</item>
+        <item>Yahoo</item>
+        <item>Custom</item>
+    </string-array>
+    <string-array name="javascript_disabled_search_entry_values">
+        <item>https://duckduckgo.com/html/?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>Custom URL</item>
+    </string-array>
+    <string name="javascript_disabled_search_custom_url">JavaScript-disabled search custom URL</string>
+    <string name="javascript_enabled_search">JavaScript-enabled search</string>
+    <string-array name="javascript_enabled_search_entries">
+        <item>DuckDuckGo</item>
+        <item>Google</item>
+        <item>Bing</item>
+        <item>Yahoo</item>
+        <item>Custom</item>
+    </string-array>
+    <string-array name="javascript_enabled_search_entry_values">
+        <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?p=</item>
+        <item>Custom URL</item>
+    </string-array>
+    <string name="javascript_enabled_search_custom_url">JavaScript-enabled search custom URL</string>
+    <string name="general">General</string>
     <string name="homepage_preference">Homepage</string>
-    <string name="homepage_preference_summary">Set the homepage</string>
+    <string name="swipe_to_refresh_enabled">Swipe to refresh</string>
+    <string name="swipe_to_refresh_enabled_summary">Some websites don\'t work well if swipe to refresh is enabled.</string>
 
     <!-- About Dialog. -->
     <string name="about_privacy_browser">About Privacy Browser</string>