From f2aadc2d0e9cb25101866c174e11ffa560ecf1b9 Mon Sep 17 00:00:00 2001
From: Felipe Erias <felipeerias@igalia.com>
Date: Fri, 10 Jan 2025 21:24:34 +0900
Subject: [PATCH] Update strings.xml and non_L10n.xml from upstream main

---
 app/src/main/res/values/non_L10n.xml |  9 ++++++--
 app/src/main/res/values/strings.xml  | 31 ++++++++++++++--------------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/app/src/main/res/values/non_L10n.xml b/app/src/main/res/values/non_L10n.xml
index 583beb6c3fe..8e8f88e6bcf 100644
--- a/app/src/main/res/values/non_L10n.xml
+++ b/app/src/main/res/values/non_L10n.xml
@@ -21,6 +21,8 @@
     <string name="settings_key_speech_data_collection" translatable="false">settings_key_speech_data_collection</string>
     <string name="settings_key_speech_data_collection_reviewed" translatable="false">settings_key_speech_data_collection_accept</string>
     <string name="settings_key_window_distance" translatable="false">settings_window_distance</string>
+    <string name="settings_key_window_width" translatable="false">settings_window_width</string>
+    <string name="settings_key_window_height" translatable="false">settings_window_height</string>
     <string name="settings_key_user_agent_version" translatable="false">settings_user_agent_version_v2</string>
     <string name="settings_key_input_mode" translatable="false">settings_touch_mode</string>
     <string name="settings_key_center_windows" translatable="false">settings_center_windows</string>
@@ -46,7 +48,7 @@
     <string name="settings_key_crash_restart_count_timestamp" translatable="false">settings_key_crash_restart_count_timestamp</string>
     <string name="settings_key_keyboard_move" translatable="false">settings_key_keyboard_move</string>
     <string name="settings_key_pointer_mode" translatable="false">settings_key_pointer_mode</string>
-    <string name="private_browsing_support_url" translatable="false">https://support.mozilla.org/kb/private-mode-firefox-reality</string>
+    <string name="private_browsing_support_url" translatable="false">https://wolvic.com/en/support/private-mode</string>
     <string name="settings_key_browser_world_width" translatable="false">settings_browser_world_width</string>
     <string name="settings_key_browser_world_height" translatable="false">settings_browser_world_height</string>
     <string name="settings_key_notifications" translatable="false">settings_key_notifications</string>
@@ -83,6 +85,7 @@
     <string name="settings_key_privacy_policy_accepted" translatable="false">settings_key_privacy_policy_accepted</string>
     <string name="settings_key_search_engine_id" translatable="false">settings_key_search_engine_id</string>
     <string name="settings_key_eye_tracking_supported" translatable="false">settings_key_eye_tracking_supported</string>
+    <string name="settings_key_tabs_location" translatable="false">settings_key_tabs_location</string>
     <string name="environment_override_help_url" translatable="false">https://github.com/igalia/wolvic/wiki/Environments</string>
     <string name="private_policy_url" translatable="false">https://wolvic.com/legal/privacy/</string>
     <string name="private_report_url" translatable="false">https://www.igalia.com/privacy/&amp;url=%1$s</string>
@@ -223,8 +226,10 @@
     <string name="keyboard_nl_NL_popup_u" translatable="false">uúüûùūůų</string>
     <string name="keyboard_nl_NL_popup_i" translatable="false">ìíiïîįī</string>
 
+    <!-- Homepage link -->
+    <string name="home_page_url" translatable="false">https://wolvic.com/</string>
+
     <!-- Settings Survey link -->
-    <string name="survey_link" translatable="false">https://github.com/Igalia/wolvic/issues/</string>
     <string name="feedback_link" translatable="false">https://wolvic.com/en/feedback/index.html?version=%1$s&amp;device=%2$d</string>
 
     <!-- Phone UI links -->
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7b190ddcee2..d7c812a2f1c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -499,9 +499,13 @@
          and is used to customize if we use passthrough mode when the app starts. -->
     <string name="display_options_start_with_passthrough">Start with Passthrough Mode</string>
 
