diff --git a/app/src/main/res/values/new-strings.xml b/app/src/main/res/values/new-strings.xml
index 1f873531c..a24568305 100644
--- a/app/src/main/res/values/new-strings.xml
+++ b/app/src/main/res/values/new-strings.xml
@@ -7,37 +7,18 @@
     <string name="about_text">Apps on F-Droid are free and open source (FOSS), they respect your privacy and they are available for anyone to see the source code, build on and improve.\n\nApp distribution is transparent, privacy-respecting, and accountable, setting a standard that challenges the mobile ecosystem to do better.\n\nF-Droid\'s impact is measured not just in apps published, but in the freedom, trust, and digital rights it helped protect.\n\nHelp F-Droid to protect community-powered innovation and continue their mission of openness, privacy, and user empowerment.</string>
     <string name="about_license_text">This program is Free Software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.</string>
 
-    <string name="menu_about">About</string>
-    <string name="menu_discover">Discover</string>
-    <string name="menu_apps_my">My apps</string>
 
-    <string name="first_start_loading">Fetching app repositories…</string>
     <string name="first_start_intro">To get started, fetch the app repositories</string>
     <string name="first_start_offline">You\'re offline. Connect to the Internet to start.</string>
     <string name="first_start_metered">You\'re on mobile data and more than 10 MB must be downloaded. Tap Fetch repositories to start anyway.</string>
     <string name="first_start_button">Fetch repositories</string>
     <string name="no_repos_enabled">No repositories available, add a repository to get started</string>
 
-    <string name="my_apps_empty">Only apps installed by %1$s are shown here</string>
-    <string name="my_apps_header_apps_with_issue">Apps with issues</string>
-    <string name="my_apps_ignore_dialog_title">Hide issue</string>
-    <string name="my_apps_ignore_dialog_text">The issue with this version of \"%1$s\" will get ignored</string>
-    <string name="my_apps_ignore_dialog_button">Hide</string>
-    <string name="my_apps_export_installed_apps">Export app list</string>
-
     <string name="install_history_empty_state">This list is still empty\n\nWhen you install, update or uninstall apps, a record will appear here</string>
     <string name="install_history_disabled_state">Install history is disabled\n\nInstallations, updates and uninstalls will not be recorded</string>
     <string name="install_history_delete_ally">Delete install history</string>
     <string name="install_history_delete_text">Delete the install history?</string>
 
-    <string name="app_list_new">New apps</string>
-    <string name="app_list_recently_updated">Recently updated</string>
-    <string name="app_list_most_downloaded">Most downloaded</string>
-    <string name="app_list_all">All apps</string>
-    <string name="app_list_author">Apps by %s</string>
-
-    <string name="search_placeholder">Search…</string>
-    <string name="search_no_results">No apps found\n\nTry to use less search terms or add more repositories</string>
     <string name="search_filter_no_results">No matching apps\n\nTry to use less search terms or remove filters</string>
     <string name="search_my_apps_no_results">No matching apps\n\nTry to use less search terms</string>
     <string name="sort_title">Sorting and compatibility</string>
@@ -59,29 +40,6 @@
     <string name="dialog_metered_button">Download</string>
     <string name="screenshots_metered">Tap to load screenshots via mobile data</string>
 
