diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0076c91b7..59a168298 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -8,7 +8,7 @@
     <string name="action_quit">Quit</string>
     <string name="action_donate">Donate</string>
     <string name="controlcenter_fetch_activity_data">Synchronize</string>
-    <string name="controlcenter_find_device">Find lost Device</string>
+    <string name="controlcenter_find_device">Find lost device</string>
     <string name="controlcenter_take_screenshot">Take Screenshot</string>
     <string name="controlcenter_connect">Connect</string>
     <string name="controlcenter_disconnect">Disconnect</string>
@@ -39,9 +39,9 @@
     <string name="appmanager_health_deactivate">Deactivate</string>
     <string name="appmanager_hrm_activate">Activate HRM</string>
     <string name="appmanager_hrm_deactivate">Deactivate HRM</string>
-    <string name="appmanager_weather_activate">Activate system weather app</string>
-    <string name="appmanager_weather_deactivate">Deactivate system weather app</string>
-    <string name="appmanager_weather_install_provider">Install the weather notification app</string>
+    <string name="appmanager_weather_activate">Activate System Weather app</string>
+    <string name="appmanager_weather_deactivate">Deactivate System Weather app</string>
+    <string name="appmanager_weather_install_provider">Install the Weather Notification app</string>
     <string name="app_configure">Configure</string>
     <string name="app_move_to_top">Move to top</string>
 
@@ -56,20 +56,20 @@
 
     <!-- Strings related to FwAppInstaller -->
     <string name="title_activity_fw_app_insaller">FW/App installer</string>
-    <string name="fw_upgrade_notice">You are about to install firmware %s instead of the one currently on your Mi Band.</string>
+    <string name="fw_upgrade_notice">You are about to install the %s firmware instead of the one currently on your Mi Band.</string>
     <string name="fw_upgrade_notice_amazfitbip">You are about to install the %s firmware on your Amazfit Bip.\n\nPlease make sure to install the .fw file, then the .res file, and finally the .gps file. Your watch will reboot after installing the .fw file.\n\nNote: You do not have to install .res and .gps if these files are exactly the same as the ones previously installed.\n\nPROCEED AT YOUR OWN RISK!</string>
     <string name="fw_upgrade_notice_amazfitcor">You are about to install the %s firmware on your Amazfit Cor.\n\nPlease make sure to install the .fw file, and after that the .res file. Your watch will reboot after installing the .fw file.\n\nNote: You do not have to install .res if it is exactly the same as the one previously installed.\n\nPROCEED AT YOUR OWN RISK!</string>
     <string name="fw_upgrade_notice_miband3">You are about to install the %s firmware on your Mi Band 3.\n\nPlease make sure to install the .fw file, and after that the .res file. Your watch will reboot after installing the .fw file.\n\nNote: You do not have to install .res if it is exactly the same as the one previously installed.\n\nUNTESTED, MAY BRICK YOUR DEVICE, PROCEED AT YOUR OWN RISK!</string>
     <string name="fw_multi_upgrade_notice">You are about to install the %1$s and %2$s firmware, instead of the ones currently on your Mi Band.</string>
     <string name="miband_firmware_known">This firmware has been tested and is known to be compatible with Gadgetbridge.</string>
     <string name="miband_firmware_unknown_warning">"This firmware is untested and may not be compatible with Gadgetbridge.\n\nYou are DISCOURAGED from flashing it onto your Mi Band!"</string>
-    <string name="miband_firmware_suggest_whitelist">If you still want to proceed and things continue to work properly afterwards, please tell the Gadgetbridge developers to whitelist the %s firmware version</string>
+    <string name="miband_firmware_suggest_whitelist">If you still want to proceed and things continue to work properly afterwards, please tell the Gadgetbridge developers to whitelist the %s firmware version.</string>
 
     <!-- Strings related to Settings -->
     <string name="title_activity_settings">Settings</string>
 
     <string name="pref_header_general">General settings</string>
-    <string name="pref_title_general_autoconnectonbluetooth">Connect to device when Bluetooth turned on</string>
+    <string name="pref_title_general_autoconnectonbluetooth">Connect to Gadgetbridge device when Bluetooth is turned on</string>
     <string name="pref_title_general_autostartonboot">Start automatically</string>
     <string name="pref_title_general_autoreconnect">Reconnect automatically</string>
     <string name="pref_title_audio_player">Preferred Audioplayer</string>
@@ -78,7 +78,7 @@
 
     <string name="pref_header_datetime">Date and Time</string>
     <string name="pref_title_datetime_syctimeonconnect">Sync time</string>
-    <string name="pref_summary_datetime_syctimeonconnect">Sync time to device when connecting, and when time or time zone changes on Android</string>
+    <string name="pref_summary_datetime_syctimeonconnect">Sync time to Gadgetbridge device when connecting, and when time or time zone changes on Android device</string>
 
     <string name="pref_title_theme">Theme</string>
     <string name="pref_theme_light">Light</string>
