X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;ds=sidebyside;f=app%2Fsrc%2Fmain%2Fres%2Fvalues%2Fstrings.xml;h=3f5aff2bc638ecf39f564d272b20d777e5da36c5;hb=8d4d8f41d729dd0354d12fd99bd7d91b436feee5;hp=413961652f5afaf3fdbe69941628090e05dbd18f;hpb=d941ca283544e1c3231f59796a3f64270e747a99;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 41396165..3f5aff2b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -36,10 +36,8 @@
     <string name="privacy_mode">Privacy Mode</string>
     <string name="javascript_enabled">JavaScript enabled</string>
     <string name="javascript_disabled">JavaScript 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_enabled">Cookies enabled</string>
+    <string name="cookies_disabled">Cookies disabled</string>
     <string name="dom_storage_enabled">DOM Storage enabled</string>
     <string name="dom_storage_disabled">DOM Storage disabled</string>
     <string name="form_data_enabled">Form Data enabled</string>  <!-- The form data strings can be removed once the minimum API >= 26. -->
@@ -132,8 +130,7 @@
     <string name="javascript">JavaScript</string>
     <string name="refresh">Refresh</string>
     <string name="stop">Stop</string>
-    <string name="first_party_cookies">First-Party Cookies</string>
-    <string name="third_party_cookies">Third-Party Cookies</string>
+    <string name="cookies">Cookies</string>
     <string name="dom_storage">DOM Storage</string>
     <string name="form_data">Form Data</string>  <!-- The form data strings can be removed once the minimum API >= 26. -->
     <string name="clear_data">Clear Data</string>
@@ -450,16 +447,11 @@
 
     <!-- Preferences. -->
     <string name="privacy">Privacy</string>
-        <string name="javascript_preference">JavaScript</string>
         <string name="javascript_preference_summary">JavaScript allows websites to run programs (scripts) on the device.</string>
-        <string name="first_party_cookies_preference">First-party cookies</string>
-        <string name="first_party_cookies_preference_summary">Because first-party cookies are an app level setting, when the active tab has cookies enabled,
-            any network requests made in the background by other tabs will also include any stored cookies for their domains.
-            Android KitKat (version 4.4.x) does not differentiate between first and third-party cookies and will enable them both with this setting.</string>
-        <string name="third_party_cookies_preference">Third-party cookies</string>
-        <string name="third_party_cookies_summary">This setting requires Android Lollipop (version 5.0) or higher.  It has no effect if first-party cookies are disabled.</string>
+        <string name="cookies_preference_summary">Cookies are an app level setting. When the active tab has cookies enabled,
+            any network request made in the background by another tab also has cookies enabled.</string>
         <string name="dom_storage_preference">DOM storage</string>
-        <string name="dom_storage_preference_summary">JavaScript must be enabled for DOM storage to function.</string>
+        <string name="dom_storage_preference_summary">JavaScript must be enabled for Document Object Model storage to function.</string>
         <string name="save_form_data_preference">Form data</string>  <!-- The form data strings can be removed once the minimum API >= 26. -->
         <string name="save_form_data_preference_summary">Saved form data can auto-populate fields on websites.</string>  <!-- The form data strings can be removed once the minimum API >= 26. -->
         <string name="user_agent">User agent</string>
@@ -611,7 +603,7 @@
         <!-- The form data part of this string can be removed once the minimum API >= 26. -->
         <string name="clear_everything_summary">Clears cookies, DOM storage, form data, the logcat, and WebView’s cache.  Then manually deletes the entire “app_webview” and “cache” directories.</string>
         <string name="clear_cookies_preference">Clear cookies</string>
-        <string name="clear_cookies_summary">Clears first and third-party cookies.</string>
+        <string name="clear_cookies_summary">Clears cookies.</string>
         <string name="clear_dom_storage_preference">Clear DOM storage</string>
         <string name="clear_dom_storage_summary">Clears DOM storage.</string>
         <string name="clear_form_data_preference">Clear form data</string>  <!-- The form data strings can be removed once the minimum API >= 26. -->
@@ -659,6 +651,7 @@
         <string name="display_webpage_images_summary">Disable to conserve bandwidth.</string>
 
     <!-- Non-translatable preference keys. -->
+    <string name="cookies_key" translatable="false">cookies</string>
     <string name="allow_screenshots_key" translatable="false">allow_screenshots</string>
     <string name="clear_logcat_key" translatable="false">clear_logcat</string>
     <string name="display_additional_app_bar_icons_key" translatable="false">display_additional_app_bar_icons</string>