diff --git a/sensorhub-android-app/res/values-zh-rTW/strings.xml b/sensorhub-android-app/res/values-zh-rTW/strings.xml
new file mode 100644
index 0000000..132aadc
--- /dev/null
+++ b/sensorhub-android-app/res/values-zh-rTW/strings.xml
@@ -0,0 +1,217 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">OpenSensorHub</string>
+    <string name="hello_world">設定參數並點擊播放按鈕以啟動 SmartHub</string>
+    <string name="action_settings">設定</string>
+    <string name="action_start">啟動 SmartHub</string>
+    <string name="action_stop">停止 SmartHub</string>
+    <string name="action_status">應用程式狀態</string>
+    <string name="action_about">關於</string>
+    <string name="action_proxy">啟動代理</string>
+    <string name="action_stop_proxy">停止代理</string>
+    <string name="action_meshtastic">Meshtastic 訊息</string>
+    <string name="sos_settings">SOS 設定（必填）</string>
+    <string name="sost_settings">SOS-T 設定（選填）</string>
+    <string name="sensor_android">Android 感測器</string>
+    <string name="sensor_trupulse">TruPulse 測距感測器</string>
+    <string name="sensor_meshtastic">Meshtastic 感測器</string>
+    <string name="sensor_angel">Angel 感測器</string>
+    <string name="sensor_flirone">Flirone 感測器</string>
+    <string name="sensor_polar">Polar 心率監測器</string>
+    <string name="sensor_controller">控制器</string>
+    <string name="sensor_kestrel">紅隼感測器</string>
+    <string name="sensor_wardriving">雷達偵測感測器</string>
+    <string name="sensor_ste">STE輻射尋呼機 感測器</string>
+    <string name="sensor_template">範本 感測器</string>
+    <string name="sensor_accelerometer">加速度計資料</string>
+    <string name="sensor_gyroscope">陀螺儀資料</string>
+    <string name="sensor_magnetometer">磁力計資料</string>
+    <string name="sensor_orientation_quat">方向資料（四元數）</string>
+    <string name="sensor_orientation_euler">方向資料（歐拉角）</string>
+    <string name="sensor_gps">GPS 定位資料</string>
+    <string name="sensor_network_location">網路定位資料</string>
+    <string name="sensor_video">影片資料</string>
+    <string name="sensor_video_roll">影片滾動資料</string>
+    <string name="sensor_audio">音訊資料</string>
+
+    <string name="device_name">裝置名稱</string>
+    <string name="device_ip_address">裝置 IP 位址</string>
+    <string name="server_profiles">伺服器設定檔</string>
+    <string name="manage_servers">管理伺服器</string>
+    <string name="services">服務</string>
+    <string name="enable_sos_service">啟用 SOS 服務</string>
+    <string name="enable_csapi_service">啟用連線系統服務</string>
+    <string name="enable_discovery_service">啟用探索服務</string>
+    <string name="run_name">執行名稱</string>
+
+    <string name="summary_accel">啟用加速度計資料串流</string>
+    <string name="summary_gyro">啟用陀螺儀資料串流</string>
+    <string name="summary_mag">啟用磁力計資料串流</string>
+    <string name="summary_orientation">啟用方向資料串流</string>
+    <string name="summary_gps">啟用 GPS 定位資料串流</string>
+    <string name="summary_netloc">啟用網路定位資料串流</string>
+    <string name="summary_video">啟用影片資料串流</string>
+    <string name="summary_video_roll">在影片幀標頭中包含影片滾��資料</string>
+    <string name="summary_audio">啟用音訊資料串流</string>
+    <string name="summary_meshtastic">啟用 Meshtastic 資料串流（感測器須在啟動時透過藍牙連接）</string>
+    <string name="summary_wardriving">啟用雷達偵測感測器串流</string>
+    <string name="summary_polar">啟用 Polar 心���感測器串流（感測器須透過藍牙 LE 連接）</string>
+    <string name="summary_kestrel">啟用紅隼氣象儀串流</string>
+    <string name="summary_controller">啟用 USB 控制器串流（控制器須在啟動時透過 USB 連接）</string>
+    <string name="summary_trupulse">啟用 TruPulse 測距儀資料串流（感測器須在啟動時透過藍牙連接）</string>
+    <string name="summary_trupulse_simu">使用模擬 TruPulse 資料取代實際感測器資料</string>
+    <string name="summary_angel">啟用 Angel 感測器健康資料串流（感測器須在啟動時透過藍牙 LE 連接）</string>
+    <string name="summary_flirone">啟用 FLIR One 熱像儀資料串流（透過 USB 連接時）</string>
+    <string name="summary_ste">啟用 STE RadPager 資料串流��感測器須在啟動時透過藍牙 LE 連接）</string>
+    <string name="summary_template">啟用範本驅動程式串流</string>
+    <string name="summary_push_options">資料推送選項</string>
+    <string name="summary_select_device">點擊以選擇或輸入裝置位址</string>
+    <string name="pref_uid_extension">感測器 UID 延伸</string>
+    <string name="server_profile_summary">新增、編輯或刪除伺服器</string>
+
+    <string-array name="orientation_angle_list">
+        <item>四元數</item>
+        <item>歐拉角</item>
+    </string-array>
+
+    <string-array name="location_type_list">
+        <item>GPS</item>
+        <item>網路</item>
+    </string-array>
+
+    <string-array name="sos_option_list">
+        <item>可擷取</item>
+        <item>本機儲存</item>
+        <item>遠端推送</item>
+    </string-array>
+
+    <string name="trupulse_device_name">Trupulse 裝置名稱</string>
+    <string-array name="trupulse_datasource_list">
+        <item>串流實體裝置</item>
+        <item>模擬虛擬裝置</item>
+    </string-array>
+    <string name="trupulse_datasource_default">溪流</string>
+
+
+    <string-array name="spot_report_feature_type_list">
+        <item>選擇報告項目</item>
+        <item>道路封閉</item>
+        <item>淹水</item>
+        <item>醫療</item>
+        <item>救助</item>
+    </string-array>
+
+    <string-array name="ble_location_method_list">
+        <item>最近信標</item>
+        <item>三邊測量</item>
+    </string-array>
+
+    <string-array name="spot_report_location_source_list">
+        <item>GPS</item>
+        <item>雷射測距儀</item>
+        <item>網路</item>
+    </string-array>
+
+    <string name="spot_report">現場報告</string>
+    <string name="spot_name_field">名稱：</string>
+    <string name="spot_description_field">描述：</string>
+    <string name="spot_take_image_button">拍攝</string>
+    <string name="spot_reset_image_button">重設</string>
+    <string name="spot_submit_report_button">提交報告</string>
+    <string name="spot_name_description">報告名稱</string>
+
+    <string name="spot_report_radius">半徑：</string>
+    <string name="spot_report_latitude">緯度：</string>
+    <string name="spot_report_longitude">經度：</string>
+    <string name="spot_report_ft">英尺</string>
+
+    <string-array name="spot_report_closure_type">
+        <item>選擇...</item>
+        <item>公共</item>
+        <item>全部</item>
+    </string-array>
+
+    <string-array name="spot_report_action_items">
+        <item>選擇...</item>
+        <item>開放</item>
+        <item>關閉</item>
+    </string-array>
+
+    <string name="spot_report_action">動作：</string>
+    <string name="spot_report_id">參考編號：</string>
+    <string name="spot_report_closure_type">類型：</string>
+
+    <string-array name="spot_report_flood_feature_type">
+        <item>選擇...</item>
+        <item>渠道排水</item>
+        <item>地表</item>
+    </string-array>
+
+    <string-array name="spot_report_observation_modes">
+        <item>選擇...</item>
+        <item>儀器</item>
+        <item>目視</item>
+        <item>模型</item>
+    </string-array>
+
+    <string name="spot_report_flood_feature">特徵類型：</string>
+    <string name="spot_report_depth">深度：</string>
+    <string name="spot_report_observation_mode">觀測模式：</string>
+
+    <string name="spot_report_med_sign">描述醫療狀況...</string>
+    <string name="spot_report_med_value">輸入測量值（血壓、體溫等）...</string>
+    <string name="spot_report_med_emergency">緊急狀況（是/否）</string>
+
+    <string-array name="spot_report_aid_types">
+        <item>選擇...</item>
+        <item>環境</item>
+        <item>健康</item>
+        <item>安全</item>
+        <item>服務</item>
+    </string-array>
+
+    <string name="spot_report_aid_type">救助類型：</string>
+    <string name="spot_report_aid_num">人數：</string>
+    <string name="spot_report_aid_urgency">緊急程度：</string>
+    <string name="spot_report_aid_description">描述所需救助...</string>
+    <string name="spot_report_aid_reporter">輸入您的姓名或編號</string>
+
+    <string-array name="spot_report_tracked_resource">
+        <item>選擇...</item>
+        <item>人員</item>
+        <item>車輛</item>
+        <item>裝置</item>
+    </string-array>
+
+    <string-array name="spot_report_tracked_method">
+        <item>選擇...</item>
+        <item>GPS</item>
+        <item>藍牙信標</item>
+        <item>WiFi</item>
+        <item>行動網路</item>
+        <item>UWB</item>
+        <item>無</item>
+    </string-array>
+
+    <string name="spot_report_track_resource_label">追蹤資源：</string>
+    <string name="spot_report_track_method_label">追蹤方法：</string>
+    <string name="spot_report_track_id">輸入資源編號</string>
+    <string name="spot_report_track_label">輸入資源標籤</string>
+
+    <string-array name="unit_list">
+        <item>英寸</item>
+        <item>密耳</item>
+        <item>tmoa</item>
+        <item>smoa</item>
+        <item>格</item>
+        <item>公分</item>
+    </string-array>
+
+    <string name="tab_sensors">感測器</string>
+    <string name="tab_dashboard">首頁</string>
+    <string name="tab_settings">設定</string>
+    <string name="meshtastic_msg">輸入訊息！</string>
+    <string name="message_hint">輸入訊息！</string>
+    <string name="meshtastic_nodeId">輸入目標節點 ID（整數）</string>
+    <string name="destination_node_hint">輸入目標節點 ID（整數）</string>
+</resources>
diff --git a/sensorhub-android-app/res/values-zh-rTW/strings_activity_user_settings.xml b/sensorhub-android-app/res/values-zh-rTW/strings_activity_user_settings.xml
new file mode 100644
index 0000000..28e4904
--- /dev/null
+++ b/sensorhub-android-app/res/values-zh-rTW/strings_activity_user_settings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="title_activity_user_settings">設定</string>
+    <string name="pref_header_general">一般</string>
+    <string name="pref_header_sensors">感測器</string>
+</resources>
diff --git a/sensorhub-android-app/res/values-zh-rTW/strings_app_status.xml b/sensorhub-android-app/res/values-zh-rTW/strings_app_status.xml
new file mode 100644
index 0000000..29d5bc4
--- /dev/null
+++ b/sensorhub-android-app/res/values-zh-rTW/strings_app_status.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- 應用程式狀態 -->
+    <string name="app_status_main_fragment">應用程式狀態</string>
+
+    <string-array name="status_options">
+        <item>初始化中</item>
+        <item>已初始化</item>
+        <item>啟動中</item>
+        <item>已啟動</item>
+        <item>停止中</item>
+        <item>已停止</item>
+        <item>未知</item>
+    </string-array>
+
+    <string name="sosServiceStatusLabel">SOS 服務狀態</string>
+    <string name="conSysServiceStatusLabel">ConSys 服務狀態</string>
+    <string name="discoveryServiceStatusLabel">探索服務狀態</string>
+    <string name="httpServerStatusLabel">HTTP 伺服器狀態</string>
+    <string name="sensorServiceStatusLabel">Android 感測器狀態</string>
+    <string name="storageServiceStatusLabel">Android 感測器儲存狀態</string>
+</resources>
diff --git a/sensorhub-android-app/res/values/strings.xml b/sensorhub-android-app/res/values/strings.xml
index 82fb066..61159a0 100644
--- a/sensorhub-android-app/res/values/strings.xml
+++ b/sensorhub-android-app/res/values/strings.xml
@@ -13,10 +13,62 @@
     <string name="sos_settings">SOS Settings (Required)</string>
     <string name="sost_settings">SOS-T Settings (Optional)</string>
     <string name="sensor_android">Android Sensor</string>
