X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fvalues%2Fstrings.xml;h=8618c220037a49b20932793e2d0fd851d08be8c0;hp=3db04d17f0c7190782da181f3e491ae1190090a8;hb=6fa1563622642855d342cd7bcb523a8c1b6bbc44;hpb=4ecc3c256e439e7779d1db4d84800a6b2f9b13e6

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3db04d17..8618c220 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  Copyright © 2015-2018 Soren Stoutner <soren@stoutner.com>.
+  Copyright © 2015-2019 Soren Stoutner <soren@stoutner.com>.
 
   This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
 
@@ -75,6 +75,7 @@
     <string name="close">Close</string>
     <string name="domain">Domain</string>
     <string name="domain_label">Domain:</string>
+    <string name="ip_addresses">IP Addresses:</string>
     <string name="issued_to">Issued To</string>
     <string name="issued_by">Issued By</string>
     <string name="common_name">Common Name (CN):</string>
@@ -96,11 +97,11 @@
     <string name="url">URL</string>
     <string name="url_label">URL:</string>
 
-    <!-- Pinned SSL Certificate Mismatch. -->
-    <string name="update_ssl">Update SSL</string>
-    <string name="ssl_certificate_mismatch">SSL Certificate Mismatch</string>
-    <string name="current_ssl">Current SSL</string>
-    <string name="pinned_ssl">Pinned SSL</string>
+    <!-- Pinned Mismatch. -->
+    <string name="pinned_mismatch">Pinned Mismatch</string>
+    <string name="update">Update</string>
+    <string name="current">Current</string>
+    <string name="pinned">Pinned</string>
 
     <!-- HTTP Authentication. -->
     <string name="http_authentication">HTTP Authentication</string>
@@ -116,7 +117,6 @@
     <string name="forward">Forward</string>
     <string name="history">History</string>
         <string name="clear_history">Clear History</string>
-    <string name="bookmarks">Bookmarks</string>
     <string name="downloads">Downloads</string>
     <string name="settings">Settings</string>
     <string name="import_export">Import/Export</string>
@@ -132,10 +132,10 @@
     <string name="third_party_cookies">Third-Party 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>  <!-- The form data strings can be removed once the minimum API >= 26. -->
+    <string name="clear_data">Clear Data</string>
         <string name="clear_cookies">Clear Cookies</string>
         <string name="clear_dom_storage">Clear DOM Storage</string>
-        <string name="clear_form_data">Clear Form Data</string>
+        <string name="clear_form_data">Clear Form Data</string>  <!-- The form data strings can be removed once the minimum API >= 26. -->
     <string name="options_fanboys_annoyance_list">Fanboy’s Annoyance List</string>
     <string name="options_fanboys_social_blocking_list">Fanboy’s Social Blocking List</string>
     <string name="options_block_all_third_party_requests">Block All Third-Party Requests</string>
@@ -165,6 +165,9 @@
         <string name="display_images">Display Images</string>
         <string name="view_source">View Source</string>
     <string name="share">Share</string>
+        <string name="share_url">Share URL</string>
+        <string name="open_with_app">Open with App</string>
+        <string name="open_with_browser">Open with Browser</string>
     <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>
@@ -205,6 +208,7 @@
     <string name="create">Create</string>
 
     <!-- Bookmarks. -->
+    <string name="bookmarks">Bookmarks</string>
     <string name="database_view">Database View</string>
     <string name="create_bookmark">Create Bookmark</string>
     <string name="create_folder">Create Folder</string>
@@ -223,31 +227,27 @@
     <string name="save">Save</string>
 
     <!-- Bookmarks Contextual App Bar. -->
-    <string name="one_selected">1 Selected</string>
-    <string name="selected">Selected</string>  <!--This is a plural adjective.-->
-    <string name="selected_russian_ends_in_1">выбрана</string>
-    <string name="selected_russian_ends_in_2">выбраны</string>
-    <string name="selected_russian_everything_else">выбрано</string>
+    <string name="selected">Selected:</string>  <!--This is a plural adjective.-->
     <string name="move_up">Move Up</string>
     <string name="move_down">Move Down</string>
     <string name="edit">Edit</string>
     <string name="delete">Delete</string>
     <string name="select_all">Select All</string>