-    <string name="category_group_productivity">Productivity</string>
-    <string name="category_group_tools">Tools</string>
-    <string name="category_group_wallets">Finances &amp; Wallets</string>
-    <string name="category_group_media">Entertainment &amp; Media</string>
-    <string name="category_group_communication">Communication</string>
-    <string name="category_group_device">Device</string>
-    <string name="category_group_network">Network</string>
-    <string name="category_group_storage">Files &amp; Storage</string>
-    <string name="category_group_interests">Interests</string>
-    <string name="category_group_misc">Miscellaneous</string>
-
-    <string name="author_by">By %1$s</string>
-    <string name="last_updated">Last updated: %1$s</string>
-    <!-- The placeholder in round brackets will be replaced with the size of the app -->
-    <string name="last_updated_with_size">Last updated: %1$s (%2$s)</string>
-    <string name="status_install_preparing">Preparing installation…</string>
-    <string name="whats_new_title">What\'s new</string>
-    <string name="donate_title">Donate</string>
-    <string name="anti_features_title">This app has anti-features</string>
-    <string name="developer_contact">Developer contact</string>
-    <string name="technical_info">Technical information</string>
-    <string name="package_name">Package name:</string>
-    <string name="installed_version">Installed version:</string>
     <string name="copy_link">Copy link</string>
     <string name="app_no_compatible_versions">This app is not compatible with your device</string>
     <string name="app_no_compatible_signer">Can\'t update this app, because all versions have an incompatible signature\n\nIf you don\'t receive updates through other means, you may need to uninstall and then reinstall this app. The app\'s data will be lost.</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 52e6cd9f9..12e0174a1 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -8,6 +8,53 @@
     <!-- The app name of nightly builds, shortened to fit reduced space for app names -->
     <string name="app_name_basic_nightly">F-Nightly Basic</string>
 
+    <string name="menu_about">About</string>
+    <string name="menu_discover">Discover</string>
+    <string name="menu_apps_my">My apps</string>
+
+    <string name="first_start_loading">Fetching app repositories…</string>
+
+    <string name="my_apps_empty">Only apps installed by %1$s are shown here</string>
+    <string name="my_apps_header_apps_with_issue">Apps with issues</string>
+    <string name="my_apps_ignore_dialog_title">Hide issue</string>
+    <string name="my_apps_ignore_dialog_text">The issue with this version of \"%1$s\" will get ignored</string>
+    <string name="my_apps_ignore_dialog_button">Hide</string>
+    <string name="my_apps_export_installed_apps">Export app list</string>
+
+    <string name="app_list_new">New apps</string>
+    <string name="app_list_recently_updated">Recently updated</string>
+    <string name="app_list_most_downloaded">Most downloaded</string>
+    <string name="app_list_all">All apps</string>
+    <string name="app_list_author">Apps by %s</string>
+
+    <string name="search_placeholder">Search…</string>
+    <string name="search_no_results">No apps found\n\nTry to use less search terms or add more repositories</string>
+
+    <string name="category_group_productivity">Productivity</string>
+    <string name="category_group_tools">Tools</string>
+    <string name="category_group_wallets">Finances &amp; Wallets</string>
+    <string name="category_group_media">Entertainment &amp; Media</string>
+    <string name="category_group_communication">Communication</string>
+    <string name="category_group_device">Device</string>
+    <string name="category_group_network">Network</string>
+    <string name="category_group_storage">Files &amp; Storage</string>
+    <string name="category_group_interests">Interests</string>
+    <string name="category_group_misc">Miscellaneous</string>
+
+    <!-- Used in app details page to show who is the author of the app -->
+    <string name="author_by">By %1$s</string>
+    <string name="last_updated">Last updated: %1$s</string>
+    <!-- The placeholder in round brackets will be replaced with the size of the app -->
+    <string name="last_updated_with_size">Last updated: %1$s (%2$s)</string>
+    <string name="status_install_preparing">Preparing installation…</string>
+    <string name="whats_new_title">What\'s new</string>
+    <string name="donate_title">Donate</string>
+    <string name="anti_features_title">This app has anti-features</string>
+    <string name="developer_contact">Developer contact</string>
+    <string name="technical_info">Technical information</string>
+    <string name="package_name">Package name:</string>
+    <string name="installed_version">Installed version:</string>
+
     <string name="SignatureMismatch">The new version is signed with a different key to the old one. To install the new
         version, the old one must be uninstalled first. Please do this and try again. (Note that uninstalling will erase
         any internal data stored by the app)