From 9aac523fc43b02e8c07b97dd9c5cb9170ec296aa Mon Sep 17 00:00:00 2001
From: SuperDragonXD <70206496+SuperDragonXD@users.noreply.github.com>
Date: Sat, 22 Jun 2024 18:30:45 +0800
Subject: [PATCH] Reorganize and refactor strings.xml

This commit re-organizes `lawn/`'s `strings.xml` code files for clarity and also adds a simple naming scheme. The strings will probably be renamed soon, since I don't have the time to do all of that
---
 CONTRIBUTING.md                               |  14 +-
 build.gradle                                  |   8 +-
 lawnchair/res/values/strings.xml              | 715 ++++++++++--------
 .../lawnchair/backup/ui/CreateBackupScreen.kt |   2 +-
 .../backup/ui/RestoreBackupScreen.kt          |   2 +-
 .../smartspace/SmartspaceViewContainer.kt     |   2 +-
 .../lawnchair/smartspace/SmartspacerView.kt   |   4 +-
 .../app/lawnchair/theme/color/ColorMode.kt    |   2 +-
 .../app/lawnchair/theme/color/ColorOption.kt  |   2 +-
 .../lawnchair/ui/popup/LawnchairShortcut.kt   |   2 +-
 .../HiddenAppsInSearchPreference.kt           |   4 +-
 .../components/NotificationDotsPreference.kt  |   4 +-
 .../ColorSelectionPreference.kt               |   2 +-
 .../destinations/AppDrawerPreferences.kt      |   6 +-
 .../destinations/CustomIconShapePreference.kt |  20 +-
 .../destinations/FolderPreferences.kt         |   2 +-
 .../destinations/FontSelectionPreference.kt   |   4 +-
 .../destinations/GeneralPreferences.kt        |   4 +-
 .../destinations/HomeScreenGridPreferences.kt |   2 +-
 .../destinations/HomeScreenPreferences.kt     |   4 +-
 .../destinations/IconPackPreferences.kt       |   2 +-
 .../settings/NotificationDotsPreference.java  |   2 +-
 22 files changed, 465 insertions(+), 344 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index cc6d1dddb7..a6b41be7e9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -23,7 +23,6 @@ Please make sure to be civil during discussion of your contribution (refer to th
 For translation, visit [Lawnchair on Crowdin](https://lawnchair.crowdin.com) and follow these tips:
 
 -   When using quotation marks, insert the symbols specific to the target language, as listed in this [this summary table](https://en.wikipedia.org/wiki/Quotation_mark#Summary_table);
--   Lawnchair uses title case for some English UI text while other languages do not use title case; opt for sentence case instead;
 -   Some English terminology may have not have commonly-used equivalents in other languages. In such cases, use short descriptive phrases—for example, the equivalent of _bottom row_ for _dock_;
 -   Some languages (e.g. French) have variations of words depending if it's masculine or feminine (gender-specific); we recommend opting for gender-neutral words instead.
 
@@ -97,3 +96,16 @@ See the table below detailing the release type:
 | Beta              | 02    |
 | Release Candidate | 03    |
 | Release           | 04    |
+
+#### String naming
+Strings `names` in `strings.xml` should follow this format:
+
+| Type                                             | Format            | Example usage              | Actual string        | Other information                                                                                                   |
+|--------------------------------------------------|-------------------|----------------------------|----------------------|---------------------------------------------------------------------------------------------------------------------|
+| Generic word                                     | $1                | `disagree_or_agree`        | Disagree or agree    | Should only be used if it doesn't fit the below categories                                                          |
+| Action                                           | $1_action         | `apply_action`             | Apply                | Any generic action verb can fit here                                                                                |
+| Preference or popup label<br/>Preference headers | $1_label          | `folders_label`            | Folders              |                                                                                                                     |
+| Preference or popup description                  | $1_description    | `folders_description`      | Row and column count |                                                                                                                     |
+| Preference choice                                | $1_choice         | `off_choice`               | Off                  |                                                                                                                     |
+| Feature string                                   | (feature_name)_$1 | `colorpicker_hsb`          | HSB                  | Feature strings are strings that are confined to a specific feature. Examples include the gesture and color picker. |
+| Launcher string                                  | $1_launcher       | `device_contacts_launcher` | Contacts from device | Strings that are specific to the Launcher area                                                                      |
diff --git a/build.gradle b/build.gradle
index d7b413769e..b1346a3ff4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -66,7 +66,7 @@ allprojects {
 
     plugins.withType(JavaBasePlugin).configureEach {
         java {
-            toolchain.languageVersion = JavaLanguageVersion.of(21)
+            toolchain.languageVersion = JavaLanguageVersion.of(17)
         }
     }
 
@@ -123,10 +123,10 @@ final def ciBuild = System.getenv("CI") == "true"
 final def ciRef = System.getenv("GITHUB_REF") ?: ""
 final def ciRunNumber = System.getenv("GITHUB_RUN_NUMBER") ?: ""
 final def isReleaseBuild = ciBuild && ciRef.contains("beta")
-final def devReleaseName = ciBuild ? "Dev (#${ciRunNumber})" : "Dev (${buildCommit})"
+final def devReleaseName = ciBuild ? "Dev.(#${ciRunNumber})" : "Dev.(${buildCommit})"
 final def version = "14"
 final def releaseName = "Beta 2"
-final def versionDisplayName = "${version} ${isReleaseBuild ? releaseName : devReleaseName}"
+final def versionDisplayName = "${version}.${isReleaseBuild ? releaseName : devReleaseName}"
 final def majorVersion = versionDisplayName.split("\\.")[0]
 
 final def quickstepMinSdk = "29"
@@ -153,7 +153,7 @@ android {
     applicationVariants.configureEach { variant ->
         variant.outputs.configureEach {
             def channel = variant.productFlavors.last().name
-            outputFileName = "Lawnchair ${variant.versionName} $channel ${variant.buildType.name}.apk"
+            outputFileName = "Lawnchair.${variant.versionName}.$channel.${variant.buildType.name}.apk"
         }
     }
 
diff --git a/lawnchair/res/values/strings.xml b/lawnchair/res/values/strings.xml
index dd8edb4ec7..7149ccd335 100644
--- a/lawnchair/res/values/strings.xml
+++ b/lawnchair/res/values/strings.xml
@@ -16,75 +16,145 @@
   -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- TODO: Rename all strings to follow CONTRIBUTING.md guidelines -->
+    <!--
+
+    Actions and Verbs
+
+    -->
+    <string name="preview_label">Preview</string>
+
+    <string name="action_create">Create</string>
+    <string name="action_backup">Backup</string>
+    <string name="action_restore">Restore</string>
+    <string name="action_delete">Delete</string>
+    <string name="action_reset">Reset</string>
+
+    <string name="action_unlock">Unlock</string>
+    <string name="action_lock">Lock</string>
+
+    <string name="action_apply">Apply</string>
+    <string name="action_customize">Customize</string>
+
+    <string name="always_choice">Always</string>
+    <string name="never_choice">Never</string>
+
+    <string name="clipboard">Clipboard</string>
+    <string name="action_copy_link">Copy link</string>
+    <string name="action_copy">Copy</string>
+    <string name="action_paste">Paste</string>
+
+    <string name="loading">Loading…</string>
+
+    <string name="managed_by_lawnchair">Managed by Lawnchair</string>
+
+    <!-- When mentioning settings UI -->
+    <string name="smartspace_preferences">Preferences</string>
+    <string name="settings_button_text">Home settings</string>
+    <string name="system_settings">System settings</string>
+    <string name="title_change_settings">Change settings</string>
+
+    <!--
+
+    General "words" used throughout Lawnchair
+
+    -->
+
+    <!-- Selection options -->
+    <string name="dynamic">Dynamic</string>
+    <string name="presets">Presets</string>
+    <string name="custom">Custom</string>
+    <string name="feed_default">Default</string>
+    <string name="system">System</string>
+
+    <!-- Relating to the Launcher ui -->
+    <string name="columns">Columns</string>
+    <string name="rows">Rows</string>
+    <string name="label">Label</string>
+    <string name="icons">Icons</string>
+    <string name="grid">Grid</string>
+    <string name="layout">Layout</string>
+
+    <!-- Generic styling options -->
+    <string name="wallpaper">Wallpaper</string>
+    <string name="background_opacity">Background opacity</string>
+
+    <!-- Toast text and tips -->
+    <string name="copied_toast">Copied to clipboard</string>
+    <string name="item_removed">Item removed</string>
+
+    <!-- Miscellaneous -->
+    <string name="google_folder_title" translatable="false">Google</string>
+    <string name="what_to_show">What to show</string>
+
+    <!-- A11y description -->
+    <string name="accessibility_service_description">To lock your phone when performing a gesture, Lawnchair requires accessibility access.\n\nLawnchair doesn\'t watch any user action, though the privilege to do so is required for all accessibility services. Lawnchair discards any event sent by the system.\n\nIn order to lock your phone, Lawnchair uses the performGlobalAction Accessibility service.</string>
+
     <string name="iconPackPackageDefault" translatable="false">""</string>
-    <!-- Todo: find common strings and centralize them here. Should we make all strings specific though?  -->
-    <!-- PreferenceDashboard -->
-    <string name="set_default_launcher_tip">Set Lawnchair as your default launcher to access shortcuts and more</string>
+
+    <string name="n_percent" translatable="false">%1$d%%</string>
+    <string name="x_by_y">%1$d x %2$d</string>
+    <string name="x_and_y">%s &amp; %s</string>
+    <!--
+
+    Preference Dashboard
+
+    -->
     <string name="settings">Settings</string>
+
     <string name="general_label">General</string>
     <string name="general_description">Colors, icon packs, notification dots</string>
+
     <string name="home_screen_label">Home screen</string>
     <string name="home_screen_description">Feed, grid, icons</string>
-    <string name="what_to_show">What to show</string>
+
     <string name="dock_label">Dock</string>
     <string name="dock_description">Search bar, icon count</string>
+
     <string name="app_drawer_label">App drawer</string>
     <string name="app_drawer_description">Hidden apps, column count, icons</string>
+
     <string name="drawer_search_label">Drawer search</string>
     <string name="drawer_search_description">Web suggestions, global search</string>
+
     <string name="folders_label">Folders</string>
     <string name="folders_description">Row and column count</string>
+
     <string name="gestures_label">Gestures</string>
     <string name="gestures_description">Taps and swipes</string>
+
     <string name="quickstep_label">Recents</string>
     <string name="quickstep_description">Clear All button, corner radius</string>
+
     <string name="about_label">About</string>
 
     <string name="app_info_drop_target_label">App info</string>
     <string name="debug_restart_launcher">Restart Lawnchair</string>
     <string name="experimental_features_label">Experimental features</string>
 
-    <!-- ExperimentalFeaturesPreferences -->
-    <!-- <string name="experimental_features_label" />-->
+    <!-- Experimental features -->
     <string name="font_picker_label">Font customization</string>
     <string name="font_picker_description">Some text remains unchanged</string>
+
     <string name="smartspace_calendar_label">At a Glance calendar customization</string>
     <string name="smartspace_calendar_description">Allow showing date in non-Gregorian calendar systems</string>
+
     <string name="workspace_increase_max_grid_size_label">Increase maximum grid size limit</string>
     <string name="workspace_increase_max_grid_size_description">Increase maximum allowed home screen grid size from 10 x 10 to 20 x 20</string>
+
     <string name="always_reload_icons_label">Always reload icons</string>
     <string name="always_reload_icons_description">Avoid using cached icons from icon packs</string>
+
     <string name="recents_lock_unlock">Lock/unlock</string>
     <string name="recents_lock_unlock_description">Prevent selected app from closing when pressing \"Clear all\"</string>
 
-    <!-- Relating to label/icon size -->
-    <string name="icons">Icons</string>
-    <string name="icon_size">Icon size</string>
-    <string name="show_home_labels">Show labels</string>
-    <string name="label_size">Label size</string>
+    <!--
 
-    <!-- GeneralPreferences -->
-    <string name="home_screen_rotation_label">Home screen rotation</string>
-    <string name="home_screen_rotation_description">Allow home screen rotation when device is rotated</string>
+    Notifications
 
-    <string name="font_label">Font (experimental)</string>
-    <string name="fontWorkspace">General</string>
-    <string name="fontHeading">Headings</string>
-    <string name="fontHeadingMedium">Headings (medium)</string>
-    <string name="fontBody">Body</string>
-    <string name="fontBodyMedium">Body (medium)</string>
+    -->
 
-    <string name="icon_style">Icon Style</string>
-    <string name="transparent_background_icons">Transparent themed icons</string>
-    <string name="transparent_background_icons_description">Use transparent background on themed icons</string>
-    <string name="icon_shape_label">Icon shape</string>
-    <string name="auto_adaptive_icons_label">Auto-adaptive icons</string>
-    <string name="auto_adaptive_icons_description">For all non-adaptive icons</string>
-    <string name="background_lightness_label">Background lightness</string>
-    <string name="adaptive_icon_background_description">Use 100% background lightness for white</string>
-
-    <string name="reset_custom_icons">Reset custom icons</string>
-    <string name="reset_custom_icons_confirmation">All custom icons will be reset. Do you want to continue?</string>
+    <string name="set_default_launcher_tip">To access shortcuts and additional features, set Lawnchair as your default launcher</string>
 
     <string name="notification_dots">Notification dots</string>
     <string name="show_notification_count">Show notification counter</string>
@@ -93,51 +163,44 @@
     <string name="notification_dots_color_contrast_warning_always">Warning: Notification dot and counter colors don\'t have enough contrast with each other</string>
     <string name="notification_dots_color_contrast_warning_sometimes">Warning: Notification dot and counter colors might not always have enough contrast with each other</string>
 
-    <!-- Notification popup -->
     <string name="missing_notification_access_label">Notification access needed</string>
-    <string name="missing_notification_access_description">Notification access needed</string>
-    <string name="msg_missing_notification_access">To show Notification Dots, turn on app notifications for <xliff:g id="name" example="My App">%1$s</xliff:g></string>
-    <string name="title_change_settings">Change settings</string>
+    <string name="missing_notification_access_desc">To show Notification Dots, turn on app notifications for <xliff:g id="name" example="My App">%1$s</xliff:g></string>
 
-    <string name="colors">Colors</string>
-    <string name="theme_label">Theme</string>
-    <string name="theme_light">Light</string>
-    <string name="theme_dark">Dark</string>
-    <string name="theme_system_default">System</string>
-    <string name="theme_follow_wallpaper">Match wallpaper</string>
-    <string name="accent_color">Accent color</string>
+    <!--
 
-    <!-- CustomIconShapePreference -->
-    <string name="custom_icon_shape">Custom icon shape</string>
-    <string name="custom_icon_shape_create">Create custom icon shape</string>
-    <string name="custom_icon_shape_edit">Edit custom icon shape</string>
-    <string name="icon_shape_corner">Corner shape</string>
-    <string name="icon_shape_corner_round">Round</string>
-    <string name="icon_shape_corner_squircle">Smooth</string>
-    <string name="icon_shape_corner_cut">Cut</string>
-    <string name="icon_shape_top_left">Top left</string>
-    <string name="icon_shape_top_right">Top right</string>
-    <string name="icon_shape_bottom_left">Bottom left</string>
-    <string name="icon_shape_bottom_right">Bottom right</string>
-    <string name="create">Create</string>
+    Icons
 
-    <string name="clipboard">Clipboard</string>
-    <string name="export_to_clipboard">Export to clipboard</string>
-    <string name="import_from_clipboard">Import from clipboard</string>
-    <string name="icon_shape_clipboard_import_error">Clipboard doesn\'t contain a valid icon shape</string>
+    -->
+    <!-- General strings -->
+    <string name="icon_style_label">Icon style</string>
+    <string name="icon_shape_label">Icon shape</string>
+    <string name="icon_sizes">Icon size</string>
 
-    <!-- IconPackPreferences -->
-    <string name="icon_pack">Icon pack</string>
-    <string name="themed_icon_pack">Themed icon source</string>
-    <string name="system_icons">System icons</string>
+    <string name="show_labels">Show labels</string>
+    <string name="label_size">Label size</string>
+    <string name="twoline_label">Use multiple lines</string>
 
-    <string name="themed_icon_title">Themed icons</string>
-    <string name="themed_icons_off_label">Off</string>
-    <string name="themed_icons_home_label">Home screen</string>
-    <string name="themed_icons_home_and_drawer_label">Home screen &amp; app drawer</string>
-    <string name="lawnicons_not_installed_description">No supported icon packs</string>
+    <!-- Icon-related settings -->
+    <string name="transparent_background_icons_label">Transparent themed icons</string>
+    <string name="transparent_background_icons_description">Use transparent background on themed icons</string>
 
-    <!-- IconPickerPreference -->
+    <string name="auto_adaptive_icons_label">Auto-adaptive icons</string>
+    <string name="auto_adaptive_icons_description">For all non-adaptive icons</string>
+
+    <string name="background_lightness_label">Background lightness</string>
+    <string name="adaptive_icon_background_description">Use 100% background lightness for white</string>
+
+    <string name="reset_custom_icons">Reset custom icons</string>
+    <string name="reset_custom_icons_confirmation">All custom icons will be reset. Do you want to continue?</string>
+
+    <!-- Icon picker -->
+    <string name="icon_picker_default_category">Icons</string>
+    <string name="icon_picker_reset_to_default">Reset to default</string>
+    <string name="icon_pack_external_picker">Open external picker</string>
+    <string name="pick_icon_from_label">Pick icon from</string>
+    <string name="icon_picker_load_failed">Couldn\'t load more icons</string>
+
+    <!-- Icon shapes  -->
     <string name="icon_shape_system">System</string>
     <string name="icon_shape_circle">Circle</string>
     <string name="icon_shape_cylinder">Cylinder</string>
@@ -152,11 +215,47 @@
     <string name="icon_shape_squircle">Squircle</string>
     <string name="icon_shape_teardrop">Teardrop</string>
 
-    <!-- FontSelectionPreferences -->
+    <!-- Custom icon shapes -->
+    <string name="custom_icon_shape">Custom icon shape</string>
+    <string name="custom_icon_shape_create">Create custom icon shape</string>
+    <string name="custom_icon_shape_edit">Edit custom icon shape</string>
+    <string name="custom_icon_shape_corner">Corner shape</string>
+    <string name="custom_icon_shape_corner_round">Round</string>
+    <string name="custom_icon_shape_corner_squircle">Smooth</string>
+    <string name="custom_icon_shape_corner_cut">Cut</string>
+    <string name="custom_icon_shape_top_left">Top left</string>
+    <string name="custom_icon_shape_top_right">Top right</string>
+    <string name="custom_icon_shape_bottom_left">Bottom left</string>
+    <string name="custom_icon_shape_bottom_right">Bottom right</string>
+
+    <string name="export_to_clipboard">Export to clipboard</string>
+    <string name="import_from_clipboard">Import from clipboard</string>
+    <string name="icon_shape_clipboard_import_error">Clipboard doesn\'t contain a valid icon shape</string>
+
+    <!-- Icon pack settings -->
+    <string name="icon_pack">Icon pack</string>
+    <string name="themed_icon_pack">Themed icon source</string>
+    <string name="system_icons">System icons</string>
+
+    <string name="themed_icon_title">Themed icons</string>
+    <string name="themed_icons_off_label">Off</string>
+    <string name="themed_icons_home_label">Home screen</string>
+    <string name="themed_icons_home_and_drawer_label">Home screen &amp; app drawer</string>
+    <string name="lawnicons_not_installed_description">No supported icon packs</string>
+
+    <!-- Fonts -->
     <string name="pref_fonts_add_fonts">Add fonts</string>
     <string name="pref_fonts_add_fonts_summary">OTF and TTF fonts are supported</string>
 
     <string name="pref_fonts_missing_font">Font not found</string>
+
+    <string name="font_label">Font (experimental)</string>
+    <string name="fontWorkspace">General</string>
+    <string name="fontHeading">Headings</string>
+    <string name="fontHeadingMedium">Headings (medium)</string>
+    <string name="fontBody">Body</string>
+    <string name="fontBodyMedium">Body (medium)</string>
+
     <string name="font_variant_italic">Italic</string>
     <string name="font_weight_thin">Thin</string>
     <string name="font_weight_extra_light">Extra light</string>
@@ -168,50 +267,215 @@
     <string name="font_weight_extra_bold">Extra bold</string>
     <string name="font_weight_extra_black">Black</string>
 
-    <string name="reset_font">Reset</string>
+    <!--
+
+    Colors and theme
+
+    -->
+
+    <!-- Theme -->
+    <string name="theme_label">Theme</string>
+    <string name="theme_light">Light</string>
+    <string name="theme_dark">Dark</string>
+    <string name="theme_system_default">System</string>
+    <string name="theme_follow_wallpaper">Match wallpaper</string>
+
+    <!-- Accent color and color picker -->
+    <string name="colors">Colors</string>
+    <string name="accent_color">Accent color</string>
 
-    <!-- colorpreference/* -->
-    <string name="dynamic">Dynamic</string>
     <string name="swatches">Swatches</string>
-    <string name="presets">Presets</string>
-    <string name="custom">Custom</string>
+
     <string name="rgb">RGB</string>
     <string name="rgb_red">Red</string>
     <string name="rgb_green">Green</string>
     <string name="rgb_blue">Blue</string>
+
     <string name="hsb">HSB</string>
     <string name="hsb_hue">Hue</string>
     <string name="hsb_saturation">Saturation</string>
     <string name="hsb_brightness">Brightness</string>
-    <string name="hex">Hex</string>
-    <string name="color_sliders">Sliders</string>
-    <string name="action_copy">Copy</string>
-    <string name="action_paste">Paste</string>
-    <string name="copied_toast">Copied to clipboard</string>
-    <string name="invalid_color">Invalid color</string>
-    <string name="launcher_default_color">Managed by Lawnchair</string>
 
-    <!-- HomeScreenPreferences -->
+    <string name="hex">Hex</string>
+
+    <string name="color_sliders">Sliders</string>
+    <string name="invalid_color">Invalid color</string>
+
+    <!--
+
+    Smartspace
+
+    -->
+    <!-- Date formats -->
+    <string name="smartspace_calendar_gregorian">Gregorian</string>
+    <string name="smartspace_calendar_persian">Persian</string>
+
+    <string name="generic_smartspace_concatenated_desc">%1$s, %2$s</string>
+    <string name="smartspace_icu_date_pattern_gregorian_wday_month_day_no_year" translatable="false">EEEMMMd</string>
+    <string name="smartspace_icu_date_pattern_gregorian_time" translatable="false">HH:mm</string>
+    <string name="smartspace_icu_date_pattern_gregorian_time_12h" translatable="false">hh:mm aa</string>
+    <string name="smartspace_icu_date_pattern_gregorian_date" translatable="false"> dd MMMM</string>
+    <string name="smartspace_icu_date_pattern_persian_wday_month_day_no_year" translatable="false">l، j F</string>
+    <string name="smartspace_icu_date_pattern_persian_time" translatable="false">H:i</string>
+    <string name="smartspace_icu_date_pattern_persian_time_12h" translatable="false">g:i a</string>
+    <string name="smartspace_icu_date_pattern_persian_date" translatable="false">"j F، "</string>
+
+    <!-- Battery labels -->
+    <string name="smartspace_battery_charging">Charging</string>
+    <string name="smartspace_battery_full">Charged</string>
+    <string name="smartspace_battery_low">Battery low</string>
+    <string name="battery_charging_percentage_charging_time">"%1$d%% — Full in %2$s"</string>
+
+    <string name="smartspace_widget">At a Glance</string>
+    <string name="smartspace_widget_description">What to show</string>
+
+    <!-- Data and time format settings -->
+    <string name="smartspace_calendar">Calendar</string>
+    <string name="smartspace_date_and_time">Date &amp; time</string>
+    <string name="smartspace_date">Date</string>
+    <string name="smartspace_time">Time</string>
+    <string name="smartspace_time_format">Time format</string>
+    <string name="smartspace_time_follow_system">Follow system</string>
+    <string name="smartspace_time_12_hour_format">12-hour format</string>
+    <string name="smartspace_time_24_hour_format">24-hour format</string>
+
+    <!-- Available targets -->
+    <string name="smartspace_weather">Weather</string>
+    <string name="smartspace_battery_status">Battery status</string>
+    <string name="smartspace_now_playing">Now Playing</string>
+
+    <!-- Setup settings -->
+    <string name="smartspace_requires_setup">Tap to set up</string>
+    <string name="event_provider_missing_notification_dots">To use <xliff:g example="My Provider" id="providerName">%1$s</xliff:g>, enable Notification Dots.</string>
+
+    <!-- Toggle button for enabling Smartspace -->
+    <string name="smartspace_widget_toggle_label">Show on home screen</string>
+    <string name="smartspace_widget_toggle_description">At a Glance can be manually added to the home screen by placing the Lawnchair widget</string>
+
+    <!-- List of available providers -->
+    <string name="smartspace_mode_label">At a Glance provider</string>
+    <string name="smartspace_mode_lawnchair" translatable="false">Lawnchair</string>
+    <string name="smartspace_mode_google">Google</string>
+    <string name="smartspace_mode_google_search">Google Search</string>
+    <string name="smartspace_mode_smartspacer" translatable="false">Smartspacer</string>
+
+    <!-- Miscellaneous Smartspace strings -->
+    <string name="smartspace_media_info_separator">" — "</string>
+    <string name="accessibility_smartspace_page">Page %1$d of %2$d</string>
+    <string name="smartspace_widget_placeholder_date">Fri, Mar 3</string>
+
+    <!--
+
+    About the app
+
+    -->
+    <string name="news">News</string>
+    <string name="support">Support</string>
+    <string name="x_twitter" translatable="false">X</string>
+    <string name="github" translatable="false">GitHub</string>
+    <string name="discord" translatable="false">Discord</string>
+
+    <string name="product">Product</string>
+    <string name="design_and_development">Design &amp; development</string>
+    <string name="development">Development</string>
+    <string name="quickswitch_maintenance">QuickSwitch maintenance</string>
+    <string name="devops">DevOps</string>
+    <string name="support_and_pr">Support &amp; PR</string>
+
+    <string name="acknowledgements">Acknowledgements</string>
+    <string name="translate">Translate</string>
+
+    <!--
+
+    Backup and restore
+
+    -->
+    <string name="create_backup">Create backup</string>
+    <string name="what_to_backup">What to back up</string>
+    <string name="backup_content_layout_and_settings">Layout and settings</string>
+    <string name="backup_content_wallpaper">Wallpaper</string>
+    <string name="backup_create_success">Backup created</string>
+    <string name="backup_create_error">Failed to create backup</string>
+    <string name="restore_backup">Restore backup</string>
+    <string name="what_to_restore">What to restore</string>
+    <string name="backup_restore_success">Backup restored</string>
+    <string name="backup_restore_error">Failed to restore backup</string>
+    <string name="invalid_backup_file">Invalid backup file</string>
+
+    <!--
+
+    Gesture settings
+
+    -->
+    <string name="gesture_double_tap">Double tap</string>
+    <string name="gesture_swipe_up">Swipe up</string>
+    <string name="gesture_swipe_down">Swipe down</string>
+    <string name="gesture_home_tap">Home button</string>
+    <string name="gesture_back_tap">Back button</string>
+
+    <string name="gesture_handler_no_op">Do nothing</string>
+    <string name="gesture_handler_sleep">Sleep</string>
+    <string name="gesture_handler_open_notifications">Open notification panel</string>
+    <string name="gesture_handler_open_app_option">Open app</string>
+    <string name="gesture_handler_open_app_config">Open %1$s</string>
+    <string name="gesture_handler_open_app_drawer">Open app drawer</string>
+    <string name="gesture_handler_open_app_search">Open app search</string>
+    <string name="gesture_handler_open_search">Open search</string>
+
+    <string name="pick_app_for_gesture">Pick app</string>
+
+    <string name="dt2s_admin_hint_title">Admin permissions required</string>
+    <string name="dt2s_admin_hint">To use Double-Tap to Sleep, set Lawnchair as a device admin app. Tap \"Open settings\", then tap \"Activate this device admin app.\"</string>
+    <string name="dt2s_admin_warning">Double-Tap to Sleep will be turned off.</string>
+
+    <string name="dt2s_a11y_hint_title">Turn on accessibility service</string>
+    <string name="dt2s_a11y_hint">To use Double-Tap to Sleep, turn on the Lawnchair accessibility service. Tap \"Open settings\", select \"Lawnchair\" and turn on \"Use Lawnchair.\"</string>
+    <string name="dt2s_warning_open_settings">Open settings</string>
+
+    <!--
+
+    Bug reporting
+
+    -->
+    <string name="lawnchair_bug_report">Lawnchair bug report</string>
+    <string name="crash_report_notif_title">%1$s crashed</string>
+    <string name="action_upload_crash_report">Upload crash log</string>
+
+    <string name="action_upload_error">Upload failed</string>
+    <string name="dogbin_uploading">Uploading…</string>
+
+    <string name="bugreport_channel_name">Bug reports</string>
+    <string name="status_channel_name">Upload status</string>
+
+    <string name="bugreport_group_summary">%d new reports</string>
+    <string name="bugreport_group_summary_multiple">Multiple new reports</string>
+
+    <!--
+
+    Preferences (without special screens)
+
+    -->
+    <!-- General and home screen settings -->
+    <string name="home_screen_rotation_label">Home screen rotation</string>
+    <string name="home_screen_rotation_description">Allow home screen rotation when device is rotated</string>
+
     <string name="auto_add_shortcuts_label">Add new apps to home screen</string>
 
     <string name="minus_one_enable">Show feed</string>
     <string name="minus_one_unavailable">No feed apps installed</string>
     <string name="minus_one">Feed</string>
     <string name="feed_provider">Feed provider</string>
-    <string name="feed_default">Default</string>
 
-    <string name="wallpaper">Wallpaper</string>
     <string name="wallpaper_scrolling_label">Scroll wallpaper</string>
     <string name="wallpaper_depth_effect_label">Wallpaper depth effect</string>
     <string name="wallpaper_depth_effect_description">Zoom in and out of the wallpaper when transitioning between areas of the launcher</string>
     <string name="show_sys_ui_scrim">Top shadow</string>
 
-    <string name="layout">Layout</string>
     <string name="home_screen_grid">Home screen grid</string>
     <string name="home_screen_lock">Lock home screen</string>
-    <string name="home_screen_lock_description">Prevent changes to the home screen layout</string>
     <string name="home_screen_unlock">Unlock home screen</string>
     <string name="home_screen_locked">Home screen is locked</string>
+    <string name="home_screen_lock_description">Prevent changes to the home screen layout</string>
 
     <string name="show_dot_pagination_label">Show dot pagination</string>
     <string name="show_dot_pagination_description">Use dots instead of lines to show page number</string>
@@ -233,67 +497,14 @@
 
     <string name="force_rounded_widgets">Rounded corners</string>
     <string name="allow_widget_overlap">Allow overlap</string>
+
     <string name="force_widget_resize_label">Enforce widget resizing</string>
     <string name="force_widget_resize_description">Allow resizing of widgets that are constrained to a specific size</string>
+
     <string name="widget_unlimited_size_label">Remove size constraints</string>
     <string name="widget_unlimited_size_description">Remove the minimum and maximum size restrictions of widgets</string>
 
-    <!-- HomeScreenGridPreferences -->
-    <string name="columns">Columns</string>
-    <string name="rows">Rows</string>
-    <string name="apply_grid">Apply</string>
-
-    <!-- Smartspace -->
-    <string name="generic_smartspace_concatenated_desc">%1$s, %2$s</string>
-    <string name="smartspace_icu_date_pattern_gregorian_wday_month_day_no_year" translatable="false">EEEMMMd</string>
-    <string name="smartspace_icu_date_pattern_gregorian_time" translatable="false">HH:mm</string>
-    <string name="smartspace_icu_date_pattern_gregorian_time_12h" translatable="false">hh:mm aa</string>
-    <string name="smartspace_icu_date_pattern_gregorian_date" translatable="false"> dd MMMM</string>
-    <string name="smartspace_icu_date_pattern_persian_wday_month_day_no_year" translatable="false">l، j F</string>
-    <string name="smartspace_icu_date_pattern_persian_time" translatable="false">H:i</string>
-    <string name="smartspace_icu_date_pattern_persian_time_12h" translatable="false">g:i a</string>
-    <string name="smartspace_icu_date_pattern_persian_date" translatable="false">"j F، "</string>
-    <string name="smartspace_battery_charging">Charging</string>
-    <string name="smartspace_battery_full">Charged</string>
-    <string name="smartspace_battery_low">Battery low</string>
-    <string name="battery_charging_percentage_charging_time">"%1$d%% — Full in %2$s"</string>
-    <string name="accessibility_smartspace_page">Page %1$d of %2$d</string>
-    <string name="smartspace_widget">At a Glance</string>
-    <string name="smartspace_widget_description">What to show</string>
-    <string name="smartspace_widget_placeholder_date">Fri, Mar 3</string>
-
-    <string name="preview_label">Preview</string>
-    <string name="smartspace_calendar">Calendar</string>
-    <string name="smartspace_date_and_time">Date &amp; time</string>
-    <string name="smartspace_date">Date</string>
-    <string name="smartspace_time">Time</string>
-    <string name="smartspace_time_format">Time format</string>
-    <string name="smartspace_time_follow_system">Follow system</string>
-    <string name="smartspace_time_12_hour_format">12-hour format</string>
-    <string name="smartspace_time_24_hour_format">24-hour format</string>
-    <string name="smartspace_weather">Weather</string>
-    <string name="smartspace_battery_status">Battery status</string>
-    <string name="smartspace_now_playing">Now Playing</string>
-    <string name="smartspace_requires_setup">Tap to set up</string>
-    <string name="event_provider_missing_notification_dots">To use <xliff:g example="My Provider" id="providerName">%1$s</xliff:g>, enable Notification Dots.</string>
-    <string name="smartspace_media_info_separator">" — "</string>
-
-    <string name="smartspace_calendar_gregorian">Gregorian</string>
-    <string name="smartspace_calendar_persian">Persian</string>
-
-    <string name="smartspace_preferences">Preferences</string>
-
-    <string name="smartspace_widget_toggle_label">Show on home screen</string>
-    <string name="smartspace_widget_toggle_description">At a Glance can be manually added to the home screen by placing the Lawnchair widget</string>
-
-    <string name="smartspace_mode_label">At a Glance provider</string>
-    <string name="smartspace_mode_lawnchair" translatable="false">Lawnchair</string>
-    <string name="smartspace_mode_google">Google</string>
-    <string name="smartspace_mode_google_search">Google Search</string>
-    <string name="smartspace_mode_smartspacer" translatable="false">Smartspacer</string>
-
-    <!-- DockPreferences -->
-    <!-- <string name="dock_label" /> -->
+    <!-- Dock settings -->
     <string name="show_hotseat_title">Show dock</string>
 
     <string name="search_bar_label">Search bar</string>
@@ -306,11 +517,10 @@
     <string name="apply_accent_color_label">Apply accent color</string>
     <string name="search_provider">Search provider</string>
 
-    <string name="grid">Grid</string>
     <string name="dock_icons">Dock icons</string>
     <string name="hotseat_bottom_space_label">Bottom padding</string>
 
-    <!-- SearchProviderPreferences -->
+    <!-- Search providers -->
     <string name="search_provider_app_search">App search</string>
     <string name="search_provider_startpage" translatable="false">Startpage</string>
     <string name="search_provider_google" translatable="false">Google</string>
@@ -324,72 +534,54 @@
     <string name="search_provider_github" translatable="false">GitHub</string>
     <string name="search_provider_youtube" translatable="false">YouTube</string>
     <string name="search_provider_pixel_search" translatable="false">Pixel Search</string>
+
     <string name="search_provider_sponsored_description">%1$s and Lawnchair have a revenue share agreement.\n\nSearching with %1$s helps support Lawnchair.</string>
+
     <string name="app_label">App</string>
     <string name="website_label">Website</string>
     <string name="qsb_search_provider_app_required">App required</string>
 
-    <!-- AppDrawerPrefences -->
-
-    <string name="background_opacity">Background opacity</string>
+    <!-- Dock search bar a11y -->
+    <string name="label_search">Search</string>
+    <string name="label_lens">Google Lens</string>
+    <string name="label_voice_search">Voice Search</string>
 
+    <!-- App drawer settings -->
     <string name="hidden_apps_label">Hidden apps</string>
-    <string name="show_enable_smart_hide">Show when full name is typed</string>
-    <string name="hide_hidden_apps_search">Hide in search results</string>
 
     <string name="pref_all_apps_bulk_icon_loading_title">Load apps in bulk</string>
     <string name="pref_all_apps_bulk_icon_loading_description">Load and display icons in bulk instead of individually</string>
 
     <string name="pref_all_apps_remember_position_title">Remember position</string>
     <string name="pref_all_apps_remember_position_description">Remember app drawer position after leaving drawer</string>
+
     <string name="pref_all_apps_show_scrollbar_title">Show scrollbar</string>
-    <string name="pref_category_search">Search</string>
-      <string name="show_app_search_bar">Show search bar</string>
-      <string name="pref_search_auto_show_keyboard">Automatically show keyboard</string>
-      <string name="fuzzy_search_title">Fuzzy search</string>
-      <string name="fuzzy_search_desc">Approximate matching for app searches</string>
 
-      <string name="clear_history">Clear search history</string>
-
-      <string name="app_drawer_columns">App drawer columns</string>
-      <string name="row_height_label">Row height</string>
-      <string name="app_drawer_indent_label">Horizontal padding</string>
+    <string name="app_drawer_columns">App drawer columns</string>
+    <string name="row_height_label">Row height</string>
+    <string name="app_drawer_indent_label">Horizontal padding</string>
 
     <!-- HiddenAppsPreferences -->
+    <string name="hide_from_drawer">Hide from app drawer</string>
     <string name="hidden_apps_label_with_count">Hidden apps (%1$d)</string>
     <plurals name="apps_count">
         <item quantity="one">%1$d app</item>
         <item quantity="other">%1$d apps</item>
     </plurals>
 
-    <!-- FolderPreferences -->
+    <!-- Folder settings -->
     <string name="folder_preview_bg_opacity_label">Icon background opacity</string>
     <string name="folder_preview_bg_color_label">Icon background color</string>
 
     <string name="max_folder_columns">Maximum folder columns</string>
     <string name="max_folder_rows">Maximum folder rows</string>
 
-    <!-- GesturePreference -->
-    <string name="gesture_double_tap">Double tap</string>
-    <string name="gesture_swipe_up">Swipe up</string>
-    <string name="gesture_swipe_down">Swipe down</string>
-    <string name="gesture_home_tap">Home button</string>
-    <string name="gesture_back_tap">Back button</string>
-
-    <string name="gesture_handler_no_op">Do nothing</string>
-    <string name="gesture_handler_sleep">Sleep</string>
-    <string name="gesture_handler_open_notifications">Open notification panel</string>
-    <string name="gesture_handler_open_app_option">Open app</string>
-    <string name="gesture_handler_open_app_config">Open %1$s</string>
-    <string name="gesture_handler_open_app_drawer">Open app drawer</string>
-    <string name="gesture_handler_open_app_search">Open app search</string>
-    <string name="gesture_handler_open_search">Open search</string>
-
-    <string name="pick_app_for_gesture">Pick app</string>
-
-    <!-- QuickstepPreferences -->
+    <!-- Quickstep settings -->
     <string name="quickswitch_ignored_warning">These settings will be ignored as Lawnchair isn\'t set as the Recents provider</string>
 
+    <string name="quickstep_incompatible">Incompatible system integration</string>
+    <string name="quickstep_incompatible_description">Your device is configured to have system gestures (known as Quickstep) provided by %1$s, but this version of %1$s isn\'t compatible with your Android version. To continue using your device, please uninstall %1$s updates or disable %1$s as a system gesture provider.</string>
+
     <string name="translucent_background">Translucent background</string>
     <string name="translucent_background_alpha">Background opacity</string>
 
@@ -406,75 +598,52 @@
     <string name="taskbar_label">Taskbar</string>
     <string name="enable_taskbar_experimental">Show taskbar (experimental)</string>
 
-    <!-- about/About.kt -->
-    <string name="news">News</string>
-    <string name="support">Support</string>
-    <string name="x_twitter" translatable="false">X</string>
-    <string name="github" translatable="false">GitHub</string>
-    <string name="discord" translatable="false">Discord</string>
+    <!--
 
-    <string name="product">Product</string>
-      <string name="design_and_development">Design &amp; development</string>
-      <string name="development">Development</string>
-      <string name="quickswitch_maintenance">QuickSwitch maintenance</string>
-      <string name="devops">DevOps</string>
+    All Apps search
 
-    <string name="support_and_pr">Support &amp; PR</string>
-
-    <string name="acknowledgements">Acknowledgements</string>
-    <string name="translate">Translate</string>
-
-    <!-- IconPickerPreference -->
-    <string name="icon_picker_default_category">Icons</string>
-    <string name="icon_picker_reset_to_default">Reset to default</string>
-    <string name="icon_pack_external_picker">Open external picker</string>
-    <string name="pick_icon_from_label">Pick icon from</string>
-    <string name="icon_picker_load_failed">Couldn\'t load more icons</string>
-
-    <!-- Misc -->
+    -->
+    <!-- Launcher strings used -->
+    <string name="all_apps_device_search_hint">Search</string>
     <string name="all_apps_search_bar_hint">Search apps</string>
-    <string name="settings_button_text">Home settings</string>
-
-    <string name="item_removed">Item removed</string>
     <string name="all_apps_no_search_results">No apps found matching \"<xliff:g example="Android" id="query">%1$s</xliff:g>\"</string>
 
-    <string name="dt2s_admin_hint_title">Admin permissions required</string>
-    <string name="dt2s_admin_hint">To use Double-Tap to Sleep, set Lawnchair as a device admin app. Tap \"Open settings\", then tap \"Activate this device admin app.\"</string>
-    <string name="dt2s_admin_warning">Double-Tap to Sleep will be turned off.</string>
-    <string name="dt2s_a11y_hint_title">Turn on accessibility service</string>
-    <string name="dt2s_a11y_hint">To use Double-Tap to Sleep, turn on the Lawnchair accessibility service. Tap \"Open settings\", select \"Lawnchair\" and turn on \"Use Lawnchair.\"</string>
-    <string name="dt2s_warning_open_settings">Open settings</string>
+    <string name="all_apps_search_result_suggestions">From the web</string>
+    <string name="all_apps_search_result_contacts_from_device">Contacts from device</string>
+    <string name="all_apps_search_result_files">Files from device</string>
+    <string name="all_apps_search_result_settings_entry_from_device">Settings from device</string>
 
-    <string name="loading">Loading…</string>
-    <string name="system">System</string>
+    <string name="all_apps_search_market_message">Search for more apps</string>
+    <string name="all_apps_search_startpage_message">Search on <xliff:g id="startpage">Startpage</xliff:g></string>
+    <string name="error_no_market_or_browser_installed">No app store or browser installed</string>
 
-    <string name="customize_button_text">Customize</string>
-      <string name="label">Label</string>
-      <string name="hide_from_drawer">Hide from app drawer</string>
+    <string name="clear_history">Clear search history</string>
+    <string name="search_input_action_clear_results">Clear search box</string>
+
+    <!-- Search settings -->
+    <string name="pref_category_search">Search</string>
+
+    <string name="show_app_search_bar">Show search bar</string>
+    <string name="pref_search_auto_show_keyboard">Automatically show keyboard</string>
+
+    <string name="fuzzy_search_title">Fuzzy search</string>
+    <string name="fuzzy_search_desc">Approximate matching for app searches</string>
 
     <string name="suggestion_pref_screen_title">Suggestions</string>
     <string name="show_suggested_apps_at_drawer_top">Show suggested apps at the top of the drawer</string>
 
-    <string name="n_percent" translatable="false">%1$d%%</string>
+    <string name="perform_wide_search_title">Device search</string>
+    <string name="perform_wide_search_description">Search your phone contacts, files, and settings</string>
 
-    <!-- Bug reporting -->
-    <string name="lawnchair_bug_report">Lawnchair bug report</string>
-    <string name="crash_report_notif_title">%1$s crashed</string>
-    <string name="action_upload_crash_report">Upload crash log</string>
+    <string name="show_hidden_apps_in_search_results">Show hidden apps in search results</string>
+    <string name="hidden_apps_show_name_typed">If full name is typed</string>
 
-    <string name="action_copy_link">Copy link</string>
+    <string name="app_search_algorithm">Search algorithm</string>
+    <string name="search_algorithm_app_search">App Search</string>
+    <string name="search_algorithm_global_search_on_device">Global search (on-device)</string>
+    <string name="search_algorithm_global_search_via_asi">Global search (via ASI)</string>
 
-    <string name="action_upload_error">Upload failed</string>
-    <string name="dogbin_uploading">Uploading…</string>
-
-    <string name="bugreport_channel_name">Bug reports</string>
-    <string name="status_channel_name">Upload status</string>
-
-    <string name="bugreport_group_summary">%d new reports</string>
-    <string name="bugreport_group_summary_multiple">Multiple new reports</string>
-
-    <!-- Search ig -->
-    <string name="action_apply">Apply</string>
+    <!-- Labels of each search result types -->
     <string name="show_search_result_types">Show in search results</string>
 
     <string name="search_pref_result_apps_and_shortcuts_title">Apps &amp; Shortcuts</string>
@@ -484,34 +653,15 @@
     <string name="search_pref_result_settings_title">Android settings</string>
     <string name="search_pref_result_files_title">Files</string>
     <string name="search_pref_result_web_title">Web suggestions</string>
-    <string name="search_pref_result_history_title">Search History</string>
+    <string name="search_pref_result_history_title">Search history</string>
+    <string name="all_apps_search_result_calculator">Calculator</string>
 
+    <!-- Description for each search result type -->
     <string name="search_pref_result_files_description">Media, files, and more</string>
     <string name="search_pref_result_contacts_description">Contacts and more</string>
     <string name="search_pref_result_web_description">Via <xliff:g id="startpage">Startpage</xliff:g></string>
-    
-    <string name="warn_contact_permission_content">To search for contacts, grant Contacts and Phone permissions to Lawnchair</string>
-    <string name="warn_files_permission_content">To search your files, grant Storage permissions to Lawnchair</string>
-    <string name="grant_requested_permissions">Grant permissions</string>
-
-    <string name="pref_suggestion_label">Suggestions</string>
-    <string name="all_apps_device_search_hint">Search</string>
-    <string name="search_input_action_clear_results">Clear search box</string>
-
-    <string name="all_apps_search_result_suggestions">From the web</string>
-    <string name="all_apps_search_result_contacts_from_device">Contacts from device</string>
-    <string name="all_apps_search_result_files">Files from device</string>
-    <string name="all_apps_search_result_settings_entry_from_device">Settings from device</string>
-
-    <string name="label_search">Search</string>
-    <string name="label_lens">Google Lens</string>
-    <string name="label_voice_search">Voice Search</string>
-
-    <string name="pref_advance_search_category">Advanced search</string>
-
-    <string name="perform_wide_search_title">Device search</string>
-    <string name="perform_wide_search_description">Search your phone contacts, files, and settings</string>
 
+    <!-- Maximum xyz for each search result type -->
     <string name="max_apps_result_count_title">Maximum number of apps in search results</string>
     <string name="max_people_result_count_title">Maximum number of people in search results</string>
     <string name="max_file_result_count_title">Maximum number of files in search results</string>
@@ -520,50 +670,9 @@
     <string name="max_suggestion_result_count_title">Maximum number of suggestions in search results</string>
     <string name="max_web_suggestion_delay">Maximum web suggestion delay</string>
 
-    <string name="all_apps_search_market_message">Search for more apps</string>
-    <string name="all_apps_search_startpage_message">Search on <xliff:g id="startpage">Startpage</xliff:g></string>
-    <string name="error_no_market_or_browser_installed">No app store or browser installed</string>
+    <!-- Permission warnings -->
+    <string name="warn_contact_permission_content">To search for contacts, grant contacts and phone permissions to Lawnchair</string>
+    <string name="warn_files_permission_content">To search your files, grant storage permissions to Lawnchair</string>
+    <string name="grant_requested_permissions">Grant permissions</string>
 
-    <string name="quickstep_incompatible">Incompatible system integration</string>
-    <string name="quickstep_incompatible_description">Your device is configured to have system gestures (known as Quickstep) provided by %1$s, but this version of %1$s isn\'t compatible with your Android version. To continue using your device, please uninstall %1$s updates or disable %1$s as a system gesture provider.</string>
-
-    <string name="delete">Delete</string>
-
-    <!-- Backup -->
-    <string name="create_backup">Create backup</string>
-    <string name="create_backup_action">Create</string>
-    <string name="what_to_backup">What to back up</string>
-    <string name="backup_content_layout_and_settings">Layout and settings</string>
-    <string name="backup_content_wallpaper">Wallpaper</string>
-    <string name="backup_create_success">Backup created</string>
-    <string name="backup_create_error">Failed to create backup</string>
-    <string name="restore_backup">Restore backup</string>
-    <string name="restore_backup_action">Restore</string>
-    <string name="what_to_restore">What to restore</string>
-    <string name="backup_restore_success">Backup restored</string>
-    <string name="backup_restore_error">Failed to restore backup</string>
-    <string name="invalid_backup_file">Invalid backup file</string>
-
-    <!-- Miscellaneous -->
-    <string name="google_folder_title" translatable="false">Google</string>
-
-    <string name="x_by_y">%1$d x %2$d</string>
-    <string name="x_and_y">%s &amp; %s</string>
-
-    <string name="system_settings">System settings</string>
-
-    <string name="action_unlock">Unlock</string>
-    <string name="action_lock">Lock</string>
-
-    <string name="allapps_twoline_label">Use Multiple Lines</string>
-    <string name="hidden_apps_show_always">Always</string>
-    <string name="hidden_apps_show_name_typed">If Full Name is Typed</string>
-    <string name="hidden_apps_show_never">Never</string>
-    <string name="show_hidden_apps_in_search_results">Show Hidden Apps in Search Results</string>
-    <string name="search_algorithm_app_search">App Search</string>
-    <string name="search_algorithm_global_search_on_device">Global Search (on-device)</string>
-    <string name="search_algorithm_global_search_via_asi">Global Search (via ASI)</string>
-    <string name="app_search_algorithm">Search Algorithm</string>
-    <string name="all_apps_search_result_calculator">Calculator</string>
-    <string name="accessibility_service_description">To lock your phone when performing a gesture, Lawnchair requires accessibility access.\n\nLawnchair doesn\'t watch any user action, though the privilege to do so is required for all accessibility services. Lawnchair discards any event sent by the system.\n\nIn order to lock your phone, Lawnchair uses the performGlobalAction Accessibility service.</string>
 </resources>
diff --git a/lawnchair/src/app/lawnchair/backup/ui/CreateBackupScreen.kt b/lawnchair/src/app/lawnchair/backup/ui/CreateBackupScreen.kt
index ecbc62e860..add91a3177 100644
--- a/lawnchair/src/app/lawnchair/backup/ui/CreateBackupScreen.kt
+++ b/lawnchair/src/app/lawnchair/backup/ui/CreateBackupScreen.kt
@@ -185,7 +185,7 @@ fun CreateBackupScreen(
                     .fillMaxWidth(),
                 enabled = contents != 0 && screenshotDone && !creatingBackup,
             ) {
-                Text(text = stringResource(id = R.string.create_backup_action))
+                Text(text = stringResource(id = R.string.action_create))
             }
         }
     }
diff --git a/lawnchair/src/app/lawnchair/backup/ui/RestoreBackupScreen.kt b/lawnchair/src/app/lawnchair/backup/ui/RestoreBackupScreen.kt
index 7bbdd0e023..0c40fe3538 100644
--- a/lawnchair/src/app/lawnchair/backup/ui/RestoreBackupScreen.kt
+++ b/lawnchair/src/app/lawnchair/backup/ui/RestoreBackupScreen.kt
@@ -209,7 +209,7 @@ fun ColumnScope.RestoreBackupOptions(
                 .fillMaxWidth(),
             enabled = contents != 0 && !restoringBackup,
         ) {
-            Text(text = stringResource(id = R.string.restore_backup_action))
+            Text(text = stringResource(id = R.string.action_restore))
         }
     }
 }
diff --git a/lawnchair/src/app/lawnchair/smartspace/SmartspaceViewContainer.kt b/lawnchair/src/app/lawnchair/smartspace/SmartspaceViewContainer.kt
index 2a25a4e6a4..491b6a50a2 100644
--- a/lawnchair/src/app/lawnchair/smartspace/SmartspaceViewContainer.kt
+++ b/lawnchair/src/app/lawnchair/smartspace/SmartspaceViewContainer.kt
@@ -48,7 +48,7 @@ class SmartspaceViewContainer @JvmOverloads constructor(
 
     private fun getCustomizeOption() = OptionsPopupView.OptionItem(
         context,
-        R.string.customize_button_text,
+        R.string.action_customize,
         R.drawable.ic_setting,
         StatsLogManager.LauncherEvent.IGNORE,
     ) {
diff --git a/lawnchair/src/app/lawnchair/smartspace/SmartspacerView.kt b/lawnchair/src/app/lawnchair/smartspace/SmartspacerView.kt
index ecc367a81f..abfd79ed30 100644
--- a/lawnchair/src/app/lawnchair/smartspace/SmartspacerView.kt
+++ b/lawnchair/src/app/lawnchair/smartspace/SmartspacerView.kt
@@ -109,7 +109,7 @@ class SmartspacerView(context: Context, attrs: AttributeSet?) : BcSmartspaceView
         if (settingsIntent == null) return null
         return OptionsPopupView.OptionItem(
             context,
-            R.string.customize_button_text,
+            R.string.action_customize,
             R.drawable.ic_setting,
             StatsLogManager.LauncherEvent.IGNORE,
         ) {
@@ -120,7 +120,7 @@ class SmartspacerView(context: Context, attrs: AttributeSet?) : BcSmartspaceView
 
     private fun getCustomizeOptionFallback() = OptionsPopupView.OptionItem(
         context,
-        R.string.customize_button_text,
+        R.string.action_customize,
         R.drawable.ic_setting,
         StatsLogManager.LauncherEvent.IGNORE,
     ) {
diff --git a/lawnchair/src/app/lawnchair/theme/color/ColorMode.kt b/lawnchair/src/app/lawnchair/theme/color/ColorMode.kt
index 6628f6d75c..597dedefcc 100644
--- a/lawnchair/src/app/lawnchair/theme/color/ColorMode.kt
+++ b/lawnchair/src/app/lawnchair/theme/color/ColorMode.kt
@@ -11,7 +11,7 @@ enum class ColorMode(
     @StringRes val labelResourceId: Int,
 ) {
     AUTO(
-        labelResourceId = R.string.launcher_default_color,
+        labelResourceId = R.string.managed_by_lawnchair,
     ),
     LIGHT(
         labelResourceId = R.string.color_light,
diff --git a/lawnchair/src/app/lawnchair/theme/color/ColorOption.kt b/lawnchair/src/app/lawnchair/theme/color/ColorOption.kt
index f0c923b3ef..89caf2ed3a 100644
--- a/lawnchair/src/app/lawnchair/theme/color/ColorOption.kt
+++ b/lawnchair/src/app/lawnchair/theme/color/ColorOption.kt
@@ -65,7 +65,7 @@ sealed class ColorOption {
 
         override val colorPreferenceEntry = ColorPreferenceEntry<ColorOption>(
             this,
-            { stringResource(id = R.string.launcher_default_color) },
+            { stringResource(id = R.string.managed_by_lawnchair) },
             { 0 },
         )
 
diff --git a/lawnchair/src/app/lawnchair/ui/popup/LawnchairShortcut.kt b/lawnchair/src/app/lawnchair/ui/popup/LawnchairShortcut.kt
index 6f4c5dede8..ac3fe064f3 100644
--- a/lawnchair/src/app/lawnchair/ui/popup/LawnchairShortcut.kt
+++ b/lawnchair/src/app/lawnchair/ui/popup/LawnchairShortcut.kt
@@ -72,7 +72,7 @@ class LawnchairShortcut {
         private val appInfo: ModelAppInfo,
         itemInfo: ItemInfo,
         originalView: View,
-    ) : SystemShortcut<LawnchairLauncher>(R.drawable.ic_edit, R.string.customize_button_text, launcher, itemInfo, originalView) {
+    ) : SystemShortcut<LawnchairLauncher>(R.drawable.ic_edit, R.string.action_customize, launcher, itemInfo, originalView) {
 
         override fun onClick(v: View) {
             val outObj = Array<Any?>(1) { null }
diff --git a/lawnchair/src/app/lawnchair/ui/preferences/components/HiddenAppsInSearchPreference.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/HiddenAppsInSearchPreference.kt
index d5f957092b..ccb61e1d2b 100644
--- a/lawnchair/src/app/lawnchair/ui/preferences/components/HiddenAppsInSearchPreference.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/components/HiddenAppsInSearchPreference.kt
@@ -16,9 +16,9 @@ object HiddenAppsInSearch {
 }
 
 val hiddenAppsInSearchEntries = sequenceOf(
-    ListPreferenceEntry(HiddenAppsInSearch.NEVER) { stringResource(R.string.hidden_apps_show_never) },
+    ListPreferenceEntry(HiddenAppsInSearch.NEVER) { stringResource(R.string.never_choice) },
     ListPreferenceEntry(HiddenAppsInSearch.IF_NAME_TYPED) { stringResource(R.string.hidden_apps_show_name_typed) },
-    ListPreferenceEntry(HiddenAppsInSearch.ALWAYS) { stringResource(R.string.hidden_apps_show_always) },
+    ListPreferenceEntry(HiddenAppsInSearch.ALWAYS) { stringResource(R.string.always_choice) },
 )
     .toPersistentList()
 
diff --git a/lawnchair/src/app/lawnchair/ui/preferences/components/NotificationDotsPreference.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/NotificationDotsPreference.kt
index 492862947a..7bb273dbd5 100644
--- a/lawnchair/src/app/lawnchair/ui/preferences/components/NotificationDotsPreference.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/components/NotificationDotsPreference.kt
@@ -65,7 +65,7 @@ fun NotificationDotsPreference(
     val context = LocalContext.current
     val showWarning = enabled && !serviceEnabled
     val summary = when {
-        showWarning -> R.string.missing_notification_access_description
+        showWarning -> R.string.missing_notification_access_label
         enabled -> R.string.notification_dots_desc_on
         else -> R.string.notification_dots_desc_off
     }
@@ -117,7 +117,7 @@ fun NotificationAccessConfirmation(
         title = { Text(text = stringResource(id = R.string.missing_notification_access_label)) },
         text = {
             val appName = stringResource(id = R.string.derived_app_name)
-            Text(text = stringResource(id = R.string.msg_missing_notification_access, appName))
+            Text(text = stringResource(id = R.string.missing_notification_access_desc, appName))
         },
         buttons = {
             OutlinedButton(
diff --git a/lawnchair/src/app/lawnchair/ui/preferences/components/colorpreference/ColorSelectionPreference.kt b/lawnchair/src/app/lawnchair/ui/preferences/components/colorpreference/ColorSelectionPreference.kt
index 61febb07d6..bcc6e31674 100644
--- a/lawnchair/src/app/lawnchair/ui/preferences/components/colorpreference/ColorSelectionPreference.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/components/colorpreference/ColorSelectionPreference.kt
@@ -86,7 +86,7 @@ fun ColorSelection(
                         .fillMaxWidth()
                         .padding(all = 16.dp),
                 ) {
-                    Text(text = stringResource(id = R.string.apply_grid))
+                    Text(text = stringResource(id = R.string.action_apply))
                 }
                 BottomSpacer()
             }
diff --git a/lawnchair/src/app/lawnchair/ui/preferences/destinations/AppDrawerPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/destinations/AppDrawerPreferences.kt
index f57b5bbe48..b0bf789cce 100644
--- a/lawnchair/src/app/lawnchair/ui/preferences/destinations/AppDrawerPreferences.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/destinations/AppDrawerPreferences.kt
@@ -108,7 +108,7 @@ fun AppDrawerPreferences(
         }
         PreferenceGroup(heading = stringResource(id = R.string.icons)) {
             SliderPreference(
-                label = stringResource(id = R.string.icon_size),
+                label = stringResource(id = R.string.icon_sizes),
                 adapter = prefs2.drawerIconSizeFactor.getAdapter(),
                 step = 0.1f,
                 valueRange = 0.5F..1.5F,
@@ -117,7 +117,7 @@ fun AppDrawerPreferences(
             val showDrawerLabels = prefs2.showIconLabelsInDrawer.getAdapter()
             SwitchPreference(
                 adapter = showDrawerLabels,
-                label = stringResource(id = R.string.show_home_labels),
+                label = stringResource(id = R.string.show_labels),
             )
             ExpandAndShrink(visible = showDrawerLabels.state.value) {
                 DividerColumn {
@@ -130,7 +130,7 @@ fun AppDrawerPreferences(
                     )
                     SwitchPreference(
                         adapter = prefs2.twoLineAllApps.getAdapter(),
-                        label = stringResource(R.string.allapps_twoline_label),
+                        label = stringResource(R.string.twoline_label),
                     )
                 }
             }
diff --git a/lawnchair/src/app/lawnchair/ui/preferences/destinations/CustomIconShapePreference.kt b/lawnchair/src/app/lawnchair/ui/preferences/destinations/CustomIconShapePreference.kt
index 922480b1ed..202a29c350 100644
--- a/lawnchair/src/app/lawnchair/ui/preferences/destinations/CustomIconShapePreference.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/destinations/CustomIconShapePreference.kt
@@ -92,9 +92,9 @@ fun CustomIconShapePreference(
                 ) {
                     Text(
                         text = if (appliedIconShape != null) {
-                            stringResource(id = R.string.apply_grid)
+                            stringResource(id = R.string.action_apply)
                         } else {
-                            stringResource(id = R.string.create)
+                            stringResource(id = R.string.action_create)
                         },
                     )
                 }
@@ -134,7 +134,7 @@ private fun IconShapeCornerPreferenceGroup(
         heading = stringResource(id = R.string.color_sliders),
     ) {
         IconShapeCornerPreference(
-            title = stringResource(id = R.string.icon_shape_top_left),
+            title = stringResource(id = R.string.custom_icon_shape_top_left),
             scale = selectedIconShape.topLeft.scale.x,
             onScaleChange = {
                 onSelectedIconShapeChange(selectedIconShape.copy(topLeftScale = it))
@@ -145,7 +145,7 @@ private fun IconShapeCornerPreferenceGroup(
             },
         )
         IconShapeCornerPreference(
-            title = stringResource(id = R.string.icon_shape_top_right),
+            title = stringResource(id = R.string.custom_icon_shape_top_right),
             scale = selectedIconShape.topRight.scale.x,
             onScaleChange = {
                 onSelectedIconShapeChange(selectedIconShape.copy(topRightScale = it))
@@ -156,7 +156,7 @@ private fun IconShapeCornerPreferenceGroup(
             },
         )
         IconShapeCornerPreference(
-            title = stringResource(id = R.string.icon_shape_bottom_left),
+            title = stringResource(id = R.string.custom_icon_shape_bottom_left),
             scale = selectedIconShape.bottomLeft.scale.x,
             onScaleChange = {
                 onSelectedIconShapeChange(selectedIconShape.copy(bottomLeftScale = it))
@@ -167,7 +167,7 @@ private fun IconShapeCornerPreferenceGroup(
             },
         )
         IconShapeCornerPreference(
-            title = stringResource(id = R.string.icon_shape_bottom_right),
+            title = stringResource(id = R.string.custom_icon_shape_bottom_right),
             scale = selectedIconShape.bottomRight.scale.x,
             onScaleChange = {
                 onSelectedIconShapeChange(selectedIconShape.copy(bottomRightScale = it))
@@ -335,7 +335,7 @@ private fun CornerSlider(
                     .clickable {
                         bottomSheetHandler.show {
                             ModalBottomSheetContent(
-                                title = { Text(stringResource(id = R.string.icon_shape_corner)) },
+                                title = { Text(stringResource(id = R.string.custom_icon_shape_corner)) },
                                 buttons = {
                                     OutlinedButton(onClick = { bottomSheetHandler.hide() }) {
                                         Text(text = stringResource(id = android.R.string.cancel))
@@ -394,7 +394,7 @@ private fun CornerSlider(
 
 @Composable
 private fun IconCornerShape.getLabel() = when (this) {
-    IconCornerShape.Squircle -> stringResource(id = R.string.icon_shape_corner_squircle)
-    IconCornerShape.Cut -> stringResource(id = R.string.icon_shape_corner_cut)
-    else -> stringResource(id = R.string.icon_shape_corner_round)
+    IconCornerShape.Squircle -> stringResource(id = R.string.custom_icon_shape_corner_squircle)
+    IconCornerShape.Cut -> stringResource(id = R.string.custom_icon_shape_corner_cut)
+    else -> stringResource(id = R.string.custom_icon_shape_corner_round)
 }
diff --git a/lawnchair/src/app/lawnchair/ui/preferences/destinations/FolderPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/destinations/FolderPreferences.kt
index c4e5a38416..061c200b3e 100644
--- a/lawnchair/src/app/lawnchair/ui/preferences/destinations/FolderPreferences.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/destinations/FolderPreferences.kt
@@ -71,7 +71,7 @@ fun FolderPreferences(
             val homeScreenLabelsAdapter = prefs2.showIconLabelsOnHomeScreenFolder.getAdapter()
             SwitchPreference(
                 adapter = homeScreenLabelsAdapter,
-                label = stringResource(id = R.string.show_home_labels),
+                label = stringResource(id = R.string.show_labels),
             )
             ExpandAndShrink(visible = homeScreenLabelsAdapter.state.value) {
                 SliderPreference(
diff --git a/lawnchair/src/app/lawnchair/ui/preferences/destinations/FontSelectionPreference.kt b/lawnchair/src/app/lawnchair/ui/preferences/destinations/FontSelectionPreference.kt
index 3141ee56f0..921a0b0931 100644
--- a/lawnchair/src/app/lawnchair/ui/preferences/destinations/FontSelectionPreference.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/destinations/FontSelectionPreference.kt
@@ -128,7 +128,7 @@ fun FontSelection(
                         hideMenu()
                     },
                     text = {
-                        Text(text = stringResource(id = R.string.reset_font))
+                        Text(text = stringResource(id = R.string.action_reset))
                     },
                 )
             }
@@ -240,7 +240,7 @@ private fun FontSelectionItem(
                     ) {
                         Icon(
                             imageVector = Icons.Rounded.Delete,
-                            contentDescription = stringResource(id = R.string.delete),
+                            contentDescription = stringResource(id = R.string.action_delete),
                             tint = MaterialTheme.colorScheme.onSurfaceVariant,
                         )
                     }
diff --git a/lawnchair/src/app/lawnchair/ui/preferences/destinations/GeneralPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/destinations/GeneralPreferences.kt
index c7c0a4f4d4..666686365e 100644
--- a/lawnchair/src/app/lawnchair/ui/preferences/destinations/GeneralPreferences.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/destinations/GeneralPreferences.kt
@@ -126,14 +126,14 @@ fun GeneralPreferences() {
             showDescription = wrapAdaptiveIcons.state.value,
         ) {
             NavigationActionPreference(
-                label = stringResource(id = R.string.icon_style),
+                label = stringResource(id = R.string.icon_style_label),
                 destination = GeneralRoutes.ICON_PACK,
                 subtitle = iconStyleSubtitle,
             )
             ExpandAndShrink(visible = themedIconsEnabled) {
                 SwitchPreference(
                     adapter = prefs.transparentIconBackground.getAdapter(),
-                    label = stringResource(id = R.string.transparent_background_icons),
+                    label = stringResource(id = R.string.transparent_background_icons_label),
                     description = stringResource(id = R.string.transparent_background_icons_description),
                 )
             }
diff --git a/lawnchair/src/app/lawnchair/ui/preferences/destinations/HomeScreenGridPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/destinations/HomeScreenGridPreferences.kt
index 02e401d6d7..21f15a9036 100644
--- a/lawnchair/src/app/lawnchair/ui/preferences/destinations/HomeScreenGridPreferences.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/destinations/HomeScreenGridPreferences.kt
@@ -105,7 +105,7 @@ fun HomeScreenGridPreferences(
                     .fillMaxWidth(),
                 enabled = columns.intValue != originalColumns || rows.intValue != originalRows,
             ) {
-                Text(text = stringResource(id = R.string.apply_grid))
+                Text(text = stringResource(id = R.string.action_apply))
             }
         }
     }
diff --git a/lawnchair/src/app/lawnchair/ui/preferences/destinations/HomeScreenPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/destinations/HomeScreenPreferences.kt
index d3a855e27e..9c7b3a6802 100644
--- a/lawnchair/src/app/lawnchair/ui/preferences/destinations/HomeScreenPreferences.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/destinations/HomeScreenPreferences.kt
@@ -164,7 +164,7 @@ fun HomeScreenPreferences(
         }
         PreferenceGroup(heading = stringResource(id = R.string.icons)) {
             SliderPreference(
-                label = stringResource(id = R.string.icon_size),
+                label = stringResource(id = R.string.icon_sizes),
                 adapter = prefs2.homeIconSizeFactor.getAdapter(),
                 step = 0.1f,
                 valueRange = 0.5F..1.5F,
@@ -173,7 +173,7 @@ fun HomeScreenPreferences(
             val homeScreenLabelsAdapter = prefs2.showIconLabelsOnHomeScreen.getAdapter()
             SwitchPreference(
                 adapter = homeScreenLabelsAdapter,
-                label = stringResource(id = R.string.show_home_labels),
+                label = stringResource(id = R.string.show_labels),
             )
             ExpandAndShrink(visible = homeScreenLabelsAdapter.state.value) {
                 SliderPreference(
diff --git a/lawnchair/src/app/lawnchair/ui/preferences/destinations/IconPackPreferences.kt b/lawnchair/src/app/lawnchair/ui/preferences/destinations/IconPackPreferences.kt
index 36941df5ee..a286abbf38 100644
--- a/lawnchair/src/app/lawnchair/ui/preferences/destinations/IconPackPreferences.kt
+++ b/lawnchair/src/app/lawnchair/ui/preferences/destinations/IconPackPreferences.kt
@@ -115,7 +115,7 @@ fun IconPackPreferences(
     val drawerThemedIconsEnabled = drawerThemedIconsAdapter.state.value
 
     PreferenceLayout(
-        label = stringResource(id = R.string.icon_style),
+        label = stringResource(id = R.string.icon_style_label),
         modifier = modifier,
         isExpandedScreen = true,
         scrollState = if (isPortrait) null else scrollState,
diff --git a/src/com/android/launcher3/settings/NotificationDotsPreference.java b/src/com/android/launcher3/settings/NotificationDotsPreference.java
index 1816e7be38..2796bb06b2 100644
--- a/src/com/android/launcher3/settings/NotificationDotsPreference.java
+++ b/src/com/android/launcher3/settings/NotificationDotsPreference.java
@@ -155,7 +155,7 @@ public class NotificationDotsPreference extends Preference
         @Override
         public Dialog onCreateDialog(Bundle savedInstanceState) {
             final Context context = getActivity();
-            String msg = context.getString(R.string.msg_missing_notification_access,
+            String msg = context.getString(R.string.missing_notification_access_desc,
                     context.getString(R.string.derived_app_name));
             return new AlertDialog.Builder(context)
                     .setTitle(R.string.title_missing_notification_access)