diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 7e94b4b9..d407a757 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.kde.kdeconnect_tp"
-    android:versionCode="1500"
-    android:versionName="1.5">
+    android:versionCode="1600"
+    android:versionName="1.6">
 
     <uses-sdk android:minSdkVersion="9"
               android:targetSdkVersion="22" />
@@ -138,6 +138,7 @@
         <activity
             android:name="org.kde.kdeconnect.Plugins.FindMyPhonePlugin.FindMyPhoneActivity"
             android:label="@string/findmyphone_title"
+            android:configChanges="orientation|screenSize"
             android:excludeFromRecents="true"
             android:launchMode="singleInstance">
         </activity>
diff --git a/res/layout/activity_device.xml b/res/layout/activity_device.xml
index 9bb47993..43028053 100644
--- a/res/layout/activity_device.xml
+++ b/res/layout/activity_device.xml
@@ -70,7 +70,7 @@
     </LinearLayout>
 
     <TextView
-        android:id="@+id/unpair_message"
+        android:id="@+id/not_reachable_message"
         android:visibility="gone"
         android:layout_width="match_parent"
         android:drawableStart="@drawable/ic_error_outline_black_48dp"
@@ -82,6 +82,19 @@
         android:textAppearance="?android:attr/textAppearanceMedium"
         />
 
+    <TextView
+        android:id="@+id/on_data_message"
+        android:visibility="gone"
+        android:layout_width="match_parent"
+        android:drawableStart="@drawable/ic_error_outline_black_48dp"
+        android:drawableLeft="@drawable/ic_error_outline_black_48dp"
+        android:drawablePadding="8dip"
+        android:layout_height="match_parent"
+        android:gravity="center_vertical"
+        android:text="@string/on_data_message"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        />
+
     <ListView
         android:id="@+id/buttons_list"
         android:layout_width="match_parent"
diff --git a/res/values-ast/strings.xml b/res/values-ast/strings.xml
index a35388af..51887e3c 100644
--- a/res/values-ast/strings.xml
+++ b/res/values-ast/strings.xml
@@ -3,24 +3,16 @@
   <string name="pref_plugin_telephony">Avisador telefónicu</string>
   <string name="pref_plugin_telephony_desc">Unvia avisos pa SMS y llamaes</string>
   <string name="pref_plugin_battery">Informe de batería</string>
-  <string name="pref_plugin_battery_desc">Informe periódicu del estáu de la batería</string>
-  <string name="pref_plugin_sftp_desc">Permite restolar remotamente a esti preséu</string>
+  <string name="pref_plugin_battery_desc">Infoma davezu del estáu de la batería</string>
   <string name="pref_plugin_clipboard">Sincronización del cartafueyu</string>
   <string name="pref_plugin_clipboard_desc">Comparte\'l conteníu del cartafueyu</string>
   <string name="pref_plugin_mousepad">Entrada remota</string>
-  <string name="pref_plugin_mousepad_desc">Usa\'l to teléfonu o tableta como panel táutil y tecláu</string>
-  <string name="pref_plugin_remotekeyboard">Pulsaciones remotes</string>
-  <string name="pref_plugin_mpris">Controles multimedia</string>
-  <string name="pref_plugin_mpris_desc">Forne un control remotu pal to reproductor multimedia</string>
-  <string name="pref_plugin_runcommand">Execución de comandos</string>
-  <string name="pref_plugin_runcommand_desc">Aiciona comandos remotos del to teléfonu o tableta</string>
+  <string name="pref_plugin_mpris">Controles remotos multimedia</string>
   <string name="pref_plugin_ping">Ping</string>
   <string name="pref_plugin_ping_desc">Unvia y recibe pings</string>
   <string name="pref_plugin_notifications">Sincronización d\'avisos</string>
-  <string name="pref_plugin_notifications_desc">Accede a los tos avisos d\'otros preseos</string>
-  <string name="pref_plugin_receive_notifications">Recibir avisos</string>
-  <string name="pref_plugin_receive_notifications_desc">Recibe avisos d\'otros preseos y amuésalos n\'Android</string>
-  <string name="pref_plugin_sharereceiver">Compartir y recibir</string>
+  <string name="pref_plugin_notifications_desc">Accede a los tos avisos dende otros preseos</string>
+  <string name="pref_plugin_sharereceiver">Unvia y recibi pings</string>
   <string name="pref_plugin_sharereceiver_desc">Comparte ficheros y URLs ente preseos</string>
   <string name="plugin_not_available">Esta carauterística nun ta disponible na to versión d\'Android</string>
   <string name="device_list_empty">Ensin preseos</string>
@@ -31,9 +23,9 @@
   <string name="send_ping">Unviar ping</string>
   <string name="open_mpris_controls">Control multimedia</string>
   <string-array name="mousepad_tap_entries">
-    <item>Right click</item>
-    <item>Middle click</item>
-    <item>Nothing</item>
+    <item>Clic drechu</item>
+    <item>Clic d\'en mediu</item>
+    <item>Nada</item>
   </string-array>
   <string-array name="mousepad_sensitivity_entries">
     <item>Slowest</item>
@@ -43,14 +35,97 @@
     <item>Fastest</item>
   </string-array>
   <string name="error_timed_out">Escosó\'l tiempu</string>