-    <string name="sensor_trupulse">TruPulse Range Finder Sensor</string>
-    <string name="sensor_meshtastic">Meshtastic Sensor</string>
     <string name="sensor_angel">Angel Sensor</string>
+    <string name="sensor_meshtastic">Meshtastic Sensor</string>
+    <string name="sensor_wardriving">Wardriving Sensor</string>
+    <string name="sensor_polar">Polar Heart Monitor Sensor</string>
+    <string name="sensor_kestrel">Kestrel Sensor</string>
+    <string name="sensor_controller">Controller Sensor</string>
+    <string name="sensor_trupulse">TruPulse Range Finder Sensor</string>
     <string name="sensor_flirone">Flirone Sensor</string>
+    <string name="sensor_ste">STE Radiation Pager Sensor</string>
+    <string name="sensor_template">Template Sensor</string>
+    <string name="sensor_accelerometer">Accelerometer Data</string>
+    <string name="sensor_gyroscope">Gyroscope Data</string>
+    <string name="sensor_magnetometer">Magnetometer Data</string>
+    <string name="sensor_orientation_quat">Orientation Data (Quaternions)</string>
+    <string name="sensor_orientation_euler">Orientation Data (Euler Angles)</string>
+    <string name="sensor_gps">GPS Location Data</string>
+    <string name="sensor_network_location">Network Location Data</string>
+    <string name="sensor_video">Video Data</string>
+    <string name="sensor_video_roll">Video Roll Data</string>
+    <string name="sensor_audio">Audio Data</string>
+
+    <string name="device_name">Device Name</string>
+    <string name="device_ip_address">Device IP Address</string>
+    <string name="server_profiles">Server Profiles</string>
+    <string name="manage_servers">Manage Servers</string>
+    <string name="services">Services</string>
+    <string name="enable_sos_service">Enable SOS Service</string>
+    <string name="enable_csapi_service">Enable Connected Systems Service</string>
+    <string name="enable_discovery_service">Enable Discovery Service</string>
+
+    <string name="run_name">Run Name</string>
+
+    <string name="summary_accel">Enable streaming of accelerometer data</string>
+    <string name="summary_gyro">Enable streaming of gyroscope data</string>
+    <string name="summary_mag">Enable streaming of magnetometer data</string>
+    <string name="summary_orientation">Enable streaming of orientation data</string>
+    <string name="summary_gps">Enable streaming of GPS location data</string>
+    <string name="summary_netloc">Enable streaming of network location data</string>
+    <string name="summary_video">Enable streaming of video data</string>
+    <string name="summary_video_roll">Include video roll data in video frame header</string>
+    <string name="summary_audio">Enable streaming of audio data</string>
+    <string name="summary_meshtastic">Enable streaming of Meshtastic data (sensor must be connected via Bluetooth on startup)</string>
+    <string name="summary_wardriving">Enable streaming of Wardriving Sensor</string>
+    <string name="summary_polar">Enable streaming of Polar Heart Sensor (sensor must be connected via Bluetooth LE)</string>
+    <string name="summary_kestrel">Enable streaming of Kestrel Weather Meter</string>
+    <string name="summary_controller">Enable streaming of USB Controller (controller must be connected to device via USB on startup)</string>
+    <string name="summary_trupulse">Enable streaming of TruPulse range finder data (sensor must be connected via Bluetooth on startup)</string>
+    <string name="summary_trupulse_simu">Use simulated TruPulse data instead of the actual sensor data</string>
+    <string name="summary_angel">Enable streaming of Angel Sensor health data (sensor must be connected via Bluetooth LE on startup)</string>
+    <string name="summary_flirone">Enable streaming of FLIR One thermal camera data when connected on USB port</string>
+    <string name="summary_ste">Enable streaming of STE RadPager data (sensor must be connected via Bluetooth LE on startup)</string>
+    <string name="summary_template">Enable streaming of template driver</string>
+    <string name="summary_push_options">Options for pushing data</string>
+    <string name="summary_select_device">Tap to select or enter device address</string>
+    <string name="pref_uid_extension">Sensors UID Extension</string>
+    <string name="server_profile_summary">Add, edit, or remove servers</string>
 
     <string-array name="video_codec_list">
         <item>JPEG</item>
