From 681058c3e61b5008036bed86418fe4d8ea6fe199 Mon Sep 17 00:00:00 2001
From: Dennis Guse <dennis.guse@alumni.tu-berlin.de>
Date: Sat, 20 Nov 2021 22:05:04 +0100
Subject: [PATCH] i18n: move translatable settings strings into strings.xml

---
 src/main/res/values/settings.xml | 18 ------------------
 src/main/res/values/strings.xml  | 28 ++++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/main/res/values/settings.xml b/src/main/res/values/settings.xml
index 46eda042b..a1c7d5930 100644
--- a/src/main/res/values/settings.xml
+++ b/src/main/res/values/settings.xml
@@ -12,40 +12,22 @@
 
     <!-- Main settings -->
     <string name="settings_open_tracks_key" translatable="false">settingsOpenTracks</string>
-    <string name="settings_open_tracks_title" translatable="false">Open Tracks</string>
-    <string name="settings_open_tracks_summary">All About OpenTracks Project</string>
 
     <string name="settings_defaults_key" translatable="false">settingsDefaults</string>
-    <string name="settings_defaults_title">Default Units and Activity</string>
-    <string name="settings_defaults_summary">Preferred Units, Default Activity, Track Default Name</string>
 
     <string name="settings_ui_key" translatable="false">settingsUI</string>
-    <string name="settings_ui_title">User Interface</string>
-    <string name="settings_ui_summary">Appearance, Recording Layout, Theme</string>
 
     <string name="settings_gps_key" translatable="false">settingsGps</string>
-    <string name="settings_gps_title">GPS</string>
-    <string name="settings_gps_summary">Time interval, Distance interval, Max Distance, Accuracy</string>
 
     <string name="settings_sensors_key" translatable="false">settingsSensorsGps</string>
-    <string name="settings_sensors_title">Bluetooth Sensors</string>
-    <string name="settings_sensors_summary">Cycling Sensors, Wheel Circumference, Running Sensors</string>
 
     <string name="settings_announcements_key" translatable="false">settingsAnnouncements</string>
-    <string name="settings_announcements_title">Voice Announcements</string>
-    <string name="settings_announcements_summary">Time, Distance, Voice Speed</string>
 
     <string name="settings_import_export_key" translatable="false">settingsImportExport</string>
-    <string name="settings_import_export_title">Import/Export</string>
-    <string name="settings_import_export_summary">Import, Export, Auto Export</string>
 
     <!-- Setting's categories -->
-    <string name="settings_units_category">Units</string>
-    <string name="settings_activity_defaults_category">Activity\'s Defaults</string>
 
     <string name="settings_reset_key" translatable="false">settingsReset</string>
-    <string name="settings_reset_summary">Reset Settings to Default Values</string>
-    <string name="settings_layout_reset_key" translatable="false">settingsLayoutReset</string>
 
     <string name="settings_sensor_bluetooth_heart_rate_key" translatable="false">bluetoothSensor</string>
     <string name="settings_sensor_bluetooth_cycling_cadence_key" translatable="false">bluetoothCyclingCadenceSensor</string>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index fa696a6f7..47d705e2f 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -328,6 +328,34 @@ limitations under the License.
     <string name="bluetooth_disabled">Please enable Bluetooth.</string>
     <string name="settings_not_while_recording">Not available while recording a track</string>
     <string name="settings_show">Show</string>
+
+    <string name="settings_open_tracks_title">Open Tracks</string>
+    <string name="settings_open_tracks_summary">All About OpenTracks Project</string>
+
+    <string name="settings_defaults_title">Default Units and Activity</string>
+    <string name="settings_defaults_summary">Preferred Units, Default Activity, Track Default Name</string>
+
+    <string name="settings_ui_title">User Interface</string>
+    <string name="settings_ui_summary">Appearance, Recording Layout, Theme</string>
+
+    <string name="settings_gps_title">GPS</string>
+    <string name="settings_gps_summary">Time interval, Distance interval, Max Distance, Accuracy</string>
+
+    <string name="settings_sensors_title">Bluetooth Sensors</string>
+    <string name="settings_sensors_summary">Cycling Sensors, Wheel Circumference, Running Sensors</string>
+
+    <string name="settings_announcements_title">Voice Announcements</string>
+    <string name="settings_announcements_summary">Time, Distance, Voice Speed</string>
+
+    <string name="settings_import_export_title">Import/Export</string>
+    <string name="settings_import_export_summary">Import, Export, Auto Export</string>
+
+    <string name="settings_units_category">Units</string>
+    <string name="settings_activity_defaults_category">Activity\'s Defaults</string>
+
+    <string name="settings_reset_summary">Reset Settings to Default Values</string>
+    <string name="settings_layout_reset_key" translatable="false">settingsLayoutReset</string>
+
     <!-- Settings Advanced -->
     <string name="settings_advanced">Advanced</string>
     <string name="settings_default_trackfileformat">Export/sharing file format</string>