+  <string name="category_connected_devices">Preseos coneutaos</string>
+  <string name="category_not_paired_devices">Preseos disponibles</string>
+  <string name="category_remembered_devices">Preseos recordaos</string>
+  <string name="device_not_reachable">El preséu empareyáu nun ye agamable</string>
+  <string name="unknown_device">Preséu desconocíu</string>
+  <string name="error_not_reachable">Nun ye algamable\'l preséu</string>
+  <string name="error_already_requested">Empareyamientu yá solicitáu</string>
+  <string name="error_already_paired">El preséu yá ta empareyáu</string>
+  <string name="error_could_not_send_package">Nun pudo unviase\'l paquete</string>
+  <string name="error_canceled_by_user">Encaboxáu pol usuariu</string>
+  <string name="error_canceled_by_other_peer">Encaboxáu pola otra parte</string>
+  <string name="error_invalid_key">Recibióse una clave non válida</string>
+  <string name="pair_requested">Solicitóse l\'empareyamientu</string>
+  <string name="pairing_request_from">Solicitú d\'empareyamientu de %1s</string>
+  <string name="received_url_title">Recibióse l\'enllaz de %1s</string>
+  <string name="received_url_text">Calca p\'abrir «%1s»</string>
+  <string name="incoming_file_title">Ficheru entrante de %1s</string>
+  <string name="incoming_file_text">%1s</string>
+  <string name="outgoing_file_title">Unviando ficheru a %1s</string>
+  <string name="outgoing_file_text">%1s</string>
+  <string name="received_file_title">Recibióse\'l ficheru de %1s</string>
+  <string name="received_file_fail_title">Fallu al recibir el ficheru de %1s</string>
+  <string name="received_file_text">Tap to open \'%1s\'</string>
+  <string name="sent_file_title">Unvióse\'l ficheru a %1s</string>
+  <string name="sent_file_text">%1s</string>
+  <string name="sent_file_failed_text">%1s</string>
+  <string name="tap_to_answer">Calca pa responder</string>
+  <string name="reconnect">Reconeutar</string>
+  <string name="show_keyboard">Amosar tecláu</string>
+  <string name="device_not_paired">Preséu non empareyáu</string>
+  <string name="request_pairing">Solicitar empareyamientu</string>
+  <string name="pairing_accept">Aceutar</string>
+  <string name="pairing_reject">Refugar</string>
+  <string name="device">Preséu</string>
+  <string name="pair_device">Empareyar preséu</string>
+  <string name="remote_control">Control remotu</string>
+  <string name="settings">Axustes KDE Connect</string>
+  <string name="mpris_play">Reproducir</string>
+  <string name="mpris_previous">Anterior</string>
+  <string name="mpris_rew">Rebobinar</string>
+  <string name="mpris_ff">Avance rápidu</string>
+  <string name="mpris_next">Siguiente</string>
+  <string name="mpris_volume">Volume</string>
+  <string name="mpris_settings">Axustes multimedia</string>
+  <string name="mpris_time_settings_title">Botones d\'avanzar/rebobinar</string>
+  <string name="mpris_time_settings_summary">Axusta\'l tiempu p\'avanzar/rebobinar al primise</string>
   <string-array name="mpris_time_entries">
-    <item>10 seconds</item>
-    <item>20 seconds</item>
-    <item>30 seconds</item>
-    <item>1 minute</item>
-    <item>2 minutes</item>
+    <item>10 segundos</item>
+    <item>20 segundos</item>
+    <item>30 segundos</item>
+    <item>1 minutu</item>
+    <item>2 minutos</item>
   </string-array>
   <string name="no_file_browser">Nun hai restoladores de ficheros instalaos</string>
+  <string name="protocol_version_older">Esti preséu usa una versión vieya del protocolu</string>
+  <string name="protocol_version_newer">Esti preséu usa una versión anovada del protocolu</string>
+  <string name="general_settings">Axustes xenerales</string>
+  <string name="plugin_settings">Axustes</string>
+  <string name="plugin_settings_with_name">Axustes de %s</string>
+  <string name="device_name">Nome de preséu</string>
+  <string name="device_name_preference_summary">%s</string>
+  <string name="invalid_device_name">Nome de preséu non válidu</string>
+  <string name="shareplugin_text_saved">Recibióse\'l testu y guardóse nel cartafueyu</string>
+  <string name="custom_devices_settings">Llista de preseos personalizada</string>
+  <string name="pair_device_action">Empareyar con un preséu nuevu</string>
+  <string name="unpair_device_action">Desempareyar %s</string>
+  <string name="custom_device_list">Amestar preseos pola IP</string>
+  <string name="share_notification_preference">Avisos sonoros</string>
+  <string name="share_notification_preference_summary">Fai vibrar y reproduz un soníu al recibir un ficheru</string>
+  <string name="title_activity_notification_filter">Peñera d\'avisos</string>
+  <string name="filter_apps_info">Los avisos sincronizaránse coles aplicaciones esbillaes.</string>
+  <string name="sftp_internal_storage">Almacenamientu internu</string>
+  <string name="sftp_all_files">Tolos ficheros</string>
+  <string name="sftp_sdcard_num">Tarxeta SD %d</string>
+  <string name="sftp_sdcard">Tarxeta SD</string>
+  <string name="sftp_readonly">(namai llectura)</string>
+  <string name="sftp_camera">Semeyes de cámara</string>
+  <string name="add_host">Amestar agospiu/IP</string>
+  <string name="add_host_hint">Nome d\'agospiu o IP</string>
+  <string name="no_players_connected">Nun s\'alcontraron reproductores</string>
+  <string name="custom_dev_list_help">Usa esta opción namái si\'l to preséu nun se deteuta automáticamente. Introduz la direición o\'l nome d\'agospiu y toca\'l botón p\'amestalu a la llista. Toca un elementu esistente pa desanicialu de la llista.</string>
+  <string name="mpris_player_on_device">%1$s en %2$s</string>
+  <string name="send_files">Unviar ficheros</string>
+  <string name="pairing_title">Preseos KDE Connect</string>
+  <string name="pairing_description">Deberíen apaecer equí otros preseos executando KDE Connect.</string>
+  <string name="device_paired">Preséu empareyáu</string>
+  <string name="device_rename_title">Renomar preséu</string>
+  <string name="device_rename_confirm">Renomar</string>
+  <string name="refresh">Refrescar</string>
+  <string name="unreachable_description">Esti preséu empareyáu nun ye algamable. Asegúrate que ta coneutáu a la to mesma rede.</string>
+  <string name="pref_plugin_telepathy">Unviar SMS</string>
   <string name="pref_plugin_telepathy_desc">Unvia mensaxes de testu dende\'l to escritoriu</string>
   <string name="plugin_not_supported">Esti complementu nun lu sofita\'l preséu</string>
   <string name="findmyphone_description">Fai sonar el teléfonu pa qu\'asina pueas alcontralu</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 9856b85a..6d090953 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -10,8 +10,8 @@
   <string name="pref_plugin_clipboard_desc">Comparteix el contingut del porta-retalls</string>
   <string name="pref_plugin_mousepad">Entrada remota</string>
   <string name="pref_plugin_mousepad_desc">Usa el vostre telèfon o tauleta com un ratolí i un teclat</string>