-    <string name="one_bookmark_deleted">1 Bookmark Deleted</string>
-    <string name="bookmarks_deleted">Bookmarks Deleted</string>
-    <string name="bookmarks_deleted_russian_ends_in_1">закладка удалена</string>
-    <string name="bookmarks_deleted_russian_ends_in_2">закладки удалены</string>
-    <string name="bookmarks_deleted_russian_everything_else">акладок удалено</string>
+    <string name="bookmarks_deleted">Bookmarks Deleted:</string>
     <string name="undo">Undo</string>
 
     <!-- Bookmarks Database View. -->
     <string name="bookmarks_database_view">Bookmarks Database View</string>
     <string name="all_folders">All Folders</string>
     <string name="home_folder">Home Folder</string>
+    <string name="sort">Sort</string>
+        <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">Folder:</string>
     <string name="parent_folder">Parent folder:</string>
     <string name="display_order">Display order:</string>
+    <string name="cannot_deselect_bookmark">A bookmark cannot be deselected while the parent folder is selected.</string>
 
     <!-- Requests. -->
     <string name="requests">Requests</string>
@@ -314,9 +314,12 @@
         <item>Images disabled</item>
     </string-array>
     <string name="pinned_ssl_certificate">Pinned SSL certificate</string>
-    <string name="saved_ssl_certificate">Saved SSL certificate</string>
-    <string name="current_website_ssl_certificate">Current website SSL certificate</string>
-    <string name="load_an_encrypted_website">Load an encrypted website before opening Domain Settings to populate the current website SSL certificate.</string>
+        <string name="saved_ssl_certificate">Saved SSL certificate</string>
+        <string name="current_website_ssl_certificate">Current website SSL certificate</string>
+        <string name="load_an_encrypted_website">Load an encrypted website before opening Domain Settings to populate the current website SSL certificate.</string>
+    <string name="pinned_ip_addresses">Pinned IP addresses</string>
+        <string name="saved_ip_addresses">Saved IP addresses</string>
+        <string name="current_ip_addresses">Current IP addresses</string>
 
     <!-- Import/Export. -->
     <string name="encryption">Encryption</string>
@@ -458,13 +461,13 @@
         <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 8.1.0; Mobile; rv:61.0) Gecko/61.0 Firefox/61.0</item>
-            <item>Mozilla/5.0 (Linux; Android 8.1.0; Pixel 2 XL Build/OPM4.171019.021.E1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.87 Mobile Safari/537.36</item>
-            <item>Mozilla/5.0 (iPhone; CPU iPhone OS 11_3 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.0 Mobile/15E148 Safari/604.1</item>
-            <item>Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Firefox/52.0</item>
-            <item>Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.87 Safari/537.36</item>
-            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:61.0) Gecko/20100101 Firefox/61.0</item>
-            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.99 Safari/537.36</item>
+            <item>Mozilla/5.0 (Android 9; Mobile; rv:63.0) Gecko/63.0 Firefox/63.0</item>
+            <item>Mozilla/5.0 (Linux; Android 9; Pixel 2 XL) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.110 Mobile Safari/537.36</item>
+            <item>Mozilla/5.0 (iPhone; CPU iPhone OS 12_0_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.0 Mobile/15E148 Safari/604.1</item>
+            <item>Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/60.0</item>
+            <item>Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.67 Safari/537.36</item>
+            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:63.0) Gecko/20100101 Firefox/63.0</item>
+            <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/71.0.3578.80 Safari/537.36</item>
             <item>Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/64.0.3282.140 Safari/537.36 Edge/17.17134</item>
             <item>Mozilla/5.0 (Windows NT 10.0; WOW64; Trident/7.0; rv:11.0) like Gecko</item>
             <item>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_4) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/11.1 Safari/605.1.15</item>
@@ -559,8 +562,8 @@
         <string name="clear_cache_summary">Clears WebView’s cache.</string>
     <string name="general">General</string>
         <string name="homepage">Homepage</string>
-        <string name="default_font_size">Default font size</string>
-        <string-array name="default_font_size_entries">
+        <string name="font_size_preference">Font size</string>
+        <string-array name="font_size_entries">
             <item>25%</item>
             <item>50%</item>
             <item>75%</item>
@@ -570,7 +573,7 @@
             <item>175%</item>
             <item>200%</item>
         </string-array>
-        <string-array name="default_font_size_entry_values" translatable="false">  <!-- None of the items in this `string-array` should be translated. -->
+        <string-array name="font_size_entry_values" translatable="false">  <!-- None of the items in this `string-array` should be translated. -->
             <item>25</item>
             <item>50</item>
             <item>75</item>
@@ -630,4 +633,4 @@
     <string name="google_app_id" translatable="false">Null</string>
     <string name="ad_unit_id" translatable="false">Null</string>
     <string name="ad_consent">Ad Consent</string>
-</resources>
+</resources>
\ No newline at end of file