diff --git a/sensorhub-android-app/res/xml/pref_sensors.xml b/sensorhub-android-app/res/xml/pref_sensors.xml
index a0d031f..14fa1e4 100644
--- a/sensorhub-android-app/res/xml/pref_sensors.xml
+++ b/sensorhub-android-app/res/xml/pref_sensors.xml
@@ -9,21 +9,21 @@
             android:maxLines="1"
             android:selectAllOnFocus="true"
             android:singleLine="true"
-            android:title="Sensors UID Extension"
+            android:title="@string/pref_uid_extension"
             android:layout="@layout/preference_item" />
 
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="accel_enabled"
-            android:summary="Enable streaming of accelerometer data"
-            android:title="Accelerometer Data"
+            android:summary="@string/summary_accel"
+            android:title="@string/sensor_accelerometer"
             android:layout="@layout/preference_switch_item" />
 
         <MultiSelectListPreference
             android:key="accel_options"
             android:visible="false"
             android:title="Accelerometer Output Options"
-            android:summary="Options for pushing data"
+            android:summary="@string/summary_push_options"
             android:entries="@array/sos_option_list"
             android:entryValues="@array/sos_option_values"
             android:defaultValue="@array/sos_option_defaults"
@@ -32,15 +32,15 @@
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="gyro_enabled"
-            android:summary="Enable streaming of gyroscope data"
-            android:title="Gyroscope Data"
+            android:summary="@string/summary_gyro"
+            android:title="@string/sensor_gyroscope"
             android:layout="@layout/preference_switch_item" />
 
         <MultiSelectListPreference
             android:key="gyro_options"
             android:visible="false"
             android:title="Gyroscope Output Options"