-    <!-- This string labels an On/Off switch in the 'Display Options' dialog and is used to
-         customize if windows can be moved. Enabling it adds a Move button to the navigation bar. -->
-    <string name="display_options_windows_can_move">Drag to move windows</string>
+    <!-- This string labels a set of radio buttons in the 'Display Options' dialog
+         and is used to customize the location of the Tabs pane. -->
+    <string name="display_options_tabs_location">Tabs location</string>
+
+    <string name="display_options_tabs_location_tray">Tray</string>
+    <string name="display_options_tabs_location_horizontal">Horizontal</string>
+    <string name="display_options_tabs_location_vertical">Vertical</string>
 
     <!-- This string labels an On/Off switch in the 'Display Options' dialog
          and is used to customize if we use sound effects when interacting with app. -->
@@ -607,6 +611,12 @@
     <!-- This string is used to label the MSAA radio button that enables two times MSAA in Immersive Mode. -->
     <string name="developer_options_msaa_4">4x</string>
 
+    <!-- This string is used to label the description of radio buttons for setting the default size of windows. -->
+    <string name="settings_window_size">Default Window Size</string>
+
+    <!-- This string is used to label the radio buttons that set the default size of windows. -->
+    <string name="window_size_preset">%1$d×%2$d</string>
+
     <!-- This string is used to label a set of radio buttons that allow the user to change the
          User-Agent (UA) string of the browser. -->
     <string name="developer_options_ua_mode">User-Agent Mode</string>
@@ -1826,14 +1836,6 @@
          tray and the Downloads view is closed. The button it labels, when pressed, closes the Downloads view. -->
     <string name="close_downloads_tooltip">Close Downloads</string>
 
-    <!-- This string is for the tooltip that appears when the user hovers over the 'Library' icon in the
-         tray and the Library view is closed. The button it labels, when pressed, opens the library panel. -->
-    <string name="open_library_tooltip">Open Library</string>
-
-    <!-- This string is for the tooltip that appears when the user hovers over the 'Library' icon in the
-         tray and the Library view is closed. The button it labels, when pressed, closes the Library panel. -->
-    <string name="close_library_tooltip">Close Library</string>
-
     <!-- This string is for the tooltip that appears when the user hovers over the 'What's New' icon in the
          Navigation Bar. The button it labels, when pressed, open the release notes page. -->
     <string name="whats_new_tooltip">What’s New</string>
@@ -2323,6 +2325,9 @@ the Select` button. When clicked it bookmarks all the previously selected tabs -
     <!-- This string is displayed in the body of the error dialog shown when downloaded addon installation is blocked. -->
     <string name="download_addon_install_blocked_body">Allow local addon installation in Developer Options to proceed.</string>
 
+    <!-- This string is displayed in the body of the error dialog shown when downloaded addon installation is blocked. -->
+    <string name="download_addon_install_blocked_permissions_body">Allow storage permissions in Privacy Options to proceed.</string>
+
     <!-- This string is shown in the body of the error dialog displayed when the user is trying to download an environment in the external storage
     but hasn't granted the permission. -->
     <string name="environment_download_permission_error_body">Permission to write the external storage is required to download the environment.</string>
@@ -2574,8 +2579,4 @@ the Select` button. When clicked it bookmarks all the previously selected tabs -
     <string name="eye_tracking_permission_title">Eye Tracking Permissions</string>
     <string name="eye_tracking_permission_message">Enabling eye tracking for browsing the web poses significant privacy risks. This technology captures where and how long a user looks at specific parts of a webpage, revealing intimate details about their interests and emotional reactions. Advertisers and third parties can exploit this data for intrusive marketing and profiling. Moreover, eye movement patterns could infer sensitive information such as medical conditions, cognitive states, or personal habits. Therefore, it is crucial to consider the privacy implications before granting access to eye tracking information to webpages.</string>
 
-    <!-- Shown when starting the application if the OS version is not compatible -->
-    <string name="incompatible_os_version_title">Incompatible OS Version</string>
-    <string name="incompatible_os_version_message">Your OS version is not supported. This version of Wolvic requires at least version %1$s</string>
-
 </resources>