-  <string name="pref_plugin_remotekeyboard">S\'estan rebent pulsacions de tecla remotes</string>
-  <string name="pref_plugin_remotekeyboard_desc">S\'estan rebent esdeveniments de pulsacions de tecla des de dispositius remots</string>
+  <string name="pref_plugin_remotekeyboard">Rep les pulsacions de tecla remotes</string>
+  <string name="pref_plugin_remotekeyboard_desc">Rep els esdeveniments de pulsacions de tecla des de dispositius remots</string>
   <string name="pref_plugin_mpris">Controls multimèdia</string>
   <string name="pref_plugin_mpris_desc">Proporciona un comandament a distància pel reproductor multimèdia</string>
   <string name="pref_plugin_runcommand">Executa una ordre</string>
@@ -33,7 +33,7 @@
   <string name="send_ping">Envia un ping</string>
   <string name="open_mpris_controls">Control multimèdia</string>
   <string name="remotekeyboard_editing_only_title">Fes servir les tecles remotes només en editar</string>
-  <string name="remotekeyboard_not_connected">No hi ha cap connexió activa amb el teclat remot, establiu-ne una al kde-connect</string>
+  <string name="remotekeyboard_not_connected">No hi ha cap connexió activa amb el teclat remot, establiu-ne una al «kdeconnect»</string>
   <string name="remotekeyboard_connected">La connexió amb el teclat remot està activa</string>
   <string name="remotekeyboard_multiple_connections">Hi ha més d\'una connexió amb un teclat remot, seleccioneu el dispositiu per configurar-lo</string>
   <string name="open_mousepad">Entrada remota</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 655b4eb3..67062450 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -9,17 +9,15 @@
   <string name="pref_plugin_clipboard">Abgleich der Zwischenablage</string>
   <string name="pref_plugin_clipboard_desc">Inhalt der Zwischenablage freigeben</string>
   <string name="pref_plugin_mousepad">Ferneingabe</string>
-  <string name="pref_plugin_mousepad_desc">Verwendet Ihr Handy als Tablet, Touchpad und Tastatur</string>
+  <string name="pref_plugin_mousepad_desc">Verwendet Ihr Handy als Tablett, Touchpad und Tastatur</string>
   <string name="pref_plugin_mpris">Multimedia-Bedienung</string>
-  <string name="pref_plugin_mpris_desc">Eine Fernbedienung für Ihre Medienwiedergabe</string>
   <string name="pref_plugin_runcommand">Befehl ausführen</string>
-  <string name="pref_plugin_runcommand_desc">Von Ihrem Telefon oder Tablet Befehle auf anderen Geräten ausführen</string>
+  <string name="pref_plugin_runcommand_desc">Von Ihrem Telefon oder Tablett Befehle auf anderen Geräten ausführen</string>
   <string name="pref_plugin_ping">Ping</string>
   <string name="pref_plugin_ping_desc">Senden und Empfangen von Pings</string>
   <string name="pref_plugin_notifications">Benachrichtigungs-Abgleich</string>
   <string name="pref_plugin_notifications_desc">Zugriff auf Ihre Benachrichtigungen von anderen Geräten</string>
   <string name="pref_plugin_receive_notifications">Benachrichtigungen empfangen</string>
-  <string name="pref_plugin_receive_notifications_desc">Empfangen und Anzeigen von Benachrichtigungen des anderen Geräts</string>
   <string name="pref_plugin_sharereceiver">Veröffentlichen und Empfangen</string>
   <string name="pref_plugin_sharereceiver_desc">Dateien und Adressen (URLs) zwischen Geräten teilen</string>
   <string name="plugin_not_available">Diese Funktion ist in Ihrer Android-Version nicht verfügbar</string>
@@ -31,7 +29,6 @@
   <string name="send_ping">Ping senden</string>
   <string name="open_mpris_controls">Multimedia-Bedienung</string>
   <string name="open_mousepad">Ferneingabe</string>