-            android:summary="Options for pushing data"
+            android:summary="@string/summary_push_options"
             android:entries="@array/sos_option_list"
             android:entryValues="@array/sos_option_values"
             android:defaultValue="@array/sos_option_defaults"
@@ -49,15 +49,15 @@
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="mag_enabled"
-            android:summary="Enable streaming of magnetometer data"
-            android:title="Magnetometer Data"
+            android:summary="@string/summary_mag"
+            android:title="@string/sensor_magnetometer"
             android:layout="@layout/preference_switch_item" />
 
         <MultiSelectListPreference
             android:key="mag_options"
             android:visible="false"
             android:title="Magnetometer Output Options"
-            android:summary="Options for pushing data"
+            android:summary="@string/summary_push_options"
             android:entries="@array/sos_option_list"
             android:entryValues="@array/sos_option_values"
             android:defaultValue="@array/sos_option_defaults"
@@ -66,15 +66,15 @@
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="orient_quat_enabled"
-            android:summary="Enable streaming of orientation data"
-            android:title="Orientation Data (Quaternions)"
+            android:summary="@string/summary_orientation"
+            android:title="@string/sensor_orientation_quat"
             android:layout="@layout/preference_switch_item" />
 
         <MultiSelectListPreference
             android:key="orient_quat_options"
             android:visible="false"
             android:title="Orientation Output Options"
