diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index b218c22..63445fc 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -158,4 +158,59 @@
Pebble Datasource Preferences
Basic Settings
General
+ Log Alarm events to SD Card
+ Log Alarm events to SD Card
+ Log Data to SD Card Regularly
+ Log Data to SD Card
+ Log Data to Central OpenSeizureDetector Database
+ Log Data Remotely
+ Use mobile internet to log remote data
+ Use Mobile Internet
+ Username for remote data logging.
+ Remote Username
+ Password for remote data logging.
+ Remote Password
+ Wearer ID
+ Wearer ID of the person wearing the watch (from OSD Web API)
+ URL for remote data logging.
+ Remote URL
+ Prevent the screen from blanking while the application is running.
+ Prevent the screen from blanking.
+ Display Update Period (ms).
+ Auto Start App on Boot
+ Auto Start App on Boot
+ App Version Number - used to decide whether to display the welcome message or not.
+ App Version Number
+ Require manual reset of alarms to reset them to silence them.
+ Latch Alarms
+ Latch Alarm Timer Duration (sec)
+ Duration in seconds that alarms will initiate for before being silenced automatically.
+ Issue an audible alarm if the seizure detector enters an alarm condition.
+ Enable Audible Alarm
+ Issue an audible alarm if the seizure detector enters a warning (pre-alarm) condition.
+ Enable Audible Warnings
+ Issue an audible alarm if the system detects a fault (e.g. can not talk to Pebble).
+ Enable Audible System FaultWarnings
+ Fault Timer Duration (sec)
+ Duration that fault alarms are muted before initiating.
+ Play an MP3 file to create the alarm beeps rather than using the default tone generator.
+ Use MP3 Alarm Sound
+ 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.
+ Enable SMS Alarm
+ Telephone number(s) to notify by SMS of Alarm (comma separated).
+ SMS Alarm numbers
+ Message to be Sent by SMS when a Seizure is Detected.
+ SMS Message
+ IP Address of OpenSeizureDetector Server (e.g. 192.168.1.175).
+ Server IP Address.
+ Period between server data requests in miliseconds.
+ Data Update Period (ms)
+ Connection Timeout Period (ms)
+
+ Read Timeout Period (ms)
+ BLE Device Settings
+ Device Address
+ Name of BLE Data Source Device
+ Device Address
+ User Interface Settings
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f8a9d38..c564e68 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -158,4 +158,64 @@
Network Datasource
Network Datasource Preferences
Pebble Datasource
+ Select Data Source
+ Select the seizure detector data source to use.
+ Log Alarm events to SD Card
+ Log Alarm events to SD Card
+ Log Data to SD Card Regularly
+ Log Data to SD Card
+ Log Data to Central OpenSeizureDetector Database
+ Log Data Remotely
+ Use mobile internet to log remote data
+ Use Mobile Internet
+ Username for remote data logging.
+ Remote Username
+ Password for remote data logging.
+ Remote Password
+ Wearer ID
+ Wearer ID of the person wearing the watch (from OSD Web API)
+ URL for remote data logging.
+ Remote URL
+ Prevent the screen from blanking while the application is running.
+ Prevent the screen from blanking.
+ Display update period in miliseconds.
+ Display Update Period (ms).
+ Auto Start App on Boot
+ Auto Start App on Boot
+ App Version Number - used to decide whether to display the welcome message or not.
+ App Version Number
+ Require manual reset of alarms to reset them to silence them.
+ Latch Alarms
+ Latch Alarm Timer Duration (sec)
+ Duration in seconds that alarms will initiate for before being silenced automatically.
+ Issue an audible alarm if the seizure detector enters an alarm condition.
+ Enable Audible Alarm
+ Issue an audible alarm if the seizure detector enters a warning (pre-alarm) condition.
+ Enable Audible Warnings
+ Issue an audible alarm if the system detects a fault (e.g. can not talk to Pebble).
+ Enable Audible System FaultWarnings
+ Fault Timer Duration (sec)
+ Duration that fault alarms are muted before initiating.
+ Play an MP3 file to create the alarm beeps rather than using the default tone generator.
+ Use MP3 Alarm Sound
+ 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.
+ Enable SMS Alarm
+ Telephone number(s) to notify by SMS of Alarm (comma separated).
+ SMS Alarm numbers
+ Message to be Sent by SMS when a Seizure is Detected.
+ SMS Message
+ IP Address of OpenSeizureDetector Server (e.g. 192.168.1.175).
+ Server IP Address.
+ Period between server data requests in miliseconds.
+ Data Update Period (ms)
+
+ Connection Timeout Period (ms)
+
+ Read Timeout Period (ms)
+ BLE Device Settings
+ MAC Address of BLE Data Source Device
+ Device Address
+ Name of BLE Data Source Device
+ Device Address
+ User Interface Settings
diff --git a/app/src/main/res/xml/alarm_prefs.xml b/app/src/main/res/xml/alarm_prefs.xml
index 1f0b7ed..d2d3998 100644
--- a/app/src/main/res/xml/alarm_prefs.xml
+++ b/app/src/main/res/xml/alarm_prefs.xml
@@ -4,12 +4,12 @@
+ android:summary="@string/latch_alarms_summary"
+ android:title="@string/latch_alarms_title" />
@@ -18,29 +18,29 @@
+ android:summary="@string/enable_audible_alarm_summary"
+ android:title="@string/enable_audible_alarm_title" />
+ android:summary="@string/enable_audible_warning_summary"
+ android:title="@string/enable_audible_warning_title" />
+ android:summary="@string/enable_audible_fault_summary"
+ android:title="@string/enable_audible_fault_title" />
+ android:summary="@string/use_mp3_alarm_summary"
+ android:title="@string/use_mp3_alarm_title" />
@@ -48,20 +48,20 @@
+ android:summary="@string/enable_sms_alarm_summary"
+ android:title="@string/enable_sms_alarm_title" />
+ android:summary="@string/sms_numbers_summary"
+ android:title="@string/sms_numbers_title" />
+ android:summary="@string/sms_message_summary"
+ android:title="@string/sms_message_title" />
-
+
+ android:summary="@string/log_alarms_summary"
+ android:title="@string/log_alarms_title" />
+ android:summary="@string/log_data_summary"
+ android:title="@string/log_data_title"/>
diff --git a/app/src/main/res/xml/camera_prefs.xml b/app/src/main/res/xml/camera_prefs.xml
deleted file mode 100644
index c047d49..0000000
--- a/app/src/main/res/xml/camera_prefs.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/res/xml/general_prefs.xml b/app/src/main/res/xml/general_prefs.xml
index 4191d7b..42fb8c3 100644
--- a/app/src/main/res/xml/general_prefs.xml
+++ b/app/src/main/res/xml/general_prefs.xml
@@ -2,12 +2,12 @@
+ android:dialogTitle="@string/select_datasource_title" />
+ android:summary="@string/log_alarms_summary"
+ android:title="@string/log_alarms_title" />
+ android:summary="@string/log_data_summary"
+ android:title="@string/log_data_title" />
+ android:summary="@string/log_data_remote_summary"
+ android:title="@string/log_data_remote_title" />
+ android:summary="@string/log_data_remote_mobile_summary"
+ android:title="@string/log_data_remote_mobile_title" />
+ android:title="@string/remote_uname_title"
+ android:summary="@string/remote_uname_summary" />
+ android:summary="@string/remote_passwd_summary"
+ android:title="@string/remote_passwd_title" />
+ android:summary="@string/wearer_id_summary"
+ android:title="@string/wearer_id_title" />
+ android:summary="@string/remote_url_summary"
+ android:title="@string/remote_url_title" />
+ android:summary="@string/prevent_sleep_summary"
+ android:title="@string/prevent_sleep_title" />
+ android:summary="@string/data_update_period_summary"
+ android:title="@string/data_update_period_title" />
+ android:summary="@string/app_version_summary"
+ android:title="@string/app_version_title" />
-
+
+ android:summary="@string/ble_mac_addr_summary"
+ android:title="@string/ble_mac_addr_title" />
+ android:summary="@string/ble_device_name_summary"
+ android:title="@string/ble_device_name_title" />
-
+