-  <string name="mousepad_info">Bewegen Sie einen Finger auf dem Bildschirm um den Maus-Zeiger zu verschieben. Tippen zum Klicken, mit zwei oder drei Fingern für rechten bzw. mittleren Mausknopf. Tippen und Halten für Ziehen und Ablegen.</string>
   <string name="mousepad_double_tap_settings_title">Aktionsausführung bei Berührung mit zwei Fingern einstellen</string>
   <string name="mousepad_triple_tap_settings_title">Aktionsausführung bei Berührung mit drei Fingern einstellen</string>
   <string name="mousepad_sensitivity_settings_title">Empfindlichkeit des Touchpads einstellen</string>
@@ -46,9 +43,9 @@
   <string name="mousepad_sensitivity_default">Standard</string>
   <string-array name="mousepad_sensitivity_entries">
     <item>Langsamste</item>
-    <item>Langsam</item>
+    <item>Above Slowest</item>
     <item>Standard</item>
-    <item>Schnell</item>
+    <item>Above Default</item>
     <item>Schnellste</item>
   </string-array>
   <string name="category_connected_devices">Verbundene Geräte</string>
@@ -69,25 +66,19 @@
   <string name="error_canceled_by_other_peer">Abbruch durch Gegenstelle</string>
   <string name="error_invalid_key">Ungültiger Schlüssel empfangen</string>
   <string name="encryption_info_title">Verschlüsselungsinformationen</string>
-  <string name="encryption_info_msg_no_ssl">Das andere Gerät verwendet eine ältere Version von KDE-Connect, eine veraltete Verschlüsselungsmethode wird verwendet.</string>
   <string name="my_device_fingerprint">Der SHA1-Fingerabdruck Ihres Gerätezertifikats lautet:</string>
   <string name="remote_device_fingerprint">Der SHA1-Fingerabdruck des Gerätezertifikats der Gegenstelle lautet:</string>
   <string name="pair_requested">Verbindung angefordert</string>
   <string name="pairing_request_from">Verbindungsanfrage von %1s</string>
   <string name="received_url_title">Verknüpfung von %1s erhalten</string>
-  <string name="received_url_text">Tippen um „%1s“ zu öffnen</string>
   <string name="incoming_file_title">Eingehende Datei von %1s</string>
   <string name="incoming_file_text">%1s</string>
   <string name="outgoing_file_title">Datei wird an %1s gesendet</string>
-  <string name="outgoing_files_title">Datei wird an %1s gesendet</string>
   <string name="outgoing_file_text">%1s</string>
-  <string name="outgoing_files_text">%1$d von %2$d Dateien gesendet</string>
   <string name="received_file_title">Datei von %1s erhalten</string>
   <string name="received_file_fail_title">Der Empfang der Datei %1s ist fehlgeschlagen</string>
-  <string name="received_file_text">Tippen um „%1s“ zu öffnen</string>
   <string name="sent_file_title">Datei an %1s gesendet</string>
   <string name="sent_file_text">%1s</string>
-  <string name="sent_file_failed_title">Das Senden der Datei an %1s ist fehlgeschlagen</string>
   <string name="sent_file_failed_text">%1s</string>
   <string name="tap_to_answer">Tippen zum Antworten</string>
   <string name="reconnect">Erneut verbinden</string>
@@ -95,7 +86,7 @@
   <string name="middle_click">Mittelklick senden</string>
   <string name="show_keyboard">Tastatur anzeigen</string>
   <string name="device_not_paired">Das Gerät ist nicht verbunden</string>
-  <string name="request_pairing">Verbindung anfordern</string>
+  <string name="request_pairing">Verbindung angefordert</string>
   <string name="pairing_accept">Annehmen</string>
   <string name="pairing_reject">Ablehnen</string>
   <string name="device">Gerät</string>
@@ -110,7 +101,6 @@
   <string name="mpris_volume">Lautstärke</string>
   <string name="mpris_settings">Multimedia-Einstellungen</string>
   <string name="mpris_time_settings_title">Knöpfe Vorwärts/Rückwärts</string>
-  <string name="mpris_time_settings_summary">Sprungweite für Vorlauf/Rücklauf anpassen.</string>
   <string-array name="mpris_time_entries">
     <item>10 Sekunden</item>
     <item>20 Sekunden</item>
@@ -134,10 +124,6 @@
   <string name="custom_device_list">Geräte nach IP hinzufügen</string>
   <string name="share_notification_preference">Ausführliche Benachrichtigungen</string>
   <string name="share_notification_preference_summary">Beim Empfang einer Datei vibrieren und einen Sound abspielen</string>
-  <string name="share_destination_customize">Zielverzeichnis anpassen</string>
-  <string name="share_destination_customize_summary_disabled">Empfangene Dateien werden in Downloads gespeichert</string>
-  <string name="share_destination_customize_summary_enabled">Dateien werden im folgenden Verzeichnis gespeichert</string>
-  <string name="share_destination_folder_preference">Zielverzeichnis</string>
   <string name="title_activity_notification_filter">Benachrichtigungs-Filter</string>
   <string name="filter_apps_info">Benachrichtigungen werden zwischen den ausgewählten Anwendungen abgeglichen.</string>
   <string name="sftp_internal_storage">Interner Speicher</string>
@@ -149,23 +135,21 @@
   <string name="add_host">Rechner/IP hinzufügen</string>
   <string name="add_host_hint">Rechnername oder IP</string>
   <string name="no_players_connected">Keine Medienspieler gefunden</string>