-            android:summary="Options for pushing data"
+            android:summary="@string/summary_push_options"
             android:entries="@array/sos_option_list"
             android:entryValues="@array/sos_option_values"
             android:defaultValue="@array/sos_option_defaults"
@@ -83,15 +83,15 @@
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="orient_euler_enabled"
-            android:summary="Enable streaming of orientation data"
-            android:title="Orientation Data (Euler Angles)"
+            android:summary="@string/summary_orientation"
+            android:title="@string/sensor_orientation_euler"
             android:layout="@layout/preference_switch_item" />
 
         <MultiSelectListPreference
             android:key="orient_euler_options"
             android:visible="false"
             android:title="Orientation Output Options"
-            android:summary="Options for pushing data"
+            android:summary="@string/summary_push_options"
             android:entries="@array/sos_option_list"
             android:entryValues="@array/sos_option_values"
             android:defaultValue="@array/sos_option_defaults"
@@ -100,15 +100,15 @@
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="gps_enabled"
-            android:summary="Enable streaming of GPS location data"
-            android:title="GPS Location Data"
+            android:summary="@string/summary_gps"
+            android:title="@string/sensor_gps"
             android:layout="@layout/preference_switch_item" />
 
         <MultiSelectListPreference
             android:key="gps_options"
             android:visible="false"
             android:title="GPS Output Options"
-            android:summary="Options for pushing data"
+            android:summary="@string/summary_push_options"
             android:entries="@array/sos_option_list"
             android:entryValues="@array/sos_option_values"
             android:defaultValue="@array/sos_option_defaults"
@@ -117,15 +117,15 @@
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="netloc_enabled"
-            android:summary="Enable streaming of network location data"
-            android:title="Network Location Data"
+            android:summary="@string/summary_netloc"
+            android:title="@string/sensor_network_location"
             android:layout="@layout/preference_switch_item" />
 
         <MultiSelectListPreference
             android:key="netloc_options"
             android:visible="false"
             android:title="Network Location Output Options"
-            android:summary="Options for pushing data"
+            android:summary="@string/summary_push_options"
             android:entries="@array/sos_option_list"
             android:entryValues="@array/sos_option_values"
             android:defaultValue="@array/sos_option_defaults"