@@ -95,11 +95,11 @@
     <string name="pref_title_notifications_call">Phone Calls</string>
     <string name="pref_title_notifications_sms">SMS</string>
     <string name="pref_title_notifications_pebblemsg">Pebble Messages</string>
-    <string name="pref_summary_notifications_pebblemsg">Support for applications which send notifications to the Pebble via PebbleKit.</string>
+    <string name="pref_summary_notifications_pebblemsg">Support for apps that send notifications to the Pebble via PebbleKit.</string>
     <string name="pref_title_notifications_generic">Generic notification support</string>
     <string name="pref_title_whenscreenon">…also when screen is on</string>
     <string name="pref_title_notification_filter">Do Not Disturb</string>
-    <string name="pref_summary_notification_filter">Stop unwanted notifications from being sent in Do Not Disturb mode</string>
+    <string name="pref_summary_notification_filter">Unwanted notifications are stopped in this mode</string>
     <string name="pref_title_transliteration">Transliteration</string>
     <string name="pref_summary_transliteration">Enable this if your device has no support for your language\'s font</string>
 
@@ -141,7 +141,7 @@
     <string name="pref_summary_enable_outgoing_call">Disabling this will also stop the Pebble 2/LE to vibrate on outgoing calls</string>
 
     <string name="pref_title_enable_pebblekit">Allow 3rd party Android App access</string>
-    <string name="pref_summary_enable_pebblekit">Enable experimental support for Android Apps using PebbleKit</string>
+    <string name="pref_summary_enable_pebblekit">Enable experimental support for Android apps using PebbleKit</string>
 
     <string name="pref_header_pebble_timeline">Pebble timeline</string>
     <string name="pref_title_sunrise_sunset">Sunrise and sunset</string>
@@ -168,13 +168,14 @@
     <string name="toast_aqurired_networklocation">location acquired</string>
 
     <string name="pref_title_pebble_forceprotocol">Force notification protocol</string>
-    <string name="pref_summary_pebble_forceprotocol">This option forces using the latest notification protocol depending on the firmware version. ENABLE ONLY IF YOU KNOW WHAT YOU ARE DOING!</string>
+    <string name="pref_summary_pebble_forceprotocol">This option forces using the latest notification protocol depending on the firmware version. KNOW WHAT YOU ARE DOING!</string>
     <string name="pref_title_pebble_forceuntested">Enable untested features</string>
-    <string name="pref_summary_pebble_forceuntested">Enable features that are untested. ENABLE ONLY IF YOU KNOW WHAT YOU ARE DOING!</string>
+    <string name="pref_summary_pebble_forceuntested">Enable untested features. KNOW WHAT YOU ARE DOING!</string>
     <string name="pref_title_pebble_forcele">Always prefer BLE</string>
     <string name="pref_summary_pebble_forcele">Use experimental Pebble LE support for all Pebbles, instead of BT classic. This requires pairing to non LE first, and then Pebble LE</string>
     <string name="pref_title_pebble_mtu_limit">Pebble 2/LE GATT MTU limit</string>
     <string name="pref_summary_pebble_mtu_limit">If your Pebble 2/Pebble LE does not work as expected, try this setting to limit the MTU (valid range 20–512)</string>
+    <string name="pref_title_pebble_enable_applogs">Enable watch app logging</string>
     <string name="pref_title_pebble_gatt_clientonly">GATT client only</string>
     <string name="pref_summary_pebble_gatt_clientonly">This is for Pebble 2 only and experimental, try this if you have connectivity problems</string>
     <string name="pref_title_pebble_enable_applogs">Enable watch App logging</string>
@@ -293,7 +294,7 @@
     <string name="pref_screen_notification_profile_sms">SMS notification</string>
     <string name="pref_header_vibration_settings">Vibration settings</string>
     <string name="pref_screen_notification_profile_generic">Generic notification</string>
-    <string name="pref_screen_notification_profile_email">Email notification</string>
+    <string name="pref_screen_notification_profile_email">E-mail notification</string>
     <string name="pref_screen_notification_profile_incoming_call">Incoming call notification</string>
     <string name="pref_screen_notification_profile_generic_chat">Chat</string>
     <string name="pref_screen_notification_profile_generic_navigation">Navigation</string>
@@ -324,8 +325,8 @@
     <string name="alarm_fri_short">Fri</string>
     <string name="alarm_sat_short">Sat</string>
     <string name="alarm_smart_wakeup">Smart wakeup</string>
-    <string name="user_feedback_miband_set_alarms_failed">There was an error setting the alarms, please try again!</string>
-    <string name="user_feedback_miband_set_alarms_ok">Alarms sent to device!</string>
+    <string name="user_feedback_miband_set_alarms_failed">There was an error setting the alarms, please try again.</string>
+    <string name="user_feedback_miband_set_alarms_ok">Alarms sent to device.</string>
     <string name="chart_no_data_synchronize">No data. Synchronize device?</string>
     <string name="user_feedback_miband_activity_data_transfer">About to transfer %1$s of data starting from %2$s</string>
     <string name="miband_prefs_fitness_goal">Daily step target</string>