-  <string name="custom_dev_list_help">Benutzen Sie diese Funktion nur, wenn Ihr Gerät nicht automatisch erkannt wird. Geben hier Sie IP-Adresse oder Hostnamen ein und bestätigen Sie, um es zu der Liste hinzuzufügen. Tippen Sie ein bestehendes Gerät an, um es aus der Liste zu entfernen.</string>
   <string name="mpris_player_on_device">%1$s auf %2$s</string>
   <string name="send_files">Dateien senden</string>
   <string name="pairing_title">KDE-Connect-Geräte</string>
-  <string name="pairing_description">Andere Geräte im selben Netzwerk, auf denen KDE-Connect läuft, sollten hier angezeigt werden.</string>
+  <string name="pairing_description">Andere Geräte, auf denen KDE-Connect läuft im gleichen Netzwerk,sollte hier angezeigt werden.</string>
   <string name="device_paired">Gerät verbunden</string>
   <string name="device_rename_title">Geräte umbenennen</string>
   <string name="device_rename_confirm">Umbenennen</string>
   <string name="refresh">Aktualisieren</string>
-  <string name="unreachable_description">Das verbundene Gerät ist nicht erreichbar. Stellen Sie sicher daß es mit demselben Netzwerk verbunden ist.</string>
   <string name="no_file_browser">Es sind keine Dateiverwaltungsprogramme installiert.</string>
   <string name="pref_plugin_telepathy">SMS senden</string>
   <string name="pref_plugin_telepathy_desc">Text-Nachrichten von Ihrer Arbeitsfläche senden</string>
   <string name="plugin_not_supported">Dieses Modul wird durch das Gerät nicht unterstützt</string>
   <string name="findmyphone_title">Mein Telefon suchen</string>
-  <string name="findmyphone_title_tablet">Mein Tablet suchen</string>
-  <string name="findmyphone_description">Ruft dieses Gerät an, damit sie es finden können</string>
+  <string name="findmyphone_title_tablet">Mein Tablett suchen</string>
+  <string name="findmyphone_description">Ruft dieses Gerät an, um es zu suchen.</string>
   <string name="findmyphone_found">Gefunden</string>
   <string name="open">Öffnen</string>
   <string name="close">Schließen</string>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 48b1c1c9..10c798e0 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -139,7 +139,7 @@
   <string name="pairing_description">Outros dispositivos que estean a executar KDE Connect na mesma rede deberían aparecer aquí.</string>
   <string name="device_paired">Emparellouse co dispositivo</string>
   <string name="device_rename_title">Cambiar o nome do dispositivo</string>
-  <string name="device_rename_confirm">Cambiar o nome</string>
+  <string name="device_rename_confirm">Mudar o nome</string>
   <string name="refresh">Actualizar</string>
   <string name="unreachable_description">Este dispositivo emparellado está fóra do alcance. Asegúrese de que está conectado á mesma rede.</string>
   <string name="no_file_browser">Non hai navegadores de ficheiros instalados.</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index aedc18d6..33209741 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -10,8 +10,6 @@
   <string name="pref_plugin_clipboard_desc">Udostępnij zawartość schowka</string>
   <string name="pref_plugin_mousepad">Zdalne sterowanie</string>
   <string name="pref_plugin_mousepad_desc">Użyj swojego telefonu lub tabletu jako myszy i klawiatury</string>
-  <string name="pref_plugin_remotekeyboard">Odbieraj zdalne naciśnięcia klawiszy</string>
-  <string name="pref_plugin_remotekeyboard_desc">Odbieraj naciśnięcia klawiszy od urządzeń zdalnych</string>
   <string name="pref_plugin_mpris">Sterowanie multimediami</string>
   <string name="pref_plugin_mpris_desc">Zapewnia zdalne sterowanie twoim odtwarzaczem multimedialnym</string>
   <string name="pref_plugin_runcommand">Wykonaj polecenie</string>
@@ -32,10 +30,6 @@
   <string name="no_permissions">Musisz przydzielić uprawnienia, aby uzyskać dostęp do powiadomień</string>
   <string name="send_ping">Wyślij ping</string>
   <string name="open_mpris_controls">Sterowanie multimediami</string>
-  <string name="remotekeyboard_editing_only_title">Obsługuj zdalne naciśnięcia klawiszy tylko podczas edycji</string>
-  <string name="remotekeyboard_not_connected">Nie istnieje połączenie zdalnej klawiatury, nawiąż takie połączenie w kdeconnect</string>
-  <string name="remotekeyboard_connected">Połączenie zdalnej klawiatury jest nawiązane</string>
-  <string name="remotekeyboard_multiple_connections">Nawiązano więcej niż jedno połączenie zdalnej klawiatury, wybierz urządzenie do ustawienia</string>
   <string name="open_mousepad">Zdalne sterowanie</string>
   <string name="mousepad_info">Przesuń palcem po ekranie, aby przesunąć wskaźnik myszy. Stuknij, aby wywołać naciśniecie lewym przyciskiem myszy i użyj dwóch/trzech palców, aby wywołać naciśniecie prawym i środkowym przyciskiem myszy. Przyciśnij na dłużej, aby przeciągnąć i upuścić.</string>
   <string name="mousepad_double_tap_settings_title">Ustaw działanie po dwukrotnym stuknięciu palcem</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index a5d85f90..13616b40 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -10,6 +10,8 @@
   <string name="pref_plugin_clipboard_desc">Zdieľať obsah schránky</string>
   <string name="pref_plugin_mousepad">Vzdialený vstup</string>
   <string name="pref_plugin_mousepad_desc">Použiť váš telefón alebo tablet ako touchpad a klávesnicu</string>
