diff --git a/app/release/app-release-3.6.1c.apk b/app/release/app-release-3.6.1c.apk
new file mode 100644
index 0000000..17befef
Binary files /dev/null and b/app/release/app-release-3.6.1c.apk differ
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
index 7a36940..17befef 100644
Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index 92f63b3..5411f92 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "properties": [],
-      "versionCode": 74,
-      "versionName": "3.6.1",
+      "versionCode": 76,
+      "versionName": "3.6.1c",
       "enabled": true,
       "outputFile": "app-release.apk"
     }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9739a81..ef0fabc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="uk.org.openseizuredetector"
-    android:versionCode="75"
-    android:versionName="3.6.1b">
+    android:versionCode="76"
+    android:versionName="3.6.1c">
     <!-- android:allowBackup="false" -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
diff --git a/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java b/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java
index 179da2e..4c86409 100644
--- a/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java
+++ b/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java
@@ -103,7 +103,6 @@ public class StartupActivity extends Activity {
         // Read the default settings from the xml preferences files, so we do
         // not have to use the hard coded ones in the java files.
         PreferenceManager.setDefaultValues(this, R.xml.alarm_prefs, true);
-        PreferenceManager.setDefaultValues(this, R.xml.camera_prefs, true);
         PreferenceManager.setDefaultValues(this, R.xml.general_prefs, true);
         PreferenceManager.setDefaultValues(this, R.xml.network_datasource_prefs, true);
         PreferenceManager.setDefaultValues(this, R.xml.pebble_datasource_prefs, true);
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 8e1136e..54e355e 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -26,7 +26,7 @@
         \n\nZmiany w tej wersji:
     </string>
     <string name="ask_for_error_log">Przykro mi, OpenSeizureDetector zepsuł się.  Proszę prześlij nam emailem ten plik abyśmy mogli zobaczyć co się stało i go naprawić.\nDzięki, Graham.</string>
-    <string name="email_welcome_note">Drogi OpenSeizureDetector,\n\nAplikacja jest zepsuta, proszę zapoznać się z poniższym logiem w celu poznania szczegółów.\n\n\n</string>
+    <string name="email_welcome_note">Dear OpenSeizureDetector,\n\nApplication is just crashed, please check following error log for more details.\n\n\n</string>
     <string name="copyright_info">OpenSeizureDetector (Używa UCE Handler\nCopyright © 2018 Rohit Sahebrao Surwase.)</string>
     <string name="okBtnTxt">OK</string>
     <string name="UpdateDialogTitleTxt">Dziękujemy za zaktualizowanie OpenSeizureDetector</string>
@@ -146,114 +146,113 @@
     <string name="unknown_device">Nieznane urządzenie</string>
     <string name="select_ble_device_title">Wybierz urządzenie BLE (tylko dla źródeł danych Bluetooth)</string>
     <string name="select_ble_device_desc">Wybierz urządzenie Bluetooth Low Energy (BLE) gdy używasz Bluetooth jako źródła danych wykrywania ataków (akcelerometr i tętno).</string>
-    <string name="basic_settings_title">Basic</string>
-    <string name="general_settings_summary">General Preferences</string>
-    <string name="alarms_settings_title">Alarms</string>
-    <string name="alarms_settings_summary">Alarms Preferences</string>
-    <string name="seizure_detector_settings_title">Seizure Detector</string>
-    <string name="seizure_detector_settings_summary">Seizure Detector Preferences</string>
-    <string name="network_datasource_title">Network Datasource</string>
-    <string name="network_datasource_summary">Network Datasource Preferences</string>
-    <string name="pebble_datasource_title">Pebble Datasource</string>
-    <string name="pebble_datasource_summary">Pebble Datasource Preferences</string>
-    <string name="basic_settings_summary">Basic Settings</string>
-    <string name="general_settings_title">General</string>
-    <string name="log_alarms_summary">Log Alarm events to SD Card</string>
-    <string name="log_alarms_title">Log Alarm events to SD Card</string>
-    <string name="log_data_summary">Log Data to SD Card Regularly</string>
-    <string name="log_data_title">Log Data to SD Card</string>
-    <string name="log_data_remote_summary">Log Data to Central OpenSeizureDetector Database</string>
-    <string name="log_data_remote_title">Log Data Remotely</string>
-    <string name="log_data_remote_mobile_summary">Use mobile internet to log remote data</string>
-    <string name="log_data_remote_mobile_title">Use Mobile Internet</string>
-    <string name="remote_uname_title">Username for remote data logging.</string>
-    <string name="remote_uname_summary">Remote Username</string>
-    <string name="remote_passwd_summary">Password for remote data logging.</string>
-    <string name="remote_passwd_title">Remote Password</string>
-    <string name="wearer_id_summary">Wearer ID</string>
-    <string name="wearer_id_title">Wearer ID of the person wearing the watch (from OSD Web API)</string>
-    <string name="remote_url_summary">URL for remote data logging.</string>
-    <string name="remote_url_title">Remote URL</string>
-    <string name="prevent_sleep_summary">Prevent the screen from blanking while the application is running.</string>
-    <string name="prevent_sleep_title">Prevent the screen from blanking.</string>
-    <string name="data_update_period_title">Display Update Period (ms).</string>
-    <string name="auto_start_summary">Auto Start App on Boot</string>
-    <string name="auto_start_title">Auto Start App on Boot</string>
-    <string name="app_version_summary">App Version Number - used to decide whether to display the welcome message or not.</string>
-    <string name="app_version_title">App Version Number</string>
-    <string name="latch_alarms_summary">Require manual reset of alarms to reset them to silence them.</string>
-    <string name="latch_alarms_title">Latch Alarms</string>
-    <string name="latch_timer_period_title">Latch Alarm Timer Duration (sec)</string>
-    <string name="latch_timer_period_summary">Duration in seconds that alarms will initiate for before being silenced automatically.</string>
-    <string name="enable_audible_alarm_summary">Issue an audible alarm if the seizure detector enters an alarm condition.</string>
-    <string name="enable_audible_alarm_title">Enable Audible Alarm</string>
-    <string name="enable_audible_warning_summary">Issue an audible alarm if the seizure detector enters a warning (pre-alarm) condition.</string>
-    <string name="enable_audible_warning_title">Enable Audible Warnings</string>
-    <string name="enable_audible_fault_summary">Issue an audible alarm if the system detects a fault (e.g. can not talk to Pebble).</string>
-    <string name="enable_audible_fault_title">Enable Audible System FaultWarnings</string>
-    <string name="fault_timer_period_title">Fault Timer Duration (sec)</string>
-    <string name="fault_timer_period_summary">Duration that fault alarms are muted before initiating.</string>
-    <string name="use_mp3_alarm_summary">Play an MP3 file to create the alarm beeps rather than using the default tone generator.</string>
-    <string name="use_mp3_alarm_title">Use MP3 Alarm Sound</string>
-    <string name="enable_sms_alarm_summary">Issue a SMS (Text Message) alarm if the seizure detector enters an alarm condition. NOTE: THE MESSAGE WILL INCLUDE THE USER\'s LOCATION. Disable this option if sharing your location is a concern.</string>
-    <string name="enable_sms_alarm_title">Enable SMS Alarm</string>
-    <string name="sms_numbers_summary">Telephone number(s) to notify by SMS of Alarm (comma separated).</string>
-    <string name="sms_numbers_title">SMS Alarm numbers</string>
-    <string name="sms_message_summary">Message to be Sent by SMS when a Seizure is Detected.</string>
-    <string name="sms_message_title">SMS Message</string>
-    <string name="server_ip_summary">IP Address of OpenSeizureDetector Server (e.g. 192.168.1.175).</string>
-    <string name="server_ip_title">Server IP Address.</string>
-    <string name="network_update_period_summary">Period between server data requests in miliseconds.</string>
-    <string name="network_update_period_title">Data Update Period (ms)</string>
-    <string name="connection_timeout_title">Connection Timeout Period (ms)</string>
+    <string name="basic_settings_title">Podstawowe</string>
+    <string name="general_settings_summary">Ustawienia ogólne</string>
+    <string name="alarms_settings_title">Alarmy</string>
+    <string name="alarms_settings_summary">Ustawienia alarmów</string>
+    <string name="seizure_detector_settings_title">Wykrywanie ataków</string>
+    <string name="seizure_detector_settings_summary">Ustawienia wykrywania ataków</string>
+    <string name="network_datasource_title">Sieciowe źródło danych</string>
+    <string name="network_datasource_summary">Ustawienia sieciowego źródła danych</string>
+    <string name="pebble_datasource_title">Źródło danych Pebble</string>
+    <string name="pebble_datasource_summary">Ustawienia źródła danych Pebble</string>
+    <string name="basic_settings_summary">Ustawienia podstawowe</string>
+    <string name="general_settings_title">Ogólne</string>
+    <string name="log_alarms_summary">Zapisuje alarmy na karcie SD</string>
+    <string name="log_alarms_title">Zapis alarmów na karcie SD</string>
+    <string name="log_data_summary">Regularnie zapisuje wszystkie dane na karcie SD</string>
+    <string name="log_data_title">Zapis danych na karcie SD</string>
+    <string name="log_data_remote_summary">Zapisuje dane w centralnej bazie danych OpenSeizureDetector</string>
+    <string name="log_data_remote_title">Zdalny zapis danych</string>
+    <string name="log_data_remote_mobile_summary">Używa internetu mobilnego do zdalnego zapisu danych</string>
+    <string name="log_data_remote_mobile_title">Użyj internetu mobilnego</string>
+    <string name="remote_uname_title">Nazwa użytkownika dla zdalnego zapisu danych</string>
+    <string name="remote_uname_summary">Nazwa użytkownika</string>
+    <string name="remote_passwd_summary">Hasło dla zdalnego zapisu danych</string>
+    <string name="remote_passwd_title">Hasło</string>
+    <string name="wearer_id_summary">ID użytkownika</string>
+    <string name="wearer_id_title">ID użytkownika noszącego zegarek (z OSD Web API)</string>
+    <string name="remote_url_summary">URL dla zdalnego zapisu danych</string>
+    <string name="remote_url_title">URL</string>
+    <string name="prevent_sleep_summary">Zapobiega wygaszaniu ekranu gdy aplikacja jest uruchomiona</string>
+    <string name="prevent_sleep_title">Zapobiegaj wygaszaniu ekranu</string>
+    <string name="data_update_period_title">Częstość wyświetlania informacji (ms).</string>
+    <string name="auto_start_summary">Automatyczny start aplikacji po włączeniu telefonu</string>
+    <string name="auto_start_title">Autostart aplikacji</string>
+    <string name="app_version_summary">Numer wersji aplikacji - decyduje czy pokazać ekran powitalny</string>
+    <string name="app_version_title">Wersja aplikacji</string>
+    <string name="latch_alarms_summary">Wymagaj ręcznego wyciszenia alarmów</string>
+    <string name="latch_alarms_title">Alarm ciągły</string>
+    <string name="latch_timer_period_title">Czas trwania alarmu ciągłego (s)</string>
+    <string name="latch_timer_period_summary">Czas w sekundach trwania alarmu nim zostanie on automatycznie wyciszony</string>
+    <string name="enable_audible_alarm_summary">Alarmuje dźwiękiem gdy zostanie wykryty atak</string>
+    <string name="enable_audible_alarm_title">Włącz alarmy dźwiękowe</string>
+    <string name="enable_audible_warning_summary">Ostrzega dźwiękiem gdy wystąpi podejrzenie początku ataku</string>
+    <string name="enable_audible_warning_title">Włącz ostrzeżenia dźwiękowe</string>
+    <string name="enable_audible_fault_summary">Informuje dźwiękiem gdy wystąpi awaria (np. brak komunikacji z zegarkiem)</string>
+    <string name="enable_audible_fault_title">Informuj dźwiękiem o awariach</string>
+    <string name="fault_timer_period_title">Opóźnienie alarmu o awariach (s)</string>
+    <string name="fault_timer_period_summary">Czas przez jaki alarmy o awariach są wyciszone nim zostaną włączone</string>
+    <string name="use_mp3_alarm_summary">Wydaje dźwięki za pomocą plików MP3 zamiast wbudowanego generatora tonów</string>
+    <string name="use_mp3_alarm_title">Używaj alarmów MP3</string>
+    <string name="enable_sms_alarm_summary">Wysyła SMS w wypadku wystąpienia alarmu. UWAGA: SMS ZAWIERA LOKALIZACJĘ UŻYTKOWNIKA. Wyłącz tą opcję jeśli udostępnianie lokalizacji jest niepożądane</string>
+    <string name="enable_sms_alarm_title">Włącz powiadomienia SMS</string>
+    <string name="sms_numbers_summary">Numery telefonów (oddzielone przecinkiem) na które będą wysyłane SMS</string>
+    <string name="sms_numbers_title">Numery telefonów</string>
+    <string name="sms_message_summary">Treść SMS gdy zostanie wykryty atak</string>
+    <string name="sms_message_title">Treść SMS</string>
+    <string name="server_ip_summary">Adres IP serwera OpenSeizureDetector (np. 192.168.1.175).</string>
+    <string name="server_ip_title">Adres IP serwera</string>
+    <string name="network_update_period_summary">Odstęp w milisekundach pomiędzy żądaniami danych z serwera</string>
+    <string name="network_update_period_title">Częstość aktualizacji danych (ms)</string>
+    <string name="connection_timeout_title">Czas na połączenie z serwerem (ms)</string>
     <string name="read_timeout_summary" />
-    <string name="read_timeout_title">Read Timeout Period (ms)</string>
-    <string name="ble_device_settings_title">BLE Device Settings</string>
-    <string name="ble_mac_addr_title">Device Address</string>
-    <string name="ble_device_name_summary">Name of BLE Data Source Device</string>
-    <string name="ble_device_name_title">Device Address</string>
-    <string name="user_interface_settings_title">User Interface Settings</string>
-    <string name="pebble_update_period_summary">Time period at which data is sent to the phone (does not affect analysis frequency - see Sample Period setting for that)</string>
-    <string name="mute_period_summary">Time that alarms are muted following a long press of the UP button</string>
-    <string name="pebble_update_period_title">Data Transfer Period (sec)</string>
-    <string name="mute_period_title">Mute Period (sec)</string>
-    <string name="manual_alarm_period_summary">Time that manual alarms sound following a long press of the DOWN button</string>
-    <string name="manual_alarm_period_title">Manual Alarm Period (sec)</string>
-    <string name="warn_time_summary">Time to wait before initiating warning (Default = 5 sec)</string>
-    <string name="warn_time_title">WarnTime (sec)</string>
-    <string name="alarm_time_summary">Time to wait before initiating alarm (Default = 10 sec)</string>
-    <string name="alarm_time_title">AlarmTime (sec)</string>
-    <string name="alarm_threshold_title">AlarmThresh</string>
-    <string name="alarm_ratio_thresh_summary">Alarm Ratio Threshold (Default = 50). Increase this value to reduce sensitivity if false alarms are a problem.</string>
-    <string name="alarm_ratio_thresh_title">AlarmRatioThresh</string>
-    <string name="alarm_feq_min_summary">Minimum Frequency of ROI (Hz) (Default = 3 Hz)</string>
-    <string name="alarm_freq_min_title">AlarmFreqMin (Hz)</string>
-    <string name="alarm_freq_max_summary">Maximum Frequency of ROI (Hz) (Default = 10 Hz)</string>
-    <string name="alarm_frequency_max_title">AlarmFreqMax (Hz)</string>
-    <string name="sample_period_summary">Period (in seconds) between data analyses</string>
-    <string name="sample_period_title">SamplePeriod (sec)</string>
-    <string name="seizure_detect_mode_summary">Select one of the three available modes of operation.</string>
-    <string name="seizure_detect_mode_title">Seizure Detector Mode</string>
-    <string name="sample_freq_summary">Higher Frequency is more Accurate, but uses more battery power.</string>
-    <string name="fall_detect_title">Fall Detector Settings</string>
-    <string name="fall_detect_active_title">Activate Fall Detection Function</string>
-    <string name="fall_thresh_min_title">Fall Detection Lower Threshold (milli-g)</string>
-    <string name="fall_window_title">Fall Detection Window (milli-seconds)</string>
-    <string name="watch_comms_title">Watch Communications Settings</string>
-    <string name="debug_mode_summary">Set Debug mode on or off.</string>
-    <string name="app_restart_timeout_summary">Period (seconds) that we wait for data from the watch before assuming the watch app is not running and re-starting it.</string>
-    <string name="app_restart_timeout_title">Period (sec) we wait for data before restarting watch app.</string>
-    <string name="display_spectrum_mode_title">Select Display Spectrum Mode</string>
-    <string name="display_spectrum_mode_summary">Set Display Spectrum mode on or off.</string>
-    <string name="analysis_prefs_title">Analysis</string>
-    <string name="watch_comms_settings_title">Watch Communications Settings</string>
-    <string name="alarm_freq_min_summary">alarm_freq_min_summary</string>
-    <string name="debug_mode_title">Seizure Detector Debug Mode</string>
-    <string name="fall_thresh_max_title">Fall Detection Upper Threshold (milli-g)</string>
-    <string name="sample_freq_title">Select Sample Frequency</string>
-    <string name="alarm_threshold_summary">Alarm Threshold (Default = 100)</string>
-    <string name="ble_mac_addr_summary">MAC Address of BLE Data Source Device</string>
-    <string name="data_update_period_summary">Display update period in miliseconds.</string>
-    <string name="select_datasource_title">Select Data Source</string>
-    <string name="select_datasource_summary">Select the seizure detector data source to use.</string>
+    <string name="read_timeout_title">Czas na odczyt danych (ms)</string>
+    <string name="ble_device_settings_title">Ustawienia urządzeń BLE</string>
+    <string name="ble_mac_addr_title">Adres urządzenia</string>
+    <string name="ble_device_name_summary">Nazwa urządzenia BLE</string>
+    <string name="ble_device_name_title">Nazwa urządzenia</string>
+    <string name="user_interface_settings_title">Ustawienia interfejsu użytkownika</string>
+    <string name="pebble_update_period_summary">Jak często dane są przesyłane do telefonu (nie wpływa na częstość analizy - do tego służy Częstość próbkowania)</string>
+    <string name="mute_period_summary">Na jak długo są wyciszane alarmy po przytrzymaniu przycisku w górę</string>
+    <string name="pebble_update_period_title">Częstość przesyłu danych (s)</string>
+    <string name="mute_period_title">Czas wyciszenia (s)</string>
+    <string name="manual_alarm_period_summary">Na jak długo włączany jest alarm po przytrzymaniu przycisku w dół</string>
+    <string name="manual_alarm_period_title">Czas trwania alarmu ręcznego (s)</string>
+    <string name="warn_time_summary">Czas oczekiwania przed włączeniem ostrzeżenia (domyślnie = 5s)</string>
+    <string name="warn_time_title">Zegar ostrzegania (s)</string>
+    <string name="alarm_time_summary">Czas oczekiwania przed włączeniem alarmu (domyślnie = 10s)</string>
+    <string name="alarm_time_title">Zegar alarmu (s)</string>
+    <string name="alarm_threshold_title">Próg alarmu</string>
+    <string name="alarm_ratio_thresh_summary">Próg współczynnika alarmu (domyślnie = 50). Zwiększ tą wartość aby zmniejszyć wrażliwość jeśli występują fałszywe alarmy</string>
+    <string name="alarm_ratio_thresh_title">Próg współczynnika alarmu</string>
+    <string name="alarm_freq_min_summary">Minimalna częstotliwość ROI (Hz) (domyślnie = 3 Hz)</string>
+    <string name="alarm_freq_min_title">Minimalna częstotliwość alarmowa (Hz)</string>
+    <string name="alarm_freq_max_summary">Maksymalna częstotliwość ROI (Hz) (domyślnie = 10 Hz)</string>
+    <string name="alarm_freq_max_title">Maksymalna częstotliwość alarmowa (Hz)</string>
+    <string name="sample_period_summary">Odstęp (w sekundach) między analizami danych</string>
+    <string name="sample_period_title">Częstość próbkowania (s)</string>
+    <string name="seizure_detect_mode_summary">Wybierz jeden z trzech dostępnych trybów pracy</string>
+    <string name="seizure_detect_mode_title">Tryb wykrywania drgawek</string>
+    <string name="sample_freq_summary">Większa częstość jest dokładniejsza, ale szybciej zużywa baterię</string>
+    <string name="fall_detect_title">Ustawienia wykrywania upadków</string>
+    <string name="fall_detect_active_title">Włącz funkcję wykrywania upadków</string>
+    <string name="fall_thresh_min_title">Dolny próg wykrycia upadku (mg)</string>
+    <string name="fall_window_title">Okno czasowe wykrycia upadku (ms)</string>
+    <string name="watch_comms_title">Ustawienia komunikacji z zegarkiem</string>
+    <string name="debug_mode_summary">Włączanie i wyłączanie trybu debugowania</string>
+    <string name="app_restart_timeout_summary">Czas (w sekundach) przez jaki czekamy na dane z zegarka nim uznamy że aplikacja na zegarku nie działa więc restartujemy ją</string>
+    <string name="app_restart_timeout_title">Czas (s) oczekiwania na dane nim aplikacja na zegarku zostanie zrestartowana</string>
+    <string name="display_spectrum_mode_title">Wybierz tryb wyświetlania spektrum</string>
+    <string name="display_spectrum_mode_summary">Włącz lub wyłącz wyświetlanie spektrum</string>
+    <string name="analysis_prefs_title">Analiza</string>
+    <string name="watch_comms_settings_title">Ustawienia komunikacji z zegarkiem</string>
+    <string name="debug_mode_title">Tryb debugowania</string>
+    <string name="fall_thresh_max_title">Górny próg wykrycia upadku (mg)</string>
+    <string name="sample_freq_title">Wybierz częstość próbkowania</string>
+    <string name="alarm_threshold_summary">Próg alarmu (domyślnie = 100)</string>
+    <string name="ble_mac_addr_summary">Adres MAC źródła danych urządzenia BLE</string>
+    <string name="data_update_period_summary">Częstość wyświetlania informacji w milisekundach</string>
+    <string name="select_datasource_title">Wybierz źródło danych</string>
+    <string name="select_datasource_summary">Wybierz które źródło danych wykrywania ataków chcesz używać</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b80d2ae..c39a2df 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -232,10 +232,10 @@
     <string name="alarm_threshold_title">AlarmThresh</string>
     <string name="alarm_ratio_thresh_summary">Alarm Ratio Threshold (Default = 50). Increase this value to reduce sensitivity if false alarms are a problem.</string>
     <string name="alarm_ratio_thresh_title">AlarmRatioThresh</string>
-    <string name="alarm_feq_min_summary">Minimum Frequency of ROI (Hz) (Default = 3 Hz)</string>
+    <string name="alarm_freq_min_summary">Minimum Frequency of ROI (Hz) (Default = 3 Hz)</string>
     <string name="alarm_freq_min_title">AlarmFreqMin (Hz)</string>
     <string name="alarm_freq_max_summary">Maximum Frequency of ROI (Hz) (Default = 10 Hz)</string>
-    <string name="alarm_frequency_max_title">AlarmFreqMax (Hz)</string>
+    <string name="alarm_freq_max_title">AlarmFreqMax (Hz)</string>
     <string name="sample_period_summary">Period (in seconds) between data analyses</string>
     <string name="sample_period_title">SamplePeriod (sec)</string>
     <string name="seizure_detect_mode_summary">Select one of the three available modes of operation.</string>
@@ -256,5 +256,4 @@
     <string name="display_spectrum_mode_summary">Set Display Spectrum mode on or off.</string>
     <string name="analysis_prefs_title">Analysis</string>
     <string name="watch_comms_settings_title">Watch Communications Settings</string>
-    <string name="alarm_freq_min_summary">alarm_freq_min_summary</string>
 </resources>
diff --git a/app/src/main/res/xml/network_passive_datasource_prefs.xml b/app/src/main/res/xml/network_passive_datasource_prefs.xml
index a046091..a31779b 100644
--- a/app/src/main/res/xml/network_passive_datasource_prefs.xml
+++ b/app/src/main/res/xml/network_passive_datasource_prefs.xml
@@ -54,13 +54,13 @@
         <EditTextPreference
             android:defaultValue="3"
             android:key="AlarmFreqMin"
-            android:summary="@string/alarm_feq_min_summary"
+            android:summary="@string/alarm_freq_min_summary"
             android:title="@string/alarm_freq_min_title" />
         <EditTextPreference
             android:defaultValue="10"
             android:key="AlarmFreqMax"
             android:summary="@string/alarm_freq_max_summary"
-            android:title="@string/alarm_frequency_max_title" />
+            android:title="@string/alarm_freq_max_title" />
 
         <EditTextPreference
             android:defaultValue="5"
diff --git a/app/src/main/res/xml/prefs.xml b/app/src/main/res/xml/prefs.xml
index 7a560a9..a3d27e8 100644
--- a/app/src/main/res/xml/prefs.xml
+++ b/app/src/main/res/xml/prefs.xml
@@ -66,7 +66,7 @@
         android:defaultValue="5" />
     <EditTextPreference
         android:key="AlarmFreqMax"
-        android:title="@string/alarm_frequency_max_title"
+        android:title="@string/alarm_freq_max_title"
         android:summary="@string/alarm_freq_max_summary"
         android:defaultValue="10" />
     <EditTextPreference