X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fxml%2Fpreferences.xml;h=4549040a27a32f1bd34a79ec3c87ad36d627e797;hb=dbdf194aca3fce9e3e60b254e173bb357a6d8ceb;hp=759bcbada2c509edfb0d9cc3494024bf1f5f495f;hpb=49e94a767e452d451a722bbb068e46458e404ed9;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 759bcbad..4549040a 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -47,6 +47,7 @@
             android:summary="@string/dom_storage_preference_summary"
             android:defaultValue="false" />
 
+        <!-- Save form data can be removed once the minimum API >= 26. -->
         <SwitchPreference
             android:key="save_form_data_enabled"
             android:title="@string/save_form_data_preference"
@@ -56,9 +57,9 @@
         <ListPreference
             android:key="user_agent"
             android:title="@string/user_agent"
-            android:entries="@array/user_agent_entries"
-            android:entryValues="@array/user_agent_entry_values"
-            android:defaultValue="PrivacyBrowser/1.0"
+            android:entries="@array/translated_user_agent_names"
+            android:entryValues="@array/user_agent_names"
+            android:defaultValue="Privacy Browser"
             android:icon="?attr/userAgentIcon" />
 
         <!-- android:inputType="textVisiblePassword" sets the keyboard to have a dedicated number row.-->
@@ -79,11 +80,17 @@
             android:title="@string/do_not_track"
             android:summary="@string/do_not_track_summary"
             android:defaultValue="false" />
+
+        <SwitchPreference
+            android:key="allow_screenshots"
+            android:title="@string/allow_screenshots"
+            android:summary="@string/allow_screenshots_summary"
+            android:defaultValue="false" />
     </PreferenceCategory>
 
     <PreferenceCategory
-        android:key="block_lists"
-        android:title="@string/block_lists" >
+        android:key="blocklists"
+        android:title="@string/blocklists" >
 
         <SwitchPreference
             android:key="easylist"
@@ -99,15 +106,21 @@
 
         <SwitchPreference
             android:key="fanboy_annoyance_list"
-            android:title="@string/fanboy_annoyance_list"
-            android:summary="@string/fanboy_annoyance_list_summary"
+            android:title="@string/fanboys_annoyance_list"
+            android:summary="@string/fanboys_annoyance_list_summary"
             android:defaultValue="true" />
 
         <SwitchPreference
             android:key="fanboy_social_blocking_list"
-            android:title="@string/fanboy_social_blocking_list"
-            android:summary="@string/fanboy_social_blocking_list_summary"
+            android:title="@string/fanboys_social_blocking_list"
+            android:summary="@string/fanboys_social_blocking_list_summary"
             android:defaultValue="true" />
+
+        <SwitchPreference
+            android:key="block_all_third_party_requests"
+            android:title="@string/block_all_third_party_requests"
+            android:summary="@string/block_all_third_party_requests_summary"
+            android:defaultValue="false" />
     </PreferenceCategory>
 
     <PreferenceCategory
@@ -187,7 +200,7 @@
     </PreferenceCategory>
 
     <PreferenceCategory
-        android:key="clean_and_exit"
+        android:key="clear_and_exit"
         android:title="@string/clear_and_exit" >
 
         <SwitchPreference
@@ -242,9 +255,9 @@
 
         <SwitchPreference
             android:key="swipe_to_refresh"
-            android:title="@string/swipe_to_refresh_enabled"
-            android:summary="@string/swipe_to_refresh_enabled_summary"
-            android:defaultValue="false" />
+            android:title="@string/swipe_to_refresh_preference"
+            android:summary="@string/swipe_to_refresh_summary"
+            android:defaultValue="true" />
 
         <SwitchPreference
             android:key="display_additional_app_bar_icons"