+  <string name="pref_plugin_remotekeyboard">Prijímať vzdialené stlačenia klávesov</string>
+  <string name="pref_plugin_remotekeyboard_desc">Prijímať udalosti stlačení klávesov od vzdialených zariadení</string>
   <string name="pref_plugin_mpris">Multimediálne ovládače</string>
   <string name="pref_plugin_mpris_desc">Poskytuje vzdialené ovládanie pre váš prehrávač médií</string>
   <string name="pref_plugin_runcommand">Spustiť príkaz</string>
@@ -30,6 +32,10 @@
   <string name="no_permissions">Musíte povoliť oprávnenia na prístup k pripomienkam</string>
   <string name="send_ping">Poslať ping</string>
   <string name="open_mpris_controls">Multimediálny ovládač</string>
+  <string name="remotekeyboard_editing_only_title">Spracúva vzdialené klávesy len pri editácii</string>
+  <string name="remotekeyboard_not_connected">Nie sú žiadne aktívne pripojenia vzdialenej klávesnice, vytvorte nejaké v Kdeconnect</string>
+  <string name="remotekeyboard_connected">Vzdialené pripojenie klávesnice je aktívne</string>
+  <string name="remotekeyboard_multiple_connections">Je viac ako jedno vzdialené pripojenie klávesnice, vyberte zariadenie na nastavenie</string>
   <string name="open_mousepad">Vzdialený vstup</string>
   <string name="mousepad_info">Posúvajte prst na obrazovke na posun kurzora. Ťuknutie vyvolá klik a použite dva/tri prsty pre pravé a stredné tlačidlo. Použite dlhé stlačenie pre drag and drop.</string>
   <string name="mousepad_double_tap_settings_title">Nastaviť akciu dvoch prstov</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index a552cd56..31311c26 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -8,10 +8,8 @@
   <string name="pref_plugin_sftp_desc">Gör det möjligt att bläddra i apparatens filsystem från annan apparat</string>
   <string name="pref_plugin_clipboard">Synkronisera klippbord</string>
   <string name="pref_plugin_clipboard_desc">Dela klippbordets innehåll</string>
-  <string name="pref_plugin_mousepad">Extern inmatning</string>
+  <string name="pref_plugin_mousepad">Fjärrinmatning</string>
   <string name="pref_plugin_mousepad_desc">Använd telefonen eller surfplattan som mus och tangentbord</string>
-  <string name="pref_plugin_remotekeyboard">Ta emot externa tangentnedtryckningar</string>
-  <string name="pref_plugin_remotekeyboard_desc">Ta emot tangentnedtryckningar från externa enheter</string>
   <string name="pref_plugin_mpris">Multimediakontroller</string>
   <string name="pref_plugin_mpris_desc">Tillhandahåller en fjärrkontroll för mediaspelaren</string>
   <string name="pref_plugin_runcommand">Kör kommando</string>
@@ -32,11 +30,7 @@
   <string name="no_permissions">Du måste ge rättighet att komma åt underrättelser</string>
   <string name="send_ping">Skicka ping</string>
   <string name="open_mpris_controls">Kontroll av multimedia</string>
-  <string name="remotekeyboard_editing_only_title">Hantera bara externa tangenter vid redigering</string>
-  <string name="remotekeyboard_not_connected">Det finns ingen aktiv anslutning till externt tangentbord, upprätta en i KDE-anslut</string>
-  <string name="remotekeyboard_connected">Anslutning till externt tangentbord är aktiv</string>
-  <string name="remotekeyboard_multiple_connections">Det finns mer än en anslutning till externt tangentbord, välj enhet att anpassa</string>
-  <string name="open_mousepad">Extern inmatning</string>
+  <string name="open_mousepad">Fjärrinmatning</string>
   <string name="mousepad_info">Flytta fingret på skärmen för att röra muspekaren. Rör för att klicka, och använd två eller tre fingrar för höger- och mittenknapparna. Använd en längre beröring för drag och släpp.</string>
   <string name="mousepad_double_tap_settings_title">Ställ in åtgärd vid två fingerberöringar</string>
   <string name="mousepad_triple_tap_settings_title">Ställ in åtgärd vid tre fingerberöringar</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6259f824..f78801be 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -193,6 +193,7 @@
     <string name="device_rename_confirm">Rename</string>
     <string name="refresh">Refresh</string>
     <string name="unreachable_description">This paired device is not reachable. Make sure it is connected to your same network.</string>
+    <string name="on_data_message">It looks like you are on a mobile data connection. KDE Connect only works on local networks.</string>
     <string name="no_file_browser">There are no file browsers installed.</string>
     <string name="pref_plugin_telepathy">Send SMS</string>
     <string name="pref_plugin_telepathy_desc">Send text messages from your desktop</string>
diff --git a/src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java b/src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
index 2a7f99c2..867ce6db 100644
--- a/src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
+++ b/src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java
@@ -31,6 +31,7 @@ import org.kde.kdeconnect.Backends.BaseLinkProvider;
 import org.kde.kdeconnect.BackgroundService;
 import org.kde.kdeconnect.Device;
 import org.kde.kdeconnect.Helpers.DeviceHelper;
+import org.kde.kdeconnect.Helpers.NetworkHelper;
 import org.kde.kdeconnect.Helpers.SecurityHelpers.SslHelper;
 import org.kde.kdeconnect.Helpers.StringsHelper;
 import org.kde.kdeconnect.NetworkPackage;
@@ -68,18 +69,18 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
     final static int MAX_PORT = 1764;
     final static int PAYLOAD_TRANSFER_MIN_PORT = 1739;
 
-    private final Context context;
+    final Context context;
 
     private final HashMap<String, LanLink> visibleComputers = new HashMap<>();  //Links by device id
 
