Increased version number to release

The problem was that I was passing the base context instead of the view's

AndroidManifest.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.kde.kdeconnect_tp"
-    android:versionCode="736"
-    android:versionName="0.7.3.6">
+    android:versionCode="808"
+    android:versionName="0.8h">
 
     <uses-sdk android:minSdkVersion="9"
-              android:targetSdkVersion="21" />
+              android:targetSdkVersion="22" />
 
     <supports-screens
         android:smallScreens="true"
@@ -32,6 +32,7 @@
         android:allowBackup="true"
         android:icon="@drawable/icon"
         android:label="KDE Connect"
+        android:theme="@style/KdeConnectTheme"
         >
 
         <service
@@ -40,7 +41,6 @@
         </service>
 
         <activity
-            android:theme="@style/Theme.AppCompat"
             android:name="org.kde.kdeconnect.UserInterface.MainActivity"
             android:label="KDE Connect" >
 
@@ -60,7 +60,6 @@
         </activity>
 
         <activity
-                android:theme="@style/Theme.AppCompat"
                 android:name="org.kde.kdeconnect.UserInterface.DeviceActivity"
                 android:label="@string/device"
                 android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity"
@@ -70,7 +69,6 @@
         </activity>
 
         <activity
-            android:theme="@style/Theme.AppCompat"
             android:name="org.kde.kdeconnect.UserInterface.PairActivity"
             android:label="@string/pair_device"
             android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity"
@@ -81,7 +79,7 @@
 
         <activity
             android:name="org.kde.kdeconnect.UserInterface.SettingsActivity"
-            android:label="@string/settings"
+            android:label="@string/device_menu_plugins"
             android:parentActivityName="org.kde.kdeconnect.UserInterface.DeviceActivity"
             >
             <meta-data android:name="android.support.PARENT_ACTIVITY"
@@ -101,7 +99,7 @@
 
         <activity
             android:name="org.kde.kdeconnect.UserInterface.PluginSettingsActivity"
-            android:label="@string/mpris_settings"
+            android:label="@string/device_menu_plugins"
             android:parentActivityName="org.kde.kdeconnect.UserInterface.SettingsActivity"
             >
             <meta-data android:name="android.support.PARENT_ACTIVITY"
@@ -136,7 +134,6 @@
         <!-- Plugin-related activities and services -->
 
         <activity
-            android:theme="@style/Theme.AppCompat"
             android:name="org.kde.kdeconnect.Plugins.MprisPlugin.MprisActivity"
             android:label="@string/remote_control"
             android:parentActivityName="org.kde.kdeconnect.UserInterface.DeviceActivity"
@@ -146,7 +143,6 @@
         </activity>
 
         <activity
-            android:theme="@style/Theme.AppCompat"
             android:name="org.kde.kdeconnect.Plugins.MousePadPlugin.MousePadActivity"
             android:label="@string/remote_control"
             android:windowSoftInputMode="stateHidden|adjustResize"
@@ -159,8 +155,7 @@
         </activity>
 
         <activity
-            android:theme="@style/Theme.AppCompat"
-            android:name="org.kde.kdeconnect.UserInterface.ShareToReceiver"
+            android:name="org.kde.kdeconnect.Plugins.SharePlugin.ShareActivity"
             android:label="KDE Connect"
             >
             <intent-filter>
@@ -182,6 +177,14 @@
             </intent-filter>
         </service>
 
+        <activity
+            android:name="org.kde.kdeconnect.Plugins.NotificationsPlugin.NotificationFilterActivity"
+            android:label="@string/title_activity_notification_filter"
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.PluginSettingsActivity" >
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.kde.kdeconnect.UserInterface.PluginSettingsActivity" />
+        </activity>
 
     </application>
 

README.md

