X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Fvalues%2Fstrings.xml;h=34ab9146bda8b55e8360ef21e052bcd83b6f13fa;hb=be1d361c9ca97f21ca9298d72b07e4a57788fe56;hp=822b87880360248c96e81793a85a94c215e98c19;hpb=12042264a50769030361cf51b0ac197050209f0f;p=PrivacyBrowserAndroid.git

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 822b8788..34ab9146 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -33,7 +33,8 @@
     <!-- For translations, `android_asset_path` should be the localization abbreviation.  For example, Spanish is `es`.  This should not be translated unless the Guide and About sections are localized. -->
     <string name="android_asset_path">en</string>
 
-    <!-- MainWebView.  Android removes double spaces, but extra spaces can be manually specified with the Unicode `\u0020` formatting. -->
+    <!-- MainWebView.  Android removes double spaces, but extra spaces can be manually specified with the Unicode `\u0020` formatting.
+        The `%1$s` code inserts variables into the displayed text and should be preserved in translation.  <https://developer.android.com/reference/kotlin/java/util/Formatter> -->
     <string name="privacy_mode">Privacy Mode</string>
     <string name="javascript_enabled">JavaScript enabled</string>
     <string name="javascript_disabled">JavaScript disabled</string>
@@ -49,12 +50,12 @@
     <string name="open_navigation_drawer">Open navigation drawer</string>
     <string name="close_navigation_drawer">Close navigation drawer</string>
     <string name="pin_drawer">Pin drawer</string>
-    <string name="unrecognized_url">Unrecognized URL: \u0020</string>
+    <string name="unrecognized_url">Unrecognized URL:\u0020 %1$s</string>
     <string name="add_tab">Add tab</string>
     <string name="close_tab">Close tab</string>
     <string name="new_tab">New tab</string>
     <string name="loading">Loading…</string>
-    <string name="error">Error: \u0020</string>
+    <string name="error">Error:\u0020 %1$s</string>
     <string name="apply">Apply</string>
 
     <!-- Loading Blocklists. -->
@@ -208,12 +209,12 @@
     <string name="bytes">bytes</string>
     <string name="unknown_size">unknown size</string>
     <string name="invalid_url">invalid URL</string>
-    <string name="saving_file">Saving file: \u0020 %1$d%% - %2$s</string>
-    <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="saving_file">Saving file:\u0020 %1$d%% - %2$s</string>
+    <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="processing_image">Processing image: \u0020 %1$s</string>
-    <string name="error_saving_file">Error saving %1$s: \u0020 %2$s</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>
 
     <!-- View Source. -->
@@ -256,14 +257,15 @@
     <string name="move_to_folder">Move to Folder</string>
     <string name="move">Move</string>
 
-    <!-- Bookmarks Contextual App Bar.  Android removes double spaces, but extra spaces can be manually specified with the Unicode `\u0020` formatting. -->
-    <string name="selected">Selected: \u0020</string>  <!--This is a plural adjective.-->
+    <!-- Bookmarks Contextual App Bar.  Android removes double spaces, but extra spaces 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="selected">Selected:\u0020 %1$d</string>
     <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="bookmarks_deleted">Bookmarks Deleted: \u0020</string>
+    <string name="bookmarks_deleted">Bookmarks Deleted:\u0020 %1$d</string>
     <string name="undo">Undo</string>
 
     <!-- Bookmarks Database View. -->
@@ -279,7 +281,7 @@
     <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. -->
+    <!-- Requests.  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="requests">Requests</string>
     <string name="request_details">Request details</string>
     <string name="disposition">Disposition</string>
@@ -363,7 +365,7 @@
         <string name="current_ip_addresses">Current IP addresses</string>
 
     <!-- Import/Export.  Android removes double spaces, but extra spaces can be manually specified with the Unicode `\u0020` formatting.