-    private ServerSocket tcpServer;
+    ServerSocket tcpServer;
     private DatagramSocket udpServer;
     private DatagramSocket udpServerOldPort;
 
-    private boolean listening = false;
+    boolean listening = false;
 
     // To prevent infinte loop between Android < IceCream because both device can only broadcast identity package but cannot connect via TCP
-    private ArrayList<InetAddress> reverseConnectionBlackList = new ArrayList<>();
+    ArrayList<InetAddress> reverseConnectionBlackList = new ArrayList<>();
 
     @Override // SocketClosedCallback
     public void linkDisconnected(LanLink brokenLink) {
@@ -89,7 +90,7 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
     }
 
     //They received my UDP broadcast and are connecting to me. The first thing they sned should be their identity.
-    public void tcpPackageReceived(Socket socket) throws Exception {
+    void tcpPackageReceived(Socket socket) throws Exception {
 
         NetworkPackage networkPackage;
         try {
@@ -112,7 +113,7 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
     }
 
     //I've received their broadcast and should connect to their TCP socket and send my identity.
-    protected void udpPacketReceived(DatagramPacket packet) throws Exception {
+    void udpPacketReceived(DatagramPacket packet) throws Exception {
 
         final InetAddress address = packet.getAddress();
 
@@ -171,7 +172,7 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
         }
     }
 
-    private void configureSocket(Socket socket) {
+    void configureSocket(Socket socket) {
         try {
             socket.setKeepAlive(true);
         } catch (SocketException e) {
@@ -360,7 +361,12 @@ public class LanLinkProvider extends BaseLinkProvider implements LanLink.LinkDis
         throw new IOException("No ports available");
     }
 
-    void broadcastUdpPackage() {
+    private void broadcastUdpPackage() {
+
+        if (NetworkHelper.isOnMobileNetwork(context)) {
+            Log.w("LanLinkProvider", "On 3G network, not sending broadcast.");
+            return;
+        }
 
         new Thread(new Runnable() {
             @Override
diff --git a/src/org/kde/kdeconnect/BackgroundService.java b/src/org/kde/kdeconnect/BackgroundService.java
index 7b5ef04a..ca6c2cca 100644
--- a/src/org/kde/kdeconnect/BackgroundService.java
+++ b/src/org/kde/kdeconnect/BackgroundService.java
@@ -119,7 +119,7 @@ public class BackgroundService extends Service {
         }
     };
 
-    private void onDeviceListChanged() {
+    public void onDeviceListChanged() {
         for(DeviceListChangedCallback callback : deviceListChangedCallbacks.values()) {
             callback.onDeviceListChanged();
         }
diff --git a/src/org/kde/kdeconnect/Helpers/NetworkHelper.java b/src/org/kde/kdeconnect/Helpers/NetworkHelper.java
new file mode 100644
index 00000000..0f6d17cd
--- /dev/null
+++ b/src/org/kde/kdeconnect/Helpers/NetworkHelper.java
@@ -0,0 +1,16 @@
+package org.kde.kdeconnect.Helpers;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.util.Log;
+
+public class NetworkHelper {
+
+    public static boolean isOnMobileNetwork(Context context) {
+        final ConnectivityManager connMgr = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+        NetworkInfo info = connMgr.getActiveNetworkInfo();
+        return (info != null && info.getType() == ConnectivityManager.TYPE_MOBILE);
+    }
+
+}
diff --git a/src/org/kde/kdeconnect/KdeConnectBroadcastReceiver.java b/src/org/kde/kdeconnect/KdeConnectBroadcastReceiver.java
index e43afbab..2cb73f34 100644
--- a/src/org/kde/kdeconnect/KdeConnectBroadcastReceiver.java
+++ b/src/org/kde/kdeconnect/KdeConnectBroadcastReceiver.java
@@ -67,6 +67,7 @@ public class KdeConnectBroadcastReceiver extends BroadcastReceiver
                 BackgroundService.RunCommand(context, new BackgroundService.InstanceCallback() {
                     @Override
                     public void onServiceStart(BackgroundService service) {
+                        service.onDeviceListChanged();
                         service.onNetworkChange();
                     }
                 });
diff --git a/src/org/kde/kdeconnect/Plugins/FindMyPhonePlugin/FindMyPhoneActivity.java b/src/org/kde/kdeconnect/Plugins/FindMyPhonePlugin/FindMyPhoneActivity.java
index 2ebba699..fa4f6a77 100644
--- a/src/org/kde/kdeconnect/Plugins/FindMyPhonePlugin/FindMyPhoneActivity.java
+++ b/src/org/kde/kdeconnect/Plugins/FindMyPhonePlugin/FindMyPhoneActivity.java
@@ -21,7 +21,12 @@ public class FindMyPhoneActivity extends Activity {
     @Override
     protected void onNewIntent(Intent intent) {
         super.onNewIntent(intent);
-        finish(); //If this activity was already open and we received the ring packet again, just finish it
+
+        if(ringtone != null) {
+            // If this activity was already open and we received the ring packet again, just finish it
+            finish();
+        }
+        // otherwise the activity will become active again
     }
 
     @Override
@@ -40,6 +45,11 @@ public class FindMyPhoneActivity extends Activity {
                 finish();
             }
         });
+    }
+
+    @Override
+    protected void onStart() {
+        super.onStart();
 
         Uri ringtoneUri = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_RINGTONE);
         ringtone = RingtoneManager.getRingtone(getApplicationContext(), ringtoneUri);
@@ -61,12 +71,16 @@ public class FindMyPhoneActivity extends Activity {
         }
 
         ringtone.play();
-
     }
 
     @Override
-    public void finish() {
-        ringtone.stop();
-        super.finish();
+    protected void onStop() {
+        super.onStop();
+
+        if(ringtone != null) {
+            ringtone.stop();
+            ringtone = null;
+        }
     }
+
 }
diff --git a/src/org/kde/kdeconnect/UserInterface/DeviceFragment.java b/src/org/kde/kdeconnect/UserInterface/DeviceFragment.java
index d97b8f3f..820e8deb 100644
--- a/src/org/kde/kdeconnect/UserInterface/DeviceFragment.java
+++ b/src/org/kde/kdeconnect/UserInterface/DeviceFragment.java
@@ -40,6 +40,7 @@ import android.widget.TextView;
 
 import org.kde.kdeconnect.BackgroundService;
 import org.kde.kdeconnect.Device;
+import org.kde.kdeconnect.Helpers.NetworkHelper;
 import org.kde.kdeconnect.Helpers.SecurityHelpers.SslHelper;
 import org.kde.kdeconnect.Plugins.Plugin;
 import org.kde.kdeconnect.UserInterface.List.CustomItem;
@@ -130,10 +131,6 @@ public class DeviceFragment extends Fragment {
 
                 refreshUI();
 
-                //TODO: Is this needed?
-                //if (!device.hasPluginsLoaded() && device.isReachable()) {
-                //    device.reloadPluginsFromSettings();
-                //}
             }
         });
 
@@ -296,21 +293,6 @@ public class DeviceFragment extends Fragment {
     public void onResume() {
         super.onResume();
 
-        //TODO: Is this needed?
-        /*
-        BackgroundService.RunCommand(mActivity, new BackgroundService.InstanceCallback() {
-            @Override
-            public void onServiceStart(BackgroundService service) {
-                if (mDeviceId != null) {
-                    Device device = service.getDevice(mDeviceId);
-                    if (device != null && device.isReachable()) {
-                        device.reloadPluginsFromSettings();
-                    }
-                }
-            }
-        });
-        */
-
         getView().setFocusableInTouchMode(true);
         getView().requestFocus();
         getView().setOnKeyListener(new View.OnKeyListener() {
@@ -352,9 +334,11 @@ public class DeviceFragment extends Fragment {
 
                     boolean paired = device.isPaired();
                     boolean reachable = device.isReachable();
+                    boolean onData = NetworkHelper.isOnMobileNetwork(getContext());
 
                     rootView.findViewById(R.id.pairing_buttons).setVisibility(paired ? View.GONE : View.VISIBLE);
-                    rootView.findViewById(R.id.unpair_message).setVisibility((paired && !reachable) ? View.VISIBLE : View.GONE);
+                    rootView.findViewById(R.id.not_reachable_message).setVisibility((paired && !reachable && !onData) ? View.VISIBLE : View.GONE);
+                    rootView.findViewById(R.id.on_data_message).setVisibility((paired && !reachable && onData) ? View.VISIBLE : View.GONE);
 
                     try {
                         ArrayList<ListAdapter.Item> items = new ArrayList<>();
diff --git a/src/org/kde/kdeconnect/UserInterface/PairingFragment.java b/src/org/kde/kdeconnect/UserInterface/PairingFragment.java
index ecf65b0a..c5fe6225 100644
--- a/src/org/kde/kdeconnect/UserInterface/PairingFragment.java
+++ b/src/org/kde/kdeconnect/UserInterface/PairingFragment.java
@@ -36,6 +36,7 @@ import android.widget.TextView;
 
 import org.kde.kdeconnect.BackgroundService;
 import org.kde.kdeconnect.Device;
+import org.kde.kdeconnect.Helpers.NetworkHelper;
 import org.kde.kdeconnect.UserInterface.List.ListAdapter;
 import org.kde.kdeconnect.UserInterface.List.PairingDeviceItem;
 import org.kde.kdeconnect.UserInterface.List.SectionItem;
@@ -60,6 +61,8 @@ public class PairingFragment extends Fragment implements PairingDeviceItem.Callb
 
     boolean listRefreshCalledThisFrame = false;
 
+    TextView headerText;
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
@@ -74,10 +77,10 @@ public class PairingFragment extends Fragment implements PairingDeviceItem.Callb
 
         rootView = inflater.inflate(R.layout.activity_list, container, false);
 
-        TextView text = new TextView(inflater.getContext());
-        text.setText(getString(R.string.pairing_description));
-        text.setPadding(0, (int) (16 * getResources().getDisplayMetrics().density), 0, (int) (12 * getResources().getDisplayMetrics().density));
-        ((ListView) rootView).addHeaderView(text);
+        headerText = new TextView(inflater.getContext());
+        headerText.setText(getString(R.string.pairing_description));
+        headerText.setPadding(0, (int) (16 * getResources().getDisplayMetrics().density), 0, (int) (12 * getResources().getDisplayMetrics().density));
+        ((ListView) rootView).addHeaderView(headerText);
 
         return rootView;
     }
@@ -104,6 +107,8 @@ public class PairingFragment extends Fragment implements PairingDeviceItem.Callb
                         }
                         listRefreshCalledThisFrame = true;
 
+                        headerText.setText(getString(NetworkHelper.isOnMobileNetwork(getContext()) ? R.string.on_data_message : R.string.pairing_description));
+
                         try {
                             Collection<Device> devices = service.getDevices().values();
                             final ArrayList<ListAdapter.Item> items = new ArrayList<>();