@@ -135,15 +135,15 @@
         <SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="cam_enabled"
-            android:summary="Enable streaming of video data"
-            android:title="Video Data"
+            android:summary="@string/summary_video"
+            android:title="@string/sensor_video"
             android:layout="@layout/preference_switch_item" />
 
         <MultiSelectListPreference
             android:key="cam_options"
             android:visible="false"
             android:title="Video Output Options"
-            android:summary="Options for pushing data"
+            android:summary="@string/summary_push_options"
             android:entries="@array/sos_option_list"
             android:entryValues="@array/sos_option_values"
             android:defaultValue="@array/sos_option_defaults"
@@ -183,15 +183,15 @@
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="video_roll_enabled"
-            android:summary="Include video roll data in video frame header"
-            android:title="Video Roll Data"
+            android:summary="@string/summary_video_roll"
+            android:title="@string/sensor_video_roll"
             android:layout="@layout/preference_switch_item" />
 
         <MultiSelectListPreference
             android:key="video_roll_options"
             android:visible="false"
             android:title="Video Roll Output Options"
-            android:summary="Options for pushing data"
+            android:summary="@string/summary_push_options"
             android:entries="@array/sos_option_list"
             android:entryValues="@array/sos_option_values"
             android:defaultValue="@array/sos_option_defaults"
@@ -200,15 +200,15 @@
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="audio_enabled"
-            android:summary="Enable streaming of audio data"
-            android:title="Audio Data"
+            android:summary="@string/summary_audio"
+            android:title="@string/sensor_audio"
             android:layout="@layout/preference_switch_item" />
 
         <MultiSelectListPreference
             android:key="audio_options"
             android:visible="false"
             android:title="Audio Output Options"
-            android:summary="Options for pushing data"
+            android:summary="@string/summary_push_options"
             android:entries="@array/sos_option_list"
             android:entryValues="@array/sos_option_values"
             android:defaultValue="@array/sos_option_defaults"
@@ -244,22 +244,22 @@
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="meshtastic_enabled"
-            android:summary="Enable streaming of Meshtastic data (sensor must be connected via Bluetooth on startup)"
-            android:title="Meshtastic Data"
+            android:summary="@string/summary_meshtastic"
+            android:title="@string/sensor_meshtastic"
             android:layout="@layout/preference_switch_item" />
 
         <Preference
             android:key="meshtastic_device_address"
             android:visible="false"
             android:title="Select Meshtastic Device"
-            android:summary="Tap to select or enter device address"
+            android:summary="@string/summary_select_device"
             android:layout="@layout/preference_list_item" />
 
         <MultiSelectListPreference
             android:key="meshtastic_options"
             android:visible="false"
             android:title="Meshtastic Output Options"
-            android:summary="Options for pushing data"
+            android:summary="@string/summary_push_options"
             android:entries="@array/sos_option_list"
             android:entryValues="@array/sos_option_values"
             android:defaultValue="@array/sos_option_defaults"
@@ -268,15 +268,15 @@
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="wardriving_enabled"
-            android:summary="Enable streaming of Wardriving Sensor"
-            android:title="Wardriving Data"
+            android:summary="@string/summary_wardriving"
+            android:title="@string/sensor_wardriving"
             android:layout="@layout/preference_switch_item" />
 
         <MultiSelectListPreference
             android:key="wardriving_options"
             android:visible="false"
             android:title="Wardriving Output Options"
-            android:summary="Options for pushing sensor data"
+            android:summary="@string/summary_push_options"
             android:entries="@array/sos_option_list"
             android:entryValues="@array/sos_option_values"
             android:defaultValue="@array/sos_option_defaults"
@@ -286,22 +286,22 @@
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="polar_enabled"
-            android:summary="Enable streaming of Polar Heart Sensor (sensor must be connected via Bluetooth LE)"
-            android:title="Polar Heart Rate Data"
+            android:summary="@string/summary_polar"
+            android:title="@string/sensor_polar"
             android:layout="@layout/preference_switch_item" />
 
         <Preference
             android:key="polar_device_address"
             android:visible="false"
             android:title="Select Polar HR Device"
-            android:summary="Tap to select or enter device address"
+            android:summary="@string/summary_select_device"
             android:layout="@layout/preference_list_item" />
 
         <MultiSelectListPreference
             android:key="polar_options"
             android:visible="false"
             android:title="Polar Output Options"