@@ -0,0 +1,25 @@
+# KDE Connect - Android app
+
+KDE Connect is a multi-platform app that allows your devices to communicate (eg: your phone and your computer).
+
+## (Some) Features
+- **Shared clipboard**: copy and paste between your phone and your computer (or any other device).
+- **Notification sync**: Read your Android notifications from the desktop.
+- **Share files and URLs** instantly from one device to another.
+- **Multimedia remote control**: Use your phone as a remote for Linux media players.
+- **Virtual touchpad**: Use your phone screen as your computer's touchpad.
+
+All this without wires, over the already existing WiFi network, and using a secure, encrypted protocol.
+
+## About this app
+
+This is a native Android port of the KDE Connect Qt app. You will find a more complete readme about KDE Connect [here](https://github.com/albertvaka/kdeconnect-kde).
+
+## How to install this app
+
+You can install this app from the [Play Store](https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp) as well as [F-Droid](https://f-droid.org/repository/browse/?fdid=org.kde.kdeconnect_tp). Note you will also need to install the [desktop app](https://github.com/albertvaka/kdeconnect-kde) for it to work.
+
+## License
+[GNU GPL v2](https://www.gnu.org/licenses/gpl-2.0.html) and [GNU GPL v3](https://www.gnu.org/licenses/gpl-3.0.html)
+
+If you are reading this from Github, you should know that this is just a mirror of the [KDE Project repo](https://projects.kde.org/projects/playground/base/kdeconnect-android/repository/).

StaticMessages.sh

@@ -15,7 +15,7 @@ function export_pot_file # First parameter will be the path of the pot file we h
 function import_po_files # First parameter will be a path that will contain several .po files with the format LANG.po
 {
 	podir=$1
-	a2po import --android res/ --gettext $podir
+	a2po import --ignore-fuzzy --android res/ --gettext $podir
 }
 
 

build.gradle

@@ -3,18 +3,18 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.+' //Update to 14 when Studio 0.9 gets to beta
+        classpath 'com.android.tools.build:gradle:1.1.0'
     }
 }
 
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion '21.1.1'
+    compileSdkVersion 22
+    buildToolsVersion '22.0.1'
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 21
+        targetSdkVersion 22
     }
 	sourceSets {
         main {
@@ -24,18 +24,24 @@ android {
             res.srcDirs = ['res']
             assets.srcDirs = ['assets']
         }
+        androidTest {
+            java.srcDirs = ['tests']
+        }
     }
     packagingOptions {
-        exclude "META-INF/DEPENDENCIES"
-        exclude "META-INF/NOTICE"
-        exclude "META-INF/LICENSE"
-        exclude "META-INF/LICENSE.txt"
-        exclude "META-INF/NOTICE.txt"
+        pickFirst "META-INF/DEPENDENCIES"
+        pickFirst "META-INF/LICENSE"
+        pickFirst "META-INF/NOTICE"
     }
     lintOptions {
         abortOnError false
+        checkReleaseBuilds false
     }
     buildTypes {
+        release {
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'),'proguard-rules.pro'
+        }
     }
 }
 
@@ -43,11 +49,18 @@ dependencies {
     repositories {
         mavenCentral()
     }
-    compile 'com.android.support:support-v4:21.0.2'
-    compile 'com.android.support:appcompat-v7:21.0.2'
+    compile 'com.android.support:support-v4:22.2.0'
+    compile 'com.android.support:appcompat-v7:22.2.0'
     compile 'org.apache.mina:mina-core:2.0.9'
     compile 'org.apache.sshd:sshd-core:0.8.0'
     compile 'org.bouncycastle:bcprov-jdk16:1.46'
 
+
+    androidTestCompile 'org.mockito:mockito-core:1.10.19'
+
+    // Because mockito has some problems with dex environment
+    androidTestCompile 'com.google.dexmaker:dexmaker:1.1'
+    androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.1'
+
     //compile fileTree(dir: 'libs', include: '*.jar')
 }

proguard-rules.pro

@@ -0,0 +1,28 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in {SDKHOME}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Allow obfuscation of android.support.v7.internal.view.menu.**
+# to avoid problem on Samsung 4.2.2 devices with appcompat v21
+# see https://code.google.com/p/android/issues/detail?id=78377
+-keep class !android.support.v7.internal.view.menu.**,** {*;}
+
+-dontwarn org.apache.sshd.**
+-dontwarn org.apache.mina.**
+-dontwarn org.bouncycastle.**
+-dontwarn org.slf4j.**
+

res/layout/activity_mousepad.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:keepScreenOn="true"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -19,9 +20,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         class="org.kde.kdeconnect.Plugins.MousePadPlugin.KeyListenerView"
-        android:id="@+id/keyListener"
-        android:layout_alignParentTop="true"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="58dp" />
+        android:id="@+id/keyListener" />
 
 </RelativeLayout>

res/layout/activity_notification_filter.xml

@@ -0,0 +1,22 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
+    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    tools:context="org.kde.kdeconnect.Plugins.NotificationsPlugin.NotificationFilterActivity">
+
+    <TextView
+        android:text="@string/filter_apps_info"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingBottom="5dp"
+        android:id="@+id/tFilter"/>
+
+    <ListView
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:id="@+id/lvFilterApps"
+        android:layout_below="@id/tFilter"/>
+
+</RelativeLayout>

res/layout/custom_ip_list.xml

@@ -9,7 +9,7 @@
 
     <ListView
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_height="0dp"
         android:id="@android:id/list"
         android:layout_weight="1"
     />
@@ -23,6 +23,7 @@
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:imeOptions="actionSend"
+            android:hint="@string/add_host_hint"
             android:id="@+id/ip_edittext"/>
 
     <Button

res/layout/mpris_control.xml

@@ -12,6 +12,14 @@
     android:paddingRight="60dip"
     android:paddingBottom="5dip">
 
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:text="@string/no_players_connected"
+        android:id="@+id/no_players"
+        android:layout_gravity="center_horizontal" />
+
     <Spinner
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -88,12 +96,49 @@
 
     </LinearLayout>
 
+    <LinearLayout
+        android:orientation="horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/progress_slider">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:id="@+id/progress_textview"
+            android:singleLine="true"
+            android:gravity="center"
+            android:padding="8dip"
+            android:layout_gravity="center"
+            android:text="00:00" />
+
+        <SeekBar
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:id="@+id/positionSeek"
+            android:layout_weight="1"
+            android:layout_gravity="center" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:id="@+id/time_textview"
+            android:singleLine="true"
+            android:gravity="center"
+            android:padding="8dip"
+            android:layout_gravity="center"
+            android:text="00:00" />
+    </LinearLayout>
+
     <LinearLayout
             android:orientation="horizontal"
             android:layout_width="match_parent"
-            android:layout_height="70dip"
+            android:layout_height="wrap_content"
             android:id="@+id/volume_layout"
-            android:layout_gravity="center">
+            android:layout_gravity="center"
+        android:layout_marginTop="8dip">
 
         <ImageView
             android:layout_width="30dip"

res/values-ar/strings.xml

@@ -0,0 +1,104 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+  <string name="pref_plugin_telephony">مُخطِر المهاتفة</string>
+  <string name="pref_plugin_telephony_desc">أرسل إخطارات لرسائل SMS والمكالمات</string>
+  <string name="pref_plugin_battery">تقرير البطّاريّة</string>
+  <string name="pref_plugin_battery_desc">بلّغ عن حالة البطّاريّة دوريًّا</string>
+  <string name="pref_plugin_sftp">اكشف نظام الملفّات</string>
+  <string name="pref_plugin_sftp_desc">تسمح بتصفّح نظام ملفّات الهاتف عن بعد</string>
+  <string name="pref_plugin_clipboard">مزامنة الحافظة</string>
+  <string name="pref_plugin_clipboard_desc">شارك محتوى الحافظة</string>
+  <string name="pref_plugin_mousepad">الدَّخل البعيد</string>
+  <string name="pref_plugin_mousepad_desc">استخدم هاتفك كفأرة ولوحة مفاتيح</string>
+  <string name="pref_plugin_mpris_desc">تحكّم بالصّوت والصّورة من هاتفك</string>
+  <string name="pref_plugin_ping">وخزة</string>
+  <string name="pref_plugin_ping_desc">أرسل واستقبل وخزات</string>
+  <string name="pref_plugin_notifications">مزامنة الإخطارات</string>
+  <string name="pref_plugin_notifications_desc">انفذ إلى إخطاراتك من أجهزة أخرى</string>
+  <string name="plugin_not_available">هذه الميزة غير متوفّرة في إصدار أندرويد لديك</string>
+  <string name="device_list_empty">لا أجهزة</string>
+  <string name="ok">حسنًا</string>
+  <string name="cancel">ألغِ</string>
+  <string name="open_settings">افتح الإعدادات</string>
+  <string name="no_permissions">عليك إعطاء التّطبيق صلاحيّات للنّفاذ إلى الإخطارات</string>
+  <string name="send_ping">أرسل وخزة</string>
+  <string-array name="mousepad_tap_entries">
+    <item/>
+    <item/>
+    <item>Nothing</item>
+  </string-array>
+  <string name="category_connected_devices">الأجهزة المقترن بها</string>
+  <string name="category_not_paired_devices">الأجهزة المتوفّرة</string>
+  <string name="category_remembered_devices">الأجهزة المتذكَّرة</string>
+  <string name="plugins_failed_to_load">فشل تحميل الملحقات (المس لمعلومات اكثر):</string>
+  <string name="device_menu_unpair">أزل الاقتران</string>
+  <string name="device_not_reachable">الجهاز المقترن غير قابل الوصول</string>
+  <string name="unknown_device">جهاز مجهول</string>
+  <string name="error_not_reachable">الجهاز غير قابل الوصول</string>
+  <string name="error_already_requested">طُلب الاقتران بالفعل</string>
+  <string name="error_already_paired">الجهاز مقترن بالفعل</string>
+  <string name="error_could_not_send_package">تعذّر إرسال الحزمة</string>
+  <string name="error_timed_out">انتهت المهلة</string>
+  <string name="error_canceled_by_user">ألغاه المستخدم</string>
+  <string name="error_canceled_by_other_peer">ألغاه ندّ آخر</string>
+  <string name="error_invalid_key">استُقبل مفتاح غير صالح</string>
+  <string name="pair_requested">طُلب الاقتران</string>
+  <string name="pairing_request_from">طلب اقتران من %1s</string>
+  <string name="received_url_title">استُلمت وصلة من %1s</string>
+  <string name="received_url_text">المس لفتح \'%1s\'</string>
+  <string name="incoming_file_title">ملفّ وارد من %1s</string>
+  <string name="incoming_file_text">%1s</string>
+  <string name="received_file_title">استُلم ملفّ من %1s</string>
+  <string name="received_file_text">المس لفتح \'%1s\'</string>
+  <string name="tap_to_answer">المس للإجابة</string>
+  <string name="reconnect">أعد الاتّصال</string>
+  <string name="right_click">أرسل نقرة باليمين</string>
+  <string name="middle_click">أرسل نقرة بالوسط</string>
+  <string name="show_keyboard">أظهر لوحة المفاتيح</string>
+  <string name="device_not_paired">الجهاز غير مقترن</string>
+  <string name="request_pairing">اطلب الاقتران</string>
+  <string name="pairing_accept">اقبل</string>
+  <string name="pairing_reject">ارفض</string>
+  <string name="device">الجهاز</string>
+  <string name="pair_device">اقرن الجهاز</string>
+  <string name="remote_control">التّحكّم البعيد</string>
+  <string name="settings">إعدادات كدي المتّصل</string>
+  <string name="mpris_play">شغّل</string>
+  <string name="mpris_previous">السّابق</string>
+  <string name="mpris_rew">رجوع</string>
+  <string name="mpris_ff">تقدّم سريع</string>
+  <string name="mpris_next">التّالي</string>
+  <string name="mpris_volume">المستوى</string>
+  <string name="mpris_settings">إعدادات الوسائط المتعدّدة</string>
+  <string-array name="mpris_time_entries">
+    <item>10 ثوان</item>
+    <item>20 ثانية</item>
+    <item>30 ثانية</item>
+    <item>دقيقة واحدة</item>
+    <item>دقيقتان</item>
+  </string-array>
+  <string name="share_to">شارك مع...</string>
+  <string name="protocol_version_older">يستخدم هذا الجهاز إصدار ميفاق أقدم</string>
+  <string name="protocol_version_newer">يستخدم هذا الجهاز إصدار ميفاق أحدث</string>
+  <string name="general_settings">إعدادات عامّة</string>
+  <string name="plugin_settings">إعدادات</string>
+  <string name="plugin_settings_with_name">إعدادات %s</string>
+  <string name="device_name">اسم الجهاز</string>
+  <string name="device_name_preference_summary">%s</string>
+  <string name="invalid_device_name">اسم جهاز غير صالح</string>
+  <string name="shareplugin_text_saved">استُقبل نصّ، حُفظ إلى الحافظة</string>
+  <string name="custom_devices_settings">قائمة أجهزة مخصّصة</string>
+  <string name="custom_device_list">أضف أجهزة بميفاق الإنترنت م​إ</string>
+  <string name="share_notification_preference">إخطارات مزعجة</string>
+  <string name="share_notification_preference_summary">اهتزّ وشغّل صوتًا عند استقبال ملفّ</string>
+  <string name="sftp_internal_storage">التّخزين الدّاخليّ</string>
+  <string name="sftp_all_files">كلّ الملفّات</string>
+  <string name="sftp_sdcard_num">بطاقة SD ‏%d</string>
+  <string name="sftp_sdcard">بطاقة SD</string>
+  <string name="sftp_readonly">(للقراءة فقط)</string>
+  <string name="sftp_camera">صور الكاميرا</string>
+  <string name="add_host">أضف مضيفًا/م​إ</string>
+  <string name="no_players_connected">لم يُعثر على مشغّلات</string>
+  <string name="custom_dev_list_help">استخدم هذا الخيار فقط إن لم يُكتَشف جهازك آليًّا. أدخِل عنوان م​إ أو اسم المضيف أدناه والمس الزرّ لإضافته إلى القائمة. المس عنصرًا موجودًا لإزالته من القائمة.</string>
+  <string name="mpris_player_on_device">%1$s على %2$s</string>
+</resources>

res/values-bg/strings.xml

@@ -8,8 +8,6 @@
   <string name="pref_plugin_sftp_desc">Позволява отдалечен достъп до файловата система на телефона</string>
   <string name="pref_plugin_clipboard">Синхронизиране на буфера</string>
   <string name="pref_plugin_clipboard_desc">Споделяне съдържанието на буфера</string>
-  <string name="pref_plugin_mousepad">Отдалечен контрол</string>
-  <string name="pref_plugin_mpris">Отдалечен мултимедиен контрол</string>
   <string name="pref_plugin_mpris_desc">Управление на звук/видео от телефона</string>
   <string name="pref_plugin_ping">Пинг</string>
   <string name="pref_plugin_ping_desc">Изпращане и получаване на пинг</string>
@@ -22,15 +20,15 @@
   <string name="open_settings">Отваряне на настройките</string>
   <string name="no_permissions">Трябва да осигурите права за достъп до уведомленията</string>
   <string name="send_ping">Изпращане на пинг</string>
-  <string name="open_mpris_controls">Отваряне на отдалечен контрол</string>
-  <string name="open_mousepad">Отваряне на отдалечен контрол</string>
+  <string-array name="mousepad_tap_entries">
+    <item>Right click</item>
+    <item>Middle click</item>
+    <item>Nothing</item>
+  </string-array>
   <string name="category_connected_devices">Свързани устройства</string>
-  <string name="category_not_paired_devices">Несдвоени устройства</string>
   <string name="category_remembered_devices">Запомнени устройства</string>
   <string name="plugins_failed_to_load">Неуспешно зареждане на приставки (докоснете за подробности)</string>
-  <string name="device_menu_plugins">Изберете приставки</string>
   <string name="device_menu_unpair">Разкачване</string>
-  <string name="device_not_reachable">Устройството е недостъпно</string>
   <string name="unknown_device">Неизвестно устройство</string>
   <string name="error_not_reachable">Устройството е недостъпно</string>
   <string name="error_already_requested">Вече е заявено сдвояване</string>
@@ -42,8 +40,6 @@
   <string name="error_invalid_key">Получен е неправилен ключ</string>
   <string name="pair_requested">Заявено е сдвояване</string>
   <string name="pairing_request_from">Заявено е сдвояване от %1s</string>
-  <string name="incoming_file_title">Заявено е сдвояване от %1s</string>
-  <string name="incoming_file_text">%s</string>
   <string name="tap_to_answer">Докоснете за да отговорите</string>
   <string name="reconnect">Ново свързване</string>
   <string name="device_not_paired">Устройството не е сдвоено</string>
@@ -60,20 +56,6 @@
   <string name="mpris_ff">Превъртане напред</string>
   <string name="mpris_next">Следващ</string>
   <string name="mpris_volume">Сила на звука</string>
-  <string name="mpris_settings">Отдалечен мултимедиен контрол</string>
-  <string name="share_to">Споделяне...</string>
-  <string name="protocol_version_older">Това устройство използва стара версия на протокола</string>
-  <string name="protocol_version_newer">Това устройство използва по-нова версия на протокола</string>
-  <string name="general_settings">Общи настройки</string>
-  <string name="plugin_settings">Общи настройки</string>
-  <string name="plugin_settings_with_name">Отваряне на настройките</string>
-  <string name="device_name">Име на устройството</string>
-  <string name="device_name_preference_summary">%s</string>
-  <string name="invalid_device_name">Невалидно име на устройство</string>
-  <string name="custom_devices_settings">Няма устройства</string>
-  <string name="custom_device_list">Няма устройства</string>
-  <string name="custom_device_list_summary">Няма устройства</string>
-  <string name="share_notification_preference">Синхронизиране на уведомленията</string>
   <string-array name="mpris_time_entries">
     <item>10 seconds</item>
     <item>20 seconds</item>
@@ -81,4 +63,11 @@
     <item>1 minute</item>
     <item>2 minutes</item>
   </string-array>
+  <string name="share_to">Споделяне...</string>
+  <string name="protocol_version_older">Това устройство използва стара версия на протокола</string>
+  <string name="protocol_version_newer">Това устройство използва по-нова версия на протокола</string>
+  <string name="general_settings">Общи настройки</string>
+  <string name="device_name">Име на устройството</string>
+  <string name="device_name_preference_summary">%s</string>
+  <string name="invalid_device_name">Невалидно име на устройство</string>
 </resources>

res/values-bs/strings.xml

@@ -1,16 +1,121 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
+  <string name="pref_plugin_telephony">Telefonski obavještavač</string>
+  <string name="pref_plugin_telephony_desc">Pošalji notifikacije za SMS i pozive</string>
   <string name="pref_plugin_battery">Baterijski izvještaj</string>
   <string name="pref_plugin_battery_desc">Periodično javi baterijski status</string>
+  <string name="pref_plugin_sftp">Otkrivanje datotečnog sistema</string>
+  <string name="pref_plugin_sftp_desc">Dopušta daljinsko pretraživanje datotečnog sistema telefona</string>
+  <string name="pref_plugin_clipboard">Sinhronizovanje sandučića</string>
+  <string name="pref_plugin_clipboard_desc">Podijeli sadržaj sandučića</string>
+  <string name="pref_plugin_mousepad">Daljinska kontrola ulaza</string>
+  <string name="pref_plugin_mousepad_desc">Koristi telofon kao miš i tastaturu</string>
+  <string name="pref_plugin_mpris_desc">Upravljajte zvukom/slikom sa vašeg telefona</string>
   <string name="pref_plugin_ping">Ping</string>
   <string name="pref_plugin_ping_desc">Šalji i primaj ping-ove</string>
   <string name="pref_plugin_notifications">Sinhronizovano obavještenje</string>
-  <string name="share_notification_preference">Sinhronizovano obavještenje</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>
+  <string name="pref_plugin_notifications_desc">Pristupite vašim notifikacijama sa drugog uređaja</string>
+  <string name="plugin_not_available">Ovo svojstvo nije dostupno i vašoj Android verziji</string>
+  <string name="device_list_empty">Nema uređaja</string>
+  <string name="ok">OK</string>
+  <string name="cancel">Prekini</string>
+  <string name="open_settings">Otvori postavke</string>
+  <string name="no_permissions">Morate odobriti dopuštenje da pristupite notifikacijama</string>
+  <string name="send_ping">Pošalji ping</string>
+  <string name="mousepad_info">Pomjerite prst na ekranu da opmjerite kursor miša. Tapnite za klik i koristite dva ili tri prsta za srednje i desno dugme. Koristite dugi pritisak za prevlačenje.</string>
+  <string name="mousepad_double_tap_settings_title">Postavite akciju tapa sa dva prsta</string>
+  <string name="mousepad_triple_tap_settings_title">Postavite akciju tapa sa tri prsta</string>
+  <string-array name="mousepad_tap_entries">
+    <item>Desni klik</item>
+    <item>Srednji klik</item>
+    <item>Ništa</item>
   </string-array>
+  <string name="mousepad_double_default">desno</string>
+  <string name="mousepad_triple_default">Srednje</string>
+  <string name="category_connected_devices">Spojeni uređaji</string>
+  <string name="category_not_paired_devices">Dostupni uređaji</string>
+  <string name="category_remembered_devices">Zapamćeni uređaji</string>
+  <string name="plugins_failed_to_load">Dodaci se nisu uspjeli učitati (kucnite za više informacija):</string>
+  <string name="device_menu_plugins">Postavke dodatka</string>
+  <string name="device_menu_unpair">Razdvoji</string>
+  <string name="device_not_reachable">Upareni uređaj nije dostupan</string>
+  <string name="unknown_device">Nepoznat uređaj</string>
+  <string name="error_not_reachable">Uređaj nije dostupan</string>
+  <string name="error_already_requested">Uparivanje već zatraženo</string>
+  <string name="error_already_paired">Uređaj već uparen</string>
+  <string name="error_could_not_send_package">Nije moguće poslati paket</string>
+  <string name="error_timed_out">Isteklo</string>
+  <string name="error_canceled_by_user">Prekinuo korisnik</string>
+  <string name="error_canceled_by_other_peer">Prekinuo drugi korisnik</string>
+  <string name="error_invalid_key">Primljen pogrešan ključ</string>
+  <string name="pair_requested">Uparivanje zatraženo</string>
+  <string name="pairing_request_from">Uparivanje zatraženo od %1s</string>
+  <string name="received_url_title">Primljena veza od %1s</string>
+  <string name="received_url_text">Kucni za otvaranje \'%1s\'</string>
+  <string name="incoming_file_title">Dolazna datoteka od %1s</string>
+  <string name="incoming_file_text">%1s</string>
+  <string name="outgoing_file_title">Slanje datoteke na %1s</string>
+  <string name="outgoing_file_text">%1s</string>
+  <string name="received_file_title">Primljena datoteka od %1s</string>
+  <string name="received_file_text">Kucni za otvaranje \'%1s\'</string>
+  <string name="sent_file_title">Poslana datoteka na %1s</string>
+  <string name="sent_file_text">%1s</string>
+  <string name="sent_file_failed_title">Neuspjelo slanje datoteke %1s</string>
+  <string name="sent_file_failed_text">%1s</string>
+  <string name="tap_to_answer">Kucni za odgovor</string>
+  <string name="reconnect">Ponovo uspostavi vezu</string>
+  <string name="right_click">Pošalji Desni Klik</string>
+  <string name="middle_click">Pošalji Srednji Klik</string>
+  <string name="show_keyboard">Pokaži Tastaturu</string>
+  <string name="device_not_paired">Uređaj nije uparen</string>
+  <string name="request_pairing">Zatraži uparivanje</string>
+  <string name="pairing_accept">Prihvati</string>
+  <string name="pairing_reject">Odbij</string>
+  <string name="device">Uređaj</string>
+  <string name="pair_device">Upari uređaj</string>
+  <string name="remote_control">Daljinska kontrola</string>
+  <string name="settings">KDE Postavke Veze</string>
+  <string name="mpris_play">Reprodukuj</string>
+  <string name="mpris_previous">Prethodni</string>
+  <string name="mpris_rew">Premotaj</string>
+  <string name="mpris_ff">Ubrzano</string>
+  <string name="mpris_next">Sljedeći</string>
+  <string name="mpris_volume">Glasnoća</string>
+  <string name="mpris_settings">Postavke multimedije</string>
+  <string name="mpris_time_settings_title">Dugmad za naprijed/premotavanje</string>
+  <string name="mpris_time_settings_summary">Postavi vrijeme na ubrzano ili premotaj multimedijalnu datoteku.</string>
+  <string-array name="mpris_time_entries">
+    <item>10 sekundi</item>
+    <item>20 sekundi</item>
+    <item>30 sekundi</item>
+    <item>1 minuta</item>
+    <item>2 minute</item>
+  </string-array>
+  <string name="share_to">Podijeli na...</string>
+  <string name="protocol_version_older">Ovaj uređaj koristi staru verziju protokola</string>
+  <string name="protocol_version_newer">Ovaj uređaj koristi noviju verziju protokola</string>
+  <string name="general_settings">Opšte postavke</string>
+  <string name="plugin_settings">Postavke</string>
+  <string name="plugin_settings_with_name">%s Postavke</string>
+  <string name="device_name">Naziv uređaja</string>
+  <string name="device_name_preference_summary">%s</string>
+  <string name="invalid_device_name">Pogrešnan naziv uređaja</string>
+  <string name="shareplugin_text_saved">Primljeni tekst, spašen u ormarić</string>
+  <string name="custom_devices_settings">Lista vlastitih uređaja</string>
+  <string name="custom_device_list">Dodaj uređaje po IP</string>
+  <string name="share_notification_preference">Glasne notifikacije</string>
+  <string name="share_notification_preference_summary">Vibriraj i reprodukuj zvuk kad se prima datoteka</string>
+  <string name="title_activity_notification_filter">Filter napomena</string>
+  <string name="filter_apps_info">Notifikacije će biti sinhronizovane s izabranim aplikacijama.</string>
+  <string name="sftp_internal_storage">Unutrašnji smještaj</string>
+  <string name="sftp_all_files">Sve fajlove</string>
+  <string name="sftp_sdcard_num">SD kartica %d</string>
+  <string name="sftp_sdcard">SD kartica</string>
+  <string name="sftp_readonly">(samo za čitanje)</string>
+  <string name="sftp_camera">Slike sa kamere</string>
+  <string name="add_host">Dodaj host/IP</string>
+  <string name="add_host_hint">IP ili ime računara</string>
+  <string name="no_players_connected">Nema nađenih igrača</string>
+  <string name="custom_dev_list_help">Koristite ovu opciju samo ako vaš uređaj nije automatski otkriven. Unesite IP adresu ili ime hosta i dodirnite dugme da dodate na listu. Dodirnite postojeće dume da uklonite s liste.</string>
+  <string name="mpris_player_on_device">%1$s na %2$s</string>
 </resources>

res/values-ca/strings.xml

@@ -10,14 +10,14 @@
   <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 com un ratolí i un teclat</string>
-  <string name="pref_plugin_mpris">Comandament a distància multimèdia</string>
+  <string name="pref_plugin_mpris">Controls multimèdia</string>
   <string name="pref_plugin_mpris_desc">Controla l\'àudio i el vídeo del vostre telèfon</string>
   <string name="pref_plugin_ping">Ping</string>
   <string name="pref_plugin_ping_desc">Envia i rep els pings</string>
   <string name="pref_plugin_notifications">Sincronitza les notificacions</string>
   <string name="pref_plugin_notifications_desc">Accedeix a les vostres notificacions des d\'altres dispositius</string>
-  <string name="pref_plugin_sharereceiver">Receptor de compartits</string>
-  <string name="pref_plugin_sharereceiver_desc">Desa els fitxers entrants a l\'emmagatzematge del telèfon</string>
+  <string name="pref_plugin_sharereceiver">Comparteix i rep</string>
+  <string name="pref_plugin_sharereceiver_desc">Comparteix els fitxers i els URL entre els dispositius</string>
   <string name="plugin_not_available">Aquesta característica no està disponible en la vostra versió d\'Android</string>
   <string name="device_list_empty">No hi ha cap dispositiu</string>
   <string name="ok">D\'acord</string>
@@ -25,18 +25,23 @@
   <string name="open_settings">Obre l\'arranjament</string>
   <string name="no_permissions">Us caldrà concedir permís per accedir a les notificacions</string>
   <string name="send_ping">Envia un ping</string>
-  <string name="open_mpris_controls">Obre el comandament a distància</string>
-  <string name="open_mousepad">Obre el control pel plafó tàctil</string>
-  <string name="mousepad_info">Moveu un dit per la pantalla per a moure el cursor del ratolí</string>
+  <string name="open_mpris_controls">Control multimèdia</string>
+  <string name="open_mousepad">Entrada remota</string>
+  <string name="mousepad_info">Moveu un dit per la pantalla per a moure el cursor del ratolí. Toqueu per un clic, i empreu dos/tres dits pels botons dret i mig. Empreu un toc llarg per arrossegar i deixar anar.</string>
   <string name="mousepad_double_tap_settings_title">Estableix l\'acció de tocar amb dos dits</string>
   <string name="mousepad_triple_tap_settings_title">Estableix l\'acció de tocar amb tres dits</string>
-  <string name="mousepad_right_click">Clic dret</string>
-  <string name="mousepad_middle_click">Clic del mig</string>
+  <string-array name="mousepad_tap_entries">
+    <item>Clic dret</item>
+    <item>Clic del mig</item>
+    <item>No fer res</item>
+  </string-array>
+  <string name="mousepad_double_default">dret</string>
+  <string name="mousepad_triple_default">mig</string>
   <string name="category_connected_devices">Dispositius connectats</string>
-  <string name="category_not_paired_devices">Dispositius sense aparellar</string>
+  <string name="category_not_paired_devices">Dispositius disponibles</string>
   <string name="category_remembered_devices">Dispositius recordats</string>
   <string name="plugins_failed_to_load">Els connectors han fallat en carregar-los (puntegeu per a més informació):</string>
-  <string name="device_menu_plugins">Selecció dels connectors</string>
+  <string name="device_menu_plugins">Arranjament del connector</string>
   <string name="device_menu_unpair">Desparella</string>
   <string name="device_not_reachable">No s\'ha pogut accedir al dispositiu parell</string>
   <string name="unknown_device">Dispositiu desconegut</string>
@@ -54,8 +59,15 @@
   <string name="received_url_text">Puntegeu per obrir «%1s»</string>
   <string name="incoming_file_title">Fitxer entrant des de %1s</string>
   <string name="incoming_file_text">%1s</string>
+  <string name="outgoing_file_title">S\'està enviant el fitxer a %1s</string>
+  <string name="outgoing_file_text">%1s</string>
   <string name="received_file_title">Fitxer rebut des de %1s</string>
+  <string name="received_file_fail_title">Ha fallat en rebre el fitxer des de %1s</string>
   <string name="received_file_text">Puntegeu per obrir «%1s»</string>
+  <string name="sent_file_title">Envia el fitxer a %1s</string>
+  <string name="sent_file_text">%1s</string>
+  <string name="sent_file_failed_title">Ha fallat en enviar el fitxer %1s</string>
+  <string name="sent_file_failed_text">%1s</string>
   <string name="tap_to_answer">Puntegeu per a respondre</string>
   <string name="reconnect">Reconnecta</string>
   <string name="right_click">Envia un clic del botó dret</string>
@@ -76,31 +88,8 @@
   <string name="mpris_next">Següent</string>
   <string name="mpris_volume">Volum</string>
   <string name="mpris_settings">Arranjament multimèdia</string>
-  <string name="mpris_time_settings_title">Interval de temps</string>
-  <string name="mpris_time_settings_summary">Ajusta el temps per avançar o rebobinar un fitxer multimèdia.</string>
-  <string name="share_to">Comparteix amb...</string>
-  <string name="protocol_version_older">Aquest dispositiu usa una versió antiga del protocol</string>
-  <string name="protocol_version_newer">Aquest dispositiu usa una versió nova del protocol</string>
-  <string name="general_settings">Arranjament general</string>
-  <string name="plugin_settings">Arranjament</string>
-  <string name="plugin_settings_with_name">Ajustaments de %s</string>
-  <string name="device_name">Nom del dispositiu</string>
-  <string name="device_name_preference_summary">%s</string>
-  <string name="invalid_device_name">El nom del dispositiu no és vàlid</string>
-  <string name="shareplugin_text_saved">S\'ha rebut text i s\'ha desat al porta-retalls</string>
-  <string name="custom_devices_settings">Llista personalitzada de dispositius</string>
-  <string name="custom_device_list">Llista personalitzada de dispositius</string>
-  <string name="custom_device_list_summary">Llista personalitzada de dispositius</string>
-  <string name="share_notification_preference">Rebombori de les notificacions</string>
-  <string name="share_notification_preference_summary">Vibra i reprodueix un so en rebre un fitxer</string>
-  <string name="sftp_internal_storage">Emmagatzematge intern</string>
-  <string name="sftp_all_files">Tots els fitxers</string>
-  <string name="sftp_sdcard_num">Targeta SD %d</string>
-  <string name="sftp_sdcard">Targeta SD</string>
-  <string name="sftp_readonly">(només de lectura)</string>
-  <string name="sftp_camera">Imatges de la càmera</string>
-  <string name="add_host">Afegeix una màquina/IP</string>
-  <string name="custom_dev_list_help">Empreu aquesta opció només si el dispositiu no és detectat automàticament. Introduïu a sota l\'adreça IP o nom de la màquina i premeu el botó per afegir-lo a la llista. Seleccioneu un element existent per eliminar-lo de la llista.</string>
+  <string name="mpris_time_settings_title">Botons per avançar o rebobinar</string>
+  <string name="mpris_time_settings_summary">Ajusta el temps per avançar o rebobinar quan es toca.</string>
   <string-array name="mpris_time_entries">
     <item>10 segons</item>
     <item>20 segons</item>
@@ -108,4 +97,31 @@
     <item>1 minut</item>
     <item>2 minuts</item>
   </string-array>
+  <string name="share_to">Comparteix amb...</string>
+  <string name="protocol_version_older">Aquest dispositiu usa una versió antiga del protocol</string>
+  <string name="protocol_version_newer">Aquest dispositiu usa una versió nova del protocol</string>
+  <string name="general_settings">Arranjament general</string>
+  <string name="plugin_settings">Arranjament</string>
+  <string name="plugin_settings_with_name">Ajustaments del %s</string>
+  <string name="device_name">Nom del dispositiu</string>
+  <string name="device_name_preference_summary">%s</string>
+  <string name="invalid_device_name">El nom del dispositiu no és vàlid</string>
+  <string name="shareplugin_text_saved">S\'ha rebut text i s\'ha desat al porta-retalls</string>
+  <string name="custom_devices_settings">Llista personalitzada de dispositius</string>
+  <string name="custom_device_list">Afegeix dispositius per la IP</string>
+  <string name="share_notification_preference">Rebombori de les notificacions</string>
+  <string name="share_notification_preference_summary">Vibra i reprodueix un so en rebre un fitxer</string>
+  <string name="title_activity_notification_filter">Filtre per a les notificacions</string>
+  <string name="filter_apps_info">Les notificacions se sincronitzaran per a les aplicacions seleccionades.</string>
+  <string name="sftp_internal_storage">Emmagatzematge intern</string>
+  <string name="sftp_all_files">Tots els fitxers</string>
+  <string name="sftp_sdcard_num">Targeta SD %d</string>
+  <string name="sftp_sdcard">Targeta SD</string>
+  <string name="sftp_readonly">(només de lectura)</string>
+  <string name="sftp_camera">Imatges de la càmera</string>
+  <string name="add_host">Afegeix una màquina/IP</string>
+  <string name="add_host_hint">Nom de la màquina o IP</string>
+  <string name="no_players_connected">No s\'ha trobat cap reproductor</string>
+  <string name="custom_dev_list_help">Empreu aquesta opció només si el dispositiu no és detectat automàticament. Introduïu a sota l\'adreça IP o nom de la màquina i premeu el botó per afegir-lo a la llista. Seleccioneu un element existent per eliminar-lo de la llista.</string>
+  <string name="mpris_player_on_device">%1$s sobre el %2$s</string>
 </resources>

res/values-cs/strings.xml

@@ -10,14 +10,14 @@
   <string name="pref_plugin_clipboard_desc">Sdílet obsah schránky</string>
   <string name="pref_plugin_mousepad">Vzdálený vstup</string>
   <string name="pref_plugin_mousepad_desc">Používejte svůj telefon jako myš a klávesnici</string>
-  <string name="pref_plugin_mpris">Vzdálené ovládání multimédií</string>
+  <string name="pref_plugin_mpris">Ovládání multimédií</string>
   <string name="pref_plugin_mpris_desc">Ovládejte audio/video z vašeho telefonu</string>
   <string name="pref_plugin_ping">Ping</string>
   <string name="pref_plugin_ping_desc">Posílat a přijímat ping</string>
   <string name="pref_plugin_notifications">Synchronizace upozornění</string>
   <string name="pref_plugin_notifications_desc">Zpřístupněte si upozornění z jiných zařízení</string>
-  <string name="pref_plugin_sharereceiver">Sdílet příjemce</string>
-  <string name="pref_plugin_sharereceiver_desc">Ukládat příchozí soubory do úložiště telefonu</string>
+  <string name="pref_plugin_sharereceiver">Sdílet s přijmnout</string>
+  <string name="pref_plugin_sharereceiver_desc">Sdílet soubory a odkazy mezi zařízeními</string>
   <string name="plugin_not_available">Tato vlastnost není pro vaši verzi Androidu platná</string>
   <string name="device_list_empty">Žádná zařízení</string>
   <string name="ok">OK</string>
@@ -25,18 +25,23 @@
   <string name="open_settings">Otevřít nastavení</string>
   <string name="no_permissions">Pro zpřístupnění upozornění potřebujete oprávnění</string>
   <string name="send_ping">Poslat ping</string>
-  <string name="open_mpris_controls">Otevřít vzdálené ovládání</string>
-  <string name="open_mousepad">Otevřít dotykové ovládání</string>
-  <string name="mousepad_info">Pohybujte prstem po monitoru pro pohybování kurzorem myši</string>
+  <string name="open_mpris_controls">Ovládání multimédií</string>
+  <string name="open_mousepad">Vzdálený vstup</string>
+  <string name="mousepad_info">Pohybujte prstem po obrazovce pro pohybování kurzorem myši. Ťukněte pro kliknutí a použijte dva/tři prsty jako pravé a prostřední tlačítko. Pro přetažení dlouze podržte.</string>
   <string name="mousepad_double_tap_settings_title">Nastavit činnost pro ťuknutí dvěma prsty</string>
   <string name="mousepad_triple_tap_settings_title">Nastavit činnost pro ťuknutí třemi prsty</string>
-  <string name="mousepad_right_click">Kliknutí pravým tlačítkem myši</string>
-  <string name="mousepad_middle_click">Kliknutí prostředním tlačítkem myši</string>
+  <string-array name="mousepad_tap_entries">
+    <item>Kliknutí pravým tlačítkem myši</item>
+    <item>Kliknutí prostředním tlačítkem myši</item>
+    <item>Nic</item>
+  </string-array>
+  <string name="mousepad_double_default">pravé</string>
+  <string name="mousepad_triple_default">prostřední</string>
   <string name="category_connected_devices">Připojená zařízení</string>
-  <string name="category_not_paired_devices">Nespárovaná zařízení</string>
+  <string name="category_not_paired_devices">Dostupná zařízení</string>
   <string name="category_remembered_devices">Zapamatovaná zařízení</string>
   <string name="plugins_failed_to_load">Moduly nebyly načteny (ťukněte pro více informací):</string>
-  <string name="device_menu_plugins">Vyberte moduly</string>
+  <string name="device_menu_plugins">Nastavení modulů</string>
   <string name="device_menu_unpair">Zrušit párování</string>
   <string name="device_not_reachable">Spárované zařízení je nedostupné</string>
   <string name="unknown_device">Neznámé zařízení</string>
@@ -54,8 +59,15 @@
   <string name="received_url_text">Ťukněte pro otevření \'%1s\'</string>
   <string name="incoming_file_title">Příchozí soubor od %1s</string>
   <string name="incoming_file_text">%1s</string>
+  <string name="outgoing_file_title">Odesílám soubor do %1s</string>
+  <string name="outgoing_file_text">%1s</string>
   <string name="received_file_title">Přijat soubor od %1s</string>
+  <string name="received_file_fail_title">Selhalo přijímání souboru od %1s</string>
   <string name="received_file_text">Ťukněte pro otevření \'%1s\'</string>
+  <string name="sent_file_title">Soubor byl odeslán do %1s</string>
+  <string name="sent_file_text">%1s</string>
+  <string name="sent_file_failed_title">Nelze odeslat soubor %1s</string>
+  <string name="sent_file_failed_text">%1s</string>
   <string name="tap_to_answer">Ťukněte pro odpovězení</string>
   <string name="reconnect">Znovu připojit</string>
   <string name="right_click">Poslat kliknutí pravým tlačítkem</string>
@@ -76,8 +88,15 @@
   <string name="mpris_next">Následující</string>
   <string name="mpris_volume">Hlasitost</string>
   <string name="mpris_settings">Nastavení multimédií</string>
-  <string name="mpris_time_settings_title">Časový interval</string>
-  <string name="mpris_time_settings_summary">Upravit čas pro rychlý posun multimediálním souborem vpřed a zpět.</string>
+  <string name="mpris_time_settings_title">Tlačítka vpřed/přetočit</string>
+  <string name="mpris_time_settings_summary">Upravit čas pro rychlý posun/přetočení při stisku.</string>
+  <string-array name="mpris_time_entries">
+    <item>10 sekund</item>
+    <item>20 sekund</item>
+    <item>30 sekund</item>
+    <item>1 minuta</item>
+    <item>2 minuty</item>
+  </string-array>
   <string name="share_to">Sdílet s...</string>
   <string name="protocol_version_older">Toto zařízení používá starou verzi protokolu</string>
   <string name="protocol_version_newer">Toto zařízení používá novější verzi protokolu</string>
@@ -89,10 +108,11 @@
   <string name="invalid_device_name">Neplatný název zařízení</string>
   <string name="shareplugin_text_saved">Přijatý text byl uložen do schránky</string>
   <string name="custom_devices_settings">Seznam vlastních zařízení</string>
-  <string name="custom_device_list">Seznam vlastních zařízení</string>
-  <string name="custom_device_list_summary">Seznam vlastních zařízení</string>
+  <string name="custom_device_list">Přidat zařízení podle IP</string>
   <string name="share_notification_preference">Hlasitá upozornění</string>
   <string name="share_notification_preference_summary">Vibrovat a přehrát melodii při přijímání souboru</string>
+  <string name="title_activity_notification_filter">Filtr upozornění</string>
+  <string name="filter_apps_info">Upozorňování mezi vybranými aplikacemi bude synchronizováno.</string>
   <string name="sftp_internal_storage">Interní úložiště</string>
   <string name="sftp_all_files">Všechny soubory</string>
   <string name="sftp_sdcard_num">SD karta %d</string>
@@ -100,12 +120,8 @@
   <string name="sftp_readonly">(pouze ke čtení)</string>
   <string name="sftp_camera">Obrázky z fotoaparátu</string>
   <string name="add_host">Přidat stroj/IP</string>
+  <string name="add_host_hint">Název hostitele nebo IP</string>
+  <string name="no_players_connected">Přehrávač nenalezen</string>
   <string name="custom_dev_list_help">Použijte tuto možnost pouze pokud není vaše zařízení automaticky detekováno. Zadejte níže IP adresu a název hostitele a stiskněte tlačítko pro přidání do seznamu. Stiskněte existující položku pro odstranění ze seznamu.</string>
-  <string-array name="mpris_time_entries">
-    <item>10 sekund</item>
-    <item>20 sekund</item>
-    <item>30 sekund</item>
-    <item>1 minuta</item>
-    <item>2 minuty</item>
-  </string-array>
+  <string name="mpris_player_on_device">%1$s na %2$s</string>
 </resources>

res/values-da/strings.xml

@@ -8,15 +8,13 @@
   <string name="pref_plugin_sftp_desc">Muliggør at gennemsøge telefonens filsystem eksternt</string>
   <string name="pref_plugin_clipboard">Synk. af udklipsholder</string>
   <string name="pref_plugin_clipboard_desc">Del indholdet af udklipsholderen</string>
-  <string name="pref_plugin_mousepad">Fjernbetjening</string>
-  <string name="pref_plugin_mpris">Fjernbetjening af multimedie</string>
+  <string name="pref_plugin_mousepad">Eksternt input</string>
+  <string name="pref_plugin_mousepad_desc">Brug din telefon som mus og tastatur</string>
   <string name="pref_plugin_mpris_desc">Styr lyd og video fra din telefon</string>
   <string name="pref_plugin_ping">Ping</string>
   <string name="pref_plugin_ping_desc">Send og modtag ping</string>
   <string name="pref_plugin_notifications">Synk. af bekendtgørelser</string>
   <string name="pref_plugin_notifications_desc">Tilgå dine bekendtgørelser fra andre enheder</string>
-  <string name="pref_plugin_sharereceiver">Del modtager</string>
-  <string name="pref_plugin_sharereceiver_desc">Gem indkommende filer til telefonens lager</string>
   <string name="plugin_not_available">Denne funktion er ikke tilgængelig i din Android-version</string>
   <string name="device_list_empty">Ingen enheder</string>
   <string name="ok">O.k.</string>
@@ -24,16 +22,21 @@
   <string name="open_settings">Åbn indstillinger</string>
   <string name="no_permissions">Du skal give tilladelse for at tilgå bekendtgørelser</string>
   <string name="send_ping">Send ping</string>
-  <string name="open_mpris_controls">Åbn fjernbetjening</string>
-  <string name="open_mousepad">Åbn touchpad-kontrol</string>
-  <string name="mousepad_info">Bevæg en finger på skærmen for at flytte musemarkøren</string>
-  <string name="mousepad_right_click">Send højreklik</string>
-  <string name="mousepad_middle_click">Send midterklik</string>
+  <string name="mousepad_info">Bevæg en finger på skærmen for at flytte musemarkøren. Tap for at klikke og brug to/tre-fingre for højre og midterste museknap. Brug et langt tryk til at trække og slippe.</string>
+  <string name="mousepad_double_tap_settings_title">Angiv handling for tap med to fingre</string>
+  <string name="mousepad_triple_tap_settings_title">Angiv handling for tap med tre fingre</string>
+  <string-array name="mousepad_tap_entries">
+    <item>Højreklik</item>
+    <item>Midterklik</item>
+    <item>Intet</item>
+  </string-array>
+  <string name="mousepad_double_default">højre</string>
+  <string name="mousepad_triple_default">midter</string>
   <string name="category_connected_devices">Forbundne enheder</string>
-  <string name="category_not_paired_devices">Ikke parrede enheder</string>
+  <string name="category_not_paired_devices">Tilgængelig enheder</string>
   <string name="category_remembered_devices">Huskede enheder</string>
   <string name="plugins_failed_to_load">Plugins kunne ikke indlæses (tap for mere info):</string>
-  <string name="device_menu_plugins">Vælg plugins</string>
+  <string name="device_menu_plugins">Plugin-indstillinger</string>
   <string name="device_menu_unpair">Fjern parring</string>
   <string name="device_not_reachable">Den parrede enhed kan ikke tilgås</string>
   <string name="unknown_device">Ukendt enhed</string>
@@ -51,8 +54,15 @@
   <string name="received_url_text">Tap for at åbne \"%1s\"</string>
   <string name="incoming_file_title">Indkommende fil fra %1s</string>
   <string name="incoming_file_text">%1s</string>
+  <string name="outgoing_file_title">Sender fil til %1s</string>
+  <string name="outgoing_file_text">%1s</string>
   <string name="received_file_title">Modtog fil fra %1s</string>
+  <string name="received_file_fail_title">Kunne ikke modtage fil fra %1s</string>
   <string name="received_file_text">Tap for at åbne \"%1s\"</string>
+  <string name="sent_file_title">Fil sendt til %1s</string>
+  <string name="sent_file_text">%1s</string>
+  <string name="sent_file_failed_title">Kunne ikke sende filen %1s</string>
+  <string name="sent_file_failed_text">%1s</string>
   <string name="tap_to_answer">Tap for at svare</string>
   <string name="reconnect">Forbind igen</string>
   <string name="right_click">Send højreklik</string>
@@ -72,26 +82,41 @@
   <string name="mpris_ff">Spol frem</string>
   <string name="mpris_next">Næste</string>
   <string name="mpris_volume">Lydstyrke</string>
-  <string name="mpris_settings">Fjernbetjening af multimedie</string>
+  <string name="mpris_settings">Multimedieindstillinger</string>
+  <string name="mpris_time_settings_title">Spol frem/tilbage-knapper</string>
+  <string name="mpris_time_settings_summary">Justér tiden for når der trykkes på spol frem/tilbage.</string>
+  <string-array name="mpris_time_entries">
+    <item>10 sekunder</item>
+    <item>20 sekunder</item>
+    <item>30 sekunder</item>
+    <item>1 minut</item>
+    <item>2 minutter</item>
+  </string-array>
   <string name="share_to">Del på...</string>
   <string name="protocol_version_older">Denne enhed bruger en gammel protokolversion</string>
   <string name="protocol_version_newer">Denne enhed bruger en nyere protokolversion</string>
   <string name="general_settings">Generelle indstillinger</string>
-  <string name="plugin_settings">Generelle indstillinger</string>
-  <string name="plugin_settings_with_name">Åbn indstillinger</string>
+  <string name="plugin_settings">Indstillinger</string>
+  <string name="plugin_settings_with_name">Indstilling af %s</string>
   <string name="device_name">Enhedsnavn</string>
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">Ugyldigt enhedsnavn</string>
   <string name="shareplugin_text_saved">Modtog tekst, gemt til udklipsholder</string>
-  <string name="custom_devices_settings">Ingen enheder</string>
-  <string name="custom_device_list">Ingen enheder</string>
-  <string name="custom_device_list_summary">Ingen enheder</string>
-  <string name="share_notification_preference">Synk. af bekendtgørelser</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>
-  </string-array>
+  <string name="custom_devices_settings">Brugertilpasset liste over enheder</string>
+  <string name="custom_device_list">Tilføj enheder via IP</string>
+  <string name="share_notification_preference">Støjende bekendtgørelser</string>
+  <string name="share_notification_preference_summary">Vibrér og afspil en lyd når en fil modtages</string>
+  <string name="title_activity_notification_filter">Bekendtgørelsesfilter</string>
+  <string name="filter_apps_info">Bekendtgørelser vil blive synkroniseret for de valgte apps.</string>
+  <string name="sftp_internal_storage">Intern lagring</string>
+  <string name="sftp_all_files">Alle filer</string>
+  <string name="sftp_sdcard_num">SD-kort %d</string>
+  <string name="sftp_sdcard">SD-kort</string>
+  <string name="sftp_readonly">(skrivebeskyttet)</string>
+  <string name="sftp_camera">Kamerabilleder</string>
+  <string name="add_host">Tilføj vært/IP</string>
+  <string name="add_host_hint">Værtsnavn eller IP</string>
+  <string name="no_players_connected">Ingen afspillere fundet</string>
+  <string name="custom_dev_list_help">Brug kun denne indstilling hvis din enhed ikke opdages automatisk. Angiv IP-adresse eller værtsnavn nedenfor og tryk på knappen for at føje den til listen. Tryk på et eksisterende element for at fjerne det fra listen.</string>
+  <string name="mpris_player_on_device">%1$s på %2$s</string>
 </resources>

res/values-de/strings.xml

@@ -8,14 +8,12 @@
   <string name="pref_plugin_sftp_desc">Erlaubt das Browsen des Dateisystems auf dem entfernten Handy</string>
   <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">Fernbedienung</string>
-  <string name="pref_plugin_mpris">Multimedia-Fernbedienungen</string>
+  <string name="pref_plugin_mousepad_desc">Verwendet Ihr Handy als Maus und Tastatur</string>
   <string name="pref_plugin_mpris_desc">Audio und Video mit Ihrem Telefon steuern</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_sharereceiver_desc">Eingehende Dateien auf dem Telefonspeicher ablegen</string>
   <string name="plugin_not_available">Diese Funktion ist in Ihrer Android-Version nicht verfügbar</string>
   <string name="device_list_empty">Keine Geräte</string>
   <string name="ok">OK</string>
@@ -23,15 +21,18 @@
   <string name="open_settings">Einstellungen öffnen</string>
   <string name="no_permissions">Sie müssen die Erlaubnis zum Zugriff auf Benachrichtigungen erteilen</string>
   <string name="send_ping">Ping senden</string>
-  <string name="open_mpris_controls">Fernbedienung öffnen</string>
-  <string name="open_mousepad">Touchpad-Steuerung öffnen</string>
-  <string name="mousepad_right_click">Rechtsklick</string>
-  <string name="mousepad_middle_click">Mittelklick</string>
+  <string-array name="mousepad_tap_entries">
+    <item>Rechtsklick</item>
+    <item>Mittelklick</item>
+    <item>Nichts</item>
+  </string-array>
+  <string name="mousepad_double_default">Rechts</string>
+  <string name="mousepad_triple_default">Mitte</string>
   <string name="category_connected_devices">Verbundene Geräte</string>
-  <string name="category_not_paired_devices">Keine angeschlossenen Geräte</string>
+  <string name="category_not_paired_devices">Verfügbare Gerät</string>
   <string name="category_remembered_devices">Gemerkte Geräte</string>
   <string name="plugins_failed_to_load">Laden der Module fehlgeschlagen, tippen Sie für weitere Details:</string>
-  <string name="device_menu_plugins">Module auswählen</string>
+  <string name="device_menu_plugins">Modul-Einstellungen</string>
   <string name="device_menu_unpair">Verbindung trennen</string>
   <string name="device_not_reachable">Das angegeben Gerät ist nicht erreichbar</string>
   <string name="unknown_device">Unbekanntes Gerät</string>
@@ -48,7 +49,13 @@
   <string name="received_url_title">Verknüpfung von %1s erhalten</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_file_text">%1s</string>
   <string name="received_file_title">Datei von %1s erhalten</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>
   <string name="right_click">Rechtsklick senden</string>
@@ -69,6 +76,13 @@
   <string name="mpris_next">Weiter</string>
   <string name="mpris_volume">Lautstärke</string>
   <string name="mpris_settings">Multimedia-Einstellungen</string>
+  <string-array name="mpris_time_entries">
+    <item>10 Sekunden</item>
+    <item>20 Sekunden</item>
+    <item>30 Sekunden</item>
+    <item>1 Minute</item>
+    <item>2 Minuten</item>
+  </string-array>
   <string name="share_to">Freigeben für ...</string>
   <string name="protocol_version_older">Dieses Gerät verwendet ein alte Protokollversion</string>
   <string name="protocol_version_newer">Dieses Gerät verwendet ein neuere Protokollversion</string>
@@ -80,10 +94,9 @@
   <string name="invalid_device_name">Ungültiger Gerätename</string>
   <string name="shareplugin_text_saved">Text empfangen und in der Zwischenablage gespeichert</string>
   <string name="custom_devices_settings">Benutzerdefinierte Geräteliste</string>
-  <string name="custom_device_list">Benutzerdefinierte Geräteliste</string>
-  <string name="custom_device_list_summary">Benutzerdefinierte Geräteliste</string>
-  <string name="share_notification_preference">Benachrichtigungs-Abgleich</string>
+  <string name="custom_device_list">Geräte nach IP hinzufügen</string>
   <string name="share_notification_preference_summary">Beim Empfang einer Datei vibrieren und einen Sound abspielen</string>
+  <string name="title_activity_notification_filter">Benachrichtigungs-Filter</string>
   <string name="sftp_internal_storage">Interner Speicher</string>
   <string name="sftp_all_files">Alle Dateien</string>
   <string name="sftp_sdcard_num">SD-Karte %d</string>
@@ -91,11 +104,6 @@
   <string name="sftp_readonly">(Nur lesen)</string>
   <string name="sftp_camera">Kamerabilder</string>
   <string name="add_host">Rechner/IP hinzufügen</string>
-  <string-array name="mpris_time_entries">
-    <item>10 Sekunden</item>
-    <item>20 Sekunden</item>
-    <item>30 Sekunden</item>
-    <item>1 Minute</item>
-    <item>2 Minuten</item>
-  </string-array>
+  <string name="add_host_hint">Rechnername oder IP</string>
+  <string name="mpris_player_on_device">%1$s auf %2$s</string>
 </resources>

res/values-es/strings.xml

@@ -4,20 +4,17 @@
   <string name="pref_plugin_telephony_desc">Enviar notificaciones de SMS y llamadas</string>
   <string name="pref_plugin_battery">Informe de la batería</string>
   <string name="pref_plugin_battery_desc">Informar periódicamente del estado de la batería</string>
-  <string name="pref_plugin_sftp">Revelar el sistema de archivos</string>
+  <string name="pref_plugin_sftp">Mostrar el sistema de archivos</string>
   <string name="pref_plugin_sftp_desc">Permite examinar de forma remota el sistema de archivos del teléfono</string>
   <string name="pref_plugin_clipboard">Sincronización del portapapeles</string>
   <string name="pref_plugin_clipboard_desc">Compartir el contenido del portapapeles</string>
   <string name="pref_plugin_mousepad">Entrada remota</string>
   <string name="pref_plugin_mousepad_desc">Usar su teléfono como ratón y teclado</string>
-  <string name="pref_plugin_mpris">Controles remotos multimedia</string>
   <string name="pref_plugin_mpris_desc">Controlar audio y vídeo desde el teléfono</string>
   <string name="pref_plugin_ping">Ping</string>
   <string name="pref_plugin_ping_desc">Enviar y recibir pings</string>
   <string name="pref_plugin_notifications">Sincronizar notificaciones</string>
   <string name="pref_plugin_notifications_desc">Acceder a las notificaciones desde otros dispositivos</string>
-  <string name="pref_plugin_sharereceiver">Compartir receptor</string>
-  <string name="pref_plugin_sharereceiver_desc">Guardar archivos entrantes en el almacenamiento del teléfono</string>
   <string name="plugin_not_available">Esta funcionalidad no está disponible en su versión de Android</string>
   <string name="device_list_empty">Ningún dispositivo</string>
   <string name="ok">Aceptar</string>
@@ -25,18 +22,21 @@
   <string name="open_settings">Abrir preferencias</string>
   <string name="no_permissions">Debe otorgar permiso para acceder a las notificaciones</string>
   <string name="send_ping">Enviar ping</string>
-  <string name="open_mpris_controls">Abrir control remoto</string>
-  <string name="open_mousepad">Abrir control del panel táctil</string>
-  <string name="mousepad_info">Mueva un dedo sobre la pantalla para mover el cursor del ratón</string>
-  <string name="mousepad_double_tap_settings_title">Establecer la acción al golpetear con dos dedos</string>
-  <string name="mousepad_triple_tap_settings_title">Establecer la acción al golpetear con tres dedos</string>
-  <string name="mousepad_right_click">Clic derecho</string>
-  <string name="mousepad_middle_click">Clic del botón central</string>
+  <string name="mousepad_info">Mueva un dedo sobre la pantalla para mover el cursor del ratón. Pulse para ejecutar un clic y use dos/tres dedos para emular los botones derecho y central. Use una pulsación larga para arrastrar y soltar.</string>
+  <string name="mousepad_double_tap_settings_title">Establecer la acción al pulsar con dos dedos</string>
+  <string name="mousepad_triple_tap_settings_title">Establecer la acción al pulsar con tres dedos</string>
+  <string-array name="mousepad_tap_entries">
+    <item>Clic derecho</item>
+    <item>Clic del botón central</item>
+    <item>Nada</item>
+  </string-array>
+  <string name="mousepad_double_default">derecho</string>
+  <string name="mousepad_triple_default">medio</string>
   <string name="category_connected_devices">Dispositivos conectados</string>
-  <string name="category_not_paired_devices">Dispositivos no vinculados</string>
+  <string name="category_not_paired_devices">Dispositivos disponibles</string>
   <string name="category_remembered_devices">Dispositivos recordados</string>
-  <string name="plugins_failed_to_load">Complementos cuya carga ha fallado (toque para más información):</string>
-  <string name="device_menu_plugins">Seleccionar complementos</string>
+  <string name="plugins_failed_to_load">Complementos cuya carga ha fallado (pulse para más información):</string>
+  <string name="device_menu_plugins">Preferencias del complemento</string>
   <string name="device_menu_unpair">Desvincular</string>
   <string name="device_not_reachable">No se encuentra el dispositivo aparejado</string>
   <string name="unknown_device">Dispositivo desconocido</string>
@@ -54,9 +54,16 @@
   <string name="received_url_text">Pulse para abrir «%1s»</string>
   <string name="incoming_file_title">Archivo entrante desde %1s</string>
   <string name="incoming_file_text">%1s</string>
+  <string name="outgoing_file_title">Enviando archivo a %1s</string>
+  <string name="outgoing_file_text">%1s</string>
   <string name="received_file_title">Archivo recibido desde %1s</string>
+  <string name="received_file_fail_title">Fallo recibiendo archivo desde %1s</string>
   <string name="received_file_text">Pulse para abrir «%1s»</string>
-  <string name="tap_to_answer">Toque para responder</string>
+  <string name="sent_file_title">Archivo enviado a %1s</string>
+  <string name="sent_file_text">%1s</string>
+  <string name="sent_file_failed_title">Fallo al enviar el archivo %1s</string>
+  <string name="sent_file_failed_text">%1s</string>
+  <string name="tap_to_answer">Pulse para responder</string>
   <string name="reconnect">Reconectar</string>
   <string name="right_click">Enviar clic derecho</string>
   <string name="middle_click">Enviar clic del botón central</string>
@@ -76,8 +83,15 @@
   <string name="mpris_next">Siguiente</string>
   <string name="mpris_volume">Volumen</string>
   <string name="mpris_settings">Preferencias multimedia</string>
-  <string name="mpris_time_settings_title">Intervalo de tiempo</string>
-  <string name="mpris_time_settings_summary">Ajustar el tiempo a avanzar o rebobinar un archivo multimedia.</string>
+  <string name="mpris_time_settings_title">Botones de avance/rebobinado</string>
+  <string name="mpris_time_settings_summary">Ajustar el tiempo a avanzar o rebobinar rápidamente al pulsar.</string>
+  <string-array name="mpris_time_entries">
+    <item>10 segundos</item>
+    <item>20 segundos</item>
+    <item>30 segundos</item>
+    <item>1 minuto</item>
+    <item>2 minutos</item>
+  </string-array>
   <string name="share_to">Compartir con...</string>
   <string name="protocol_version_older">Este dispositivo usa una versión antigua del protocolo</string>
   <string name="protocol_version_newer">Este dispositivo usa una versión más reciente del protocolo</string>
@@ -89,23 +103,20 @@
   <string name="invalid_device_name">Nombre de dispositivo no válido</string>
   <string name="shareplugin_text_saved">Texto recibido y guardado en el portapapeles</string>
   <string name="custom_devices_settings">Lista de dispositivos personalizada</string>
-  <string name="custom_device_list">Lista de dispositivos personalizada</string>
-  <string name="custom_device_list_summary">Lista de dispositivos personalizada</string>
+  <string name="custom_device_list">Añadir dispositivos por IP</string>
   <string name="share_notification_preference">Notificaciones ruidosas</string>
   <string name="share_notification_preference_summary">Vibrar y reproducir un sonido cuando se reciba un archivo</string>
+  <string name="title_activity_notification_filter">Filtro de notificaciones</string>
+  <string name="filter_apps_info">Las notificaciones se sincronizarán en las aplicaciones seleccionadas.</string>
   <string name="sftp_internal_storage">Almacenamiento interno</string>
   <string name="sftp_all_files">Todos los archivos</string>
   <string name="sftp_sdcard_num">Tarjeta SD %d</string>
   <string name="sftp_sdcard">Tarjeta SD</string>
   <string name="sftp_readonly">(solo lectura)</string>
   <string name="sftp_camera">Imágenes de la cámara</string>
-  <string name="add_host">Añadir IP/nombre</string>
+  <string name="add_host">Añadir servidor/IP</string>
+  <string name="add_host_hint">Nombre o dirección IP</string>
+  <string name="no_players_connected">Ningún reproductor encontrado</string>
   <string name="custom_dev_list_help">Use esta opción solo si su dispositivo no es detectado automáticamente. Introduzca la dirección IP o nombre debajo y pulse el botón para añadirlo a la lista. Pulse un ítem existente para eliminarlo de la lista.</string>
-  <string-array name="mpris_time_entries">
-    <item>10 segundos</item>
-    <item>20 segundos</item>
-    <item>30 segundos</item>
-    <item>1 minuto</item>
-    <item>2 minutos</item>
-  </string-array>
+  <string name="mpris_player_on_device">%1$s en %2$s</string>
 </resources>

res/values-fi/strings.xml

@@ -8,16 +8,13 @@
   <string name="pref_plugin_sftp_desc">Mahdollistaa puhelimen tiedostojärjestelmän etäselaamisen</string>
   <string name="pref_plugin_clipboard">Leikepöydän synkronointi</string>
   <string name="pref_plugin_clipboard_desc">Jaa leikepöydän sisältö</string>
-  <string name="pref_plugin_mousepad">Kaukosyöte</string>
+  <string name="pref_plugin_mousepad">Kauko-ohjaus</string>
   <string name="pref_plugin_mousepad_desc">Käytä puhelintasi hiirenä ja näppäimistönä</string>
-  <string name="pref_plugin_mpris">Multimediakauko-ohjaimet</string>
   <string name="pref_plugin_mpris_desc">Ohjaa ääntä ja videota puhelimestasi</string>
   <string name="pref_plugin_ping">Tiedustelupaketti</string>
   <string name="pref_plugin_ping_desc">Lähetä ja vastaanota tiedustelupaketteja</string>
   <string name="pref_plugin_notifications">Ilmoitusten synkronointi</string>
   <string name="pref_plugin_notifications_desc">Näe ilmoituksesi muissa laitteissa</string>
-  <string name="pref_plugin_sharereceiver">Jaon vastaanottaja</string>
-  <string name="pref_plugin_sharereceiver_desc">Tallenna tulevat tiedoston puhelimen muistiin</string>
   <string name="plugin_not_available">Piirre ei ole käytettävissä Android-versiossasi</string>
   <string name="device_list_empty">Ei laitteita</string>
   <string name="ok">OK</string>
@@ -25,18 +22,21 @@
   <string name="open_settings">Avaa asetukset</string>
   <string name="no_permissions">Sinun on annettava lupa ilmoitusten näkemiseen</string>
   <string name="send_ping">Lähetä tiedustelupaketti</string>
-  <string name="open_mpris_controls">Avaa kauko-ohjain</string>
-  <string name="open_mousepad">Avaa hiiren ohjain</string>
-  <string name="mousepad_info">Liikuta hiiren osoitinta liikuttamalla sormeasi näytöllä</string>
+  <string name="mousepad_info">Liikuta hiiren osoitinta liikuttamalla sormeasi näytöllä. Napsauta napauttamalla yhdellä sormella, käytä oikeaa painiketta kahdella sormella ja keskipainiketta kolmella. Vedä ja pudota painamalla pitkään.</string>
   <string name="mousepad_double_tap_settings_title">Aseta kahden sormen napautuksen toiminto</string>
   <string name="mousepad_triple_tap_settings_title">Aseta kolmen sormen napautuksen toiminto</string>
-  <string name="mousepad_right_click">Oikea napsautus</string>
-  <string name="mousepad_middle_click">Keskinapsautus</string>
+  <string-array name="mousepad_tap_entries">
+    <item>Oikea napsautus</item>
+    <item>Keskinapsautus</item>
+    <item>Ei toimintoa</item>
+  </string-array>
+  <string name="mousepad_double_default">Oikea painike</string>
+  <string name="mousepad_triple_default">Keskipainike</string>
   <string name="category_connected_devices">Yhdistetyt laitteet</string>
-  <string name="category_not_paired_devices">Pariksi liitetyt laitteet</string>
+  <string name="category_not_paired_devices">Saatavilla olevat laitteet</string>
   <string name="category_remembered_devices">Muistetut laitteet</string>
-  <string name="plugins_failed_to_load">Liitännäisten lataus epäonnistui (lisätietoa napauttamalla):</string>
-  <string name="device_menu_plugins">Valitse liitännäiset</string>
+  <string name="plugins_failed_to_load">Seuraavien liitännäisten lataus epäonnistui (lisätietoa painamalla):</string>
+  <string name="device_menu_plugins">Liitännäisten asetukset</string>
   <string name="device_menu_unpair">Poista laitepari</string>
   <string name="device_not_reachable">Laitepari tavoittamattomissa</string>
   <string name="unknown_device">Tuntematon laite</string>
@@ -49,13 +49,20 @@
   <string name="error_canceled_by_other_peer">Vertaiskäyttäjä perui</string>
   <string name="error_invalid_key">Vastaanotettiin väärä avain</string>
   <string name="pair_requested">Paripyyntö</string>
-  <string name="pairing_request_from">Paripyyntö kohteesta %1s</string>
+  <string name="pairing_request_from">Paripyyntö laitteesta %1s</string>
   <string name="received_url_title">Vastaanotettiin linkki lähettäjältä %1s</string>
   <string name="received_url_text">Avaa ”%1s” napauttamalla</string>
   <string name="incoming_file_title">Saapuva tiedosto lähettäjältä %1s</string>
   <string name="incoming_file_text">%1s</string>
+  <string name="outgoing_file_title">Lähetetään tiedostoa laitteeseen %1s</string>
+  <string name="outgoing_file_text">%1s</string>
   <string name="received_file_title">Vastaanotettiin tiedosto lähettäjältä %1s</string>
+  <string name="received_file_fail_title">Ei voitu vastaanottaa tiedostoa lähettäjältä %1s</string>
   <string name="received_file_text">Avaa ”%1s” napauttamalla</string>
+  <string name="sent_file_title">Tiedosto lähetetty laitteeseen %1s</string>
+  <string name="sent_file_text">%1s</string>
+  <string name="sent_file_failed_title">Tiedoston lähetys epäonnistui: %1s</string>
+  <string name="sent_file_failed_text">%1s</string>
   <string name="tap_to_answer">Vastaa napauttamalla</string>
   <string name="reconnect">Yhdistä uudelleen</string>
   <string name="right_click">Lähetä oikean painikkeen napsautus</string>
@@ -72,12 +79,19 @@
   <string name="mpris_play">Toista</string>
   <string name="mpris_previous">Edellinen</string>
   <string name="mpris_rew">Kelaa takaisin</string>
-  <string name="mpris_ff">Nopeasti eteenpäin</string>
+  <string name="mpris_ff">Pikakelaa</string>
   <string name="mpris_next">Seuraava</string>
   <string name="mpris_volume">Äänenvoimakkuus</string>
   <string name="mpris_settings">Multimedia-asetukset</string>
-  <string name="mpris_time_settings_title">Aikaväli</string>
-  <string name="mpris_time_settings_summary">Säädä multimediatiedoston pikakelauksen aikaa.</string>
+  <string name="mpris_time_settings_title">Kelauspainikkeet</string>
+  <string name="mpris_time_settings_summary">Säädä painettaessa tapahtuvan kelauksen kestoa.</string>
+  <string-array name="mpris_time_entries">
+    <item>10 sekuntia</item>
+    <item>20 sekuntia</item>
+    <item>30 sekuntia</item>
+    <item>1 minuutti</item>
+    <item>2 minuuttia</item>
+  </string-array>
   <string name="share_to">Jaa…</string>
   <string name="protocol_version_older">Laite käyttää vanha yhteyskäytäntöversiota</string>
   <string name="protocol_version_newer">Laite käyttää uudempaa yhteyskäytäntöversiota</string>
@@ -89,10 +103,11 @@
   <string name="invalid_device_name">Virheellinen laitenimi</string>
   <string name="shareplugin_text_saved">Vastaanotettiin tekstiä, tallennettiin leikepöydälle</string>
   <string name="custom_devices_settings">Omien laitteiden luettelo</string>
-  <string name="custom_device_list">Omien laitteiden luettelo</string>
-  <string name="custom_device_list_summary">Omien laitteiden luettelo</string>
+  <string name="custom_device_list">Lisää laitteita IP:llä</string>
   <string name="share_notification_preference">Äänekkäät ilmoitukset</string>
   <string name="share_notification_preference_summary">Värise ja soita ääni tiedoston saapuessa</string>
+  <string name="title_activity_notification_filter">Ilmoitussuodatin</string>
+  <string name="filter_apps_info">Valittujen sovellusten ilmoitukset synkronoidaan.</string>
   <string name="sftp_internal_storage">Sisäinen muisti</string>
   <string name="sftp_all_files">Kaikki tiedostot</string>
   <string name="sftp_sdcard_num">SD-kortti %d</string>
@@ -100,12 +115,8 @@
   <string name="sftp_readonly">(vain luku)</string>
   <string name="sftp_camera">Kamerakuvat</string>
   <string name="add_host">Lisää kone/IP</string>
+  <string name="add_host_hint">Konenimi tai IP-osoite</string>
+  <string name="no_players_connected">Soittimia ei löytynyt</string>
   <string name="custom_dev_list_help">Käytä tätä vain, jos laitettasi ei tunnisteta automaattisesti. Kirjoita IP-osoite tai konenimi alle ja kosketa painiketta lisätäksesi sen luetteloon. Kosketa olemassa olevaa kohtaa poistaaksesi sen luettelosta.</string>
-  <string-array name="mpris_time_entries">
-    <item>10 sekuntia</item>
-    <item>20 sekuntia</item>
-    <item>30 sekuntia</item>
-    <item>1 minuutti</item>
-    <item>2 minuuttia</item>
-  </string-array>
+  <string name="mpris_player_on_device">%1$s laitteella %2$s</string>
 </resources>

res/values-fr/strings.xml

@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="pref_plugin_telephony">Notificateur de téléphonie</string>
+  <string name="pref_plugin_telephony">Notifications du téléphonie</string>
   <string name="pref_plugin_telephony_desc">Envoie des notifications pour les SMS et les appels</string>
   <string name="pref_plugin_battery">Rapport sur la batterie</string>
   <string name="pref_plugin_battery_desc">Rapport périodique sur l\'état de la batterie</string>
@@ -9,7 +9,7 @@
   <string name="pref_plugin_clipboard">Synchronisation avec le presse-papiers</string>
   <string name="pref_plugin_clipboard_desc">Partage le contenu du presse-papiers</string>
   <string name="pref_plugin_mousepad">Contrôle distant</string>
-  <string name="pref_plugin_mpris">Contrôles distants multimédia</string>
+  <string name="pref_plugin_mousepad_desc">Utilisez votre téléphone comme une souris et un clavier</string>
   <string name="pref_plugin_mpris_desc">Contrôle l\'audio / la vidéo depuis votre téléphone</string>
   <string name="pref_plugin_ping">Commande « Ping »</string>
   <string name="pref_plugin_ping_desc">Envoie et reçoit des commandes « Ping »</string>
@@ -22,13 +22,21 @@
   <string name="open_settings">Accéder aux paramètres</string>
   <string name="no_permissions">Vous devez accorder la permission d\'accéder aux notifications</string>
   <string name="send_ping">Envoyer un « Ping »</string>
-  <string name="open_mpris_controls">Ouvrir un contrôle distant</string>
-  <string name="open_mousepad">Ouvrir un contrôle distant</string>
+  <string name="mousepad_info">Déplacer le doigt sur l\'écran pour bouger le pointeur de la souris. Appuyez pour cliquer et utiliser deux/trois doigts pour les clic droit et centre. Appuyez longtemps pour faire un glisser déplacer.</string>
+  <string name="mousepad_double_tap_settings_title">Action pour l\'appui à deux doigts</string>
+  <string name="mousepad_triple_tap_settings_title">Action pour l\'appui à trois doigts</string>
+  <string-array name="mousepad_tap_entries">
+    <item>Clic droit</item>
+    <item>Clic central</item>
+    <item>Rien</item>
+  </string-array>
+  <string name="mousepad_double_default">Droite</string>
+  <string name="mousepad_triple_default">Milieu</string>
   <string name="category_connected_devices">Périphériques connectés</string>
-  <string name="category_not_paired_devices">Pas de périphériques appariés</string>
+  <string name="category_not_paired_devices">Périphériques disponibles</string>
   <string name="category_remembered_devices">Périphériques mémorisés</string>
   <string name="plugins_failed_to_load">Le chargement des modules externes a échoué (cliquez pour plus d\'informations) :</string>
-  <string name="device_menu_plugins">Sélectionner des modules externes</string>
+  <string name="device_menu_plugins">Paramètres du module externe</string>
   <string name="device_menu_unpair">Désapparier</string>
   <string name="device_not_reachable">Périphérique inaccessible</string>
   <string name="unknown_device">Périphérique inconnu</string>
@@ -42,10 +50,23 @@
   <string name="error_invalid_key">Clé reçue non valable</string>
   <string name="pair_requested">Paire demandée</string>
   <string name="pairing_request_from">Demande d\'appariement provenant de %1s</string>
-  <string name="incoming_file_title">Demande d\'appariement provenant de %1s</string>
-  <string name="incoming_file_text">%s</string>
+  <string name="received_url_title">Lien reçu de %1s</string>
+  <string name="received_url_text">Appuyez pour ouvrir %1s</string>
+  <string name="incoming_file_title">Réception d\'un fichier en cours depuis %1s</string>
+  <string name="incoming_file_text">%1s</string>
+  <string name="outgoing_file_title">Envoi d\'un fichier à %1s</string>
+  <string name="outgoing_file_text">%1s</string>
+  <string name="received_file_title">Fichier reçu de %1s</string>
+  <string name="received_file_text">Appuyez pour ouvrir %1s</string>
+  <string name="sent_file_title">Fichier envoyé à %1s</string>
+  <string name="sent_file_text">%1s</string>
+  <string name="sent_file_failed_title">Impossible d\'envoyer le fichier %1s</string>
+  <string name="sent_file_failed_text">%1s</string>
   <string name="tap_to_answer">Cliquer pour répondre</string>
   <string name="reconnect">Reconnecter</string>
+  <string name="right_click">Envoyer un clic droit</string>
+  <string name="middle_click">Envoyer un clic central</string>
+  <string name="show_keyboard">Afficher le clavier</string>
   <string name="device_not_paired">Périphérique non apparié</string>
   <string name="request_pairing">Demande d\'appariement</string>
   <string name="pairing_accept">Accepter</string>
@@ -60,25 +81,41 @@
   <string name="mpris_ff">Avance rapide</string>
   <string name="mpris_next">Suivant</string>
   <string name="mpris_volume">Volume</string>
-  <string name="mpris_settings">Contrôles distants multimédia</string>
+  <string name="mpris_settings">Configuration multimédia</string>
+  <string name="mpris_time_settings_title">Boutons avance / retour rapide.</string>
+  <string name="mpris_time_settings_summary">Ajustez le temps pour l\'avance ou retour rapide</string>
+  <string-array name="mpris_time_entries">
+    <item>10 secondes</item>
+    <item>20 secondes</item>
+    <item>30 secondes</item>
+    <item>1 minute</item>
+    <item>2 minutes</item>
+  </string-array>
   <string name="share_to">Partager vers...</string>
   <string name="protocol_version_older">Le périphérique utilise une version ancienne du protocole</string>
   <string name="protocol_version_newer">Le périphérique utilise une version plus récente du protocole</string>
   <string name="general_settings">Paramètres généraux</string>
-  <string name="plugin_settings">Paramètres généraux</string>
-  <string name="plugin_settings_with_name">Accéder aux paramètres</string>
+  <string name="plugin_settings">Configuration</string>
+  <string name="plugin_settings_with_name">Configuration %s</string>
   <string name="device_name">Nom du périphérique</string>
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">Nom de périphérique non valable</string>
-  <string name="custom_devices_settings">Pas de périphériques</string>
-  <string name="custom_device_list">Pas de périphériques</string>
-  <string name="custom_device_list_summary">Pas de périphériques</string>
-  <string name="share_notification_preference">Synchronisation des notifications</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>
-  </string-array>
+  <string name="shareplugin_text_saved">Texte reçu et enregistré dans le presse-papiers</string>
+  <string name="custom_devices_settings">Liste personnalisée de périphériques</string>
+  <string name="custom_device_list">Ajouter des périphériques par IP</string>
+  <string name="share_notification_preference">Notifications sonores</string>
+  <string name="share_notification_preference_summary">Vibrer et jouer un son quand un fichier est reçu</string>
+  <string name="title_activity_notification_filter">Filtre des notifications</string>
+  <string name="filter_apps_info">Les notifications seront synchronisées pour les applications sélectionnées.</string>
+  <string name="sftp_internal_storage">Stockage interne</string>
+  <string name="sftp_all_files">Tous les fichiers</string>
+  <string name="sftp_sdcard_num">Carte SD %d</string>
+  <string name="sftp_sdcard">Carte SD</string>
+  <string name="sftp_readonly">(lecture seule)</string>
+  <string name="sftp_camera">Images de l\'appareil photo</string>
+  <string name="add_host">Ajouter hôte/IP</string>
+  <string name="add_host_hint">Nom d\'hôte ou adresse IP </string>
+  <string name="no_players_connected">Aucun lecteur trouvé</string>
+  <string name="custom_dev_list_help">N\'utilisez cette option que si votre périphérique n\'est pas détecté automatiquement. Saisissez l\'adresse IP ou le nom d\'hôte ci-dessous et appuyez sur le bouton pour l\'ajouter à la liste. Appuyez sur un élément existant pour le retirer de la liste.</string>
+  <string name="mpris_player_on_device">%1$s sur %2$s</string>
 </resources>

res/values-gl/strings.xml

@@ -0,0 +1,59 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+  <string name="pref_plugin_ping">Ping</string>
+  <string name="pref_plugin_ping_desc">Enviar e recibir pings.</string>
+  <string name="pref_plugin_notifications">Sincronización de notificacións</string>
+  <string name="device_list_empty">Non hai dispositivos.</string>
+  <string name="ok">Aceptar</string>
+  <string name="cancel">Cancelar</string>
+  <string name="open_settings">Abrir a configuración</string>
+  <string name="send_ping">Enviar un ping</string>
+  <string-array name="mousepad_tap_entries">
+    <item>Clic dereito</item>
+    <item>Clic central</item>
+    <item>Nada</item>
+  </string-array>
+  <string name="mousepad_double_default">dereita</string>
+  <string name="mousepad_triple_default">medio</string>
+  <string name="category_connected_devices">Dispositivos conectados</string>
+  <string name="category_not_paired_devices">Dispositivos dispoñíbeis</string>
+  <string name="device_menu_plugins">Configuración do engadido</string>
+  <string name="device_menu_unpair">Desemparellarse</string>
+  <string name="unknown_device">Dispositivo descoñecido</string>
+  <string name="error_not_reachable">Dispositivo fóra do alcance</string>
+  <string name="error_timed_out">Esgotouse o tempo límite</string>
+  <string name="error_canceled_by_user">Cancelouno o usuario.</string>
+  <string name="error_canceled_by_other_peer">Cancelouse remotamente</string>
+  <string name="incoming_file_text">%1s</string>
+  <string name="outgoing_file_text">%1s</string>
+  <string name="sent_file_text">%1s</string>
+  <string name="sent_file_failed_text">%1s</string>
+  <string name="reconnect">Conectar de novo</string>
+  <string name="show_keyboard">Mostrar o teclado</string>
+  <string name="pairing_accept">Aceptar</string>
+  <string name="pairing_reject">Rexeitar</string>
+  <string name="device">Dispositivo</string>
+  <string name="remote_control">Control remoto</string>
+  <string name="settings">Configuración de KDE Connect</string>
+  <string name="mpris_play">Reproducir</string>
+  <string name="mpris_previous">Anterior</string>
+  <string name="mpris_rew">Retroceder</string>
+  <string name="mpris_ff">Cara a adiante</string>
+  <string name="mpris_next">Seguinte</string>
+  <string name="mpris_volume">Volume</string>
+  <string-array name="mpris_time_entries">
+    <item>10 segundos</item>
+    <item>20 segundos</item>
+    <item>30 segundos</item>
+    <item>1 minuto</item>
+    <item>2 minutos</item>
+  </string-array>
+  <string name="general_settings">Configuración xeral</string>
+  <string name="plugin_settings">Configuración</string>
+  <string name="device_name">Nome do dispositivo</string>
+  <string name="device_name_preference_summary">%s</string>
+  <string name="sftp_internal_storage">Almacenamento interno</string>
+  <string name="sftp_all_files">Todos os ficheiros</string>
+  <string name="sftp_readonly">(só lectura)</string>
+  <string name="sftp_camera">Imaxes da cámara</string>
+</resources>

res/values-hu/strings.xml

@@ -8,15 +8,11 @@
   <string name="pref_plugin_sftp_desc">Lehetővé teszi a telefon fájlrendszerének távolról történő tallózását</string>
   <string name="pref_plugin_clipboard">Vágólap szinkronizáció</string>
   <string name="pref_plugin_clipboard_desc">A vágólap tartalmának megosztása</string>
-  <string name="pref_plugin_mousepad">Távirányító</string>
-  <string name="pref_plugin_mpris">Multimedia távirányítók</string>
   <string name="pref_plugin_mpris_desc">Hang vagy videó vezérlése a telefonról</string>
   <string name="pref_plugin_ping">Ping</string>
   <string name="pref_plugin_ping_desc">Pingek küldése és fogadása</string>
   <string name="pref_plugin_notifications">Értesítés szinkronizáció</string>
   <string name="pref_plugin_notifications_desc">Hozzáférés az értesítésekhez más eszközökről</string>
-  <string name="pref_plugin_sharereceiver">Megosztás vevő</string>
-  <string name="pref_plugin_sharereceiver_desc">Bejövő fájlok mentése a telefon háttértárára</string>
   <string name="plugin_not_available">Ez a funkció nem érhető el az ön Android verziójában</string>
   <string name="device_list_empty">Nincsenek eszközök</string>
   <string name="ok">OK</string>
@@ -24,16 +20,14 @@
   <string name="open_settings">Beállítások megnyitása</string>
   <string name="no_permissions">Jogot kell adnia az értesítésekhez való hozzáféréshez</string>
   <string name="send_ping">Ping küldése</string>
-  <string name="open_mpris_controls">Távirányító megnyitása</string>
-  <string name="open_mousepad">Érintőtábla vezérlő megnyitása</string>
-  <string name="mousepad_info">Mozgassa az ujját a képernyőn az egérkurzor mozgatásához</string>
-  <string name="mousepad_right_click">Jobb kattintás küldése</string>
-  <string name="mousepad_middle_click">Középső kattintás küldése</string>
+  <string-array name="mousepad_tap_entries">
+    <item/>
+    <item/>
+    <item>Nothing</item>
+  </string-array>
   <string name="category_connected_devices">Csatlakoztatott eszközök</string>
-  <string name="category_not_paired_devices">Nincsenek párosított eszközök</string>
   <string name="category_remembered_devices">Megjegyzett eszközök</string>
   <string name="plugins_failed_to_load">A bővítményeket nem sikerült betölteni (érintse meg a további információkért):</string>
-  <string name="device_menu_plugins">Bővítmények kijelölése</string>
   <string name="device_menu_unpair">Leválasztás</string>
   <string name="device_not_reachable">A párosított eszköz nem érhető el</string>
   <string name="unknown_device">Ismeretlen eszköz</string>
@@ -71,21 +65,6 @@
   <string name="mpris_ff">Gyors előretekerés</string>
   <string name="mpris_next">Következő</string>
   <string name="mpris_volume">Hangerő</string>
-  <string name="mpris_settings">Multimedia távirányítók</string>
-  <string name="share_to">Megosztás…</string>
-  <string name="protocol_version_older">Ez az eszköz egy régi protokollverziót használ</string>
-  <string name="protocol_version_newer">Ez az eszköz egy újabb protokollverziót használ</string>
-  <string name="general_settings">Általános beállítások</string>
-  <string name="plugin_settings">Általános beállítások</string>
-  <string name="plugin_settings_with_name">Beállítások megnyitása</string>
-  <string name="device_name">Eszköznév</string>
-  <string name="device_name_preference_summary">%s</string>
-  <string name="invalid_device_name">Érvénytelen eszköznév</string>
-  <string name="shareplugin_text_saved">Szöveg érkezett, elmentve a vágólapra</string>
-  <string name="custom_devices_settings">Nincsenek eszközök</string>
-  <string name="custom_device_list">Nincsenek eszközök</string>
-  <string name="custom_device_list_summary">Nincsenek eszközök</string>
-  <string name="share_notification_preference">Értesítés szinkronizáció</string>
   <string-array name="mpris_time_entries">
     <item>10 seconds</item>
     <item>20 seconds</item>
@@ -93,4 +72,12 @@
     <item>1 minute</item>
     <item>2 minutes</item>
   </string-array>
+  <string name="share_to">Megosztás…</string>
+  <string name="protocol_version_older">Ez az eszköz egy régi protokollverziót használ</string>
+  <string name="protocol_version_newer">Ez az eszköz egy újabb protokollverziót használ</string>
+  <string name="general_settings">Általános beállítások</string>
+  <string name="device_name">Eszköznév</string>
+  <string name="device_name_preference_summary">%s</string>
+  <string name="invalid_device_name">Érvénytelen eszköznév</string>
+  <string name="shareplugin_text_saved">Szöveg érkezett, elmentve a vágólapra</string>
 </resources>

res/values-it/strings.xml

@@ -4,10 +4,12 @@
   <string name="pref_plugin_telephony_desc">Invia notifiche di SMS e chiamate</string>
   <string name="pref_plugin_battery">Livello batteria</string>
   <string name="pref_plugin_battery_desc">Comunica periodicamente lo stato della batteria</string>
+  <string name="pref_plugin_sftp">Esposizione filesystem</string>
+  <string name="pref_plugin_sftp_desc">Consente di navigare da remoto il filesystem del telefono</string>
   <string name="pref_plugin_clipboard">Sincronizzazione appunti</string>
   <string name="pref_plugin_clipboard_desc">Condividi il contenuto degli appunti</string>
-  <string name="pref_plugin_mousepad">Telecomando</string>
-  <string name="pref_plugin_mpris">Telecomando multimediale</string>
+  <string name="pref_plugin_mousepad">Impulso remoto</string>
+  <string name="pref_plugin_mousepad_desc">Usa il tuo telefono come mouse e tastiera</string>
   <string name="pref_plugin_mpris_desc">Controlla la riproduzione audio/video dal telefono</string>
   <string name="pref_plugin_ping">Ping</string>
   <string name="pref_plugin_ping_desc">Invia e ricevi ping</string>
@@ -18,32 +20,54 @@
   <string name="ok">OK</string>
   <string name="cancel">Annulla</string>
   <string name="open_settings">Apri impostazioni</string>
-  <string name="no_permissions">Devi garantire a KDE Connect l\'accesso alle notifiche</string>
+  <string name="no_permissions">Devi concedere i permessi per l\'accesso alle notifiche</string>
   <string name="send_ping">Invia ping</string>
-  <string name="open_mpris_controls">Apri il telecomando multimediale</string>
-  <string name="open_mousepad">Apri il telecomando multimediale</string>
+  <string name="mousepad_info">Muovi un dito sullo schermo per spostare il puntatore del mouse. Tocca per un clic e usa due/tre dita per i pulsanti destro e centrale. Utilizza una pressione lunga per trascinare e rilasciare.</string>
+  <string name="mousepad_double_tap_settings_title">Imposta azione per il tocco a due dita</string>
+  <string name="mousepad_triple_tap_settings_title">Imposta azione per il tocco a tre dita</string>
+  <string-array name="mousepad_tap_entries">
+    <item>Clic destro</item>
+    <item>Clic centrale</item>
+    <item>Niente</item>
+  </string-array>
+  <string name="mousepad_double_default">destra</string>
+  <string name="mousepad_triple_default">centro</string>
   <string name="category_connected_devices">Dispositivi connessi</string>
-  <string name="category_not_paired_devices">Dispositivi non associati</string>
+  <string name="category_not_paired_devices">Dispositivi disponibili</string>
   <string name="category_remembered_devices">Dispositivi memorizzati</string>
-  <string name="plugins_failed_to_load">Alcune estensioni non si sono avviate correttamente (tocca per maggiori informazioni):</string>
-  <string name="device_menu_plugins">Estensioni</string>
+  <string name="plugins_failed_to_load">Impossibile caricare alcune estensioni (tocca per maggiori informazioni):</string>
+  <string name="device_menu_plugins">Impostazioni estensioni</string>
   <string name="device_menu_unpair">Disassocia</string>
-  <string name="device_not_reachable">Dispositivo fuori portata</string>
+  <string name="device_not_reachable">Dispositivo associato non raggiungibile</string>
   <string name="unknown_device">Dispositivo sconosciuto</string>
   <string name="error_not_reachable">Dispositivo fuori portata</string>
   <string name="error_already_requested">Richiesta già inviata</string>
   <string name="error_already_paired">Dispositivo già associato</string>
   <string name="error_could_not_send_package">Impossibile inviare i dati</string>
   <string name="error_timed_out">Richiesta scaduta</string>
-  <string name="error_canceled_by_user">Richiesta annullata dall\'utente</string>
-  <string name="error_canceled_by_other_peer">Richiesta annullata dal dispositivo remoto</string>
+  <string name="error_canceled_by_user">Annullata dall\'utente</string>
+  <string name="error_canceled_by_other_peer">Annullata dal dispositivo remoto</string>
   <string name="error_invalid_key">Ricevuta chiave non valida</string>
   <string name="pair_requested">Richiesta di associazione</string>
   <string name="pairing_request_from">Richiesta associazione da %1s</string>
-  <string name="incoming_file_title">Richiesta associazione da %1s</string>
-  <string name="incoming_file_text">%s</string>
+  <string name="received_url_title">Collegamento ricevuto da %1s</string>
+  <string name="received_url_text">Tocca per aprire «%1s»</string>
+  <string name="incoming_file_title">File in ingresso da %1s</string>
+  <string name="incoming_file_text">%1s</string>
+  <string name="outgoing_file_title">Invio file a %1s</string>
+  <string name="outgoing_file_text">%1s</string>
+  <string name="received_file_title">File ricevuto da %1s</string>
+  <string name="received_file_fail_title">Ricezione file da %1s non riuscita</string>
+  <string name="received_file_text">Tocca per aprire «%1s»</string>
+  <string name="sent_file_title">File inviato a %1s</string>
+  <string name="sent_file_text">%1s</string>
+  <string name="sent_file_failed_title">Invio del file %1s non riuscito</string>
+  <string name="sent_file_failed_text">%1s</string>
   <string name="tap_to_answer">Tocca per rispondere</string>
   <string name="reconnect">Riconnetti</string>
+  <string name="right_click">Invia clic tasto destro</string>
+  <string name="middle_click">Invia clic tasto centrale</string>
+  <string name="show_keyboard">Mostra tastiera</string>
   <string name="device_not_paired">Dispositivo non associato</string>
   <string name="request_pairing">Richiedi associazione</string>
   <string name="pairing_accept">Accetta</string>
@@ -58,25 +82,41 @@
   <string name="mpris_ff">Avanti veloce</string>
   <string name="mpris_next">Successivo</string>
   <string name="mpris_volume">Volume</string>
-  <string name="mpris_settings">Telecomando multimediale</string>
+  <string name="mpris_settings">Impostazioni multimediali</string>
+  <string name="mpris_time_settings_title">Pulsanti di avanzamento/riavvolgimento</string>
+  <string name="mpris_time_settings_summary">Regola l\'ora per avanzare rapidamente o riavvolgere in caso di pressione.</string>
+  <string-array name="mpris_time_entries">
+    <item>10 secondi</item>
+    <item>20 secondi</item>
+    <item>30 secondi</item>
+    <item>1 minuto</item>
+    <item>2 minuti</item>
+  </string-array>
   <string name="share_to">Condividi…</string>
   <string name="protocol_version_older">Questo dispositivo usa una vecchia versione del protocollo di rete</string>
   <string name="protocol_version_newer">Questo dispositivo usa una nuova versione del protocollo di rete</string>
   <string name="general_settings">Impostazioni generali</string>
-  <string name="plugin_settings">Impostazioni generali</string>
-  <string name="plugin_settings_with_name">Apri impostazioni</string>
+  <string name="plugin_settings">Impostazioni</string>
+  <string name="plugin_settings_with_name">Impostazioni di %s</string>
   <string name="device_name">Nome dispositivo</string>
   <string name="device_name_preference_summary">%s</string>
-  <string name="invalid_device_name">Nome non valido</string>
-  <string name="custom_devices_settings">Nessun dispositivo</string>
-  <string name="custom_device_list">Nessun dispositivo</string>
-  <string name="custom_device_list_summary">Nessun dispositivo</string>
-  <string name="share_notification_preference">Sincronizzazione notifiche</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>
-  </string-array>
+  <string name="invalid_device_name">Nome dispositivo non valido</string>
+  <string name="shareplugin_text_saved">Testo ricevuto, salvato negli appunti</string>
+  <string name="custom_devices_settings">Elenco dispositivi personalizzato</string>
+  <string name="custom_device_list">Aggiungi dispositivi per IP</string>
+  <string name="share_notification_preference">Notifiche rumorose</string>
+  <string name="share_notification_preference_summary">Vibra e riproduci un suono alla ricezione di un file</string>
+  <string name="title_activity_notification_filter">Filtro delle notifiche</string>
+  <string name="filter_apps_info">Le notifiche saranno sincronizzate per le applicazioni selezionate.</string>
+  <string name="sftp_internal_storage">Archiviazione interna</string>
+  <string name="sftp_all_files">Tutti i file</string>
+  <string name="sftp_sdcard_num">Scheda SD %d</string>
+  <string name="sftp_sdcard">Scheda SD</string>
+  <string name="sftp_readonly">(sola lettura)</string>
+  <string name="sftp_camera">Immagini fotocamera</string>
+  <string name="add_host">Aggiungi host/IP</string>
+  <string name="add_host_hint">Nome host o IP</string>
+  <string name="no_players_connected">Nessun lettore trovato</string>
+  <string name="custom_dev_list_help">Usa questa opzione solo se il tuo dispositivo non è rilevato automaticamente. Digita l\'indirizzo IP o il nome host in basso e tocca il pulsante per aggiungerlo all\'elenco. Tocca un elemento esistente per rimuoverlo dall\'elenco.</string>
+  <string name="mpris_player_on_device">%1$s su %2$s</string>
 </resources>

res/values-ja/strings.xml

@@ -1,5 +1,10 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
+  <string-array name="mousepad_tap_entries">
+    <item>Right click</item>
+    <item>Middle click</item>
+    <item>Nothing</item>
+  </string-array>
   <string-array name="mpris_time_entries">
     <item>10 seconds</item>
     <item>20 seconds</item>

res/values-ko/strings.xml

@@ -8,8 +8,8 @@
   <string name="pref_plugin_sftp_desc">휴대폰의 파일 시스템 보기</string>
   <string name="pref_plugin_clipboard">클립보드 동기화</string>
   <string name="pref_plugin_clipboard_desc">클립보드 내용 동기화</string>
-  <string name="pref_plugin_mousepad">원격 제어</string>
-  <string name="pref_plugin_mpris">멀티미디어 제어</string>
+  <string name="pref_plugin_mousepad">원격 입력</string>
+  <string name="pref_plugin_mousepad_desc">내 장치를 마우스와 키보드로 사용하기</string>
   <string name="pref_plugin_mpris_desc">휴대폰에서 오디오/비디오 제어</string>
   <string name="pref_plugin_ping">핑</string>
   <string name="pref_plugin_ping_desc">핑 보내고 받기</string>
@@ -22,15 +22,17 @@
   <string name="open_settings">설정 열기</string>
   <string name="no_permissions">알림 접근 권한을 허가해야 합니다</string>
   <string name="send_ping">핑 보내기</string>
-  <string name="open_mpris_controls">원격 제어 열기</string>
-  <string name="open_mousepad">원격 제어 열기</string>
+  <string-array name="mousepad_tap_entries">
+    <item/>
+    <item/>
+    <item>Nothing</item>
+  </string-array>
   <string name="category_connected_devices">연결된 장치</string>
-  <string name="category_not_paired_devices">페어링되지 않은 장치</string>
+  <string name="category_not_paired_devices">사용 가능한 장치</string>
   <string name="category_remembered_devices">기억하는 장치</string>
   <string name="plugins_failed_to_load">불러올 수 없는 플러그인(정보를 보려면 누르기)</string>
-  <string name="device_menu_plugins">플러그인 선택</string>
   <string name="device_menu_unpair">페어링 해제</string>
-  <string name="device_not_reachable">장치에 접근할 수 없음</string>
+  <string name="device_not_reachable">페어링된 장치에 도달할 수 없음</string>
   <string name="unknown_device">알 수 없는 장치</string>
   <string name="error_not_reachable">장치에 접근할 수 없음</string>
   <string name="error_already_requested">페어링이 이미 요청됨</string>
@@ -42,10 +44,17 @@
   <string name="error_invalid_key">잘못된 키 받음</string>
   <string name="pair_requested">페어링 요청됨</string>
   <string name="pairing_request_from">%1s에서 페어링 요청</string>
-  <string name="incoming_file_title">%1s에서 페어링 요청</string>
-  <string name="incoming_file_text">%s</string>
+  <string name="received_url_title">%1s에서 링크 받음</string>
+  <string name="received_url_text">\'%1s\'을(를) 열려면 누르십시오</string>
+  <string name="incoming_file_title">%1s에서 파일 보냄</string>
+  <string name="incoming_file_text">%1s</string>
+  <string name="received_file_title">%1s에서 파일 받음</string>
+  <string name="received_file_text">\'%1s\'을(를) 열려면 누르십시오</string>
   <string name="tap_to_answer">눌러서 응답하기</string>
   <string name="reconnect">다시 연결</string>
+  <string name="right_click">오른쪽 단추 누름 신호 보내기</string>
+  <string name="middle_click">가운데 단추 누름 신호 보내기</string>
+  <string name="show_keyboard">키보드 보이기</string>
   <string name="device_not_paired">장치가 페어링되지 않음</string>
   <string name="request_pairing">페어링 요청</string>
   <string name="pairing_accept">수락</string>
@@ -60,25 +69,36 @@
   <string name="mpris_ff">빨리 감기</string>
   <string name="mpris_next">다음</string>
   <string name="mpris_volume">음량</string>
-  <string name="mpris_settings">멀티미디어 제어</string>
+  <string name="mpris_settings">멀티미디어 설정</string>
+  <string-array name="mpris_time_entries">
+    <item>10초</item>
+    <item>20초</item>
+    <item>30초</item>
+    <item>1분</item>
+    <item>2분</item>
+  </string-array>
   <string name="share_to">다음으로 공유...</string>
   <string name="protocol_version_older">이 장치의 프로토콜 버전이 오래되었습니다</string>
   <string name="protocol_version_newer">이 장치의 프로토콜 버전이 더 새롭습니다</string>
   <string name="general_settings">일반 설정</string>
-  <string name="plugin_settings">일반 설정</string>
-  <string name="plugin_settings_with_name">설정 열기</string>
+  <string name="plugin_settings">설정</string>
+  <string name="plugin_settings_with_name">%s 설정</string>
   <string name="device_name">장치 이름</string>
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">잘못된 장치 이름</string>
-  <string name="custom_devices_settings">장치 없음</string>
-  <string name="custom_device_list">장치 없음</string>
-  <string name="custom_device_list_summary">장치 없음</string>
-  <string name="share_notification_preference">알림 동기화</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>
-  </string-array>
+  <string name="shareplugin_text_saved">텍스트 수신, 클립보드에 복사됨</string>
+  <string name="custom_devices_settings">사용자 정의 장치 목록</string>
+  <string name="custom_device_list">IP로 장치 추가</string>
+  <string name="share_notification_preference">시끄러운 알림</string>
+  <string name="share_notification_preference_summary">파일을 받았을 때 진동과 소리로 알림</string>
+  <string name="sftp_internal_storage">내부 저장소</string>
+  <string name="sftp_all_files">모든 파일</string>
+  <string name="sftp_sdcard_num">SD 카드 %d</string>
+  <string name="sftp_sdcard">SD 카드</string>
+  <string name="sftp_readonly">(읽기 전용)</string>
+  <string name="sftp_camera">카메라 사진</string>
+  <string name="add_host">호스트/IP 주소 추가</string>
+  <string name="no_players_connected">재생기를 찾을 수 없음</string>
+  <string name="custom_dev_list_help">장치를 자동으로 인식할 수 없을 때 이 옵션을 사용하십시오. IP 주소나 호스트 이름을 입력하고 단추를 누르면 목록에 추가합니다. 목록에 있는 항목을 누르면 삭제합니다.</string>
+  <string name="mpris_player_on_device">%2$s의 %1$s</string>
 </resources>

res/values-lt/strings.xml

@@ -1,5 +1,10 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
+  <string-array name="mousepad_tap_entries">
+    <item>Right click</item>
+    <item>Middle click</item>
+    <item>Nothing</item>
+  </string-array>
   <string-array name="mpris_time_entries">
     <item>10 seconds</item>
     <item>20 seconds</item>

res/values-nl/strings.xml

@@ -10,14 +10,14 @@
   <string name="pref_plugin_clipboard_desc">De inhoud van het klembord delen</string>
   <string name="pref_plugin_mousepad">Invoer op afstand</string>
   <string name="pref_plugin_mousepad_desc">Uw telefoon gebruiken als een muis en toetsenbord</string>
-  <string name="pref_plugin_mpris">Afstandsbediening van multimedia</string>
+  <string name="pref_plugin_mpris">Bediening van multimedia</string>
   <string name="pref_plugin_mpris_desc">Bedien de audio/video vanaf uw telefoon</string>
   <string name="pref_plugin_ping">Ping</string>
   <string name="pref_plugin_ping_desc">Pings verzenden en ontvangen</string>
   <string name="pref_plugin_notifications">Synchronisatie van meldingen</string>
   <string name="pref_plugin_notifications_desc">Bekijk uw meldingen van andere apparaten</string>
-  <string name="pref_plugin_sharereceiver">Ontvanger delen</string>
-  <string name="pref_plugin_sharereceiver_desc">Inkomende bestanden opslaan naar de opslag van de telefoon</string>
+  <string name="pref_plugin_sharereceiver">Delen en Ontvangen</string>
+  <string name="pref_plugin_sharereceiver_desc">Bestanden en URL\'s delen tussen apparaten</string>
   <string name="plugin_not_available">Deze functie is niet beschikbaar in uw versie van Android</string>
   <string name="device_list_empty">Geen apparaten</string>
   <string name="ok">OK</string>
@@ -25,18 +25,23 @@
   <string name="open_settings">Instellingen openen</string>
   <string name="no_permissions">U moet toestemming geven voor toegang tot meldingen</string>
   <string name="send_ping">Ping verzenden</string>
-  <string name="open_mpris_controls">Afstandsbediening openen</string>
-  <string name="open_mousepad">Afstandsbediening van touchpad openen</string>
-  <string name="mousepad_info">Veeg met een vinger op het scherm om de muiscursor te verplaatsen</string>
-  <string name="mousepad_double_tap_settings_title">Klopactie met twee vingers instellen</string>
-  <string name="mousepad_triple_tap_settings_title">Klopactie met drie vingers instellen</string>
-  <string name="mousepad_right_click">Rechter muisklik</string>
-  <string name="mousepad_middle_click">Middelste muisklik</string>
+  <string name="open_mpris_controls">Bediening van multimedia</string>
+  <string name="open_mousepad">Invoer op afstand</string>
+  <string name="mousepad_info">Veeg met een vinger op het scherm om de muiscursor te verplaatsen. Tik om te klikken en gebruik twee/drie vingers voor rechter en middelste knop. Druk lang voor slepen en loslaten.</string>
+  <string name="mousepad_double_tap_settings_title">Tikactie met twee vingers instellen</string>
+  <string name="mousepad_triple_tap_settings_title">Tikactie met drie vingers instellen</string>
+  <string-array name="mousepad_tap_entries">
+    <item>Rechter muisklik</item>
+    <item>Middelste muisklik</item>
+    <item>Niets</item>
+  </string-array>
+  <string name="mousepad_double_default">rechts</string>
+  <string name="mousepad_triple_default">midden</string>
   <string name="category_connected_devices">Verbonden apparaten</string>
-  <string name="category_not_paired_devices">Geen gepaarde apparaten</string>
+  <string name="category_not_paired_devices">Beschikbare apparaten</string>
   <string name="category_remembered_devices">Onthouden apparaten</string>
   <string name="plugins_failed_to_load">Laden van plug-ins is mislukt (tap voor meer informatie):</string>
-  <string name="device_menu_plugins">Plug-ins selecteren</string>
+  <string name="device_menu_plugins">Plugin-instellingen</string>
   <string name="device_menu_unpair">Paar uit elkaar halen</string>
   <string name="device_not_reachable">Gepaard apparaat niet bereikbaar</string>
   <string name="unknown_device">Onbekend apparaat</string>
@@ -54,8 +59,15 @@
   <string name="received_url_text">Tap om \'%1s\' te openen</string>
   <string name="incoming_file_title">Inkomend bestand van %1s</string>
   <string name="incoming_file_text">%1s</string>
+  <string name="outgoing_file_title">Bezig bestand te verzenden naar %1s</string>
+  <string name="outgoing_file_text">%1s</string>
   <string name="received_file_title">Bestand ontvangen van %1s</string>
+  <string name="received_file_fail_title">Bestand ontvangen van %1s is mislukt</string>
   <string name="received_file_text">Tap om \'%1s\' te openen</string>
+  <string name="sent_file_title">Bestand verzonden naar %1s</string>
+  <string name="sent_file_text">%1s</string>
+  <string name="sent_file_failed_title">Verzenden van bestand %1s is mislukt</string>
+  <string name="sent_file_failed_text">%1s</string>
   <string name="tap_to_answer">Tap om te antwoorden</string>
   <string name="reconnect">Opnieuw verbinden</string>
   <string name="right_click">Verstuur een rechter muisklik</string>
@@ -76,8 +88,15 @@
   <string name="mpris_next">Volgende</string>
   <string name="mpris_volume">Volume</string>
   <string name="mpris_settings">Instellingen voor multimedia</string>
-  <string name="mpris_time_settings_title">Intervaltijd</string>
-  <string name="mpris_time_settings_summary">Pas de tijd aan om snel voorwaarts te gaan or terug te spoelen in een multimedia bestand.</string>
+  <string name="mpris_time_settings_title">Knoppen vooruit/terug</string>
+  <string name="mpris_time_settings_summary">Pas de tijd aan om snel voorwaarts/terug te gaan bij indrukken.</string>
+  <string-array name="mpris_time_entries">
+    <item>10 seconden</item>
+    <item>20 seconden</item>
+    <item>30 seconden</item>
+    <item>1 minuut</item>
+    <item>2 minuten</item>
+  </string-array>
   <string name="share_to">Delen met...</string>
   <string name="protocol_version_older">Dit apparaat gebruikt een oude protocolversie</string>
   <string name="protocol_version_newer">Dit apparaat gebruikt een nieuwere protocolversie</string>
@@ -89,10 +108,11 @@
   <string name="invalid_device_name">Ongeldige apparaatnaam</string>
   <string name="shareplugin_text_saved">Oontvangen tekst, opgeslagen op klembord</string>
   <string name="custom_devices_settings">Aangepaste lijst apparaten</string>
-  <string name="custom_device_list">Aangepaste lijst apparaten</string>
-  <string name="custom_device_list_summary">Aangepaste lijst apparaten</string>
+  <string name="custom_device_list">Voeg apparaten toe per IP-adres</string>
   <string name="share_notification_preference">Luidruchtige meldingen</string>
   <string name="share_notification_preference_summary">Vibreer en speel een geluidje bij ontvangen van een bestand</string>
+  <string name="title_activity_notification_filter">Filter voor meldingen</string>
+  <string name="filter_apps_info">Meldingen zullen gesynchroniseerd worden voor de geselecteerde apps.</string>
   <string name="sftp_internal_storage">Interne opslag</string>
   <string name="sftp_all_files">Alle bestanden</string>
   <string name="sftp_sdcard_num">SD-kaartje %d</string>
@@ -100,12 +120,8 @@
   <string name="sftp_readonly">(alleen-lezen)</string>
   <string name="sftp_camera">Afbeeldingen van camera</string>
   <string name="add_host">Host/IP-adres toevoegen</string>
+  <string name="add_host_hint">Hostnaam of IP-adres</string>
+  <string name="no_players_connected">Geen spelers gevonden</string>
   <string name="custom_dev_list_help">Deze optie alleen gebruiken als uw apparaat niet automatisch gedetecteerd wordt. Voer IP-adres of hostnaam hieronder in en klik op de knop om het aan de lijst toe te voegen. Klik op een bestaand item om het uit de lijst te verwijderen.</string>
-  <string-array name="mpris_time_entries">
-    <item>10 seconden</item>
-    <item>20 seconden</item>
-    <item>30 seconden</item>
-    <item>1 minuut</item>
-    <item>2 minuten</item>
-  </string-array>
+  <string name="mpris_player_on_device">%1$s op %2$s</string>
 </resources>

res/values-pl/strings.xml

@@ -10,14 +10,14 @@
   <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 jako myszy i klawiatury</string>
-  <string name="pref_plugin_mpris">Zdalne sterowanie multimediami</string>
+  <string name="pref_plugin_mpris">Sterowanie multimediami</string>
   <string name="pref_plugin_mpris_desc">Steruj dźwiękiem/obrazem ze swojego telefonu</string>
   <string name="pref_plugin_ping">Ping</string>
   <string name="pref_plugin_ping_desc">Wysyłaj i otrzymuj pingi</string>
   <string name="pref_plugin_notifications">Powiadomienia synchronizacji</string>
   <string name="pref_plugin_notifications_desc">Uzyskaj dostęp do swoich powiadomień z innego urządzenia</string>
-  <string name="pref_plugin_sharereceiver">Udostępnij odbiornik</string>
-  <string name="pref_plugin_sharereceiver_desc">Zapisz przychodzące pliki do pamięci telefonu</string>
+  <string name="pref_plugin_sharereceiver">Udostępniaj i otrzymuj</string>
+  <string name="pref_plugin_sharereceiver_desc">Współdziel pliki i adresy URL pomiędzy urządzeniami</string>
   <string name="plugin_not_available">Funkcja ta nie jest dostępna w twojej wersji Androida</string>
   <string name="device_list_empty">Brak urządzeń</string>
   <string name="ok">OK</string>
@@ -25,18 +25,23 @@
   <string name="open_settings">Otwórz ustawienia</string>
   <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">Otwórz zdalne sterowanie</string>
-  <string name="open_mousepad">Otwórz sterowanie gładzikiem</string>
-  <string name="mousepad_info">Przesuń kciukiem po ekranie, aby przesunąć wskaźnik myszy</string>
+  <string name="open_mpris_controls">Sterowanie multimediami</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>
   <string name="mousepad_triple_tap_settings_title">Ustaw działanie po trzykrotnym stuknięciu palcem</string>
-  <string name="mousepad_right_click">Naciśnięcie prawym</string>
-  <string name="mousepad_middle_click">Naciśnięcie środkowym</string>
+  <string-array name="mousepad_tap_entries">
+    <item>Naciśnięcie prawym</item>
+    <item>Naciśnięcie środkowym</item>
+    <item>Nic</item>
+  </string-array>
+  <string name="mousepad_double_default">prawo</string>
+  <string name="mousepad_triple_default">środek</string>
   <string name="category_connected_devices">Podłączone urządzenia</string>
-  <string name="category_not_paired_devices">Brak sparowanych urządzeń</string>
+  <string name="category_not_paired_devices">Dostępne urządzenia</string>
   <string name="category_remembered_devices">Zapamiętane urządzenia</string>
   <string name="plugins_failed_to_load">Nieudane wczytywanie wtyczki (stuknij po więcej informacji):</string>
-  <string name="device_menu_plugins">Wybierz wtyczki</string>
+  <string name="device_menu_plugins">Ustawienia wtyczki</string>
   <string name="device_menu_unpair">Odparuj</string>
   <string name="device_not_reachable">Sparowane urządzenie nieosiągalne</string>
   <string name="unknown_device">Nieznane urządzenie</string>
@@ -54,8 +59,15 @@
   <string name="received_url_text">Znacznik do otwarcia \'%1s\'</string>
   <string name="incoming_file_title">Plik przychodzący od %1s</string>
   <string name="incoming_file_text">%1s</string>
+  <string name="outgoing_file_title">Wysyłanie pliku do %1s</string>
+  <string name="outgoing_file_text">%1s</string>
   <string name="received_file_title">Odebrano plik od %1s</string>
+  <string name="received_file_fail_title">Nieudane odbieranie pliku z %1s</string>
   <string name="received_file_text">Znacznik do otwarcia \'%1s\'</string>
+  <string name="sent_file_title">Plik wysłano do %1s</string>
+  <string name="sent_file_text">%1s</string>
+  <string name="sent_file_failed_title">Nieudane wysyłanie pliku %1s</string>
+  <string name="sent_file_failed_text">%1s</string>
   <string name="tap_to_answer">Stuknij, aby odpowiedzieć</string>
   <string name="reconnect">Połącz ponownie</string>
   <string name="right_click">Wyślij naciskając prawym</string>
@@ -76,8 +88,15 @@
   <string name="mpris_next">Następny</string>
   <string name="mpris_volume">Głośność</string>
   <string name="mpris_settings">Ustawienia multimediów</string>
-  <string name="mpris_time_settings_title">Czas okresu</string>
-  <string name="mpris_time_settings_summary">Dostosuj czas do przewijania wprzód lub wstecz w pliku multimedialnym.</string>
+  <string name="mpris_time_settings_title">Przyciski naprzód/wstecz</string>
+  <string name="mpris_time_settings_summary">Dostosuj czas do przewijania wprzód lub wstecz po naciśnięciu.</string>
+  <string-array name="mpris_time_entries">
+    <item>10 sekund</item>
+    <item>20 sekund</item>
+    <item>30 sekund</item>
+    <item>1 minuta</item>
+    <item>2 minuty</item>
+  </string-array>
   <string name="share_to">Współdziel z...</string>
   <string name="protocol_version_older">Urządzenie to używa starej wersji protokołu</string>
   <string name="protocol_version_newer">Urządzenie to używa nowszej wersji protokołu</string>
@@ -89,10 +108,11 @@
   <string name="invalid_device_name">Nieprawidłowa nazwa urządzenia</string>
   <string name="shareplugin_text_saved">Otrzymano tekst, zapisano do schowka</string>
   <string name="custom_devices_settings">Lista własnych urządzeń</string>
-  <string name="custom_device_list">Lista własnych urządzeń</string>
-  <string name="custom_device_list_summary">Lista własnych urządzeń</string>
+  <string name="custom_device_list">Dodaj urządzenia po numerze IP</string>
   <string name="share_notification_preference">Hałaśliwe powiadomienia</string>
   <string name="share_notification_preference_summary">Zadrżyj i odegraj dźwięk przy odebraniu pliku</string>
+  <string name="title_activity_notification_filter">Filtr powiadomień</string>
+  <string name="filter_apps_info">Powiadomienia zostaną zsynchronizowane z wybranymi aplikacjami.</string>
   <string name="sftp_internal_storage">"Pamięć wewnętrzna "</string>
   <string name="sftp_all_files">Wszystkie pliki</string>
   <string name="sftp_sdcard_num">Karta SD %d</string>
@@ -100,12 +120,8 @@
   <string name="sftp_readonly">(tylko do odczytu)</string>
   <string name="sftp_camera">Zdjęcia z aparatu</string>
   <string name="add_host">Dodaj gospodarza/IP</string>
+  <string name="add_host_hint">Gospodarz lub IP</string>
+  <string name="no_players_connected">Nie znaleziono żadnego odtwarzacza</string>
   <string name="custom_dev_list_help">Użyj tej opcji tylko wtedy, gdy twoje urządzenie nie jest samoczynnie wykrywane. Podaj adres IP i nazwę gospodarza poniżej i dotknij przycisku, aby dodać je do listy. Dotknij istniejącego elementu, aby usunąć go z listy.</string>
-  <string-array name="mpris_time_entries">
-    <item>10 sekund</item>
-    <item>20 sekund</item>
-    <item>30 sekund</item>
-    <item>1 minuta</item>
-    <item>2 minuty</item>
-  </string-array>
+  <string name="mpris_player_on_device">%1$s na %2$s</string>
 </resources>

res/values-pt-rBR/strings.xml

@@ -10,14 +10,14 @@
   <string name="pref_plugin_clipboard_desc">Compartilha o conteúdo da área de transferência</string>
   <string name="pref_plugin_mousepad">Introdução de dados remota</string>
   <string name="pref_plugin_mousepad_desc">Usar seu telefone como mouse ou teclado</string>
-  <string name="pref_plugin_mpris">Controle remoto multimídia</string>
+  <string name="pref_plugin_mpris">Controle multimídia</string>
   <string name="pref_plugin_mpris_desc">Controla áudio e vídeo a partir do seu telefone</string>
   <string name="pref_plugin_ping">Ping</string>
   <string name="pref_plugin_ping_desc">Envia e recebe pings</string>
   <string name="pref_plugin_notifications">Sincronização de notificações</string>
   <string name="pref_plugin_notifications_desc">Acesse suas notificações a partir de outros dispositivos</string>
-  <string name="pref_plugin_sharereceiver">Destinatário do compartilhamento</string>
-  <string name="pref_plugin_sharereceiver_desc">Salvar os arquivos recebidos no armazenamento do celular</string>
+  <string name="pref_plugin_sharereceiver">Compartilhar e receber</string>
+  <string name="pref_plugin_sharereceiver_desc">Compartilhar arquivos e URLs entre os dispositivos</string>
   <string name="plugin_not_available">Esta funcionalidade não está disponível na sua versão do Android</string>
   <string name="device_list_empty">Sem dispositivos</string>
   <string name="ok">OK</string>
@@ -25,18 +25,23 @@
   <string name="open_settings">Abrir configurações</string>
   <string name="no_permissions">Você precisa conceder permissão para acessar as notificações</string>
   <string name="send_ping">Enviar ping</string>
-  <string name="open_mpris_controls">Abra o controle remoto</string>
-  <string name="open_mousepad">Abrir o controle do touchpad</string>
-  <string name="mousepad_info">Mova um dedo na tela para mover o ponteiro do mouse</string>
+  <string name="open_mpris_controls">Controle multimídia</string>
+  <string name="open_mousepad">Introdução de dados remota</string>
+  <string name="mousepad_info">Mova um dedo pelo tela para mover o ponteiro do mouse. Dê um toque para clicar e use dois/três dedos para os botões da direita e do meio. Use uma pressão longa para arrastar e soltar.</string>
   <string name="mousepad_double_tap_settings_title">Definir a ação do toque com dois dedos</string>
   <string name="mousepad_triple_tap_settings_title">Definir a ação do toque com três dedos</string>
-  <string name="mousepad_right_click">Botão direito</string>
-  <string name="mousepad_middle_click">Botão do meio</string>
+  <string-array name="mousepad_tap_entries">
+    <item>Botão direito</item>
+    <item>Botão do meio</item>
+    <item>Nada</item>
+  </string-array>
+  <string name="mousepad_double_default">direita</string>
+  <string name="mousepad_triple_default">meio</string>
   <string name="category_connected_devices">Dispositivos conectados</string>
-  <string name="category_not_paired_devices">Dispositivos não emparelhados</string>
+  <string name="category_not_paired_devices">Dispositivos disponíveis</string>
   <string name="category_remembered_devices">Dispositivos lembrados</string>
   <string name="plugins_failed_to_load">Plugins não carregados (toque para mais informações):</string>
-  <string name="device_menu_plugins">Selecionar plugins</string>
+  <string name="device_menu_plugins">Configurações do plugin</string>
   <string name="device_menu_unpair">Cancelar emparelhamento</string>
   <string name="device_not_reachable">O dispositivo pareado está inacessível</string>
   <string name="unknown_device">Dispositivo desconhecido</string>
@@ -54,8 +59,15 @@
   <string name="received_url_text">Toque para abrir o \'%1s\'</string>
   <string name="incoming_file_title">Arquivo recebido de %1s</string>
   <string name="incoming_file_text">%1s</string>
+  <string name="outgoing_file_title">Enviando arquivo para %1s</string>
+  <string name="outgoing_file_text">%1s</string>
   <string name="received_file_title">Arquivo recebido de %1s</string>
+  <string name="received_file_fail_title">Falha ao receber o arquivo de %1s</string>
   <string name="received_file_text">Toque para abrir o \'%1s\'</string>
+  <string name="sent_file_title">Enviar arquivo para %1s</string>
+  <string name="sent_file_text">%1s</string>
+  <string name="sent_file_failed_title">Falha ao enviar o arquivo %1s</string>
+  <string name="sent_file_failed_text">%1s</string>
   <string name="tap_to_answer">Toque para responder</string>
   <string name="reconnect">Reconectar</string>
   <string name="right_click">Enviar um Botão Direito</string>
@@ -76,8 +88,15 @@
   <string name="mpris_next">Próximo</string>
   <string name="mpris_volume">Volume</string>
   <string name="mpris_settings">Configurações de multimídia</string>
-  <string name="mpris_time_settings_title">Intervalo de tempo</string>
-  <string name="mpris_time_settings_summary">Ajuste o tempo para avançar ou retroceder um arquivo multimídia.</string>
+  <string name="mpris_time_settings_title">Botões para avançar/voltar</string>
+  <string name="mpris_time_settings_summary">Ajuste o tempo para avançar ou retroceder quando pressionar.</string>
+  <string-array name="mpris_time_entries">
+    <item>10 segundos</item>
+    <item>20 segundos</item>
+    <item>30 segundos</item>
+    <item>1 minuto</item>
+    <item>2 minutos</item>
+  </string-array>
   <string name="share_to">Compartilhar com...</string>
   <string name="protocol_version_older">Este dispositivo usa uma versão antiga do protocolo</string>
   <string name="protocol_version_newer">Este dispositivo usa uma versão mais recente do protocolo</string>
@@ -89,10 +108,11 @@
   <string name="invalid_device_name">Nome do dispositivo inválido</string>
   <string name="shareplugin_text_saved">Texto recebido e salvo na área de transferência</string>
   <string name="custom_devices_settings">Lista de dispositivos personalizada</string>
-  <string name="custom_device_list">Lista de dispositivos personalizada</string>
-  <string name="custom_device_list_summary">Lista de dispositivos personalizada</string>
+  <string name="custom_device_list">Adicionar dispositivos pelo IP</string>
   <string name="share_notification_preference">Notificações barulhentas</string>
   <string name="share_notification_preference_summary">Vibrar e tocar um som ao receber um arquivo</string>
+  <string name="title_activity_notification_filter">Filtro de notificações</string>
+  <string name="filter_apps_info">As notificações serão sincronizadas para os aplicativos selecionados.</string>
   <string name="sftp_internal_storage">Armazenamento interno</string>
   <string name="sftp_all_files">Todos os arquivos</string>
   <string name="sftp_sdcard_num">Cartão SD %d</string>
@@ -100,12 +120,8 @@
   <string name="sftp_readonly">(somente leitura)</string>
   <string name="sftp_camera">Imagens da câmera</string>
   <string name="add_host">Adicionar máquina/IP</string>
+  <string name="add_host_hint">Máquina ou IP</string>
+  <string name="no_players_connected">Nenhum reprodutor encontrado</string>
   <string name="custom_dev_list_help">Use esta opção apenas se o seu dispositivo não for detectado automaticamente. Digite o endereço IP ou nome da máquina no campo abaixo e toque o botão para adicioná-lo à lista. Toque em um item existente para removê-lo da lista.</string>
-  <string-array name="mpris_time_entries">
-    <item>10 segundos</item>
-    <item>20 segundos</item>
-    <item>30 segundos</item>
-    <item>1 minuto</item>
-    <item>2 minutos</item>
-  </string-array>
+  <string name="mpris_player_on_device">%1$s em %2$s</string>
 </resources>

res/values-pt/strings.xml

@@ -10,14 +10,14 @@
   <string name="pref_plugin_clipboard_desc">Partilhar o conteúdo da área de transferência</string>
   <string name="pref_plugin_mousepad">Introdução remota de dados</string>
   <string name="pref_plugin_mousepad_desc">Usar o seu telefone como um rato ou teclado</string>
-  <string name="pref_plugin_mpris">Comando à distância multimédia</string>
+  <string name="pref_plugin_mpris">Comandos multimédia</string>
   <string name="pref_plugin_mpris_desc">Controlar o áudio/vídeo a partir do seu telefone</string>
   <string name="pref_plugin_ping">Contacto</string>
   <string name="pref_plugin_ping_desc">Enviar e receber pedidos de contacto (\'ping\')</string>
   <string name="pref_plugin_notifications">Sincronização da notificação</string>
   <string name="pref_plugin_notifications_desc">Aceder às suas notificações a partir de outros dispositivos</string>
-  <string name="pref_plugin_sharereceiver">Destinatário da partilha</string>
-  <string name="pref_plugin_sharereceiver_desc">Gravar os ficheiros recebidos no armazenamento do telemóvel</string>
+  <string name="pref_plugin_sharereceiver">Partilhar e receber</string>
+  <string name="pref_plugin_sharereceiver_desc">Partilhar ficheiros e URL\'s entre dispositivos</string>
   <string name="plugin_not_available">Esta funcionalidade não está disponível na sua versão do Android</string>
   <string name="device_list_empty">Sem dispositivos</string>
   <string name="ok">OK</string>
@@ -25,18 +25,23 @@
   <string name="open_settings">Abrir a configuração</string>
   <string name="no_permissions">Precisa de dar permissões de acesso às notificações</string>
   <string name="send_ping">Enviar um pedido de contacto</string>
-  <string name="open_mpris_controls">Abrir o comando à distância</string>
-  <string name="open_mousepad">Abrir o controlo do painel do rato</string>
-  <string name="mousepad_info">Mova um dedo no ecrã para mover o cursor do rato</string>
-  <string name="mousepad_double_tap_settings_title">Definir a Acção do Toque com Dois Dedos</string>
-  <string name="mousepad_triple_tap_settings_title">Definir a Acção do Toque com Três Dedos</string>
-  <string name="mousepad_right_click">Botão direito</string>
-  <string name="mousepad_middle_click">Botão do meio</string>
+  <string name="open_mpris_controls">Comando multimédia</string>
+  <string name="open_mousepad">Introdução remota de dados</string>
+  <string name="mousepad_info">Mova um dedo pelo ecrã para mover o cursor do rato. Dê um toque para carregar no botão esquerdo e use dois/três dedos para os botões direito e do meio. Use uma pressão longa para arrastar e largar.</string>
+  <string name="mousepad_double_tap_settings_title">Definir a acção do toque com dois dedos</string>
+  <string name="mousepad_triple_tap_settings_title">Definir a acção do toque com três dedos</string>
+  <string-array name="mousepad_tap_entries">
+    <item>Botão direito</item>
+    <item>Botão do meio</item>
+    <item>Nada</item>
+  </string-array>
+  <string name="mousepad_double_default">direita</string>
+  <string name="mousepad_triple_default">meio</string>
   <string name="category_connected_devices">Dispositivos ligados</string>
-  <string name="category_not_paired_devices">Dispositivos não emparelhados</string>
+  <string name="category_not_paired_devices">Dispositivos disponíveis</string>
   <string name="category_remembered_devices">Dispositivos recordados</string>
   <string name="plugins_failed_to_load">Não foi possível carregar os \'plugin\' (toque para mais informações):</string>
-  <string name="device_menu_plugins">Seleccionar os \'plugins\'</string>
+  <string name="device_menu_plugins">Configuração do \'plugin\'</string>
   <string name="device_menu_unpair">Desemparelhar</string>
   <string name="device_not_reachable">O dispositivo emparelhado está inacessível</string>
   <string name="unknown_device">Dispositivo desconhecido</string>
@@ -54,8 +59,15 @@
   <string name="received_url_text">Toque para abrir o \'%1s\'</string>
   <string name="incoming_file_title">Ficheiro recebido de %1s</string>
   <string name="incoming_file_text">%1s</string>
+  <string name="outgoing_file_title">A enviar o ficheiro para o %1s</string>
+  <string name="outgoing_file_text">%1s</string>
   <string name="received_file_title">Ficheiro recebido de %1s</string>
+  <string name="received_file_fail_title">Falhou a recepção do ficheiro de %1s</string>
   <string name="received_file_text">Toque para abrir o \'%1s\'</string>
+  <string name="sent_file_title">O ficheiro foi enviado para %1s</string>
+  <string name="sent_file_text">%1s</string>
+  <string name="sent_file_failed_title">Não foi possível enviar o ficheiro %1s</string>
+  <string name="sent_file_failed_text">%1s</string>
   <string name="tap_to_answer">Toque para responder</string>
   <string name="reconnect">Ligar de Novo</string>
   <string name="right_click">Enviar um Botão Direito</string>
@@ -76,8 +88,15 @@
   <string name="mpris_next">Seguinte</string>
   <string name="mpris_volume">Volume</string>
   <string name="mpris_settings">Configuração Multimédia</string>
-  <string name="mpris_time_settings_title">Tempo do Intervalo</string>
-  <string name="mpris_time_settings_summary">Ajusta o tempo de avanço ou de recuo de um ficheiro multimédia.</string>
+  <string name="mpris_time_settings_title">Botões para avançar/recuar</string>
+  <string name="mpris_time_settings_summary">Ajusta o tempo para o avanço/recuo quando pressionar.</string>
+  <string-array name="mpris_time_entries">
+    <item>10 segundos</item>
+    <item>20 segundos</item>
+    <item>30 segundos</item>
+    <item>1 minuto</item>
+    <item>2 minutos</item>
+  </string-array>
   <string name="share_to">Partilhar Com...</string>
   <string name="protocol_version_older">Este dispositivo usa uma versão antiga do protocolo</string>
   <string name="protocol_version_newer">Este dispositivo usa uma versão mais recente do protocolo</string>
@@ -89,10 +108,11 @@
   <string name="invalid_device_name">Nome do dispositivo inválido</string>
   <string name="shareplugin_text_saved">Texto recebido e guardado na área de transferência</string>
   <string name="custom_devices_settings">Lista de dispositivos personalizada</string>
-  <string name="custom_device_list">Lista de dispositivos personalizada</string>
-  <string name="custom_device_list_summary">Lista de dispositivos personalizada</string>
+  <string name="custom_device_list">Adicionar dispositivos pelo IP</string>
   <string name="share_notification_preference">Notificações com ruído</string>
   <string name="share_notification_preference_summary">Vibrar e tocar um som ao receber um ficheiro</string>
+  <string name="title_activity_notification_filter">Filtro de notificações</string>
+  <string name="filter_apps_info">As notificações serão sincronizadas para as aplicações seleccionadas.</string>
   <string name="sftp_internal_storage">Armazenamento interno</string>
   <string name="sftp_all_files">Todos os ficheiros</string>
   <string name="sftp_sdcard_num">Cartão SD %d</string>
@@ -100,12 +120,8 @@
   <string name="sftp_readonly">(apenas para leitura)</string>
   <string name="sftp_camera">Fotografias</string>
   <string name="add_host">Adicionar uma máquina/IP</string>
+  <string name="add_host_hint">Nome ou IP da máquina</string>
+  <string name="no_players_connected">Não foram encontrados leitores</string>
   <string name="custom_dev_list_help">Use esta opção apenas se o seu dispositivo não for detectado automaticamente. Indique o endereço IP ou nome da máquina em baixo e carregue no botão para a adicionar à lista. Carregue sobre um item existente para o remover da lista.</string>
-  <string-array name="mpris_time_entries">
-    <item>10 segundos</item>
-    <item>20 segundos</item>
-    <item>30 segundos</item>
-    <item>1 minuto</item>
-    <item>2 minutos</item>
-  </string-array>
+  <string name="mpris_player_on_device">%1$s em %2$s</string>
 </resources>

res/values-ro/strings.xml

@@ -8,8 +8,6 @@
   <string name="pref_plugin_sftp_desc">Vă permite să răsfoiți de la distanță sistemul de fișiere al dispozitivului</string>
   <string name="pref_plugin_clipboard">Sincronizare clipboard</string>
   <string name="pref_plugin_clipboard_desc">Partajează conținutul clipboardului</string>
-  <string name="pref_plugin_mousepad">Control de la distanță</string>
-  <string name="pref_plugin_mpris">Controale multimedia distante</string>
   <string name="pref_plugin_mpris_desc">Controlați audio/video de pe telefon</string>
   <string name="pref_plugin_ping">Ping</string>
   <string name="pref_plugin_ping_desc">Trimite și primește ping-uri</string>
@@ -22,15 +20,15 @@
   <string name="open_settings">Deschide configurările</string>
   <string name="no_permissions">Trebuie să acordați permisiunea pentru accesarea notificărilor</string>
   <string name="send_ping">Trimite ping</string>
-  <string name="open_mpris_controls">Deschide controlul de la distanță</string>
-  <string name="open_mousepad">Deschide controlul de la distanță</string>
+  <string-array name="mousepad_tap_entries">
+    <item>Right click</item>
+    <item>Middle click</item>
+    <item>Nothing</item>
+  </string-array>
   <string name="category_connected_devices">Dispozitive conectate</string>
-  <string name="category_not_paired_devices">Dispozitive neasociate</string>
   <string name="category_remembered_devices">Dispozitive memorizate</string>
   <string name="plugins_failed_to_load">Încărcarea extensiilor a eșuat (atingeți pentru mai multe informații):</string>
-  <string name="device_menu_plugins">Alege extensii</string>
   <string name="device_menu_unpair">Dezasociază</string>
-  <string name="device_not_reachable">Dispozitivul nu e accesibil</string>
   <string name="unknown_device">Dispozitiv necunoscut</string>
   <string name="error_not_reachable">Dispozitivul nu e accesibil</string>
   <string name="error_already_requested">Asocierea a fost cerută deja</string>
@@ -42,8 +40,6 @@
   <string name="error_invalid_key">Cheie nevalidă recepționată</string>
   <string name="pair_requested">Asociere cerută</string>
   <string name="pairing_request_from">Cerere de asociere de la %1s</string>
-  <string name="incoming_file_title">Cerere de asociere de la %1s</string>
-  <string name="incoming_file_text">%s</string>
   <string name="tap_to_answer">Atingeți pentru a răspunde</string>
   <string name="reconnect">Reconectează</string>
   <string name="device_not_paired">Dispozitiv neasociat</string>
@@ -60,20 +56,6 @@
   <string name="mpris_ff">Derulare rapidă înainte</string>
   <string name="mpris_next">Următor</string>
   <string name="mpris_volume">Volum</string>
-  <string name="mpris_settings">Controale multimedia distante</string>
-  <string name="share_to">Partajează cu...</string>
-  <string name="protocol_version_older">Acest dispozitiv folosește o versiune veche a protocolului</string>
-  <string name="protocol_version_newer">Acest dispozitiv folosește o versiune mai nouă a protocolului</string>
-  <string name="general_settings">Configurări generale</string>
-  <string name="plugin_settings">Configurări generale</string>
-  <string name="plugin_settings_with_name">Deschide configurările</string>
-  <string name="device_name">Denumire dispozitiv</string>
-  <string name="device_name_preference_summary">%s</string>
-  <string name="invalid_device_name">Denumire nevalidă a dispozitivului</string>
-  <string name="custom_devices_settings">Niciun dispozitiv</string>
-  <string name="custom_device_list">Niciun dispozitiv</string>
-  <string name="custom_device_list_summary">Niciun dispozitiv</string>
-  <string name="share_notification_preference">Sincronizare notificări</string>
   <string-array name="mpris_time_entries">
     <item>10 seconds</item>
     <item>20 seconds</item>
@@ -81,4 +63,11 @@
     <item>1 minute</item>
     <item>2 minutes</item>
   </string-array>
+  <string name="share_to">Partajează cu...</string>
+  <string name="protocol_version_older">Acest dispozitiv folosește o versiune veche a protocolului</string>
+  <string name="protocol_version_newer">Acest dispozitiv folosește o versiune mai nouă a protocolului</string>
+  <string name="general_settings">Configurări generale</string>
+  <string name="device_name">Denumire dispozitiv</string>
+  <string name="device_name_preference_summary">%s</string>
+  <string name="invalid_device_name">Denumire nevalidă a dispozitivului</string>
 </resources>

res/values-ru/strings.xml

@@ -6,8 +6,6 @@
   <string name="pref_plugin_battery_desc">Периодически сообщать о состоянии батареи</string>
   <string name="pref_plugin_clipboard">Синхронизация буфера обмена</string>
   <string name="pref_plugin_clipboard_desc">Сделать содержимое буфера обмена общим</string>
-  <string name="pref_plugin_mousepad">Дистанционное управление</string>
-  <string name="pref_plugin_mpris">ДУ для мультимедия</string>
   <string name="pref_plugin_mpris_desc">Управление аудио/видео с устройства</string>
   <string name="pref_plugin_ping">Пинг</string>
   <string name="pref_plugin_ping_desc">Посылать и получать пинги</string>
@@ -20,15 +18,15 @@
   <string name="open_settings">Открыть настройки</string>
   <string name="no_permissions">Вы должны разрешить доступ к уведомлениям</string>
   <string name="send_ping">Послать пинг</string>
-  <string name="open_mpris_controls">Открыть дистанционное управление</string>
-  <string name="open_mousepad">Открыть дистанционное управление</string>
+  <string-array name="mousepad_tap_entries">
+    <item>Right click</item>
+    <item>Middle click</item>
+    <item>Nothing</item>
+  </string-array>
   <string name="category_connected_devices">Подключённые устройства</string>
-  <string name="category_not_paired_devices">Не спаренные устройства</string>
   <string name="category_remembered_devices">Запомненные устройства</string>
   <string name="plugins_failed_to_load">Сбой загрузки следующих модулей (прикоснитесь чтобы получить подробности):</string>
-  <string name="device_menu_plugins">Выбрать модули</string>
   <string name="device_menu_unpair">Разделить спаренные устройства</string>
-  <string name="device_not_reachable">Устройство недоступно</string>
   <string name="unknown_device">Неизвестное устройство</string>
   <string name="error_not_reachable">Устройство недоступно</string>
   <string name="error_already_requested">Запрос на спаривание уже был сделан</string>
@@ -40,7 +38,6 @@
   <string name="error_invalid_key">Недопустимый получатель ключа</string>
   <string name="pair_requested">Запрошено спаривание</string>
   <string name="pairing_request_from">Запрос на спаривание от %1s</string>
-  <string name="incoming_file_title">Запрос на спаривание от %1s</string>
   <string name="tap_to_answer">Коснитесь чтобы ответить</string>
   <string name="reconnect">Переподключить</string>
   <string name="device_not_paired">Устройство не спарено</string>
@@ -55,19 +52,6 @@
   <string name="mpris_previous">Предыдущий</string>
   <string name="mpris_next">Следующее</string>
   <string name="mpris_volume">Громкость</string>
-  <string name="mpris_settings">ДУ для мультимедия</string>
-  <string name="share_to">Сделать общим с...</string>
-  <string name="protocol_version_older">Это устройство использует старую версию протокола</string>
-  <string name="protocol_version_newer">Это устройство использует более свежую версию протокола</string>
-  <string name="general_settings">Открыть настройки</string>
-  <string name="plugin_settings">Открыть настройки</string>
-  <string name="plugin_settings_with_name">Открыть настройки</string>
-  <string name="device_name">Устройство не спарено</string>
-  <string name="invalid_device_name">Недопустимый получатель ключа</string>
-  <string name="custom_devices_settings">Нет устройств</string>
-  <string name="custom_device_list">Нет устройств</string>
-  <string name="custom_device_list_summary">Нет устройств</string>
-  <string name="share_notification_preference">Синхронизация уведомлений</string>
   <string-array name="mpris_time_entries">
     <item>10 seconds</item>
     <item>20 seconds</item>
@@ -75,4 +59,7 @@
     <item>1 minute</item>
     <item>2 minutes</item>
   </string-array>
+  <string name="share_to">Сделать общим с...</string>
+  <string name="protocol_version_older">Это устройство использует старую версию протокола</string>
+  <string name="protocol_version_newer">Это устройство использует более свежую версию протокола</string>
 </resources>

res/values-sk/strings.xml

@@ -10,14 +10,11 @@
   <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 ako myš a klávesnicu</string>
-  <string name="pref_plugin_mpris">Multimediálne diaľkové ovládače</string>
   <string name="pref_plugin_mpris_desc">Ovládať audio/video z vášho telefónu</string>
   <string name="pref_plugin_ping">Ping</string>
   <string name="pref_plugin_ping_desc">Poslať a prijať pingy</string>
   <string name="pref_plugin_notifications">Synchronizácia pripomienok</string>
   <string name="pref_plugin_notifications_desc">Prístup k vašim pripomienkam z iných zariadení</string>
-  <string name="pref_plugin_sharereceiver">Zdieľať prijímač</string>
-  <string name="pref_plugin_sharereceiver_desc">Uložiť prichádzajúce súbory na úložiska telefónu</string>
   <string name="plugin_not_available">Táto funkcia nie je dostupná vo vašej verzii Androidu</string>
   <string name="device_list_empty">Žiadne zariadenia</string>
   <string name="ok">OK</string>
@@ -25,18 +22,21 @@
   <string name="open_settings">Otvoriť nastavenia</string>
   <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">Otvoriť diaľkové ovládanie</string>
-  <string name="open_mousepad">Otvoriť ovládanie touchpadu</string>
-  <string name="mousepad_info">Presuňte prst na obrazovke na presun kurzora myši</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>
   <string name="mousepad_triple_tap_settings_title">Nastaviť akciu troch prstov</string>
-  <string name="mousepad_right_click">Kliknutie pravým tlačidlom</string>
-  <string name="mousepad_middle_click">Stredný klik</string>
+  <string-array name="mousepad_tap_entries">
+    <item>Kliknutie pravým tlačidlom</item>
+    <item>Stredný klik</item>
+    <item>Nič</item>
+  </string-array>
+  <string name="mousepad_double_default">vpravo</string>
+  <string name="mousepad_triple_default">stred</string>
   <string name="category_connected_devices">Pripojené zariadenia</string>
-  <string name="category_not_paired_devices">Nespárované zariadenia</string>
+  <string name="category_not_paired_devices">Dostupné zariadenia</string>
   <string name="category_remembered_devices">Zapamätané zariadenia</string>
   <string name="plugins_failed_to_load">Zlyhalo načítanie pluginov (tapnite pre viac info):</string>
-  <string name="device_menu_plugins">Vybrať pluginy</string>
+  <string name="device_menu_plugins">Nastavenia pluginu</string>
   <string name="device_menu_unpair">Odpárovať</string>
   <string name="device_not_reachable">Spárované zariadenie nedostupné</string>
   <string name="unknown_device">Neznáme zariadenie</string>
@@ -54,8 +54,15 @@
   <string name="received_url_text">Ťuknite na otvorenie \'%1s\'</string>
   <string name="incoming_file_title">Prichádzajúci súbor od %s</string>
   <string name="incoming_file_text">%1s</string>
+  <string name="outgoing_file_title">Posielam súbor pre %1s</string>
+  <string name="outgoing_file_text">%1s</string>
   <string name="received_file_title">Prijatý súbor od %1s</string>
+  <string name="received_file_fail_title">Zlyhalo prijatie súboru od %1s</string>
   <string name="received_file_text">Ťuknite na otvorenie \'%1s\'</string>
+  <string name="sent_file_title">Poslať súbor pre %1s</string>
+  <string name="sent_file_text">%1s</string>
+  <string name="sent_file_failed_title">Zlyhalo poslanie súboru %1s</string>
+  <string name="sent_file_failed_text">%1s</string>
   <string name="tap_to_answer">Tapnite na odpoveď</string>
   <string name="reconnect">Znovu pripojiť</string>
   <string name="right_click">Poslať kliknutie pravým</string>
@@ -76,8 +83,15 @@
   <string name="mpris_next">Nasledovné</string>
   <string name="mpris_volume">Hlasitosť</string>
   <string name="mpris_settings">Multimediálne nastavenia</string>
-  <string name="mpris_time_settings_title">Časový interval</string>
-  <string name="mpris_time_settings_summary">Prispôsobiť čas na pretáčanie dopredu alebo späť pre multimediálne súbory.</string>
+  <string name="mpris_time_settings_title">Tlačidlá dopredu/pretočiť</string>
+  <string name="mpris_time_settings_summary">Prispôsobiť čas na pretáčanie dopredu alebo dozadu pri stlačení.</string>
+  <string-array name="mpris_time_entries">
+    <item>10 sekúnd</item>
+    <item>20 sekúnd</item>
+    <item>30 sekúnd</item>
+    <item>1 minúta</item>
+    <item>2 minúty</item>
+  </string-array>
   <string name="share_to">Zdieľať pre...</string>
   <string name="protocol_version_older">Toto zariadenie používa starú verziu protokolu</string>
   <string name="protocol_version_newer">Toto zariadenie používa novšiu verziu protokolu</string>
@@ -89,10 +103,11 @@
   <string name="invalid_device_name">Neplatný názov zariadenia</string>
   <string name="shareplugin_text_saved">Prijatý text, uložený do schránky</string>
   <string name="custom_devices_settings">Zoznam vlastných zariadení</string>
-  <string name="custom_device_list">Zoznam vlastných zariadení</string>
-  <string name="custom_device_list_summary">Zoznam vlastných zariadení</string>
+  <string name="custom_device_list">Pridať zariadenia podľa IP</string>
   <string name="share_notification_preference">Hlučné pripomienky</string>
   <string name="share_notification_preference_summary">Vibrovať a prehrať zvuk pri prijatí súboru</string>
+  <string name="title_activity_notification_filter">Filter upozornení</string>
+  <string name="filter_apps_info">Upozornenia budú synchronizované pre vybrané aplikácie.</string>
   <string name="sftp_internal_storage">Interné úložisko</string>
   <string name="sftp_all_files">Všetky súbory</string>
   <string name="sftp_sdcard_num">SD karta %d</string>
@@ -100,12 +115,8 @@
   <string name="sftp_readonly">(iba na čítanie)</string>
   <string name="sftp_camera">Obrázky fotoaparátu</string>
   <string name="add_host">Pridať hostiteľa/IP</string>
+  <string name="add_host_hint">Názov hostiteľa alebo IP</string>
+  <string name="no_players_connected">Nenašli sa žiadne prehrávače</string>
   <string name="custom_dev_list_help">Túto voľbu použite iba vtedy, ak vaše zariadenie nie je automaticky detekované. Zadajte IP adresu alebo názov hostiteľa nižšie a kliknite na tlačidlo na pridanie do zoznamu. Kliknite na existujúcu položku na odstránenie jej zo zoznamu.</string>
-  <string-array name="mpris_time_entries">
-    <item>10 sekúnd</item>
-    <item>20 sekúnd</item>
-    <item>30 sekúnd</item>
-    <item>1 minúta</item>
-    <item>2 minúty</item>
-  </string-array>
+  <string name="mpris_player_on_device">%1$s na %2$s</string>
 </resources>

res/values-sv/strings.xml

@@ -8,15 +8,16 @@
   <string name="pref_plugin_sftp_desc">Gör det möjligt att bläddra i telefonens filsystem från annan enhet</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">Fjärrkontroll</string>
-  <string name="pref_plugin_mpris">Fjärrkontroll av multimedia</string>
+  <string name="pref_plugin_mousepad">Fjärrinmatning</string>
+  <string name="pref_plugin_mousepad_desc">Använd telefonen som mus och tangentbord</string>
+  <string name="pref_plugin_mpris">Multimediakontroller</string>
   <string name="pref_plugin_mpris_desc">Styr ljud och video från telefonen</string>
   <string name="pref_plugin_ping">Ping</string>
   <string name="pref_plugin_ping_desc">Skicka och ta emot ping</string>
   <string name="pref_plugin_notifications">Synkronisering av underrättelser</string>
   <string name="pref_plugin_notifications_desc">Kom åt underrättelser från andra apparater</string>
-  <string name="pref_plugin_sharereceiver">Dela mottagare</string>
-  <string name="pref_plugin_sharereceiver_desc">Spara inkommande filer i telefonens minne</string>
+  <string name="pref_plugin_sharereceiver">Dela och ta emot</string>
+  <string name="pref_plugin_sharereceiver_desc">Dela filer och webbadresser mellan enheter</string>
   <string name="plugin_not_available">Funktionen är inte tillgänglig i Android-versionen</string>
   <string name="device_list_empty">Inga apparater</string>
   <string name="ok">Ok</string>
@@ -24,16 +25,23 @@
   <string name="open_settings">Öppna inställningarna</string>
   <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">Öppna fjärrkontroll</string>
-  <string name="open_mousepad">Öppna kontroll med tryckplatta</string>
-  <string name="mousepad_info">Flytta ett finger på skärmen för att flytta muspekaren</string>
-  <string name="mousepad_right_click">Skicka högerklick</string>
-  <string name="mousepad_middle_click">Skicka mittenklick</string>
+  <string name="open_mpris_controls">Kontroll av multimedia</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>
+  <string-array name="mousepad_tap_entries">
+    <item>Högerklick</item>
+    <item>Mittenklick</item>
+    <item>Ingenting</item>
+  </string-array>
+  <string name="mousepad_double_default">höger</string>
+  <string name="mousepad_triple_default">mitten</string>
   <string name="category_connected_devices">Anslutna apparater</string>
-  <string name="category_not_paired_devices">Inga parade apparater</string>
+  <string name="category_not_paired_devices">Tillgängliga enheter</string>
   <string name="category_remembered_devices">Ihågkomna apparater</string>
   <string name="plugins_failed_to_load">Misslyckades ladda insticksprogram (rör för mer information):</string>
-  <string name="device_menu_plugins">Välj insticksprogram</string>
+  <string name="device_menu_plugins">Inställningar av insticksprogram</string>
   <string name="device_menu_unpair">Ta bort ihopparning</string>
   <string name="device_not_reachable">Ihopparad enhet kan inte nås</string>
   <string name="unknown_device">Okänd apparat</string>
@@ -48,11 +56,18 @@
   <string name="pair_requested">Ihopparning begärd</string>
   <string name="pairing_request_from">Begäran om ihopparning från %1s</string>
   <string name="received_url_title">Tog emot länk från %1s</string>
-  <string name="received_url_text">Klicka för att öppna \'%1s\'</string>
+  <string name="received_url_text">Rör för att öppna \'%1s\'</string>
   <string name="incoming_file_title">Inkommande fil från %1s</string>
   <string name="incoming_file_text">%1s</string>
+  <string name="outgoing_file_title">Skickar fil till %1s</string>
+  <string name="outgoing_file_text">%1s</string>
   <string name="received_file_title">Tog emot fil från %1s</string>
-  <string name="received_file_text">Klicka för att öppna \'%1s\'</string>
+  <string name="received_file_fail_title">Misslyckades ta emot fil från %1s</string>
+  <string name="received_file_text">Rör för att öppna \'%1s\'</string>
+  <string name="sent_file_title">Skickade fil till %1s</string>
+  <string name="sent_file_text">%1s</string>
+  <string name="sent_file_failed_title">Misslyckades skicka fil %1s</string>
+  <string name="sent_file_failed_text">%1s</string>
   <string name="tap_to_answer">Rör för att svara</string>
   <string name="reconnect">Anslut igen</string>
   <string name="right_click">Skicka högerklick</string>
@@ -73,29 +88,8 @@
   <string name="mpris_next">Nästa</string>
   <string name="mpris_volume">Volym</string>
   <string name="mpris_settings">Multimediainställningar</string>
-  <string name="mpris_time_settings_title">Intervalltid</string>
-  <string name="mpris_time_settings_summary">Justera tiden för att snabbspola framåt eller tillbaka en multimediafil.</string>
-  <string name="share_to">Dela med...</string>
-  <string name="protocol_version_older">Apparaten använder en gammal protokollversion</string>
-  <string name="protocol_version_newer">Apparaten använder en nyare protokollversion</string>
-  <string name="general_settings">Allmänna inställningar</string>
-  <string name="plugin_settings">Inställningar</string>
-  <string name="plugin_settings_with_name">Öppna inställningarna</string>
-  <string name="device_name">Apparatnamn</string>
-  <string name="device_name_preference_summary">%s</string>
-  <string name="invalid_device_name">Ogiltigt apparatnamn</string>
-  <string name="shareplugin_text_saved">Tog emot text, spara på klippbordet</string>
-  <string name="custom_devices_settings">Inga apparater</string>
-  <string name="custom_device_list">Inga apparater</string>
-  <string name="custom_device_list_summary">Inga apparater</string>
-  <string name="share_notification_preference">Ljudliga underrättelser</string>
-  <string name="share_notification_preference_summary">Vibrera och spela ett ljud när en fil tas emot</string>
-  <string name="sftp_internal_storage">Intern lagring</string>
-  <string name="sftp_all_files">Alla filer</string>
-  <string name="sftp_sdcard_num">SD-kort %d</string>
-  <string name="sftp_sdcard">SD-kort</string>
-  <string name="sftp_readonly">(skrivskyddat)</string>
-  <string name="sftp_camera">Kamerabilder</string>
+  <string name="mpris_time_settings_title">Framåt- och bakåt-knappar</string>
+  <string name="mpris_time_settings_summary">Justera tiden för att snabbspola framåt eller tillbaka om nertryckt.</string>
   <string-array name="mpris_time_entries">
     <item>10 sekunder</item>
     <item>20 sekunder</item>
@@ -103,4 +97,31 @@
     <item>1 minut</item>
     <item>2 minuter</item>
   </string-array>
+  <string name="share_to">Dela med...</string>
+  <string name="protocol_version_older">Apparaten använder en gammal protokollversion</string>
+  <string name="protocol_version_newer">Apparaten använder en nyare protokollversion</string>
+  <string name="general_settings">Allmänna inställningar</string>
+  <string name="plugin_settings">Inställningar</string>
+  <string name="plugin_settings_with_name">Inställningar av %s</string>
+  <string name="device_name">Apparatnamn</string>
+  <string name="device_name_preference_summary">%s</string>
+  <string name="invalid_device_name">Ogiltigt apparatnamn</string>
+  <string name="shareplugin_text_saved">Tog emot text, spara på klippbordet</string>
+  <string name="custom_devices_settings">Egen apparatlista</string>
+  <string name="custom_device_list">Lägg till apparater enligt IP-adress</string>
+  <string name="share_notification_preference">Ljudliga underrättelser</string>
+  <string name="share_notification_preference_summary">Vibrera och spela ett ljud när en fil tas emot</string>
+  <string name="title_activity_notification_filter">Underrättelsefilter</string>
+  <string name="filter_apps_info">Underrättelser synkroniseras för markerade applikationer.</string>
+  <string name="sftp_internal_storage">Intern lagring</string>
+  <string name="sftp_all_files">Alla filer</string>
+  <string name="sftp_sdcard_num">SD-kort %d</string>
+  <string name="sftp_sdcard">SD-kort</string>
+  <string name="sftp_readonly">(skrivskyddat)</string>
+  <string name="sftp_camera">Kamerabilder</string>
+  <string name="add_host">Lägg till värddator/IP-adress</string>
+  <string name="add_host_hint">Värddatornamn eller IP-adress</string>
+  <string name="no_players_connected">Inga spelare hittades</string>
+  <string name="custom_dev_list_help">Använd bara alternativet om apparaten inte detekteras automatiskt. Skriv in IP-adress eller värddatornamn nedan och rör vid knappen för att lägga till den i listan. Rör vid ett befintligt objekt för att ta bort det från listan.</string>
+  <string name="mpris_player_on_device">%1$s på %2$s</string>
 </resources>

res/values-uk/strings.xml

@@ -10,14 +10,14 @@
   <string name="pref_plugin_clipboard_desc">Спільне використання буфера обміну даними</string>
   <string name="pref_plugin_mousepad">Дистанційне введення</string>
   <string name="pref_plugin_mousepad_desc">Скористайтеся телефоном як замінником миші і клавіатури</string>
-  <string name="pref_plugin_mpris">Дистанційне керування відтворенням</string>
+  <string name="pref_plugin_mpris">Керування відтворенням</string>
   <string name="pref_plugin_mpris_desc">Керування відтворенням звуку та відео з вашого телефону</string>
   <string name="pref_plugin_ping">Підтримання зв’язку</string>
   <string name="pref_plugin_ping_desc">Надсилання і отримання сигналів підтримання зв’язку</string>
   <string name="pref_plugin_notifications">Синхронізація сповіщень</string>
   <string name="pref_plugin_notifications_desc">Доступ до ваших сповіщень з інших пристроїв</string>
-  <string name="pref_plugin_sharereceiver">Отримувач спільних ресурсів</string>
-  <string name="pref_plugin_sharereceiver_desc">Зберігає вхідні файли на носій даних телефону</string>
+  <string name="pref_plugin_sharereceiver">Надання і отримання</string>
+  <string name="pref_plugin_sharereceiver_desc">Спільне використання файлів і адрес між пристроями</string>
   <string name="plugin_not_available">Ця можливість є недоступною для вашої версії для Android</string>
   <string name="device_list_empty">Немає пристроїв</string>
   <string name="ok">Гаразд</string>
@@ -25,18 +25,23 @@
   <string name="open_settings">Відкрити вікно параметрів</string>
   <string name="no_permissions">Вам слід надати доступ до сповіщень</string>
   <string name="send_ping">Надіслати сигнал підтримання зв’язку</string>
-  <string name="open_mpris_controls">Відкрити дистанційне керування</string>
-  <string name="open_mousepad">Відкрити керування сенсорною панеллю</string>
-  <string name="mousepad_info">Проведіть по екрану пальцем, щоб пересунути вказівник миші</string>
+  <string name="open_mpris_controls">Керування відтворенням</string>
+  <string name="open_mousepad">Дистанційне введення</string>
+  <string name="mousepad_info">Проведіть по екрану пальцем, щоб пересунути вказівник миші. Дотик одним пальцем означатиме клацання, дотиком двома або трьома пальцями можна імітувати праву і середню кнопки. Для перетягування зі скиданням скористайтеся тривалим натисканням.</string>
   <string name="mousepad_double_tap_settings_title">Встановлення дії для торкання двома пальцями</string>
   <string name="mousepad_triple_tap_settings_title">Встановлення дії для торкання трьома пальцями</string>
-  <string name="mousepad_right_click">Клацання правою</string>
-  <string name="mousepad_middle_click">Клацання середньою</string>
+  <string-array name="mousepad_tap_entries">
+    <item>Клацання правою</item>
+    <item>Клацання середньою</item>
+    <item>Нічого</item>
+  </string-array>
+  <string name="mousepad_double_default">права</string>
+  <string name="mousepad_triple_default">середня</string>
   <string name="category_connected_devices">З’єднані пристрої</string>
-  <string name="category_not_paired_devices">Непов’язані пристрої</string>
+  <string name="category_not_paired_devices">Доступні пристрої</string>
   <string name="category_remembered_devices">Відомі пристрої</string>
   <string name="plugins_failed_to_load">Додатки, які не вдалося завантажити (натисніть, щоб дізнатися більше):</string>
-  <string name="device_menu_plugins">Виберіть додатки</string>
+  <string name="device_menu_plugins">Параметри додатків</string>
   <string name="device_menu_unpair">Скасувати пов’язування</string>
   <string name="device_not_reachable">Немає доступу до пов’язаного пристрою</string>
   <string name="unknown_device">Невідомий пристрій</string>
@@ -54,8 +59,15 @@
   <string name="received_url_text">Натисніть, щоб відкрити «%1s»</string>
   <string name="incoming_file_title">Вхідний файл з %1s</string>
   <string name="incoming_file_text">%1s</string>
+  <string name="outgoing_file_title">Надсилаємо файл до %1s</string>
+  <string name="outgoing_file_text">%1s</string>
   <string name="received_file_title">Отримано файл з %1s</string>
+  <string name="received_file_fail_title">Не вдалося отримати файл з %1s</string>
   <string name="received_file_text">Натисніть, щоб відкрити «%1s»</string>
+  <string name="sent_file_title">Файл надіслано до %1s</string>
+  <string name="sent_file_text">%1s</string>
+  <string name="sent_file_failed_title">Не вдалося надіслати файл %1s</string>
+  <string name="sent_file_failed_text">%1s</string>
   <string name="tap_to_answer">Натисніть, щоб відповісти</string>
   <string name="reconnect">З\'єднати знову</string>
   <string name="right_click">Надіслати клацання правою кнопкою</string>
@@ -76,8 +88,15 @@
   <string name="mpris_next">Далі</string>
   <string name="mpris_volume">Гучність</string>
   <string name="mpris_settings">Мультимедійні параметри</string>
-  <string name="mpris_time_settings_title">Часовий інтервал</string>
-  <string name="mpris_time_settings_summary">Скоригувати час швидкого гортання вперед або назад у мультимедійному файлі.</string>
+  <string name="mpris_time_settings_title">Кнопки «Вперед/Назад»</string>
+  <string name="mpris_time_settings_summary">Скоригувати час швидкого гортання вперед або назад при натисканні.</string>
+  <string-array name="mpris_time_entries">
+    <item>10 секунд</item>
+    <item>20 секунд</item>
+    <item>30 секунд</item>
+    <item>1 хвилина</item>
+    <item>2 хвилини</item>
+  </string-array>
   <string name="share_to">Спільно використовувати з…</string>
   <string name="protocol_version_older">На цьому пристрої використовується стара версія протоколу</string>
   <string name="protocol_version_newer">На цьому пристрої використовується новіша версія протоколу</string>
@@ -89,10 +108,11 @@
   <string name="invalid_device_name">Некоректна назва пристрою</string>
   <string name="shareplugin_text_saved">Отримано текст, збережено до буфера обміну даними</string>
   <string name="custom_devices_settings">Список нетипових пристроїв</string>
-  <string name="custom_device_list">Список нетипових пристроїв</string>
-  <string name="custom_device_list_summary">Список нетипових пристроїв</string>
+  <string name="custom_device_list">Додати пристрої за IP</string>
   <string name="share_notification_preference">Звукові сповіщення</string>
   <string name="share_notification_preference_summary">Вібрація і відтворення звуку у відповідь на отримання файла</string>
+  <string name="title_activity_notification_filter">Фільтр сповіщень</string>
+  <string name="filter_apps_info">Сповіщення буде синхронізовано для позначених програм.</string>
   <string name="sftp_internal_storage">Вбудоване сховище даних</string>
   <string name="sftp_all_files">Усі файли</string>
   <string name="sftp_sdcard_num">Картка SD %d</string>
@@ -100,12 +120,8 @@
   <string name="sftp_readonly">(лише читання)</string>
   <string name="sftp_camera">Знімки фотоапарата</string>
   <string name="add_host">Додати вузол/IP</string>
+  <string name="add_host_hint">Назва або IP вузла</string>
+  <string name="no_players_connected">Не знайдено програвачів</string>
   <string name="custom_dev_list_help">Цим пунктом слід користуватися, лише якщо ваш пристрій не було визначено у автоматичному режимі. Введіть IP-адресу або назву вузла нижче і натисніть кнопку, щоб додати пункт до списку. Натисніть наявний пункт, щоб вилучити його зі списку.</string>
-  <string-array name="mpris_time_entries">
-    <item>10 секунд</item>
-    <item>20 секунд</item>
-    <item>30 секунд</item>
-    <item>1 хвилина</item>
-    <item>2 хвилини</item>
-  </string-array>
+  <string name="mpris_player_on_device">%1$s на %2$s</string>
 </resources>

res/values-v11/styles.xml

@@ -1,11 +0,0 @@
-<resources>
-
-    <!--
-        Base application theme for API 11+. This theme completely replaces
-        AppBaseTheme from res/values/styles.xml on API 11+ devices.
-    -->
-    <style name="AppBaseTheme" parent="android:Theme.Holo">
-        <!-- API 11 theme customizations can go here. -->
-    </style>
-
-</resources>

res/values-zh-rCN/strings.xml

@@ -0,0 +1,122 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+  <string name="pref_plugin_telephony">电话通知</string>
+  <string name="pref_plugin_telephony_desc">为短信和来电发送通知</string>
+  <string name="pref_plugin_battery">电池报告</string>
+  <string name="pref_plugin_battery_desc">定期报告电池状态</string>
+  <string name="pref_plugin_sftp">开放文件系统</string>
+  <string name="pref_plugin_sftp_desc">允许远程浏览手机的文件系统</string>
+  <string name="pref_plugin_clipboard">剪贴板同步</string>
+  <string name="pref_plugin_clipboard_desc">共享剪贴板内容</string>
+  <string name="pref_plugin_mousepad">远程输入</string>
+  <string name="pref_plugin_mousepad_desc">将手机用作鼠标和键盘</string>
+  <string name="pref_plugin_mpris_desc">从手机控制音频或视频</string>
+  <string name="pref_plugin_ping">Ping</string>
+  <string name="pref_plugin_ping_desc">发送和接受ping</string>
+  <string name="pref_plugin_notifications">通知同步</string>
+  <string name="pref_plugin_notifications_desc">从其他设备访问你的通知</string>
+  <string name="plugin_not_available">该特性不适用于您的Android版本</string>
+  <string name="device_list_empty">无设备</string>
+  <string name="ok">确认</string>
+  <string name="cancel">取消</string>
+  <string name="open_settings">开启设置</string>
+  <string name="no_permissions">你需要授予权限以便访问通知</string>
+  <string name="send_ping">发送ping</string>
+  <string name="mousepad_info">在屏幕上移动手指来移动光标。轻击代表左键，双指或三指点击代表右键或中键。用长按来拖放。</string>
+  <string name="mousepad_double_tap_settings_title">设置双指点击动作</string>
+  <string name="mousepad_triple_tap_settings_title">设置三指点击动作</string>
+  <string-array name="mousepad_tap_entries">
+    <item>右键点击</item>
+    <item>中键点击</item>
+    <item>无</item>
+  </string-array>
+  <string name="mousepad_double_default">右</string>
+  <string name="mousepad_triple_default">中</string>
+  <string name="category_connected_devices">已连接设备</string>
+  <string name="category_not_paired_devices">可用设备</string>
+  <string name="category_remembered_devices">已记住设备</string>
+  <string name="plugins_failed_to_load">插件载入失败 (按下以查看更多信息)：</string>
+  <string name="device_menu_plugins">插件设置</string>
+  <string name="device_menu_unpair">取消配对</string>
+  <string name="device_not_reachable">配对设备不可及</string>
+  <string name="unknown_device">未知设备</string>
+  <string name="error_not_reachable">设备不可及</string>
+  <string name="error_already_requested">已在请求配对</string>
+  <string name="error_already_paired">设备已配对</string>
+  <string name="error_could_not_send_package">数据包无法发送</string>
+  <string name="error_timed_out">超时</string>
+  <string name="error_canceled_by_user">已被用户取消</string>
+  <string name="error_canceled_by_other_peer">已被另一方取消</string>
+  <string name="error_invalid_key">收到无效密钥</string>
+  <string name="pair_requested">已请求配对</string>
+  <string name="pairing_request_from">来自%1s的配对请求</string>
+  <string name="received_url_title">已从%1s接收链接</string>
+  <string name="received_url_text">点击以打开“%1s”</string>
+  <string name="incoming_file_title">来自%1s的文件</string>
+  <string name="incoming_file_text">%1s</string>
+  <string name="outgoing_file_title">正在向%1s发送文件</string>
+  <string name="outgoing_file_text">%1s</string>
+  <string name="received_file_title">已从%1s接收文件</string>
+  <string name="received_file_fail_title">未能从%1s接收文件</string>
+  <string name="received_file_text">点击以打开“%1s”</string>
+  <string name="sent_file_title">发送文件到%1s</string>
+  <string name="sent_file_text">%1s</string>
+  <string name="sent_file_failed_title">未能发送文件%1s</string>
+  <string name="sent_file_failed_text">%1s</string>
+  <string name="tap_to_answer">点击以应答</string>
+  <string name="reconnect">重新连接</string>
+  <string name="right_click">发送右键点击</string>
+  <string name="middle_click">发送中键点击</string>
+  <string name="show_keyboard">显示键盘</string>
+  <string name="device_not_paired">设备未配对</string>
+  <string name="request_pairing">请求配对</string>
+  <string name="pairing_accept">接受</string>
+  <string name="pairing_reject">拒绝</string>
+  <string name="device">设备</string>
+  <string name="pair_device">进行配对</string>
+  <string name="remote_control">远程控制</string>
+  <string name="settings">KDE Connect设置</string>
+  <string name="mpris_play">播放</string>
+  <string name="mpris_previous">前一个</string>
+  <string name="mpris_rew">后退</string>
+  <string name="mpris_ff">快进</string>
+  <string name="mpris_next">下一个</string>
+  <string name="mpris_volume">音量</string>
+  <string name="mpris_settings">多媒体设置</string>
+  <string name="mpris_time_settings_title">快进/后退按钮</string>
+  <string name="mpris_time_settings_summary">调整快进或后退的时间 (当按下时)</string>
+  <string-array name="mpris_time_entries">
+    <item>10秒</item>
+    <item>20秒</item>
+    <item>30秒</item>
+    <item>1分钟</item>
+    <item>2分钟</item>
+  </string-array>
+  <string name="share_to">分享到...</string>
+  <string name="protocol_version_older">该设备使用旧版本的协议</string>
+  <string name="protocol_version_newer">该设备使用较新版本的协议</string>
+  <string name="general_settings">通用设置</string>
+  <string name="plugin_settings">设置</string>
+  <string name="plugin_settings_with_name">%s设置</string>
+  <string name="device_name">设备名</string>
+  <string name="device_name_preference_summary">%s</string>
+  <string name="invalid_device_name">设备名无效</string>
+  <string name="shareplugin_text_saved">已收到文本，存至剪贴板</string>
+  <string name="custom_devices_settings">自定义设备列表</string>
+  <string name="custom_device_list">通过IP增加设备</string>
+  <string name="share_notification_preference">出声通知</string>
+  <string name="share_notification_preference_summary">当收到文件时震动并播放声音</string>
+  <string name="title_activity_notification_filter">通知过滤器</string>
+  <string name="filter_apps_info">所选软件的通知将会被同步。</string>
+  <string name="sftp_internal_storage">内部存储</string>
+  <string name="sftp_all_files">所有文件</string>
+  <string name="sftp_sdcard_num">SD卡%d</string>
+  <string name="sftp_sdcard">SD卡</string>
+  <string name="sftp_readonly">(只读)</string>
+  <string name="sftp_camera">相机照片</string>
+  <string name="add_host">增加主机/IP</string>
+  <string name="add_host_hint">主机名或IP</string>
+  <string name="no_players_connected">未找到播放器</string>
+  <string name="custom_dev_list_help">仅当你的设备没有被自动检测出时再使用本选项。在下方输入IP地址或主机名，然后点击按钮以添加其到列表中。点击已有条目来从列表中删除它。</string>
+  <string name="mpris_player_on_device">%2$s上的%1$s</string>
+</resources>

res/values/strings.xml

@@ -11,14 +11,14 @@
     <string name="pref_plugin_clipboard_desc">Share the clipboard content</string>
     <string name="pref_plugin_mousepad">Remote input</string>
     <string name="pref_plugin_mousepad_desc">Use your phone as a mouse and keyboard</string>
-    <string name="pref_plugin_mpris">Multimedia remote controls</string>
+    <string name="pref_plugin_mpris">Multimedia controls</string>
     <string name="pref_plugin_mpris_desc">Control audio/video from your phone</string>
     <string name="pref_plugin_ping">Ping</string>
     <string name="pref_plugin_ping_desc">Send and receive pings</string>
     <string name="pref_plugin_notifications">Notification sync</string>
     <string name="pref_plugin_notifications_desc">Access your notifications from other devices</string>
-    <string name="pref_plugin_sharereceiver">Share receiver</string>
-    <string name="pref_plugin_sharereceiver_desc">Save incoming files to the phone storage</string>
+    <string name="pref_plugin_sharereceiver">Share and receive</string>
+    <string name="pref_plugin_sharereceiver_desc">Share files and URLs between devices</string>
     <string name="plugin_not_available">This feature is not available in your Android version</string>
     <string name="device_list_empty">No devices</string>
     <string name="ok">OK</string>
@@ -26,24 +26,30 @@
     <string name="open_settings">Open settings</string>
     <string name="no_permissions">You need to grant permission to access notifications</string>
     <string name="send_ping">Send ping</string>
-    <string name="open_mpris_controls">Open remote control</string>
-    <string name="open_mousepad">Open touchpad control</string>
-    <string name="mousepad_info">Move a finger on the screen to move the mouse cursor</string>
+    <string name="open_mpris_controls">Multimedia control</string>
+    <string name="open_mousepad">Remote input</string>
+    <string name="mousepad_info">Move a finger on the screen to move the mouse cursor. Tap for a click, and use two/three fingers for right and middle buttons. Use a long press to drag\'n drop.</string>
+    <string name="mousepad_double_tap_settings_title">Set two finger tap action</string>
+    <string name="mousepad_triple_tap_settings_title">Set three finger tap action</string>
     <string name="mousepad_double_tap_key" translatable="false">mousepad_double_tap_key</string>
     <string name="mousepad_triple_tap_key" translatable="false">mousepad_triple_tap_key</string>
-    <string name="mousepad_right_value" translatable="false">right</string>
-    <string name="mousepad_middle_value" translatable="false">middle</string>
-    <string name="mousepad_double_tap_settings_title">Set Two Finger Tap Action</string>
-    <string name="mousepad_double_default" translatable="false">@string/mousepad_right_value</string>
-    <string name="mousepad_triple_default" translatable="false">@string/mousepad_middle_value</string>
-    <string name="mousepad_triple_tap_settings_title">Set Three Finger Tap Action</string>
-    <string name="mousepad_right_click">Right click</string>
-    <string name="mousepad_middle_click">Middle click</string>
+    <string-array name="mousepad_tap_entries">
+        <item>Right click</item>
+        <item>Middle click</item>
+        <item>Nothing</item>
+    </string-array>
+    <string name="mousepad_double_default">right</string>
+    <string name="mousepad_triple_default">middle</string>
+    <string-array name="mousepad_tap_values" translatable="false">
+        <item>right</item>
+        <item>middle</item>
+        <item>none</item>
+    </string-array>
     <string name="category_connected_devices">Connected devices</string>
     <string name="category_not_paired_devices">Available devices</string>
     <string name="category_remembered_devices">Remembered devices</string>
     <string name="plugins_failed_to_load">Plugins failed to load (tap for more info):</string>
-    <string name="device_menu_plugins">Select plugins</string>
+    <string name="device_menu_plugins">Plugin settings</string>
     <string name="device_menu_unpair">Unpair</string>
     <string name="device_not_reachable">Paired device not reachable</string>
     <string name="unknown_device">Unknown device</string>
@@ -61,8 +67,15 @@
     <string name="received_url_text">Tap to open \'%1s\'</string>
     <string name="incoming_file_title">Incoming file from %1s</string>
     <string name="incoming_file_text">%1s</string>
+    <string name="outgoing_file_title">Sending file to %1s</string>
+    <string name="outgoing_file_text">%1s</string>
     <string name="received_file_title">Received file from %1s</string>
+    <string name="received_file_fail_title">Failed receiving file from %1s</string>
     <string name="received_file_text">Tap to open \'%1s\'</string>
+    <string name="sent_file_title">Sent file to %1s</string>
+    <string name="sent_file_text">%1s</string>
+    <string name="sent_file_failed_title">Failed to send file %1s</string>
+    <string name="sent_file_failed_text">%1s</string>
     <string name="tap_to_answer">Tap to answer</string>
     <string name="reconnect">Reconnect</string>
     <string name="right_click">Send Right Click</string>
@@ -83,17 +96,30 @@
     <string name="mpris_next">Next</string>
     <string name="mpris_volume">Volume</string>
     <string name="mpris_settings">Multimedia Settings</string>
-    <string name="mpris_time_settings_title">Interval Time</string>
-    <string name="mpris_time_settings_summary">Adjust the time to fast forward or rewind a multimedia file.</string>
+    <string name="mpris_time_settings_title">Forward/rewind buttons</string>
+    <string name="mpris_time_settings_summary">Adjust the time to fast forward/rewind when pressed.</string>
     <string name="mpris_time_key" translatable="false">mpris_interval_time</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>
+    </string-array>
     <string name="mpris_time_default" translatable="false">10000000</string>
+    <string-array name="mpris_time_entries_values" translatable="false">
+        <item>10000000</item>
+        <item>20000000</item>
+        <item>30000000</item>
+        <item>60000000</item>
+        <item>120000000</item>
+    </string-array>
     <string name="share_to">Share To...</string>
     <string name="protocol_version_older">This device uses an old protocol version</string>
     <string name="protocol_version_newer">This device uses a newer protocol version</string>
     <string name="general_settings">General Settings</string>
     <string name="plugin_settings">Settings</string>
     <string name="plugin_settings_with_name">%s settings</string>
-    <string name="plugin_settings_key" translatable="false">_preferences</string>
     <string name="device_name">Device name</string>
     <string name="device_name_preference_summary">%s</string>
     <string name="invalid_device_name">Invalid device name</string>
@@ -102,6 +128,8 @@
     <string name="custom_device_list">Add devices by IP</string>
     <string name="share_notification_preference">Noisy notifications</string>
     <string name="share_notification_preference_summary">Vibrate and play a sound when receiving a file</string>
+    <string name="title_activity_notification_filter">Notification filter</string>
+    <string name="filter_apps_info">Notifications will be synchronized for the selected apps.</string>
     <string name="sftp_internal_storage">Internal storage</string>
     <string name="sftp_all_files">All files</string>
     <string name="sftp_sdcard_num">SD card %d</string>
@@ -109,32 +137,9 @@
     <string name="sftp_readonly">(read only)</string>
     <string name="sftp_camera">Camera pictures</string>
     <string name="add_host">Add host/IP</string>
+    <string name="add_host_hint">Hostname or IP</string>
+    <string name="no_players_connected">No players found</string>
     <string name="custom_dev_list_help">Use this option only if your device is not automatically detected. Enter IP address or hostname below and touch the button to add it to the list. Touch an existing item to remove it from the list.</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>
-    </string-array>
-
-    <string-array name="mpris_time_entries_values" translatable="false">
-        <item>10000000</item>
-        <item>20000000</item>
-        <item>30000000</item>
-        <item>60000000</item>
-        <item>120000000</item>
-    </string-array>
-
-    <string-array name="mousepad_tap_entries" translatable="false">
-        <item>@string/mousepad_right_click</item>
-        <item>@string/mousepad_middle_click</item>
-    </string-array>
-
-    <string-array name="mousepad_tap_values" translatable="false">
-        <item>@string/mousepad_right_value</item>
-        <item>@string/mousepad_middle_value</item>
-    </string-array>
+    <string name="mpris_player_on_device">%1$s on %2$s</string>
 
 </resources>

res/values/styles.xml

@@ -1,20 +1,7 @@
 <resources>
 
-    <!--
-        Base application theme, dependent on API level. This theme is replaced
-        by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
-    -->
-    <style name="AppBaseTheme" parent="android:Theme">
-        <!--
-            Theme customizations available in newer API levels can go in
-            res/values-vXX/styles.xml, while customizations related to
-            backward-compatibility can go here.
-        -->
-    </style>
+    <style name="KdeConnectTheme" parent="Theme.AppCompat">
 
-    <!-- Application theme. -->
-    <style name="AppTheme" parent="AppBaseTheme">
-        <!-- All customizations that are NOT specific to a particular API-level can go here. -->
     </style>
 
 </resources>

res/xml/general_preferences.xml

@@ -7,7 +7,7 @@
         <EditTextPreference
             android:key="device_name_preference"
             android:title="@string/device_name"
-            android:summary="@string/device_name_preference_summary"
+            android:summary=""
             android:dialogTitle="@string/device_name"
             android:singleLine="true" />
 

src/org/kde/kdeconnect/Backends/BaseLink.java

@@ -20,6 +20,7 @@
 
 package org.kde.kdeconnect.Backends;
 
+import org.kde.kdeconnect.Device;
 import org.kde.kdeconnect.NetworkPackage;
 
 import java.security.PrivateKey;
@@ -71,7 +72,7 @@ public abstract class BaseLink {
     }
 
     //TO OVERRIDE, should be sync
-    public abstract boolean sendPackage(NetworkPackage np);
-    public abstract boolean sendPackageEncrypted(NetworkPackage np, PublicKey key);
+    public abstract void sendPackage(NetworkPackage np,Device.SendPackageStatusCallback callback);
+    public abstract void sendPackageEncrypted(NetworkPackage np,Device.SendPackageStatusCallback callback, PublicKey key);
 
 }

src/org/kde/kdeconnect/Backends/BaseLinkProvider.java

@@ -46,13 +46,13 @@ public abstract class BaseLinkProvider {
 
     //These two should be called when the provider links to a new computer
     protected void connectionAccepted(NetworkPackage identityPackage, BaseLink link) {
-        Log.i("LinkProvider", "connectionAccepted");
+        //Log.i("KDE/LinkProvider", "connectionAccepted");
         for(ConnectionReceiver cr : connectionReceivers) {
             cr.onConnectionReceived(identityPackage, link);
         }
     }
     protected void connectionLost(BaseLink link) {
-        Log.i("LinkProvider", "connectionLost");
+        //Log.i("KDE/LinkProvider", "connectionLost");
         for(ConnectionReceiver cr : connectionReceivers) {
             cr.onConnectionLost(link);
         }

src/org/kde/kdeconnect/Backends/LanBackend/LanLink.java

@@ -27,22 +27,30 @@ import org.apache.mina.core.session.IoSession;
 import org.json.JSONObject;
 import org.kde.kdeconnect.Backends.BaseLink;
 import org.kde.kdeconnect.Backends.BaseLinkProvider;
+import org.kde.kdeconnect.Device;
 import org.kde.kdeconnect.NetworkPackage;
 
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.InetSocketAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
+import java.nio.channels.NotYetConnectedException;
 import java.security.PublicKey;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.TimeoutException;
 
 public class LanLink extends BaseLink {
 
     private IoSession session = null;
 
     public void disconnect() {
-        if (session == null) return;
-        //Log.i("LanLink", "Disconnect: "+session.getRemoteAddress().toString());
+        if (session == null) {
+            Log.e("KDE/LanLink", "Not yet connected");
+            return;
+        }
         session.close(true);
     }
 
@@ -51,141 +59,99 @@ public class LanLink extends BaseLink {
         this.session = session;
     }
 
-    private Thread sendPayload(NetworkPackage np) {
-
-        try {
-
-            final InputStream stream = np.getPayload();
-
-            ServerSocket candidateServer = null;
-            boolean success = false;
-            int tcpPort = 1739;
-            while(!success) {
-                try {
-                    candidateServer = new ServerSocket();
-                    candidateServer.bind(new InetSocketAddress(tcpPort));
-                    success = true;
-                } catch(Exception e) {
-                    Log.e("LanLink", "Exception openning serversocket: "+e);
-                    tcpPort++;
-                    if (tcpPort >= 1764) {
-                        Log.e("LanLink", "No more ports available");
-                        return null;
-                    }
-                }
-            }
-            JSONObject payloadTransferInfo = new JSONObject();
-            payloadTransferInfo.put("port", tcpPort);
-
-            final ServerSocket server = candidateServer;
-            Thread thread = new Thread(new Runnable() {
-                @Override
-                public void run() {
-                    //TODO: Timeout when waiting for a connection and close the socket
-                    OutputStream socket = null;
-                    try {
-                        socket = server.accept().getOutputStream();
-                        byte[] buffer = new byte[4096];
-                        int bytesRead;
-                        Log.e("LanLink","Beginning to send payload");
-                        while ((bytesRead = stream.read(buffer)) != -1) {
-                            //Log.e("ok",""+bytesRead);
-                            socket.write(buffer, 0, bytesRead);
-                        }
-                        Log.e("LanLink","Finished sending payload");
-                    } catch(Exception e) {
-                        e.printStackTrace();
-                        Log.e("LanLink", "Exception with payload upload socket");
-                    } finally {
-                        if (socket != null) {
-                            try { socket.close(); } catch(Exception e) { }
-                        }
-                        try { server.close(); } catch(Exception e) { }
-                    }
-                }
-            });
-            thread.start();
-
-            np.setPayloadTransferInfo(payloadTransferInfo);
-
-            return thread;
-
-        } catch(Exception e) {
-
-            e.printStackTrace();
-            Log.e("LanLink", "Exception with payload upload socket");
-
-            return null;
-        }
-
-    }
-
     //Blocking, do not call from main thread
-    @Override
-    public boolean sendPackage(final NetworkPackage np) {
-
+    private void sendPackageInternal(NetworkPackage np, final Device.SendPackageStatusCallback callback, PublicKey key) {
         if (session == null) {
-            Log.e("LanLink", "sendPackage failed: not yet connected");
-            return false;
+            Log.e("KDE/sendPackage", "Not yet connected");
+            callback.sendFailure(new NotYetConnectedException());
+            return;
         }
 
         try {
-            Thread thread = null;
+
+            //Prepare socket for the payload
+            final ServerSocket server;
             if (np.hasPayload()) {
-                thread = sendPayload(np);
-                if (thread == null) return false;
+                server = openTcpSocketOnFreePort();
+                JSONObject payloadTransferInfo = new JSONObject();
+                payloadTransferInfo.put("port", server.getLocalPort());
+                np.setPayloadTransferInfo(payloadTransferInfo);
+            } else {
+                server = null;
             }
 
+            //Encrypt if key provided
+            if (key != null) {
+                np = np.encrypt(key);
+            }
+
+            //Send body of the network package
             WriteFuture future = session.write(np.serialize());
             future.awaitUninterruptibly();
-            if (!future.isWritten()) return false;
-
-            if (thread != null) {
-                thread.join(); //Wait for thread to finish
+            if (!future.isWritten()) {
+                Log.e("KDE/sendPackage", "!future.isWritten()");
+                callback.sendFailure(future.getException());
+                return;
             }
 
-            return true;
+            //Send payload
+            if (server != null) {
+                OutputStream socket = null;
+                try {
+                    //Wait a maximum of 10 seconds for the other end to establish a connection with our socket, close it afterwards
+                    server.setSoTimeout(10*1000);
+                    socket = server.accept().getOutputStream();
+
+                    Log.i("KDE/LanLink", "Beginning to send payload");
+
+                    byte[] buffer = new byte[4096];
+                    int bytesRead;
+                    long progress = 0;
+                    InputStream stream = np.getPayload();
+                    while ((bytesRead = stream.read(buffer)) != -1) {
+                        //Log.e("ok",""+bytesRead);
+                        progress += bytesRead;
+                        socket.write(buffer, 0, bytesRead);
+                        if (np.getPayloadSize() > 0) {
+                            callback.sendProgress((int)(progress / np.getPayloadSize()));
+                        }
+                    }
+                    socket.flush();
+                    stream.close();
+                    Log.i("KDE/LanLink", "Finished sending payload ("+progress+" bytes written)");
+                } catch (Exception e) {
+                    Log.e("KDE/sendPackage", "Exception: "+e);
+                    callback.sendFailure(e);
+                    return;
+                } finally {
+                    if (socket != null) {
+                        try { socket.close(); } catch (Exception e) { }
+                    }
+                    try { server.close(); } catch (Exception e) { }
+                }
+            }
+
+            callback.sendSuccess();
+
         } catch (Exception e) {
-            e.printStackTrace();
-            Log.e("LanLink", "sendPackage exception");
-            return false;
+            if (callback != null) {
+                callback.sendFailure(e);
+            }
         }
+    }
+
+
+    //Blocking, do not call from main thread
+    @Override
+    public void sendPackage(NetworkPackage np,Device.SendPackageStatusCallback callback) {
+        sendPackageInternal(np, callback, null);
 
     }
 
     //Blocking, do not call from main thread
     @Override
-    public boolean sendPackageEncrypted(NetworkPackage np, PublicKey key) {
-
-        if (session == null) {
-            Log.e("LanLink", "sendPackage failed: not yet connected");
-            return false;
-        }
-
-        try {
-
-            Thread thread = null;
-            if (np.hasPayload()) {
-                thread = sendPayload(np);
-                if (thread == null) return false;
-            }
-
-            np = np.encrypt(key);
-            WriteFuture future = session.write(np.serialize());
-            if (!future.await().isWritten()) return false;
-
-            if (thread != null) {
-                thread.join(); //Wait for thread to finish
-            }
-
-            return true;
-
-        } catch (Exception e) {
-            e.printStackTrace();
-            Log.e("LanLink", "sendPackageEncrypted exception");
-            return false;
-        }
-
+    public void sendPackageEncrypted(NetworkPackage np, Device.SendPackageStatusCallback callback, PublicKey key) {
+        sendPackageInternal(np, callback, key);
     }
 
     public void injectNetworkPackage(NetworkPackage np) {
@@ -196,26 +162,52 @@ public class LanLink extends BaseLink {
                 np = np.decrypt(privateKey);
             } catch(Exception e) {
                 e.printStackTrace();
-                Log.e("onPackageReceived","Exception reading the key needed to decrypt the package");
+                Log.e("KDE/onPackageReceived","Exception reading the key needed to decrypt the package");
             }
 
         }
 
         if (np.hasPayloadTransferInfo()) {
 
+            Socket socket = null;
             try {
-                Socket socket = new Socket();
+                socket = new Socket();
                 int tcpPort = np.getPayloadTransferInfo().getInt("port");
                 InetSocketAddress address = (InetSocketAddress)session.getRemoteAddress();
                 socket.connect(new InetSocketAddress(address.getAddress(), tcpPort));
                 np.setPayload(socket.getInputStream(), np.getPayloadSize());
             } catch (Exception e) {
+                try { socket.close(); } catch(Exception ignored) { }
                 e.printStackTrace();
-                Log.e("LanLink", "Exception connecting to payload remote socket");
+                Log.e("KDE/LanLink", "Exception connecting to payload remote socket");
             }
 
         }
 
         packageReceived(np);
     }
+
+
+    static ServerSocket openTcpSocketOnFreePort() throws IOException {
+        boolean success = false;
+        int tcpPort = 1739;
+        ServerSocket candidateServer = null;
+        while(!success) {
+            try {
+                candidateServer = new ServerSocket();
+                candidateServer.bind(new InetSocketAddress(tcpPort));
+                success = true;
+                Log.i("KDE/LanLink", "Using port "+tcpPort);
+            } catch(IOException e) {
+                //Log.e("LanLink", "Exception openning serversocket: "+e);
+                tcpPort++;
+                if (tcpPort >= 1764) {
+                    Log.e("KDE/LanLink", "No more ports available");
+                    throw e;
+                }
+            }
+        }
+        return candidateServer;
+    }
+
 }

src/org/kde/kdeconnect/Backends/LanBackend/LanLinkProvider.java

@@ -21,7 +21,6 @@
 package org.kde.kdeconnect.Backends.LanBackend;
 
 import android.content.Context;
-import android.os.AsyncTask;
 import android.preference.PreferenceManager;
 import android.support.v4.util.LongSparseArray;
 import android.util.Log;
@@ -39,6 +38,7 @@ import org.apache.mina.transport.socket.nio.NioDatagramAcceptor;
 import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
 import org.apache.mina.transport.socket.nio.NioSocketConnector;
 import org.kde.kdeconnect.Backends.BaseLinkProvider;
+import org.kde.kdeconnect.Device;
 import org.kde.kdeconnect.NetworkPackage;
 import org.kde.kdeconnect.UserInterface.CustomDevicesActivity;
 
@@ -46,9 +46,11 @@ import java.net.DatagramPacket;
 import java.net.DatagramSocket;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
+import java.net.SocketAddress;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Set;
 
 public class LanLinkProvider extends BaseLinkProvider {
 
@@ -58,6 +60,7 @@ public class LanLinkProvider extends BaseLinkProvider {
     private final Context context;
     private final HashMap<String, LanLink> visibleComputers = new HashMap<String, LanLink>();
     private final LongSparseArray<LanLink> nioSessions = new LongSparseArray<LanLink>();
+    private final LongSparseArray<NioSocketConnector> nioConnectors = new LongSparseArray<NioSocketConnector>();
 
     private NioSocketAcceptor tcpAcceptor = null;
     private NioDatagramAcceptor udpAcceptor = null;
@@ -65,18 +68,46 @@ public class LanLinkProvider extends BaseLinkProvider {
     private final IoHandler tcpHandler = new IoHandlerAdapter() {
         @Override
         public void sessionClosed(IoSession session) throws Exception {
-
-            LanLink brokenLink = nioSessions.get(session.getId());
-            if (brokenLink != null) {
-                nioSessions.remove(session.getId());
-                connectionLost(brokenLink);
-                brokenLink.disconnect();
-                String deviceId = brokenLink.getDeviceId();
-                if (visibleComputers.get(deviceId) == brokenLink) {
-                    visibleComputers.remove(deviceId);
+            try {
+                long id = session.getId();
+                final LanLink brokenLink = nioSessions.get(id);
+                NioSocketConnector connector = nioConnectors.get(id);
+                if (connector != null) {
+                    connector.dispose();
+                    nioConnectors.remove(id);
                 }
-            }
+                if (brokenLink != null) {
+                    nioSessions.remove(id);
+                    //Log.i("KDE/LanLinkProvider", "nioSessions.size(): " + nioSessions.size() + " (-)");
+                    try {
+                        brokenLink.disconnect();
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                        Log.e("KDE/LanLinkProvider", "Exception. Already disconnected?");
+                    }
+                    //Log.i("KDE/LanLinkProvider", "Disconnected!");
+                    String deviceId = brokenLink.getDeviceId();
+                    if (visibleComputers.get(deviceId) == brokenLink) {
+                        visibleComputers.remove(deviceId);
+                    }
+                    new Thread(new Runnable() {
+                        @Override
+                        public void run() {
+                            //Wait a bit before emiting connectionLost, in case the same device re-appears
+                            try {
+                                Thread.sleep(200);
+                            } catch (InterruptedException e) {
+                            }
+                            connectionLost(brokenLink);
 
+                        }
+                    }).start();
+
+                }
+            } catch (Exception e) { //If we don't catch it here, Mina will swallow it :/
+                e.printStackTrace();
+                Log.e("KDE/LanLinkProvider", "sessionClosed exception");
+            }
         }
 
         @Override
@@ -88,7 +119,7 @@ public class LanLinkProvider extends BaseLinkProvider {
 
             String theMessage = (String) message;
             if (theMessage.isEmpty()) {
-                Log.e("LanLinkProvider","Empty package received");
+                Log.e("KDE/LanLinkProvider","Empty package received");
                 return;
             }
 
@@ -101,15 +132,16 @@ public class LanLinkProvider extends BaseLinkProvider {
                     return;
                 }
 
-                //Log.e("LanLinkProvider", "Identity package received from "+np.getString("deviceName"));
+                //Log.i("KDE/LanLinkProvider", "Identity package received from " + np.getString("deviceName"));
 
                 LanLink link = new LanLink(session, np.getString("deviceId"), LanLinkProvider.this);
                 nioSessions.put(session.getId(),link);
+                //Log.e("KDE/LanLinkProvider","nioSessions.size(): " + nioSessions.size());
                 addLink(np, link);
             } else {
                 LanLink prevLink = nioSessions.get(session.getId());
                 if (prevLink == null) {
-                    Log.e("LanLinkProvider","2 Expecting an identity package");
+                    Log.e("KDE/LanLinkProvider","Expecting an identity package (A)");
                 } else {
                     prevLink.injectNetworkPackage(np);
                 }
@@ -131,7 +163,7 @@ public class LanLinkProvider extends BaseLinkProvider {
                 final NetworkPackage identityPackage = NetworkPackage.unserialize(theMessage);
 
                 if (!identityPackage.getType().equals(NetworkPackage.PACKAGE_TYPE_IDENTITY)) {
-                    Log.e("LanLinkProvider", "1 Expecting an identity package");
+                    Log.e("KDE/LanLinkProvider", "Expecting an identity package (B)");
                     return;
                 } else {
                     String myId = NetworkPackage.createIdentityPackage(context).getString("deviceId");
@@ -140,47 +172,60 @@ public class LanLinkProvider extends BaseLinkProvider {
                     }
                 }
 
-                Log.i("LanLinkProvider", "Identity package received, creating link");
+                //Log.i("KDE/LanLinkProvider", "Identity package received, creating link");
 
                 final InetSocketAddress address = (InetSocketAddress) udpSession.getRemoteAddress();
 
                 final NioSocketConnector connector = new NioSocketConnector();
                 connector.setHandler(tcpHandler);
-                //TextLineCodecFactory will split incoming data delimited by the given string
-                connector.getFilterChain().addLast("codec",
-                        new ProtocolCodecFilter(
-                                new TextLineCodecFactory(Charset.defaultCharset(), LineDelimiter.UNIX, LineDelimiter.UNIX)
-                        )
-                );
                 connector.getSessionConfig().setKeepAlive(true);
+                //TextLineCodecFactory will buffer incoming data and emit a message very time it finds a \n
+                TextLineCodecFactory textLineFactory = new TextLineCodecFactory(Charset.defaultCharset(), LineDelimiter.UNIX, LineDelimiter.UNIX);
+                textLineFactory.setDecoderMaxLineLength(512*1024); //Allow to receive up to 512kb of data
+                connector.getFilterChain().addLast("codec", new ProtocolCodecFilter(textLineFactory));
 
-                int tcpPort = identityPackage.getInt("tcpPort",port);
-                ConnectFuture future = connector.connect(new InetSocketAddress(address.getAddress(), tcpPort));
+                int tcpPort = identityPackage.getInt("tcpPort", port);
+                final ConnectFuture future = connector.connect(new InetSocketAddress(address.getAddress(), tcpPort));
                 future.addListener(new IoFutureListener<IoFuture>() {
+
                     @Override
                     public void operationComplete(IoFuture ioFuture) {
-                        final IoSession session = ioFuture.getSession();
+                        try {
+                            future.removeListener(this);
+                            final IoSession session = ioFuture.getSession();
+                            Log.i("KDE/LanLinkProvider", "Connection successful: " + session.isConnected());
 
-                        final LanLink link = new LanLink(session, identityPackage.getString("deviceId"), LanLinkProvider.this);
+                            final LanLink link = new LanLink(session, identityPackage.getString("deviceId"), LanLinkProvider.this);
+                            new Thread(new Runnable() {
+                                @Override
+                                public void run() {
+                                    NetworkPackage np2 = NetworkPackage.createIdentityPackage(context);
+                                    link.sendPackage(np2,new Device.SendPackageStatusCallback() {
+                                        @Override
+                                        protected void onSuccess() {
+                                            nioSessions.put(session.getId(), link);
+                                            nioConnectors.put(session.getId(), connector);
+                                            //Log.e("KDE/LanLinkProvider","nioSessions.size(): " + nioSessions.size());
+                                            addLink(identityPackage, link);
+                                        }
 
-                        Log.i("LanLinkProvider", "Connection successful: " + session.isConnected());
-
-                        new Thread(new Runnable() {
-                            @Override
-                            public void run() {
-                                NetworkPackage np2 = NetworkPackage.createIdentityPackage(context);
-                                link.sendPackage(np2);
-
-                                nioSessions.put(session.getId(), link);
-                                addLink(identityPackage, link);
-                            }
-                        }).start();
+                                        @Override
+                                        protected void onFailure(Throwable e) {
+                                            Log.e("KDE/LanLinkProvider", "Connection failed: could not send identity package back");
+                                        }
+                                    });
 
+                                }
+                            }).start();
+                        } catch (Exception e) { //If we don't catch it here, Mina will swallow it :/
+                            e.printStackTrace();
+                            Log.e("KDE/LanLinkProvider", "sessionClosed exception");
+                        }
                     }
                 });
 
             } catch (Exception e) {
-                Log.e("LanLinkProvider","Exception receiving udp package!!");
+                Log.e("KDE/LanLinkProvider","Exception receiving udp package!!");
                 e.printStackTrace();
             }
 
@@ -189,16 +234,16 @@ public class LanLinkProvider extends BaseLinkProvider {
 
     private void addLink(NetworkPackage identityPackage, LanLink link) {
         String deviceId = identityPackage.getString("deviceId");
-        Log.i("LanLinkProvider","addLink to "+deviceId);
+        Log.i("KDE/LanLinkProvider","addLink to "+deviceId);
         LanLink oldLink = visibleComputers.get(deviceId);
         if (oldLink == link) {
-            Log.e("KDEConnect", "LanLinkProvider: oldLink == link. This should not happen!");
+            Log.e("KDE/LanLinkProvider", "oldLink == link. This should not happen!");
             return;
         }
         visibleComputers.put(deviceId, link);
         connectionAccepted(identityPackage, link);
         if (oldLink != null) {
-            Log.i("LanLinkProvider","Removing old connection to same device");
+            Log.i("KDE/LanLinkProvider","Removing old connection to same device");
             oldLink.disconnect();
             connectionLost(oldLink);
         }
@@ -213,18 +258,15 @@ public class LanLinkProvider extends BaseLinkProvider {
         tcpAcceptor.setHandler(tcpHandler);
         tcpAcceptor.getSessionConfig().setKeepAlive(true);
         tcpAcceptor.getSessionConfig().setReuseAddress(true);
-        tcpAcceptor.setCloseOnDeactivation(false);
-        //TextLineCodecFactory will split incoming data delimited by the given string
-        tcpAcceptor.getFilterChain().addLast("codec",
-                new ProtocolCodecFilter(
-                        new TextLineCodecFactory(Charset.defaultCharset(), LineDelimiter.UNIX, LineDelimiter.UNIX)
-                )
-        );
-
+        //TextLineCodecFactory will buffer incoming data and emit a message very time it finds a \n
+        TextLineCodecFactory textLineFactory = new TextLineCodecFactory(Charset.defaultCharset(), LineDelimiter.UNIX, LineDelimiter.UNIX);
+        textLineFactory.setDecoderMaxLineLength(512*1024); //Allow to receive up to 512kb of data
+        tcpAcceptor.getFilterChain().addLast("codec", new ProtocolCodecFilter(textLineFactory));
 
         udpAcceptor = new NioDatagramAcceptor();
-        udpAcceptor.getSessionConfig().setReuseAddress(true);        //Share port if existing
-        //TextLineCodecFactory will split incoming data delimited by the given string
+        udpAcceptor.getSessionConfig().setReuseAddress(true); //Share port if existing
+        //TextLineCodecFactory will buffer incoming data and emit a message very time it finds a \n
+        //This one will have the default MaxLineLength of 1KB
         udpAcceptor.getFilterChain().addLast("codec",
                 new ProtocolCodecFilter(
                         new TextLineCodecFactory(Charset.defaultCharset(), LineDelimiter.UNIX, LineDelimiter.UNIX)
@@ -238,12 +280,19 @@ public class LanLinkProvider extends BaseLinkProvider {
 
         //This handles the case when I'm the existing device in the network and receive a "hello" UDP package
 
+        Set<SocketAddress> addresses = udpAcceptor.getLocalAddresses();
+        for (SocketAddress address : addresses) {
+            Log.i("KDE/LanLinkProvider", "UDP unbind old address");
+            udpAcceptor.unbind(address);
+        }
+
+        //Log.i("KDE/LanLinkProvider", "UDP Bind.");
         udpAcceptor.setHandler(udpHandler);
 
         try {
             udpAcceptor.bind(new InetSocketAddress(port));
         } catch(Exception e) {
-            Log.e("LanLinkProvider", "Error: Could not bind udp socket");
+            Log.e("KDE/LanLinkProvider", "Error: Could not bind udp socket");
             e.printStackTrace();
         }
 
@@ -258,50 +307,73 @@ public class LanLinkProvider extends BaseLinkProvider {
             }
         }
 
-        Log.i("LanLinkProvider","Using tcpPort "+tcpPort);
+        Log.i("KDE/LanLinkProvider","Using tcpPort "+tcpPort);
 
         //I'm on a new network, let's be polite and introduce myself
         final int finalTcpPort = tcpPort;
-        new AsyncTask<Void,Void,Void>() {
+        new Thread(new Runnable() {
             @Override
-            protected Void doInBackground(Void... voids) {
+            public void run() {
+
                 String deviceListPrefs = PreferenceManager.getDefaultSharedPreferences(context).getString(
                         KEY_CUSTOM_DEVLIST_PREFERENCE, "");
                 ArrayList<String> iplist = new ArrayList<String>();
                 if (!deviceListPrefs.isEmpty()) {
                     iplist = CustomDevicesActivity.deserializeIpList(deviceListPrefs);
                 }
-                iplist.add("255.255.255.255");
-                for (String ipstr : iplist) {
-                    try {
-                        InetAddress client = InetAddress.getByName(ipstr);
-                        NetworkPackage identity = NetworkPackage.createIdentityPackage(context);
-                        identity.set("tcpPort", finalTcpPort);
-                        byte[] b = identity.serialize().getBytes("UTF-8");
-                        DatagramPacket packet = new DatagramPacket(b, b.length, client, port);
-                        DatagramSocket socket = new DatagramSocket();
-                        socket.setReuseAddress(true);
-                        socket.setBroadcast(true);
-                        socket.send(packet);
-                        //Log.i("LanLinkProvider","Udp identity package sent to address "+packet.getAddress());
-                    } catch(Exception e) {
-                        e.printStackTrace();
-                        Log.e("LanLinkProvider","Sending udp identity package failed. Invalid address? ("+ipstr+")");
+                iplist.add("255.255.255.255"); //Default: broadcast.
+
+                NetworkPackage identity = NetworkPackage.createIdentityPackage(context);
+                identity.set("tcpPort", finalTcpPort);
+                DatagramSocket socket = null;
+                byte[] bytes = null;
+                try {
+                    socket = new DatagramSocket();
+                    socket.setReuseAddress(true);
+                    socket.setBroadcast(true);
+                    bytes = identity.serialize().getBytes("UTF-8");
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    Log.e("KDE/LanLinkProvider","Failed to create DatagramSocket");
+                }
+
+                if (bytes != null) {
+                    //Log.e("KDE/LanLinkProvider","Sending packet to "+iplist.size()+" ips");
+                    for (String ipstr : iplist) {
+                        try {
+                            InetAddress client = InetAddress.getByName(ipstr);
+                            DatagramPacket packet = new DatagramPacket(bytes, bytes.length, client, port);
+                            socket.send(packet);
+                            //Log.i("KDE/LanLinkProvider","Udp identity package sent to address "+packet.getAddress());
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                            Log.e("KDE/LanLinkProvider", "Sending udp identity package failed. Invalid address? (" + ipstr + ")");
+                        }
                     }
                 }
 
-                return null;
+                socket.close();
 
             }
-
-        }.execute();
-
+        }).start();
     }
 
     @Override
     public void onNetworkChange() {
+        //Log.e("KDE/LanLinkProvider","onNetworkChange");
+
+        //FilesHelper.LogOpenFileCount();
+
+        //Keep existing connections open while unbinding the socket
+        tcpAcceptor.setCloseOnDeactivation(false);
         onStop();
+        tcpAcceptor.setCloseOnDeactivation(true);
+
+        //FilesHelper.LogOpenFileCount();
+
         onStart();
+
+        //FilesHelper.LogOpenFileCount();
     }
 
     @Override
@@ -309,14 +381,12 @@ public class LanLinkProvider extends BaseLinkProvider {
         udpAcceptor.unbind();
         tcpAcceptor.unbind();
     }
-/*
-    @Override
-    public int getPriority() {
-        return 1000;
-    }
-*/
+
     @Override
     public String getName() {
         return "LanLinkProvider";
     }
+
+
+
 }

src/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLink.java

@@ -20,10 +20,9 @@
 
 package org.kde.kdeconnect.Backends.LoopbackBackend;
 
-import android.util.Log;
-
 import org.kde.kdeconnect.Backends.BaseLink;
 import org.kde.kdeconnect.Backends.BaseLinkProvider;
+import org.kde.kdeconnect.Device;
 import org.kde.kdeconnect.NetworkPackage;
 
 import java.security.PublicKey;
@@ -35,29 +34,30 @@ public class LoopbackLink extends BaseLink {
     }
 
     @Override
-    public boolean sendPackage(NetworkPackage in) {
-        String s = in.serialize();
-        NetworkPackage out= NetworkPackage.unserialize(s);
-        if (in.hasPayload()) out.setPayload(in.getPayload(), in.getPayloadSize());
-        packageReceived(out);
-        return true;
+    public void sendPackage(NetworkPackage in, Device.SendPackageStatusCallback callback) {
+        sendPackageEncrypted(in, callback, null);
     }
 
     @Override
-    public boolean sendPackageEncrypted(NetworkPackage in, PublicKey key) {
+    public void sendPackageEncrypted(NetworkPackage in, Device.SendPackageStatusCallback callback, PublicKey key) {
         try {
-            in = in.encrypt(key);
+            if (key != null) {
+                in = in.encrypt(key);
+            }
             String s = in.serialize();
             NetworkPackage out= NetworkPackage.unserialize(s);
-            out.decrypt(privateKey);
+            if (key != null) {
+                out = out.decrypt(privateKey);
+            }
             packageReceived(out);
-            if (in.hasPayload()) out.setPayload(in.getPayload(), in.getPayloadSize());
-            return true;
+            if (in.hasPayload()) {
+                callback.sendProgress(0);
+                out.setPayload(in.getPayload(), in.getPayloadSize());
+                callback.sendProgress(100);
+            }
+            callback.sendSuccess();
         } catch(Exception e) {
-            e.printStackTrace();
-            Log.e("LoopbackLink", "Encryption exception");
-            return false;
+            callback.sendFailure(e);
         }
-
     }
 }

src/org/kde/kdeconnect/BackgroundService.java

@@ -105,17 +105,17 @@ public class BackgroundService extends Service {
         @Override
         public void onConnectionReceived(final NetworkPackage identityPackage, final BaseLink link) {
 
-            Log.i("BackgroundService", "Connection accepted!");
+            Log.i("KDE/BackgroundService", "Connection accepted!");
 
             String deviceId = identityPackage.getString("deviceId");
 
             Device device = devices.get(deviceId);
 
             if (device != null) {
-                Log.i("BackgroundService", "addLink, known device: " + deviceId);
+                Log.i("KDE/BackgroundService", "addLink, known device: " + deviceId);
                 device.addLink(identityPackage, link);
             } else {
-                Log.i("BackgroundService", "addLink,unknown device: " + deviceId);
+                Log.i("KDE/BackgroundService", "addLink,unknown device: " + deviceId);
                 device = new Device(BackgroundService.this, identityPackage, link);
                 devices.put(deviceId, device);
                 device.addPairingCallback(devicePairingCallback);
@@ -127,7 +127,7 @@ public class BackgroundService extends Service {
         @Override
         public void onConnectionLost(BaseLink link) {
             Device d = devices.get(link.getDeviceId());
-            Log.i("onConnectionLost", "removeLink, deviceId: " + link.getDeviceId());
+            Log.i("KDE/onConnectionLost", "removeLink, deviceId: " + link.getDeviceId());
             if (d != null) {
                 d.removeLink(link);
                 if (!d.isReachable() && !d.isPaired()) {
@@ -136,7 +136,7 @@ public class BackgroundService extends Service {
                     d.removePairingCallback(devicePairingCallback);
                 }
             } else {
-                Log.e("onConnectionLost","Removing connection to unknown device, this should not happen");
+                Log.e("KDE/onConnectionLost","Removing connection to unknown device, this should not happen");
             }
             if (deviceListChangedCallback != null) deviceListChangedCallback.onDeviceListChanged();
         }
@@ -147,34 +147,35 @@ public class BackgroundService extends Service {
     }
 
     public void startDiscovery() {
-        Log.i("BackgroundService","StartDiscovery");
+        Log.i("KDE/BackgroundService","StartDiscovery");
         for (BaseLinkProvider a : linkProviders) {
             a.onStart();
         }
     }
 
     public void stopDiscovery() {
-        Log.i("BackgroundService","StopDiscovery");
+        Log.i("KDE/BackgroundService","StopDiscovery");
         for (BaseLinkProvider a : linkProviders) {
             a.onStop();
         }
     }
 
     public void onNetworkChange() {
-        Log.i("BackgroundService","OnNetworkChange");
+        Log.i("KDE/BackgroundService","OnNetworkChange");
         for (BaseLinkProvider a : linkProviders) {
             a.onNetworkChange();
         }
     }
 
     public void addConnectionListener(BaseLinkProvider.ConnectionReceiver cr) {
-        Log.i("BackgroundService","Registering connection listener");
+        Log.i("KDE/BackgroundService","Registering connection listener");
         for (BaseLinkProvider a : linkProviders) {
             a.addConnectionReceiver(cr);
         }
     }
 
     public void removeConnectionListener(BaseLinkProvider.ConnectionReceiver cr) {
+        Log.i("KDE/BackgroundService","Removing connection listener");
         for (BaseLinkProvider a : linkProviders) {
             a.removeConnectionReceiver(cr);
         }
@@ -198,7 +199,7 @@ public class BackgroundService extends Service {
         IntentFilter filter = new IntentFilter(Intent.ACTION_SCREEN_ON);
         registerReceiver(new KdeConnectBroadcastReceiver(), filter);
 
-        Log.i("BackgroundService","Service not started yet, initializing...");
+        Log.i("KDE/BackgroundService","Service not started yet, initializing...");
 
         initializeRsaKeys();
         MainSettingsActivity.initializeDeviceName(this);
@@ -223,7 +224,7 @@ public class BackgroundService extends Service {
                 keyPair = keyGen.genKeyPair();
             } catch(Exception e) {
                 e.printStackTrace();
-                Log.e("initializeRsaKeys","Exception");
+                Log.e("KDE/initializeRsaKeys","Exception");
                 return;
             }
 
@@ -233,7 +234,7 @@ public class BackgroundService extends Service {
             SharedPreferences.Editor edit = settings.edit();
             edit.putString("publicKey",Base64.encodeToString(publicKey, 0).trim()+"\n");
             edit.putString("privateKey",Base64.encodeToString(privateKey, 0));
-            edit.commit();
+            edit.apply();
 
         }
 
@@ -268,7 +269,7 @@ public class BackgroundService extends Service {
 
     @Override
     public void onDestroy() {
-        Log.i("BackgroundService", "Destroying");
+        Log.i("KDE/BackgroundService", "Destroying");
         stopDiscovery();
         super.onDestroy();
     }
@@ -305,14 +306,19 @@ public class BackgroundService extends Service {
         RunCommand(c, null);
     }
 
-    public static void RunCommand(Context c, final InstanceCallback callback) {
-        if (callback != null) {
-            mutex.lock();
-            callbacks.add(callback);
-            mutex.unlock();
-        }
-        Intent serviceIntent = new Intent(c, BackgroundService.class);
-        c.startService(serviceIntent);
+    public static void RunCommand(final Context c, final InstanceCallback callback) {
+        new Thread(new Runnable() {
+            @Override
+            public void run() {
+                if (callback != null) {
+                    mutex.lock();
+                    callbacks.add(callback);
+                    mutex.unlock();
+                }
+                Intent serviceIntent = new Intent(c, BackgroundService.class);
+                c.startService(serviceIntent);
+            }
+        }).start();
     }
 
 }

src/org/kde/kdeconnect/Device.java

@@ -27,6 +27,8 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Resources;
+import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.preference.PreferenceManager;
@@ -46,8 +48,6 @@ import java.security.PublicKey;
 import java.security.spec.PKCS8EncodedKeySpec;
 import java.security.spec.X509EncodedKeySpec;
 import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Set;
 import java.util.Timer;
@@ -58,18 +58,37 @@ public class Device implements BaseLink.PackageReceiver {
     private final Context context;
 
     private final String deviceId;
-    private final String name;
+    private String name;
     public PublicKey publicKey;
     private int notificationId;
     private int protocolVersion;
 
-    private enum PairStatus {
+    public enum PairStatus {
         NotPaired,
         Requested,
         RequestedByPeer,
         Paired
     }
 
+    public enum DeviceType {
+        Phone,
+        Tablet,
+        Computer;
+
+        public static DeviceType FromString(String s) {
+            if ("tablet".equals(s)) return Tablet;
+            if ("computer".equals(s)) return Computer;
+            return Phone; //Default
+        }
+        public String toString() {
+            switch (this) {
+                case Tablet: return "tablet";
+                case Computer: return "computer";
+                default: return "phone";
+            }
+        }
+    }
+
     public interface PairingCallback {
         abstract void incomingRequest();
         abstract void pairingSuccessful();
@@ -77,6 +96,7 @@ public class Device implements BaseLink.PackageReceiver {
         abstract void unpaired();
     }
 
+    private DeviceType deviceType;
     private PairStatus pairStatus;
     private ArrayList<PairingCallback> pairingCallback = new ArrayList<PairingCallback>();
     private Timer pairingTimer;
@@ -95,16 +115,18 @@ public class Device implements BaseLink.PackageReceiver {
 
         this.context = context;
         this.deviceId = deviceId;
-        this.name = settings.getString("deviceName", "unknown device");
+        this.name = settings.getString("deviceName", context.getString(R.string.unknown_device));
         this.pairStatus = PairStatus.Paired;
         this.protocolVersion = NetworkPackage.ProtocolVersion; //We don't know it yet
+        this.deviceType = DeviceType.FromString(settings.getString("deviceType", "computer"));
 
         try {
             byte[] publicKeyBytes = Base64.decode(settings.getString("publicKey", ""), 0);
             publicKey = KeyFactory.getInstance("RSA").generatePublic(new X509EncodedKeySpec(publicKeyBytes));
         } catch (Exception e) {
             e.printStackTrace();
-            Log.e("Device","Exception");
+            unpair();
+            Log.e("KDE/Device","Exception");
         }
 
         reloadPluginsFromSettings();
@@ -117,9 +139,10 @@ public class Device implements BaseLink.PackageReceiver {
 
         this.context = context;
         this.deviceId = np.getString("deviceId");
-        this.name = np.getString("deviceName", "unidentified device");
-        this.protocolVersion = np.getInt("protocolVersion");
+        this.name = np.getString("deviceName", context.getString(R.string.unknown_device));
         this.pairStatus = PairStatus.NotPaired;
+        this.protocolVersion = np.getInt("protocolVersion");
+        this.deviceType = DeviceType.FromString(np.getString("deviceType", "computer"));
         this.publicKey = null;
 
         settings = context.getSharedPreferences(deviceId, Context.MODE_PRIVATE);
@@ -131,6 +154,19 @@ public class Device implements BaseLink.PackageReceiver {
         return name != null? name : context.getString(R.string.unknown_device);
     }
 
+    public Drawable getIcon()
+    {
+        switch (deviceType) {
+            case Phone: return context.getResources().getDrawable(R.drawable.ic_device_phone);
+            case Tablet: return context.getResources().getDrawable(R.drawable.ic_device_tablet);
+            default: return context.getResources().getDrawable(R.drawable.ic_device_laptop);
+        }
+    }
+
+    public DeviceType getDeviceType() {
+        return deviceType;
+    }
+
     public String getDeviceId() {
         return deviceId;
     }
@@ -191,10 +227,9 @@ public class Device implements BaseLink.PackageReceiver {
 
         //Send our own public key
         NetworkPackage np = NetworkPackage.createPublicKeyPackage(context);
-        sendPackage(np, new SendPackageFinishedCallback(){
-
+        sendPackage(np, new SendPackageStatusCallback(){
             @Override
-            public void sendSuccessful() {
+            public void onSuccess() {
                 if (pairingTimer != null) pairingTimer.cancel();
                 pairingTimer = new Timer();
                 pairingTimer.schedule(new TimerTask() {
@@ -203,7 +238,7 @@ public class Device implements BaseLink.PackageReceiver {
                         for (PairingCallback cb : pairingCallback) {
                             cb.pairingFailed(context.getString(R.string.error_timed_out));
                         }
-                        Log.e("Device","Unpairing (timeout A)");
+                        Log.e("KDE/Device","Unpairing (timeout A)");
                         pairStatus = PairStatus.NotPaired;
                     }
                 }, 30*1000); //Time to wait for the other to accept
@@ -211,11 +246,11 @@ public class Device implements BaseLink.PackageReceiver {
             }
 
             @Override
-            public void sendFailed() {
+            public void onFailure(Throwable e) {
                 for (PairingCallback cb : pairingCallback) {
                     cb.pairingFailed(context.getString(R.string.error_could_not_send_package));
                 }
-                Log.e("Device","Unpairing (sendFailed A)");
+                Log.e("KDE/Device","Unpairing (sendFailed A)");
                 pairStatus = PairStatus.NotPaired;
             }
 
@@ -233,7 +268,7 @@ public class Device implements BaseLink.PackageReceiver {
         pairStatus = PairStatus.NotPaired;
 
         SharedPreferences preferences = context.getSharedPreferences("trusted_devices", Context.MODE_PRIVATE);
-        preferences.edit().remove(deviceId).commit();
+        preferences.edit().remove(deviceId).apply();
 
         NetworkPackage np = new NetworkPackage(NetworkPackage.PACKAGE_TYPE_PAIR);
         np.set("pair", false);
@@ -255,14 +290,15 @@ public class Device implements BaseLink.PackageReceiver {
 
         //Store as trusted device
         SharedPreferences preferences = context.getSharedPreferences("trusted_devices", Context.MODE_PRIVATE);
-        preferences.edit().putBoolean(deviceId,true).commit();
+        preferences.edit().putBoolean(deviceId,true).apply();
 
         //Store device information needed to create a Device object in a future
         SharedPreferences.Editor editor = settings.edit();
         editor.putString("deviceName", getName());
+        editor.putString("deviceType", deviceType.toString());
         String encodedPublicKey = Base64.encodeToString(publicKey.getEncoded(), 0);
         editor.putString("publicKey", encodedPublicKey);
-        editor.commit();
+        editor.apply();
 
         reloadPluginsFromSettings();
 
@@ -274,17 +310,17 @@ public class Device implements BaseLink.PackageReceiver {
 
     public void acceptPairing() {
 
-        Log.i("Device","Accepted pair request started by the other device");
+        Log.i("KDE/Device","Accepted pair request started by the other device");
 
         //Send our own public key
         NetworkPackage np = NetworkPackage.createPublicKeyPackage(context);
-        sendPackage(np, new SendPackageFinishedCallback() {
+        sendPackage(np, new SendPackageStatusCallback() {
             @Override
-            public void sendSuccessful() {
+            protected void onSuccess() {
                 pairingDone();
             }
             @Override
-            public void sendFailed() {
+            protected void onFailure(Throwable e) {
                 Log.e("Device","Unpairing (sendFailed B)");
                 pairStatus = PairStatus.NotPaired;
                 for (PairingCallback cb : pairingCallback) {
@@ -297,7 +333,7 @@ public class Device implements BaseLink.PackageReceiver {
 
     public void rejectPairing() {
 
-        Log.i("Device","Rejected pair request started by the other device");
+        Log.i("KDE/Device","Rejected pair request started by the other device");
 
         //Log.e("Device","Unpairing (rejectPairing)");
         pairStatus = PairStatus.NotPaired;
@@ -324,9 +360,22 @@ public class Device implements BaseLink.PackageReceiver {
     }
 
     public void addLink(NetworkPackage identityPackage, BaseLink link) {
+        //FilesHelper.LogOpenFileCount();
 
         this.protocolVersion = identityPackage.getInt("protocolVersion");
 
+        if (identityPackage.has("deviceName")) {
+            this.name = identityPackage.getString("deviceName", this.name);
+            SharedPreferences.Editor editor = settings.edit();
+            editor.putString("deviceName", this.name);
+            editor.apply();
+        }
+
+        if (identityPackage.has("deviceType")) {
+            this.deviceType = DeviceType.FromString(identityPackage.getString("deviceType", "computer"));
+        }
+
+
         links.add(link);
 
         try {
@@ -336,10 +385,10 @@ public class Device implements BaseLink.PackageReceiver {
             link.setPrivateKey(privateKey);
         } catch (Exception e) {
             e.printStackTrace();
-            Log.e("Device", "Exception reading our own private key"); //Should not happen
+            Log.e("KDE/Device", "Exception reading our own private key"); //Should not happen
         }
 
-        Log.i("Device","addLink "+link.getLinkProvider().getName()+" -> "+getName() + " active links: "+ links.size());
+        Log.i("KDE/Device","addLink "+link.getLinkProvider().getName()+" -> "+getName() + " active links: "+ links.size());
 
         /*
         Collections.sort(links, new Comparator<BaseLink>() {
@@ -358,9 +407,11 @@ public class Device implements BaseLink.PackageReceiver {
     }
 
     public void removeLink(BaseLink link) {
+        //FilesHelper.LogOpenFileCount();
+
         link.removePackageReceiver(this);
         links.remove(link);
-        Log.i("Device","removeLink: "+link.getLinkProvider().getName() + " -> "+getName() + " active links: "+ links.size());
+        Log.i("KDE/Device","removeLink: "+link.getLinkProvider().getName() + " -> "+getName() + " active links: "+ links.size());
         if (links.isEmpty()) {
             reloadPluginsFromSettings();
         }
@@ -371,7 +422,7 @@ public class Device implements BaseLink.PackageReceiver {
 
         if (np.getType().equals(NetworkPackage.PACKAGE_TYPE_PAIR)) {
 
-            Log.i("Device","Pair package");
+            Log.i("KDE/Device","Pair package");
 
             boolean wantsPair = np.getBoolean("pair");
 
@@ -396,7 +447,7 @@ public class Device implements BaseLink.PackageReceiver {
                     publicKey = KeyFactory.getInstance("RSA").generatePublic(new X509EncodedKeySpec(publicKeyBytes));
                 } catch(Exception e) {
                     e.printStackTrace();
-                    Log.e("Device","Pairing exception: Received incorrect key");
+                    Log.e("KDE/Device","Pairing exception: Received incorrect key");
                     for (PairingCallback cb : pairingCallback) {
                         cb.pairingFailed(context.getString(R.string.error_invalid_key));
                     }
@@ -405,7 +456,7 @@ public class Device implements BaseLink.PackageReceiver {
 
                 if (pairStatus == PairStatus.Requested)  { //We started pairing
 
-                    Log.i("Pairing","Pair answer");
+                    Log.i("KDE/Pairing","Pair answer");
 
                     if (pairingTimer != null) pairingTimer.cancel();
 
@@ -413,7 +464,7 @@ public class Device implements BaseLink.PackageReceiver {
 
                 } else {
 
-                    Log.i("Pairing","Pair request");
+                    Log.i("KDE/Pairing","Pair request");
 
                     Intent intent = new Intent(context, PairActivity.class);
                     intent.putExtra("deviceId", deviceId);
@@ -434,7 +485,12 @@ public class Device implements BaseLink.PackageReceiver {
 
                     final NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
                     notificationId = (int)System.currentTimeMillis();
-                    notificationManager.notify(notificationId, noti);
+                    try {
+                        notificationManager.notify(notificationId, noti);
+                    } catch(Exception e) {
+                        //4.1 will throw an exception about not having the VIBRATE permission, ignore it.
+                        //https://android.googlesource.com/platform/frameworks/base/+/android-4.2.1_r1.2%5E%5E!/
+                    }
 
                     if (pairingTimer != null) pairingTimer.cancel();
                     pairingTimer = new Timer();
@@ -442,7 +498,7 @@ public class Device implements BaseLink.PackageReceiver {
                     pairingTimer.schedule(new TimerTask() {
                         @Override
                         public void run() {
-                            Log.e("Device","Unpairing (timeout B)");
+                            Log.e("KDE/Device","Unpairing (timeout B)");
                             pairStatus = PairStatus.NotPaired;
                             notificationManager.cancel(notificationId);
                         }
@@ -452,7 +508,7 @@ public class Device implements BaseLink.PackageReceiver {
 
                 }
             } else {
-                Log.i("Pairing","Unpair request");
+                Log.i("KDE/Pairing","Unpair request");
 
                 if (pairStatus == PairStatus.Requested) {
                     pairingTimer.cancel();
@@ -461,87 +517,98 @@ public class Device implements BaseLink.PackageReceiver {
                     }
                 } else if (pairStatus == PairStatus.Paired) {
                     SharedPreferences preferences = context.getSharedPreferences("trusted_devices", Context.MODE_PRIVATE);
-                    preferences.edit().remove(deviceId).commit();
+                    preferences.edit().remove(deviceId).apply();
                     reloadPluginsFromSettings();
                 }
 
-                //Log.e("Device","Unpairing (unpair request)");
                 pairStatus = PairStatus.NotPaired;
                 for (PairingCallback cb : pairingCallback) cb.unpaired();
 
             }
-        } else if (!isPaired()) {
-
-            unpair();
-            Log.e("onPackageReceived","Device not paired, ignoring package!");
-
-        } else {
+        } else if (isPaired()) {
 
             for (Plugin plugin : plugins.values()) {
                 try {
                     plugin.onPackageReceived(np);
                 } catch (Exception e) {
                     e.printStackTrace();
-                    Log.e("Device", "Exception in "+plugin.getDisplayName()+"'s onPackageReceived()");
+                    Log.e("KDE/Device", "Exception in "+plugin.getDisplayName()+"'s onPackageReceived()");
                 }
 
             }
+
+        } else {
+
+            Log.e("KDE/onPackageReceived","Device not paired, ignoring package!");
+
+            if (pairStatus != PairStatus.Requested) {
+                unpair();
+            }
+
         }
 
     }
 
-    public interface SendPackageFinishedCallback {
-        void sendSuccessful();
-        void sendFailed();
+    public static abstract class SendPackageStatusCallback {
+        protected abstract void onSuccess();
+        protected abstract void onFailure(Throwable e);
+        protected void onProgressChanged(int percent) { }
+
+        private boolean success = false;
+        public void sendSuccess() {
+            success = true;
+            onSuccess();
+        }
+        public void sendFailure(Throwable e) {
+            if (e != null) {
+                e.printStackTrace();
+                Log.e("KDE/sendPackage", "Exception: " + e.getMessage());
+            } else {
+                Log.e("KDE/sendPackage", "Unknown (null) exception");
+            }
+            onFailure(e);
+        }
+        public void sendProgress(int percent) { onProgressChanged(percent); }
     }
 
+
     public void sendPackage(NetworkPackage np) {
-        sendPackage(np,null);
+        sendPackage(np,new SendPackageStatusCallback() {
+            @Override
+            protected void onSuccess() { }
+            @Override
+            protected void onFailure(Throwable e) { }
+        });
     }
 
     //Async
-    public void sendPackage(final NetworkPackage np, final SendPackageFinishedCallback callback) {
+    public void sendPackage(final NetworkPackage np, final SendPackageStatusCallback callback) {
 
+        //Log.e("sendPackage", "Sending package...");
+        //Log.e("sendPackage", np.serialize());
 
-        final Exception backtrace = new Exception();
+        final Throwable backtrace = new Throwable();
         new Thread(new Runnable() {
             @Override
             public void run() {
 
-                //Log.e("sendPackage", "Sending package...");
-                //Log.e("sendPackage", np.serialize());
-
                 boolean useEncryption = (!np.getType().equals(NetworkPackage.PACKAGE_TYPE_PAIR) && isPaired());
 
-                //We need a copy to avoid concurrent modification exception if the original list changes
+                //Make a copy to avoid concurrent modification exception if the original list changes
                 ArrayList<BaseLink> mLinks = new ArrayList<BaseLink>(links);
-
-                boolean success = false;
-                try {
-                    for (BaseLink link : mLinks) {
-                        if (useEncryption) {
-                            success = link.sendPackageEncrypted(np, publicKey);
-                        } else {
-                            success = link.sendPackage(np);
-                        }
-                        if (success) break;
+                for (final BaseLink link : mLinks) {
+                    if (link == null) continue; //Since we made a copy, maybe somebody destroyed the link in the meanwhile
+                    if (useEncryption) {
+                        link.sendPackageEncrypted(np, callback, publicKey);
+                    } else {
+                        link.sendPackage(np, callback);
                     }
-                } catch(Exception e) {
-                    e.printStackTrace();
-                    Log.e("sendPackage","Error while sending package");
-                    success = false;
+                    if (callback.success) break; //If the link didn't call sendSuccess(), try the next one
                 }
 
-                if (success) {
-                   // Log.e("sendPackage","Package sent");
-                } else {
+                if (!callback.success) {
+                    Log.e("KDE/sendPackage", "No device link (of "+mLinks.size()+" available) could send the package. Package lost!");
                     backtrace.printStackTrace();
-                    Log.e("sendPackage","Error: Package could not be sent ("+mLinks.size()+" links available)");
-                }
-
-                if (callback != null) {
-                    if (success) callback.sendSuccessful();
-                    else callback.sendFailed();
                 }
 
             }
@@ -549,29 +616,41 @@ public class Device implements BaseLink.PackageReceiver {
 
     }
 
-
-
-
-
     //
     // Plugin-related functions
     //
 
-    public Plugin getPlugin(String name) {
-        return plugins.get(name);
+    public <T extends Plugin> T getPlugin(Class<T> pluginClass) {
+        return (T)getPlugin(Plugin.getPluginKey(pluginClass));
     }
 
-    private synchronized void addPlugin(final String name) {
-        Plugin existing = plugins.get(name);
+    public <T extends Plugin> T getPlugin(Class<T> pluginClass, boolean includeFailed) {
+        return (T)getPlugin(Plugin.getPluginKey(pluginClass), includeFailed);
+    }
+
+    public Plugin getPlugin(String pluginKey) {
+        return getPlugin(pluginKey, false);
+    }
+
+    public Plugin getPlugin(String pluginKey, boolean includeFailed) {
+        Plugin plugin = plugins.get(pluginKey);
+        if (includeFailed && plugin == null) {
+            plugin = failedPlugins.get(pluginKey);
+        }
+        return plugin;
+    }
+
+    private synchronized void addPlugin(final String pluginKey) {
+        Plugin existing = plugins.get(pluginKey);
         if (existing != null) {
-            Log.w("addPlugin","plugin already present:" + name);
+            Log.w("KDE/addPlugin","plugin already present:" + pluginKey);
             return;
         }
 
-        final Plugin plugin = PluginFactory.instantiatePluginForDevice(context, name, this);
+        final Plugin plugin = PluginFactory.instantiatePluginForDevice(context, pluginKey, this);
         if (plugin == null) {
-            Log.e("addPlugin","could not instantiate plugin: "+name);
-            failedPlugins.put(name, plugin);
+            Log.e("KDE/addPlugin","could not instantiate plugin: "+pluginKey);
+            failedPlugins.put(pluginKey, plugin);
             return;
         }
 
@@ -585,18 +664,17 @@ public class Device implements BaseLink.PackageReceiver {
                 } catch (Exception e) {
                     success = false;
                     e.printStackTrace();
-                    Log.e("addPlugin", "Exception loading plugin " + name);
-                    return;
+                    Log.e("KDE/addPlugin", "Exception loading plugin " + pluginKey);
                 }
 
                 if (success) {
-                    //Log.e("addPlugin","added " + name);
-                    failedPlugins.remove(name);
-                    plugins.put(name, plugin);
+                    //Log.e("addPlugin","added " + pluginKey);
+                    failedPlugins.remove(pluginKey);
+                    plugins.put(pluginKey, plugin);
                 } else {
-                    Log.e("addPlugin", "plugin failed to load " + name);
-                    plugins.remove(name);
-                    failedPlugins.put(name, plugin);
+                    Log.e("KDE/addPlugin", "plugin failed to load " + pluginKey);
+                    plugins.remove(pluginKey);
+                    failedPlugins.put(pluginKey, plugin);
                 }
 
                 for (PluginsChangedListener listener : pluginsChangedListeners) {
@@ -608,10 +686,10 @@ public class Device implements BaseLink.PackageReceiver {
 
     }
 
-    private synchronized boolean removePlugin(String name) {
+    private synchronized boolean removePlugin(String pluginKey) {
 
-        Plugin plugin = plugins.remove(name);
-        Plugin failedPlugin = failedPlugins.remove(name);
+        Plugin plugin = plugins.remove(pluginKey);
+        Plugin failedPlugin = failedPlugins.remove(pluginKey);
 
         if (plugin == null) {
             if (failedPlugin == null) {
@@ -623,10 +701,10 @@ public class Device implements BaseLink.PackageReceiver {
 
         try {
             plugin.onDestroy();
-            //Log.e("removePlugin","removed " + name);
+            //Log.e("removePlugin","removed " + pluginKey);
         } catch (Exception e) {
             e.printStackTrace();
-            Log.e("removePlugin","Exception calling onDestroy for plugin "+name);
+            Log.e("KDE/removePlugin","Exception calling onDestroy for plugin "+pluginKey);
         }
 
         for (PluginsChangedListener listener : pluginsChangedListeners) {
@@ -636,15 +714,15 @@ public class Device implements BaseLink.PackageReceiver {
         return true;
     }
 
-    public void setPluginEnabled(String pluginName, boolean value) {
-        settings.edit().putBoolean(pluginName,value).commit();
-        if (value && isPaired() && isReachable()) addPlugin(pluginName);
-        else removePlugin(pluginName);
+    public void setPluginEnabled(String pluginKey, boolean value) {
+        settings.edit().putBoolean(pluginKey,value).apply();
+        if (value && isPaired() && isReachable()) addPlugin(pluginKey);
+        else removePlugin(pluginKey);
     }
 
-    public boolean isPluginEnabled(String pluginName) {
-        boolean enabledByDefault = PluginFactory.getPluginInfo(context, pluginName).isEnabledByDefault();
-        boolean enabled = settings.getBoolean(pluginName, enabledByDefault);
+    public boolean isPluginEnabled(String pluginKey) {
+        boolean enabledByDefault = PluginFactory.getPluginInfo(context, pluginKey).isEnabledByDefault();
+        boolean enabled = settings.getBoolean(pluginKey, enabledByDefault);
         return enabled;
     }
 
@@ -658,15 +736,15 @@ public class Device implements BaseLink.PackageReceiver {
 
         Set<String> availablePlugins = PluginFactory.getAvailablePlugins();
 
-        for(String pluginName : availablePlugins) {
+        for(String pluginKey : availablePlugins) {
             boolean enabled = false;
             if (isPaired() && isReachable()) {
-                enabled = isPluginEnabled(pluginName);
+                enabled = isPluginEnabled(pluginKey);
             }
             if (enabled) {
-                addPlugin(pluginName);
+                addPlugin(pluginKey);
             } else {
-                removePlugin(pluginName);
+                removePlugin(pluginKey);
             }
         }
 

src/org/kde/kdeconnect/Helpers/DeviceHelper.java

@@ -23,6 +23,7 @@ package org.kde.kdeconnect.Helpers;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.Build;
+import android.util.Log;
 
 import java.util.HashMap;
 
@@ -34,18 +35,38 @@ public class DeviceHelper {
     private final static HashMap<String,String> humanReadableNames = new HashMap<String,String>();
     static {
         humanReadableNames.put("5860E","Coolpad Quattro 4G");
+        humanReadableNames.put("831C","HTC One M8");
+        humanReadableNames.put("9920","Star Alps S9920");
+        humanReadableNames.put("A0001","OnePlus One");
+        humanReadableNames.put("A1-810","Acer Iconia A1-810");
         humanReadableNames.put("ADR6300","HTC Droid Incredible");
         humanReadableNames.put("ADR6330VW","HTC Rhyme");
         humanReadableNames.put("ADR6350","HTC Droid Incredible 2");
         humanReadableNames.put("ADR6400L","HTC Thunderbolt");
         humanReadableNames.put("ADR6410LVW","HTC Droid Incredible 4G");
         humanReadableNames.put("ADR6425LVW","HTC Rezound 4G");
+        humanReadableNames.put("ALCATEL_ONE_TOUCH_5035X","Alcatel One Touch X Pop");
+        humanReadableNames.put("ALCATEL_ONE_TOUCH_7041X","Alcatel One Touch Pop C7");
+        humanReadableNames.put("Aquaris_E4.5","bq Aquaris E4.5");
         humanReadableNames.put("ASUS_Transformer_Pad_TF300T","Asus Transformer Pad");
+        humanReadableNames.put("bq_Aquaris_5","bq Aquaris 5");
+        humanReadableNames.put("bq_Aquaris_5_HD","bq Aquaris 5 HD");
+        humanReadableNames.put("C1905","Sony Xperia M");
+        humanReadableNames.put("C2105","Sony Xperia L");
         humanReadableNames.put("C5155","Kyocera Rise");
         humanReadableNames.put("C5170","Kyocera Hydro");
+        humanReadableNames.put("C5303","Sony Xperia SP");
         humanReadableNames.put("C6603","Sony Xperia Z");
         humanReadableNames.put("C6606","Sony Xperia Z");
+        humanReadableNames.put("C6833","Sony Xperia Z Ultra");
         humanReadableNames.put("C6903","Sony Xperia Z1");
+        humanReadableNames.put("C6916","Sony Xperia Z1S");
+        humanReadableNames.put("CM990","Huawei Evolution III");
+        humanReadableNames.put("CUBOT_ONE","Cubot One");
+        humanReadableNames.put("D2005","Sony Xperia E1");
+        humanReadableNames.put("D2303","Sony Xperia M2");
+        humanReadableNames.put("D5503","Sony Xperia Z1");
+        humanReadableNames.put("D5803","Sony Xperia Z3 Compact");
         humanReadableNames.put("D6503","Sony Xperia Z2");
         humanReadableNames.put("Desire_HD","HTC Desire HD");
         humanReadableNames.put("DROID2_GLOBAL","Motorola Droid 2 Global");
@@ -63,16 +84,23 @@ public class DeviceHelper {
         humanReadableNames.put("Galaxy_Nexus","Samsung Galaxy Nexus");
         humanReadableNames.put("google_sdk","Android Emulator");
         humanReadableNames.put("GT-I8160","Samsung Galaxy Ace 2");
+        humanReadableNames.put("GT-I8190L","Samsung Galaxy S3 Mini");
         humanReadableNames.put("GT-I8190N","Samsung Galaxy S III Mini");
         humanReadableNames.put("GT-I8190","Samsung Galaxy S III Mini");
+        humanReadableNames.put("GT-I8260","Samsung Galaxy Core");
+        humanReadableNames.put("GT-I8550L","Samsung Galaxy Win");
         humanReadableNames.put("GT-I9000","Samsung Galaxy S");
         humanReadableNames.put("GT-I9001","Samsung Galaxy S Plus");
+        humanReadableNames.put("GT-I9060","Samsung Galaxy Grand Neo");
+        humanReadableNames.put("GT-I9063T","Samsung Galaxy Grand Neo Duos");
         humanReadableNames.put("GT-I9070","Samsung Galaxy S Advance");
         humanReadableNames.put("GT-I9082","Samsung Galaxy Grand");
         humanReadableNames.put("GT-I9100M","Samsung Galaxy S II");
         humanReadableNames.put("GT-I9100P","Samsung Galaxy S II");
         humanReadableNames.put("GT-I9100","Samsung Galaxy S II");
         humanReadableNames.put("GT-I9100T","Samsung Galaxy S II");
+        humanReadableNames.put("GT-I9105P","Samsung Galaxy S2 Plus");
+        humanReadableNames.put("GT-I9192","Samsung Galaxy S4 Mini Duos");
         humanReadableNames.put("GT-I9195","Samsung Galaxy S4 Mini");
         humanReadableNames.put("GT-I9300","Samsung Galaxy S III");
         humanReadableNames.put("GT-I9300T","Samsung Galaxy S III");
@@ -80,74 +108,118 @@ public class DeviceHelper {
         humanReadableNames.put("GT-I9305T","Samsung Galaxy S III");
         humanReadableNames.put("GT-I9500","Samsung Galaxy S4");
         humanReadableNames.put("GT-I9505","Samsung Galaxy S4");
+        humanReadableNames.put("GT-I9506","Samsung Galaxy S4");
         humanReadableNames.put("GT-N5110","Samsung Galaxy Note 8.0");
         humanReadableNames.put("GT-N7000","Samsung Galaxy Note");
         humanReadableNames.put("GT-N7100","Samsung Galaxy Note II");
         humanReadableNames.put("GT-N7105","Samsung Galaxy Note II");
+        humanReadableNames.put("GT-N7105T","Samsung Galaxy Note II");
+        humanReadableNames.put("GT-N8010","Samsung Galaxy Note 10.1");
         humanReadableNames.put("GT-N8013","Samsung Galaxy Note 10.1");
+        humanReadableNames.put("GT-P3100","Samsung Galaxy Tab 2");
+        humanReadableNames.put("GT-P3110","Samsung Galaxy Tab 2");
         humanReadableNames.put("GT-P3113","Samsung Galaxy Tab 2 7.0");
+        humanReadableNames.put("GT-P5110","Samsung Galaxy Tab 2");
         humanReadableNames.put("GT-P5113","Samsnung Galaxy Tab 2 10.1");
         humanReadableNames.put("GT-P5210","Samsung Galaxy Tab 3 10.1");
         humanReadableNames.put("GT-P7510","Samsung Galaxy Tab 10.1");
+        humanReadableNames.put("GT-S5301L","Samsung Galaxy Pocket Plus");
         humanReadableNames.put("GT-S5360","Samsung Galaxy Y");
         humanReadableNames.put("GT-S5570","Samsung Galaxy Mini");
         humanReadableNames.put("GT-S5830i","Samsung Galaxy Ace");
         humanReadableNames.put("GT-S5830","Samsung Galaxy Ace");
+        humanReadableNames.put("GT-S6310N","Samsung Galaxy Young");
+        humanReadableNames.put("GT-S6310","Samsung Galaxy Young");
+        humanReadableNames.put("GT-S6810P","Samsung Galaxy Fame");
+        humanReadableNames.put("GT-S7560M","Samsung Galaxy Ace II X");
         humanReadableNames.put("GT-S7562","Samsung Galaxy S Duos");
+        humanReadableNames.put("GT-S7580","Samsung Galaxy Trend Plus");
         humanReadableNames.put("HTC6435LVW","HTC Droid DNA");
         humanReadableNames.put("HTC6500LVW","HTC One");
+        humanReadableNames.put("HTC6525LVW","HTC One M8");
+        humanReadableNames.put("HTC_Desire_500","HTC Desire 500");
         humanReadableNames.put("HTC_Desire_HD_A9191","HTC Desire HD");
         humanReadableNames.put("HTCEVODesign4G","HTC Evo Design 4G");
         humanReadableNames.put("HTCEVOV4G","HTC Evo V 4G");
         humanReadableNames.put("HTCONE","HTC One");
+        humanReadableNames.put("HTC_One_mini","HTC One mini");
         humanReadableNames.put("HTC_PH39100","HTC Vivid 4G");
         humanReadableNames.put("HTC_PN071","HTC One");
         humanReadableNames.put("HTC_Sensation_Z710e","HTC Sensation");
         humanReadableNames.put("HTC_VLE_U","HTC One S");
+        humanReadableNames.put("HUAWEI_G510-0251","Huawei Ascend G510");
+        humanReadableNames.put("HUAWEI_P6-U06","Huawei Ascend P6");
+        humanReadableNames.put("HUAWEI_Y300-0100","Huawei Ascend Y300");
         humanReadableNames.put("KFJWA","Kindle Fire HD 8.9");
         humanReadableNames.put("KFJWI","Kindle Fire HD 8.9");
         humanReadableNames.put("KFOT","Kindle Fire");
         humanReadableNames.put("KFTT","Kindle Fire HD 7");
         humanReadableNames.put("LG-C800","LG myTouch Q");
+        humanReadableNames.put("LG-D415","LG Optimus L90");
+        humanReadableNames.put("LG-D620","LG G2 Mini");
+        humanReadableNames.put("LG-D686","LG G Pro Lite Dual");
         humanReadableNames.put("LG-D800","LG G2");
         humanReadableNames.put("LG-D801","LG G2");
         humanReadableNames.put("LG-D802","LG G2");
+        humanReadableNames.put("LG-D850","LG G3");
+        humanReadableNames.put("LG-D851","LG G3");
+        humanReadableNames.put("LG-D855","LG G3");
+        humanReadableNames.put("LG-E411g","LG Optimus L1 II");
+        humanReadableNames.put("LG-E425g","LG Optimus L3 II");
+        humanReadableNames.put("LG-E440g","LG Optimus L4 II");
+        humanReadableNames.put("LG-E460","LG Optimus L5 II");
+        humanReadableNames.put("LG-E610","LG Optimus L5");
+        humanReadableNames.put("LG-E612g","LG Optimus L5 Dual");
         humanReadableNames.put("LG-E739","LG MyTouch e739");
         humanReadableNames.put("LG-E970","LG Optimus G");
         humanReadableNames.put("LG-E980","LG Optimus G Pro");
         humanReadableNames.put("LGL55C","LG LGL55C");
+        humanReadableNames.put("LG-LG730","LG Venice");
+        humanReadableNames.put("LG-LS720","LG Optimus F3");
+        humanReadableNames.put("LGLS740","LG Volt");
         humanReadableNames.put("LG-LS840","LG Viper");
         humanReadableNames.put("LG-LS970","LG Optimus G");
         humanReadableNames.put("LG-LS980","LG G2");
+        humanReadableNames.put("LGMS323","LG Optimus L70");
+        humanReadableNames.put("LGMS500","LG Optimus F6");
         humanReadableNames.put("LGMS769","LG Optimus L9");
         humanReadableNames.put("LG-MS770","LG Motion 4G");
         humanReadableNames.put("LG-MS910","LG Esteem");
         humanReadableNames.put("LG-P509","LG Optimus T");
+        humanReadableNames.put("LG-P760","LG Optimus L9");
+        humanReadableNames.put("LG-P768","LG Optimus L9");
         humanReadableNames.put("LG-P769","LG Optimus L9");
         humanReadableNames.put("LG-P999","LG G2X P999");
         humanReadableNames.put("LG-VM696","LG Optimus Elite");
         humanReadableNames.put("LS670","LG Optimus S");
+        humanReadableNames.put("LT22i","Sony Xperia P");
+        humanReadableNames.put("LT25i","Sony Xperia V");
         humanReadableNames.put("LT26i","Sony Xperia S");
         humanReadableNames.put("MB855","Motorola Photon 4G");
         humanReadableNames.put("MB860","Motorola Atrix 4G");
         humanReadableNames.put("MB865","Motorola Atrix 2");
         humanReadableNames.put("MB886","Motorola Atrix HD");
+        humanReadableNames.put("ME173X","Asus MeMO Pad HD 7");
+        humanReadableNames.put("MI_3W","Xiaomi Mi 3");
         humanReadableNames.put("MOTWX435KT","Motorola Triumph");
         humanReadableNames.put("myTouch_4G_Slide","HTC myTouch 4G Slide");
+        humanReadableNames.put("N3","Star NO.1 N3");
         humanReadableNames.put("N860","ZTE Warp N860");
-        humanReadableNames.put("Nexus_10","Nexus 10");
-        humanReadableNames.put("Nexus_4","Nexus 4");
-        humanReadableNames.put("Nexus_5","Nexus 5");
-        humanReadableNames.put("Nexus_7","Nexus 7");
-        humanReadableNames.put("Nexus_S_4G","Nexus S 4G");
-        humanReadableNames.put("Nexus_S","Nexus S");
+        humanReadableNames.put("Nexus_10","Google Nexus 10");
+        humanReadableNames.put("Nexus_4","Google Nexus 4");
+        humanReadableNames.put("Nexus_7","Asus Nexus 7");
+        humanReadableNames.put("Nexus_S_4G","Samsung Nexus S 4G");
+        humanReadableNames.put("Nexus_S","Samsung Nexus S");
+        humanReadableNames.put("Orange_Daytona","Huawei Ascend G510");
         humanReadableNames.put("PantechP9070","Pantech Burst");
         humanReadableNames.put("PC36100","HTC Evo 4G");
         humanReadableNames.put("PG06100","HTC EVO Shift 4G");
         humanReadableNames.put("PG86100","HTC Evo 3D");
         humanReadableNames.put("PH44100","HTC Evo Design 4G");
+        humanReadableNames.put("QMV7A","Verizon Ellipsis 7");
         humanReadableNames.put("SAMSUNG-SGH-I317","Samsung Galaxy Note II");
         humanReadableNames.put("SAMSUNG-SGH-I337","Samsung Galaxy S4");
+        humanReadableNames.put("SAMSUNG-SGH-I527","Samsung Galaxy Mega");
         humanReadableNames.put("SAMSUNG-SGH-I537","Samsung Galaxy S4 Active");
         humanReadableNames.put("SAMSUNG-SGH-I717","Samsung Galaxy Note");
         humanReadableNames.put("SAMSUNG-SGH-I727","Samsung Skyrocket");
@@ -156,19 +228,26 @@ public class DeviceHelper {
         humanReadableNames.put("SAMSUNG-SGH-I897","Samsung Captivate");
         humanReadableNames.put("SAMSUNG-SGH-I927","Samsung Captivate Glide");
         humanReadableNames.put("SAMSUNG-SGH-I997","Samsung Infuse 4G");
+        humanReadableNames.put("SAMSUNG-SM-G730A","Samsung Galaxy S3 Mini");
+        humanReadableNames.put("SAMSUNG-SM-G870A","Samsung Galaxy S5 Active");
+        humanReadableNames.put("SAMSUNG-SM-G900A","Samsung Galaxy S5");
         humanReadableNames.put("SAMSUNG-SM-N900A","Samsung Galaxy Note 3");
+        humanReadableNames.put("SAMSUNG-SM-N910A","Samsung Galaxy Note 4");
         humanReadableNames.put("SCH-I200","Samsung Galaxy Stellar");
         humanReadableNames.put("SCH-I405","Samsung Stratosphere");
         humanReadableNames.put("SCH-I415","Samsung Galaxy Stratosphere II");
+        humanReadableNames.put("SCH-I435","Samsung Galaxy S4 Mini");
         humanReadableNames.put("SCH-I500","Samsung Fascinate");
         humanReadableNames.put("SCH-I510","Samsung Droid Charge");
         humanReadableNames.put("SCH-I535","Samsung Galaxy S III");
         humanReadableNames.put("SCH-I545","Samsung Galaxy S4");
         humanReadableNames.put("SCH-I605","Samsung Galaxy Note II");
         humanReadableNames.put("SCH-I800","Samsung Galaxy Tab 7.0");
+        humanReadableNames.put("SCH-R530C","Samsung Galaxy S3");
         humanReadableNames.put("SCH-R530M","Samsung Galaxy S III");
         humanReadableNames.put("SCH-R530U","Samsung Galaxy S III");
         humanReadableNames.put("SCH-R720","Samsung Admire");
+        humanReadableNames.put("SCH-R970","Samsung Galaxy S4");
         humanReadableNames.put("SCH-S720C","Samsung Proclaim");
         humanReadableNames.put("SCH-S738C","Samsung Galaxy Centura");
         humanReadableNames.put("SGH-I317M","Samsung Galaxy Note II");
@@ -176,6 +255,7 @@ public class DeviceHelper {
         humanReadableNames.put("SGH-I727R","Samsung Galaxy S II");
         humanReadableNames.put("SGH-I747M","Samsung Galaxy S III");
         humanReadableNames.put("SGH-M919","Samsung Galaxy S4");
+        humanReadableNames.put("SGH-T399","Samsung Galaxy Light");
         humanReadableNames.put("SGH-T599N","Samsung Galaxy Exhibit");
         humanReadableNames.put("SGH-T679","Samsung Exhibit II");
         humanReadableNames.put("SGH-T769","Samsung Galaxy S Blaze");
@@ -187,13 +267,31 @@ public class DeviceHelper {
         humanReadableNames.put("SGH-T999L","Samsung Galaxy S III");
         humanReadableNames.put("SGH-T999","Samsung Galaxy S III");
         humanReadableNames.put("SGH-T999V","Samsung Galaxy S III");
+        humanReadableNames.put("SGP312","Sony Xperia Tablet Z");
+        humanReadableNames.put("SHV-E210K","Samsung Galaxy S3");
         humanReadableNames.put("SHV-E210S","Samsung Galaxy S III");
+        humanReadableNames.put("SHV-E250S","Samsung Galaxy Note II");
+        humanReadableNames.put("SM-G3815","Samsung Galaxy Express II");
+        humanReadableNames.put("SM-G7102","Samsung Galaxy Grand II");
+        humanReadableNames.put("SM-G900F","Samsung Galaxy S5");
+        humanReadableNames.put("SM-G900I","Samsung Galaxy S5");
+        humanReadableNames.put("SM-G900P","Samsung Galaxy S5");
+        humanReadableNames.put("SM-G900T","Samsung Galaxy S5");
+        humanReadableNames.put("SM-G900V","Samsung Galaxy S5");
+        humanReadableNames.put("SM-G900W8","Samsung Galaxy S5");
+        humanReadableNames.put("SM-N7505","Samsung Galaxy Note 3 Neo");
         humanReadableNames.put("SM-N9005","Samsung Galaxy Note 3");
+        humanReadableNames.put("SM-N9006","Samsung Galaxy Note 3");
         humanReadableNames.put("SM-N900P","Samsung Galaxy Note 3");
+        humanReadableNames.put("SM-N900","Samsung Galaxy Note 3");
         humanReadableNames.put("SM-N900T","Samsung Galaxy Note 3");
         humanReadableNames.put("SM-N900V","Samsung Galaxy Note 3");
         humanReadableNames.put("SM-N900W8","Samsung Galaxy Note 3");
+        humanReadableNames.put("SM-N910T","Samsung Galaxy Note 4");
+        humanReadableNames.put("SM-N910V","Samsung Galaxy Note 4");
+        humanReadableNames.put("SM-P600","Samsung Galaxy Note 10.1");
         humanReadableNames.put("SM-T210R","Samsung Galaxy Tab 3 7.0");
+        humanReadableNames.put("SM-T217S","Samsung Galaxy Tab 3 7.0");
         humanReadableNames.put("SM-T310","Samsung Galaxy Tab 3 8.0");
         humanReadableNames.put("SPH-D600","Samsung Conquer 4G");
         humanReadableNames.put("SPH-D700","Samsung Epic 4G");
@@ -203,21 +301,33 @@ public class DeviceHelper {
         humanReadableNames.put("SPH-L300","Samsung Galaxy Victory");
         humanReadableNames.put("SPH-L710","Samsung Galaxy S III");
         humanReadableNames.put("SPH-L720","Samsung Galaxy S4");
+        humanReadableNames.put("SPH-L720T","Samsung Galaxy S4");
         humanReadableNames.put("SPH-L900","Samsung Galaxy Note II");
         humanReadableNames.put("SPH-M820-BST","Samsung Galaxy Prevail");
         humanReadableNames.put("SPH-M830","Samsung Galaxy Rush");
+        humanReadableNames.put("SPH-M840","Samsung Galaxy Prevail 2");
         humanReadableNames.put("SPH-M930BST","Samsung Transform Ultra");
+        humanReadableNames.put("ST21i","Sony Xperia Tipo");
         humanReadableNames.put("ST25i","Sony Xperia U");
+        humanReadableNames.put("ST26i","Sony Xperia J");
         humanReadableNames.put("Transformer_Prime_TF201","Asus Eee Pad Transformer Prime");
         humanReadableNames.put("Transformer_TF101","Asus Eee Pad Transformer");
         humanReadableNames.put("VM670","LG Optimus V");
         humanReadableNames.put("VS840_4G","LG Lucid 4G");
         humanReadableNames.put("VS910_4G","LG Revolution 4G");
         humanReadableNames.put("VS920_4G","LG Spectrum 4G");
+        humanReadableNames.put("VS930_4G","LG Spectrum 2");
         humanReadableNames.put("VS980_4G","LG G2");
+        humanReadableNames.put("VS985_4G","LG G3 4G");
         humanReadableNames.put("Xoom","Motorola Xoom");
+        humanReadableNames.put("XT1028","Motorola Moto G");
         humanReadableNames.put("XT1030","Motorola Droid Mini");
+        humanReadableNames.put("XT1031","Motorola Moto G");
         humanReadableNames.put("XT1032","Motorola Moto G");
+        humanReadableNames.put("XT1033","Motorola Moto G");
+        humanReadableNames.put("XT1049","Motorola Moto X");
+        humanReadableNames.put("XT1053","Motorola Moto X");
+        humanReadableNames.put("XT1056","Motorola Moto X");
         humanReadableNames.put("XT1058","Motorola Moto X");
         humanReadableNames.put("XT1060","Motorola Moto X");
         humanReadableNames.put("XT1080","Motorola Droid Ultra");
@@ -226,16 +336,26 @@ public class DeviceHelper {
     }
 
     public static String getDeviceName() {
-
-        String dictName = humanReadableNames.get(Build.MODEL.replace(' ','_'));
-        if (dictName != null) return dictName;
-
-        if (Build.BRAND.equals("samsung") || Build.BRAND.equals("Samsung")) {
-            return "Samsung" + Build.MODEL;
+        String deviceName = null;
+        try {
+            String dictName = humanReadableNames.get(Build.MODEL.replace(' ', '_'));
+            if (dictName != null) {
+                deviceName = dictName;
+            } else if (Build.BRAND.equalsIgnoreCase("samsung")) {
+                deviceName = "Samsung " + Build.MODEL;
+            } else {
+                deviceName = Build.BRAND;
+            }
+        } catch (Exception e) {
+            //Some phones might not define BRAND or MODEL, ignore exceptions
+            Log.e("Exception", e.getMessage());
+            e.printStackTrace();
+        }
+        if (deviceName == null || deviceName.isEmpty()) {
+            return "Android"; //Could not find a name
+        } else {
+            return deviceName;
         }
-
-        return Build.MODEL;
-
     }
 
     public static boolean isTablet() {

src/org/kde/kdeconnect/Helpers/FilesHelper.java

@@ -20,8 +20,11 @@
 
 package org.kde.kdeconnect.Helpers;
 
+import android.util.Log;
 import android.webkit.MimeTypeMap;
 
+import java.io.File;
+
 public class FilesHelper {
 
     public static String getFileExt(String fileName) {
@@ -73,4 +76,11 @@ public class FilesHelper {
         return toFileSystemSafeName(name, true, 255);
     }
 
+    public static int GetOpenFileCount() {
+        return new File("/proc/self/fd").listFiles().length;
+    }
+
+    public static void LogOpenFileCount() {
+        Log.e("KDE/FileCount",""+GetOpenFileCount());
+    }
 }

src/org/kde/kdeconnect/Helpers/NotificationsHelper.java

@@ -0,0 +1,12 @@
+package org.kde.kdeconnect.Helpers;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+public class NotificationsHelper {
+
+    private final static AtomicInteger c = new AtomicInteger((int)System.currentTimeMillis());
+    public static int getUniqueId() {
+        return c.incrementAndGet();
+    }
+
+}