-      The `%1$s` code inserts variables into the displayed text and should be preserved in translation.  <https://developer.android.com/reference/kotlin/java/util/Formatter> -->
+      The `%1$*` code inserts variables into the displayed text and should be preserved in translation.  <https://developer.android.com/reference/kotlin/java/util/Formatter> -->
     <string name="encryption">Encryption</string>
     <string-array name="encryption_type">
         <item>None</item>
@@ -377,19 +379,19 @@
     <string name="export">Export</string>
     <string name="import_button">Import</string>  <!-- `import` is a reserved word and cannot be used as the name. -->
     <string name="decrypt">Decrypt</string>
-    <string name="privacy_browser_settings_pbs">Privacy Browser Settings %1$s.pbs</string>
-    <string name="privacy_browser_settings_pbs_aes">Privacy Browser Settings %1$s.pbs.aes</string>
+    <string name="privacy_browser_settings_pbs">Privacy Browser Android %1$s Settings - Schema %2$d.pbs</string>
+    <string name="privacy_browser_settings_pbs_aes">Privacy Browser Android %1$s Settings - Schema %2$d.pbs.aes</string>
     <string name="export_successful">Export successful.</string>
-    <string name="export_failed">Export failed: \u0020 %1$s</string>
-    <string name="import_failed">Import failed: \u0020 %1$s</string>
+    <string name="export_failed">Export failed:\u0020 %1$s</string>
+    <string name="import_failed">Import failed:\u0020 %1$s</string>
 
     <!-- Logcat.  Android removes double spaces, but extra spaces can be manually specified with the Unicode `\u0020` formatting.
         The `%1$s` code inserts variables into the displayed text and should be preserved in translation.  <https://developer.android.com/reference/kotlin/java/util/Formatter> -->
     <string name="copy_string">Copy</string>
     <string name="clear">Clear</string>
     <string name="logcat_copied">Logcat copied.</string>
-    <string name="privacy_browser_logcat_txt">Privacy Browser %1$s Logcat.txt</string>
-    <string name="error_saving_logcat">Error saving logcat: \u0020 %1$s</string>
+    <string name="privacy_browser_logcat_txt">Privacy Browser Android %1$s Logcat.txt</string>
+    <string name="error_saving_logcat">Error saving logcat:\u0020 %1$s</string>
 
     <!-- Guide. -->
     <string name="overview">Overview</string>
@@ -456,8 +458,8 @@
             <string name="serial_number">Serial Number: \u0020</string>
             <string name="signature_algorithm">Signature Algorithm: \u0020</string>
         <string name="version_info_copied">Version info copied.</string>
-        <string name="privacy_browser_version_txt">Privacy Browser Version %1$s.txt</string>
-        <string name="privacy_browser_version_png">Privacy Browser Version %1$s.png</string>
+        <string name="privacy_browser_version_txt">Privacy Browser Android %1$s Version.txt</string>
+        <string name="privacy_browser_version_png">Privacy Browser Android %1$s Version.png</string>
     <string name="permissions">Permissions</string>
     <string name="privacy_policy">Privacy Policy</string>
     <string name="changelog">Changelog</string>
@@ -635,7 +637,8 @@
         <string name="bottom_app_bar">Bottom app bar</string>
         <string name="bottom_app_bar_summary">Move the app bar to the bottom of the screen. Changing this setting will restart Privacy Browser.</string>
         <string name="display_additional_app_bar_icons">Display additional app bar icons</string>
-        <string name="display_additional_app_bar_icons_summary">Display icons in the app bar for refreshing the WebView and, if there is room, for opening the bookmarks drawer and toggling cookies.</string>
+        <string name="display_additional_app_bar_icons_summary">Display icons in the app bar for refreshing the WebView and, if there is room, for opening the bookmarks drawer and toggling cookies.
+            Changing this setting will restart Privacy Browser.</string>
         <string name="app_theme">App theme</string>
         <string-array name="app_theme_entries">
             <item>System default</item>