X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fvalues%2Fstrings.xml;h=a759feb8505335041c916b4627d72dc9e9cd4c42;hb=a424c7a4dd110995277c9f4753fecb21a4a4991a;hp=37e2554ad761c423017cfeb3ae9d2f78fd41301b;hpb=c51155ed36754975d2b8673e37e58df6201702b8;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 37e2554a..a759feb8 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -213,6 +213,7 @@
     <string name="saving_file_progress">Saving file:\u0020 %1$s bytes - %2$s</string>
     <string name="saving_file_percentage_progress">Saving file:\u0020 %1$d%% - %2$s bytes / %3$s bytes - %4$s</string>
     <string name="saved">%1$s saved.</string>
+    <string name="download_cancelled">Download cancelled.</string>
     <string name="processing_image">Processing image:\u0020 %1$s</string>
     <string name="error_saving_file">Error saving %1$s:\u0020 %2$s</string>
     <string name="unknown_error">Unknown error</string>
@@ -251,7 +252,6 @@
     <string name="bookmark_name">Bookmark name</string>
     <string name="folder_name">Folder name</string>
     <string name="bookmark_url">Bookmark URL</string>
-    <string name="folder_names_must_be_unique">Folder names must be unique</string>
     <string name="edit_bookmark">Edit Bookmark</string>
     <string name="edit_folder">Edit Folder</string>
     <string name="move_to_folder">Move to Folder</string>
@@ -268,7 +268,8 @@
     <string name="bookmarks_deleted">Bookmarks Deleted:\u0020 %1$d</string>
     <string name="undo">Undo</string>
 
-    <!-- Bookmarks Database View. -->
+    <!-- Bookmarks Database View.  Android removes initial spaces, but they can be manually specified with the Unicode `\u0020` formatting.
+        The `%1$d` code inserts variables into the displayed text and should be preserved in translation.  <https://developer.android.com/reference/kotlin/java/util/Formatter>-->
     <string name="bookmarks_database_view">Bookmarks Database View</string>
     <string name="all_folders">All Folders</string>
     <string name="home_folder">Home Folder</string>
@@ -276,6 +277,8 @@
         <string name="sorted_by_database_id">Sorted by database ID.</string>
         <string name="sorted_by_display_order">Sorted by display order.</string>
     <string name="database_id">Database ID:</string>
+    <string name="folder_id">Folder ID:</string>
+    <string name="folder_id_separator">\u0020 – %1$d</string>
     <string name="folder">Folder:</string>
     <string name="parent_folder">Parent folder:</string>
     <string name="display_order">Display order:</string>
@@ -332,6 +335,61 @@
     <string name="domain_name">Domain name</string>
     <string name="domain_deleted">Domain deleted</string>
     <string name="domain_name_instructions">*. may be prepended to a domain to include all subdomains (eg. *.stoutner.com)</string>
+    <string-array name="javascript_array">
+        <item>System default</item>
+        <item>JavaScript enabled</item>
+        <item>JavaScript disabled</item>
+    </string-array>
+    <string-array name="cookies_array">
+        <item>System default</item>
+        <item>Cookies enabled</item>
+        <item>Cookies disabled</item>
+    </string-array>
+    <string-array name="dom_storage_array">
+        <item>System default</item>
+        <item>DOM storage enabled</item>
+        <item>DOM storage disabled</item>
+    </string-array>
+    <string-array name="form_data_array">  <!-- Form data can be removed once the minimum API >= 26. -->
+        <item>System default</item>
+        <item>Form data enabled</item>
+        <item>Form data disabled</item>
+    </string-array>
+    <string-array name="easylist_array">
+        <item>System default</item>
+        <item>EasyList enabled</item>
+        <item>EasyList disabled</item>
+    </string-array>
+    <string-array name="easyprivacy_array">
+        <item>System default</item>
+        <item>EasyPrivacy enabled</item>
+        <item>EasyPrivacy disabled</item>
+    </string-array>
+    <string-array name="fanboys_annoyance_list_array">
+        <item>System default</item>
+        <item>Fanboy’s Annoyance List enabled</item>
+        <item>Fanboy’s Annoyance List disabled</item>
+    </string-array>
+    <string-array name="fanboys_social_blocking_list_array">
+        <item>System default</item>
+        <item>Fanboy’s Social Blocking List enabled</item>
+        <item>Fanboy’s Social Blocking List disabled</item>
+    </string-array>
+    <string-array name="ultralist_array">
+        <item>System default</item>
+        <item>UltraList enabled</item>
+        <item>UltraList disabled</item>
+    </string-array>
+    <string-array name="ultraprivacy_array">
+        <item>System default</item>
+        <item>UltraPrivacy enabled</item>
+        <item>UltraPrivacy disabled</item>
+    </string-array>
+    <string-array name="block_all_third_party_requests_array">
+        <item>System default</item>
+        <item>Block all third-party requests enabled</item>
+        <item>Block all third-party requests disabled</item>
+    </string-array>
     <string-array name="font_size_array">
         <item>System default</item>
         <item>Custom font size</item>
@@ -523,15 +581,15 @@
         <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 13; Mobile; rv:108.0) Gecko/108.0 Firefox/108.0</item>
-            <item>Mozilla/5.0 (Linux; Android 13; Pixel 5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Mobile Safari/537.36</item>
-            <item>Mozilla/5.0 (iPhone; CPU iPhone OS 16_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.1 Mobile/15E148 Safari/604.1</item>
+            <item>Mozilla/5.0 (Android 13; Mobile; rv:109.0) Gecko/113.0 Firefox/113.0</item>
+            <item>Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Mobile Safari/537.36</item>
+            <item>Mozilla/5.0 (iPhone; CPU iPhone OS 16_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.4 Mobile/15E148 Safari/604.1</item>
             <item>Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Firefox/102.0</item>
-            <item>Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36</item>
-            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:108.0) Gecko/20100101 Firefox/108.0</item>
-            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36</item>
-            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/108.0.0.0 Safari/537.36 Edg/108.0.1462.54</item>
-            <item>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.0 Safari/605.1.15</item>
+            <item>Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/113.0.0.0 Safari/537.36</item>
+            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:109.0) Gecko/20100101 Firefox/113.0</item>
+            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36</item>
+            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36 Edg/114.0.1823.37</item>
+            <item>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/16.4 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>