@@ -375,7 +376,7 @@
     <string name="pref_summary_dont_ack_transfers">If the activity data are not acked to the band, they will not be cleared. Useful if GB is used together with other apps.</string>
     <string name="pref_summary_keep_data_on_device">Will keep activity data on the Mi Band even after synchronization. Useful if GB is used together with other apps.</string>
     <string name="pref_title_low_latency_fw_update">Use low-latency mode for firmware flashing</string>
-    <string name="pref_summary_low_latency_fw_update">This might help on devices where firmware flashing fails</string>
+    <string name="pref_summary_low_latency_fw_update">This might help on devices where firmware flashing fails.</string>
 
     <string name="live_activity_steps_history">Steps history</string>
     <string name="live_activity_current_steps_per_minute">Current steps/min</string>
@@ -425,7 +426,7 @@
     <string name="mi2_prefs_inactivity_warnings">Inactivity warnings</string>
     <string name="mi2_prefs_inactivity_warnings_summary">The band will vibrate when you have been inactive for a while</string>
     <string name="mi2_prefs_inactivity_warnings_threshold">Inactivity threshold (in minutes)</string>
-    <string name="mi2_prefs_inactivity_warnings_dnd_summary">Disable the inactivity warnings for a time interval</string>
+    <string name="mi2_prefs_inactivity_warnings_dnd_summary">Disable inactivity warnings for a time interval</string>
     <string name="mi2_prefs_do_not_disturb_start">Start time</string>
     <string name="mi2_prefs_do_not_disturb_end">End time</string>
     <string name="mi3_prefs_band_screen_unlock">Band screen unlock"</string>
@@ -434,6 +435,7 @@
     <string name="simplified_chinese">Simplified Chinese</string>
     <string name="traditional_chinese">Traditional Chinese</string>
     <string name="english">English</string>
+    <string name="norwegian_bokmal">Norwegian Bokmål</string>
     <string name="spanish">Spanish</string>
     <string name="russian">Russian</string>
     <string name="german">German</string>
@@ -470,10 +472,10 @@
     <string name="live_activity_heart_rate">Heart rate</string>
 
     <string name="pref_title_pebble_health_store_raw">Store raw record in the database</string>
-    <string name="pref_summary_pebble_health_store_raw">If checked the data is stored \"as is\" and is available for later interpretation. NB: the database will be bigger in this case!</string>
+    <string name="pref_summary_pebble_health_store_raw">Stores the data \"as is\", increasing the database usage to allow for later interpretation.</string>
     <string name="action_db_management">Database management</string>
     <string name="title_activity_db_management">Database management</string>
-    <string name="activity_db_management_import_export_explanation">The database operations use the following path on your device. \nThis path is accessible to other Android applications and your computer. \nExpect to find your exported database (or place the database you want to import) there:</string>
+    <string name="activity_db_management_import_export_explanation">The database operations use the following path on your device. \nThis path is accessible to other Android apps and your computer. \nExpect to find your exported database (or place the database you want to import) there:</string>
     <string name="activity_db_management_merge_old_title">Legacy database delete</string>
     <string name="dbmanagementactivvity_cannot_access_export_path">Cannot access export path. Please contact the developers.</string>
     <string name="dbmanagementactivity_exported_to">Exported to: %1$s</string>
@@ -501,7 +503,7 @@
 
     <!-- Strings related to Pebble Pairing Activity-->
     <string name="title_activity_pebble_pairing">Pebble pairing</string>
-    <string name="pebble_pairing_hint">A pairing dialog will pop up on your Android device. If not, look in the notification drawer and accept the pairing request. Also accept it on your Pebble afterwards</string>
+    <string name="pebble_pairing_hint">A pairing dialog will pop up on your Android device. If not, look in the notification drawer and accept the pairing request. Also accept it on your Pebble afterwards.</string>
 
     <string name="weather_notification_label">Make sure that this skin is enabled in the Weather Notification app to get weather information on your Pebble.\n\nNo configuration is needed here.\n\nYou can enable the system weather app of your Pebble from the app management.\n\nSupported watchfaces will show the weather automatically.</string>
     <string name="pref_title_setup_bt_pairing">Enable Bluetooth pairing</string>
@@ -539,7 +541,7 @@
     <string name="discovery_dont_pair">Don\'t Pair</string>
 
     <!-- strings sent to pebble watches for quick actions -->
-    <string name="_pebble_watch_open_on_phone">Open on phone</string>
+    <string name="_pebble_watch_open_on_phone">Open on Android device</string>
     <string name="_pebble_watch_mute">Mute</string>
     <string name="_pebble_watch_reply">Reply</string>