-            android:summary="Options for pushing sensor data"
+            android:summary="@string/summary_push_options"
             android:entries="@array/sos_option_list"
             android:entryValues="@array/sos_option_values"
             android:defaultValue="@array/sos_option_defaults"
@@ -311,22 +311,22 @@
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="kestrel_enabled"
-            android:summary="Enable streaming of Kestrel Weather Meter"
-            android:title="Kestrel Weather Meter"
+            android:summary="@string/summary_kestrel"
+            android:title="@string/sensor_kestrel"
             android:layout="@layout/preference_switch_item" />
 
         <Preference
             android:key="kestrel_device_address"
             android:visible="false"
             android:title="Select Kestrel Device"
-            android:summary="Tap to select or enter device address"
+            android:summary="@string/summary_select_device"
             android:layout="@layout/preference_list_item" />
 
         <MultiSelectListPreference
             android:key="kestrel_options"
             android:visible="false"
             android:title="Kestrel Weather Output Options"
-            android:summary="Options for pushing sensor data"
+            android:summary="@string/summary_push_options"
             android:entries="@array/sos_option_list"
             android:entryValues="@array/sos_option_values"
             android:defaultValue="@array/sos_option_defaults"
@@ -335,15 +335,15 @@
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="controller_enabled"
-            android:summary="Enable streaming of USB Controller (controller must be connected to device via USB on startup)"
-            android:title="Controller"
+            android:summary="@string/summary_controller"
+            android:title="@string/sensor_controller"
             android:layout="@layout/preference_switch_item" />
 
         <MultiSelectListPreference
             android:key="controller_options"
             android:visible="false"
             android:title="Controller Output Options"
-            android:summary="Options for pushing sensor data"
+            android:summary="@string/summary_push_options"
             android:entries="@array/sos_option_list"
             android:entryValues="@array/sos_option_values"
             android:defaultValue="@array/sos_option_defaults"
@@ -353,8 +353,8 @@
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="trupulse_enabled"
-            android:summary="Enable streaming of TruPulse range finder data (sensor must be connected via Bluetooth on startup)"
-            android:title="TruPulse Range Finder Data"
+            android:summary="@string/summary_trupulse"
+            android:title="@string/sensor_trupulse"
             android:layout="@layout/preference_switch_item" />
 
         <ListPreference
@@ -371,7 +371,7 @@
             android:key="trupulse_options"
             android:visible="false"
             android:title="TruPulse Output Options"
-            android:summary="Options for pushing data"
+            android:summary="@string/summary_push_options"
             android:entries="@array/sos_option_list"
             android:entryValues="@array/sos_option_values"
             android:defaultValue="@array/sos_option_defaults"
@@ -381,14 +381,14 @@
             android:key="trupulse_device_address"
             android:visible="false"
             android:title="Select TruPulse Device"
-            android:summary="Tap to select or enter device address"
+            android:summary="@string/summary_select_device"
             android:layout="@layout/preference_list_item" />
 
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:visible="false"
             android:key="trupulse_simu"
-            android:summary="Use simulated TruPulse data instead of the actual sensor data"
+            android:summary="@string/summary_trupulse_simu"
             android:title="Use Simulated TruPulse Data"
             android:layout="@layout/preference_switch_item" />
 
@@ -396,8 +396,8 @@
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="angel_enabled"
-            android:summary="Enable streaming of Angel Sensor health data (sensor must be connected via Bluetooth LE on startup)"
-            android:title="Angel Sensor Health Data"
+            android:summary="@string/summary_angel"
+            android:title="@string/sensor_angel"
             android:layout="@layout/preference_switch_item" />
 
         <EditTextPreference
@@ -413,7 +413,7 @@
             android:key="angel_options"
             android:visible="false"
             android:title="Angel Output Options"
-            android:summary="Options for pushing sensor data"
+            android:summary="@string/summary_push_options"
             android:entries="@array/sos_option_list"
             android:entryValues="@array/sos_option_values"
             android:defaultValue="@array/sos_option_defaults"
@@ -422,15 +422,15 @@
         <SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="flirone_enabled"
-            android:summary="Enable streaming of FLIR One thermal camera data when connected on USB port"
-            android:title="FLIR One Thermal Camera Data"
+            android:summary="@string/summary_flirone"
+            android:title="@string/sensor_flirone"
             android:layout="@layout/preference_switch_item" />
 
         <MultiSelectListPreference
             android:key="flir_options"
             android:visible="false"
             android:title="FLIR Output Options"
-            android:summary="Options for pushing sensor data"
+            android:summary="@string/summary_push_options"
             android:entries="@array/sos_option_list"
             android:entryValues="@array/sos_option_values"
             android:defaultValue="@array/sos_option_defaults"
@@ -439,15 +439,15 @@
         <SwitchPreferenceCompat
             android:key="ste_radpager_enabled"
             android:defaultValue="false"
-            android:summary="Enable streaming of STE RadPager data (sensor must be connected via Bluetooth LE on startup)"
-            android:title="STE RadPager Data"
+            android:summary="@string/summary_ste"
+            android:title="@string/sensor_ste"
             android:layout="@layout/preference_switch_item" />
 
         <MultiSelectListPreference
             android:key="ste_radpager_options"
             android:visible="false"
             android:title="STE RadPager Output Options"
-            android:summary="Options for pushing sensor data"
+            android:summary="@string/summary_push_options"
             android:entries="@array/sos_option_list"
             android:entryValues="@array/sos_option_values"
             android:defaultValue="@array/sos_option_defaults"
@@ -457,22 +457,22 @@
         <SwitchPreferenceCompat
             android:key="template_enabled"
             android:defaultValue="false"
-            android:summary="Enable streaming of template driver"
-            android:title="Template Driver Data"
+            android:summary="@string/summary_template"
+            android:title="@string/sensor_template"
             android:layout="@layout/preference_switch_item" />
 
         <Preference
             android:key="template_device_address"
             android:visible="false"
             android:title="Select template Device"
-            android:summary="Tap to select or enter device address"
+            android:summary="@string/summary_select_device"
             android:layout="@layout/preference_list_item" />
 
         <MultiSelectListPreference
             android:key="template_options"
             android:visible="false"
             android:title="Template Driver Output Options"
-            android:summary="Options for pushing sensor data"
+            android:summary="@string/summary_push_options"
             android:entries="@array/sos_option_list"
             android:entryValues="@array/sos_option_values"
             android:defaultValue="@array/sos_option_defaults"
diff --git a/sensorhub-android-app/res/xml/pref_settings.xml b/sensorhub-android-app/res/xml/pref_settings.xml
index caf3b3b..fa496da 100644
--- a/sensorhub-android-app/res/xml/pref_settings.xml
+++ b/sensorhub-android-app/res/xml/pref_settings.xml
@@ -12,7 +12,7 @@
             android:maxLines="1"
             android:selectAllOnFocus="true"
             android:singleLine="true"
-            android:title="Device Name"
+            android:title="@string/device_name"
             app:useSimpleSummaryProvider="true"
             android:layout="@layout/preference_item" />
         <Preference
@@ -20,7 +20,7 @@
             android:key="nop_ipAddress"
             android:selectable="false"
             android:summary=""
-            android:title="Device IP Address"
+            android:title="@string/device_ip_address"
             app:useSimpleSummaryProvider="true"
             android:layout="@layout/preference_item" />
 
@@ -28,8 +28,8 @@
     <PreferenceCategory android:title="Server Profiles">
         <Preference
             android:key="manage_servers"
-            android:title="Manage Servers"
-            android:summary="Add, edit, or remove servers"
+            android:title="@string/manage_servers"
+            android:summary="@string/server_profile_summary"
             android:layout="@layout/preference_list_item" />
     </PreferenceCategory>
 
@@ -40,21 +40,21 @@
         <SwitchPreferenceCompat
             android:id="@+id/sos_service_switch"
             android:key="sos_service"
-            android:title="Enable SOS Service"
+            android:title="@string/enable_sos_service"
             android:defaultValue="true"
             android:layout="@layout/preference_switch_item" />
 
         <SwitchPreferenceCompat
             android:id="@+id/csapi_service_switch"
             android:key="csapi_service"
-            android:title="Enable Connected Systems Service"
+            android:title="@string/enable_csapi_service"
             android:defaultValue="true"
             android:layout="@layout/preference_switch_item" />
 
         <SwitchPreferenceCompat
             android:id="@+id/discovery_service_switch"
             android:key="discovery_service"
-            android:title="Enable Discovery Service"
+            android:title="@string/enable_discovery_service"
             android:defaultValue="false"
             android:layout="@layout/preference_switch_item" />