Bump version to release

getOrDefault is not supported until java 8, introduced on Android 7

.gitignore

@@ -8,8 +8,7 @@ build/
 target/
 classes/
 gradle
-gradlew
-gradlew.bat
 *.iml
 *.keystore
 .directory
+GPUCache/

.gitlab/merge_request_templates/Bugfix.md

@@ -0,0 +1,32 @@
+## Summary
+
+Add a description of your merge request here. What does your new feature do?
+
+Describe in detail what your patch does, why it does that, etc. Merge requests
+without an adequate description are difficult to review, and probably we will
+ask for more information!
+
+Please also keep this description up-to-date with any discussion that takes
+place so that reviewers can understand your intent. This is especially
+important if they didn't participate in the discussion.
+
+Make sure to remove this comment when you are done.
+
+Fill in the following lines as appropriate to automatically close GitLab issue or Bugzilla bugs
+Fixes <!-- Gitlab Issue Number -->
+BUG: <!-- bugzilla bug -->
+
+## Test Plan
+
+### Before:
+Add a quick discription of the (buggy) behavior of the app before this fix
+This section does not need to be too detailed because it should mostly be
+covered by the bug report and the summary. Just share the steps for how to
+reproduce the bug.
+
+### After:
+Add a more detailed description of how to exercise the new behavior, showing
+that the bug has been fixed. If any other behavior has been changed, share
+the steps to verify that the new behavior doesn't have any regressions.
+
+/label ~bugfix

.gitlab/merge_request_templates/Feature.md

@@ -0,0 +1,27 @@
+## Summary
+
+Add a description of your merge request here. What does your new feature do?
+
+Describe in detail what your patch does, why it does that, etc. Merge requests
+without an adequate description are difficult to review, and probably we will
+ask for more information!
+
+Please also keep this description up-to-date with any discussion that takes
+place so that reviewers can understand your intent. This is especially
+important if they didn't participate in the discussion.
+
+Make sure to remove this comment when you are done.
+
+Implements <!-- GitLab Issue Number -->
+
+## Test Plan
+
+Add a description of how to test your patch here. Tell us how to use the new
+feature and what we should be seeing. If applicable, it is great to include
+screenshots, either here or in the Summary section.
+
+It can be difficult to understand a new feature from the text description in
+the summary, so put enough detail here that so that we can understand how to run
+the new feature and we can play with it ourselves to understand it.
+
+/label ~feature

AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.kde.kdeconnect_tp"
-    android:versionCode="1720"
+    android:versionCode="11292"
-    android:versionName="1.7.2">
+    android:versionName="1.12.9">
 
     <supports-screens
         android:anyDensity="true"
@@ -11,100 +11,87 @@
         android:smallScreens="true"
         android:xlargeScreens="true" />
 
-    <uses-feature android:name="android.hardware.telephony" android:required="false" />
+    <uses-feature
+        android:name="android.hardware.telephony"
+        android:required="false" />
 
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.INTERNET" />
-    <!--<uses-permission android:name="android.permission.BLUETOOTH" />-->
+    <!-- <uses-permission android:name="android.permission.BLUETOOTH" /> -->
-    <!--<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />-->
+    <!-- <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> -->
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
-    <uses-permission android:name="android.permission.BATTERY_STATS" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" android:required="false" />
-    <uses-permission android:name="android.permission.RECEIVE_SMS" android:required="false" />
-    <uses-permission android:name="android.permission.SEND_SMS" android:required="false" />
-    <uses-permission android:name="android.permission.READ_SMS" android:required="false" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.READ_CALL_LOG"/>
+    <uses-permission android:name="android.permission.RECEIVE_SMS" />
+    <uses-permission android:name="android.permission.SEND_SMS" />
+    <uses-permission android:name="android.permission.READ_SMS" />
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
 
     <application
-        android:allowBackup="true"
         android:icon="@drawable/icon"
         android:label="KDE Connect"
         android:supportsRtl="true"
-        android:theme="@style/KdeConnectTheme"
+        android:networkSecurityConfig="@xml/network_security_config"
-        >
+        android:theme="@style/KdeConnectTheme">
-
         <service
             android:name="org.kde.kdeconnect.BackgroundService"
-            android:enabled="true" >
+            android:enabled="true" />
-        </service>
+        <service
-
+            android:name="org.kde.kdeconnect.Plugins.RemoteKeyboardPlugin.RemoteKeyboardService"
-        <service android:name="org.kde.kdeconnect.Plugins.RemoteKeyboardPlugin.RemoteKeyboardService"
             android:label="KDE Connect Remote Keyboard"
             android:permission="android.permission.BIND_INPUT_METHOD">
             <intent-filter>
                 <action android:name="android.view.InputMethod" />
             </intent-filter>
-            <meta-data android:name="android.view.im" android:resource="@xml/remotekeyboardplugin_method" />
+
+            <meta-data
+                android:name="android.view.im"
+                android:resource="@xml/remotekeyboardplugin_method" />
         </service>
 
         <activity
-            android:name="org.kde.kdeconnect.UserInterface.MaterialActivity"
+            android:name="org.kde.kdeconnect.UserInterface.MainActivity"
             android:label="KDE Connect"
             android:theme="@style/KdeConnectTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
-        <activity
-            android:name="org.kde.kdeconnect.UserInterface.SettingsActivity"
-            android:label="@string/device_menu_plugins"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.MaterialActivity" >
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.MaterialActivity" />
-        </activity>
-        <activity
-            android:name="org.kde.kdeconnect.UserInterface.CustomDevicesActivity"
-            android:label="@string/custom_devices_settings"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.MaterialActivity" >
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.MaterialActivity" />
-        </activity>
-        <activity
-            android:name="org.kde.kdeconnect.Plugins.SharePlugin.SendFileActivity"
-            android:label="KDE Connect"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.MaterialActivity" >
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.MaterialActivity" />
-        </activity>
         <activity
             android:name="org.kde.kdeconnect.UserInterface.PluginSettingsActivity"
             android:label="@string/device_menu_plugins"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.SettingsActivity" >
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.SettingsActivity" />
+                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
         </activity>
         <activity
-            android:name="org.kde.kdeconnect.Plugins.SharePlugin.ShareSettingsActivity"
+            android:name="org.kde.kdeconnect.UserInterface.CustomDevicesActivity"
-            android:label="@string/device_menu_plugins"
+            android:label="@string/custom_devices_settings"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.SettingsActivity" >
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.Plugins.SharePlugin.ShareSettingsActivity" />
+                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
+        </activity>
+        <activity
+            android:name="org.kde.kdeconnect.Plugins.SharePlugin.SendFileActivity"
+            android:label="KDE Connect"
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
         </activity>
 
-
+        <receiver android:name="org.kde.kdeconnect.KdeConnectBroadcastReceiver">
-
-        <receiver android:name="org.kde.kdeconnect.KdeConnectBroadcastReceiver" >
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_REPLACED" />
 
@@ -122,17 +109,6 @@
             <intent-filter>
                 <action android:name="android.net.wifi.WIFI_STATE_CHANGED" />
             </intent-filter>
-            <!--
-            <intent-filter>
-                <action android:name="android.provider.Telephony.SMS_RECEIVED" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.PHONE_STATE" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.BATTERY_CHANGED" />
-            </intent-filter>
-            -->
         </receiver>
 
         <activity
@@ -140,43 +116,97 @@
             android:configChanges="orientation|screenSize"
             android:excludeFromRecents="true"
             android:label="@string/findmyphone_title"
-            android:launchMode="singleInstance">
+            android:launchMode="singleInstance" />
-        </activity>
 
         <!-- Plugin-related activities and services -->
 
         <activity
             android:name="org.kde.kdeconnect.Plugins.MprisPlugin.MprisActivity"
-            android:label="@string/remote_control"
+            android:label="@string/open_mpris_controls"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.MaterialActivity"
+            android:launchMode="singleTop"
-            >
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.MaterialActivity" />
+                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
         </activity>
+
+        <receiver android:name="org.kde.kdeconnect.Plugins.MprisPlugin.MprisMediaNotificationReceiver">
+            <intent-filter>
+                <action android:name="android.intent.action.MEDIA_BUTTON" />
+            </intent-filter>
+        </receiver>
+
         <activity
             android:name="org.kde.kdeconnect.Plugins.RunCommandPlugin.RunCommandActivity"
-            android:label="@string/remote_control"
+            android:label="@string/pref_plugin_runcommand"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.MaterialActivity"
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity">
-            >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.MaterialActivity" />
+                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
+        </activity>
+        <activity
+            android:name="org.kde.kdeconnect.Plugins.RunCommandPlugin.RunCommandWidgetDeviceSelector"
+            android:excludeFromRecents="true"
+            android:label="@string/pref_plugin_runcommand"
+            android:launchMode="singleTask"
+            android:noHistory="true"
+            android:screenOrientation="user"
+            android:theme="@style/Theme.AppCompat.Light.Dialog" />
+
+        <service
+            android:name="org.kde.kdeconnect.Plugins.RunCommandPlugin.RunCommandWidgetDataProviderService"
+            android:exported="false"
+            android:permission="android.permission.BIND_REMOTEVIEWS" />
+
+        <receiver
+            android:name="org.kde.kdeconnect.Plugins.RunCommandPlugin.RunCommandWidget"
+            android:label="@string/pref_plugin_runcommand">
+            <intent-filter>
+                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="RUN_COMMAND_ACTION" />
+            </intent-filter>
+
+            <meta-data
+                android:name="android.appwidget.provider"
+                android:resource="@xml/remotecommandplugin_widget" />
+        </receiver>
+
+        <activity android:name="org.kde.kdeconnect.Plugins.RunCommandPlugin.RunCommandUrlActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+
+                <data
+                    android:host="runcommand"
+                    android:scheme="kdeconnect" />
+            </intent-filter>
         </activity>
         <activity
             android:name="org.kde.kdeconnect.Plugins.MousePadPlugin.MousePadActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:label="@string/pref_plugin_mousepad"
-            android:label="@string/remote_control"
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity">
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.MaterialActivity"
-            android:windowSoftInputMode="stateHidden|adjustResize" >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.MaterialActivity" />
+                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
+        </activity>
+        <activity
+            android:name="org.kde.kdeconnect.Plugins.PresenterPlugin.PresenterActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize"
+            android:label="@string/pref_plugin_presenter"
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity"
+            android:windowSoftInputMode="stateHidden|adjustResize">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
         </activity>
         <activity
             android:name="org.kde.kdeconnect.Plugins.SharePlugin.ShareActivity"
-            android:label="KDE Connect"
+            android:label="KDE Connect">
-            >
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
 
@@ -191,12 +221,20 @@
 
                 <data android:mimeType="*/*" />
             </intent-filter>
+
             <meta-data
                 android:name="android.service.chooser.chooser_target_service"
                 android:value="org.kde.kdeconnect.Plugins.SharePlugin.ShareChooserTargetService" />
         </activity>
+
+        <receiver android:name="org.kde.kdeconnect.Plugins.SharePlugin.ShareBroadcastReceiver">
+            <intent-filter>
+                <action android:name="org.kde.kdeconnect.Plugins.SharePlugin.CancelShare" />
+            </intent-filter>
+        </receiver>
+
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="org.kde.kdeconnect_tp.fileprovider"
             android:exported="false"
             android:grantUriPermissions="true">
@@ -204,9 +242,10 @@
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/fileprovider_paths" />
         </provider>
+
         <service
             android:name="org.kde.kdeconnect.Plugins.NotificationsPlugin.NotificationReceiver"
-            android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE" >
+            android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
             <intent-filter>
                 <action android:name="android.service.notification.NotificationListenerService" />
             </intent-filter>
@@ -217,17 +256,17 @@
             <intent-filter>
                 <action android:name="android.service.chooser.ChooserTargetService" />
             </intent-filter>
-            </service>
+        </service>
 
         <activity
             android:name="org.kde.kdeconnect.Plugins.NotificationsPlugin.NotificationFilterActivity"
             android:label="@string/title_activity_notification_filter"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.PluginSettingsActivity" >
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.PluginSettingsActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.kde.kdeconnect.UserInterface.PluginSettingsActivity" />
         </activity>
-
+        <activity android:name="org.kde.kdeconnect.Plugins.PhotoPlugin.PhotoActivity" />
 
     </application>
 

build.gradle

@@ -1,37 +1,29 @@
+apply plugin: 'com.android.application'
+
 buildscript {
     repositories {
         jcenter()
-        maven {
+        google()
-            url 'https://maven.google.com/'
-            name 'Google'
-        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.4.1'
     }
 }
 
-apply plugin: 'com.android.application'
-
 android {
-    buildToolsVersion '26.0.2'
+    compileSdkVersion 28
-    compileSdkVersion 25
     defaultConfig {
-        minSdkVersion 9
+        minSdkVersion 14
-        targetSdkVersion 25
+        targetSdkVersion 28
-        //multiDexEnabled true
-        //testInstrumentationRunner "com.android.test.runner.MultiDexTestRunner"
     }
     dexOptions {
         javaMaxHeapSize "2g"
     }
     compileOptions {
-        // Use Java 1.7, requires minSdk 8
+        sourceCompatibility JavaVersion.VERSION_1_8
-        //SSHD requires mina when running on JDK < 7
+        targetCompatibility JavaVersion.VERSION_1_8
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
     }
-	sourceSets {
+    sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
             java.srcDirs = ['src']
@@ -39,18 +31,14 @@ android {
             res.srcDirs = ['res']
             assets.srcDirs = ['assets']
         }
-        androidTest {
+        test {
             java.srcDirs = ['tests']
         }
     }
     packagingOptions {
-        pickFirst "META-INF/DEPENDENCIES"
+        merge "META-INF/DEPENDENCIES"
-        pickFirst "META-INF/LICENSE"
+        merge "META-INF/LICENSE"
-        pickFirst "META-INF/NOTICE"
+        merge "META-INF/NOTICE"
-        pickFirst "META-INF/BCKEY.SF"
-        pickFirst "META-INF/BCKEY.DSA"
-        pickFirst "META-INF/INDEX.LIST"
-        pickFirst "META-INF/io.netty.versions.properties"
     }
     lintOptions {
         abortOnError false
@@ -61,10 +49,10 @@ android {
             minifyEnabled false
             useProguard false
         }
-        release { //keep on 'release', set to 'all' when testing to make sure proguard is not deleting important stuff
+        release { //keep on 'release' for faster builds, set to 'all' when testing to make sure proguard is not deleting important stuff
             minifyEnabled true
             useProguard true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'),'proguard-rules.pro'
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 }
@@ -73,24 +61,38 @@ dependencies {
 
     repositories {
         jcenter()
+        google()
+        /* Needed for org.apache.sshd debugging
         maven {
-            url 'https://maven.google.com/'
+            url "https://jitpack.io"
-            name 'Google'
         }
+        */
     }
 
-    implementation 'com.android.support:support-v4:25.4.0'
+    implementation 'androidx.media:media:1.0.1'
-    implementation 'com.android.support:appcompat-v7:25.4.0'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'com.android.support:design:25.4.0'
+    implementation 'androidx.preference:preference:1.0.0'
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'com.jakewharton:disklrucache:2.0.2' //For caching album art bitmaps
 
-    implementation 'org.apache.sshd:sshd-core:0.8.0' //0.9 seems to fail on Android 6 and 1.+ requires java.nio.file, which doesn't exist in Android
+    implementation 'org.apache.sshd:sshd-core:0.14.0'
+    implementation 'org.apache.mina:mina-core:2.0.19' //For some reason, makes sshd-core:0.14.0 work without NIO, which isn't available until Android 8+
 
-    implementation 'com.madgag.spongycastle:pkix:1.54.0.0' //For SSL certificate generation
+    //implementation('com.github.bright:slf4android:0.1.6') { transitive = true } // For org.apache.sshd debugging
+    implementation 'com.madgag.spongycastle:bcpkix-jdk15on:1.58.0.0' //For SSL certificate generation
+
+    implementation 'com.jakewharton:butterknife:10.0.0'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:10.0.0'
+
+    implementation 'org.atteo.classindex:classindex:3.6'
+    annotationProcessor 'org.atteo.classindex:classindex:3.6'
 
     // Testing
-    androidTestImplementation 'org.mockito:mockito-core:1.10.19'
-    androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.1'// Because mockito has some problems with dex environment
-    androidTestImplementation 'org.skyscreamer:jsonassert:1.3.0'
     testImplementation 'junit:junit:4.12'
-
+    testImplementation 'org.powermock:powermock-core:2.0.0'
+    testImplementation 'org.powermock:powermock-module-junit4:2.0.0'
+    testImplementation 'org.powermock:powermock-api-mockito2:2.0.0'
+    testImplementation 'org.mockito:mockito-core:2.23.0'
+    testImplementation 'org.skyscreamer:jsonassert:1.3.0'
 }

gradle.properties

@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Wed May 01 14:24:13 CEST 2019
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

gradlew

@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

gradlew.bat

@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

proguard-rules.pro

@@ -35,5 +35,12 @@
 
 # SSHd requires mina, and mina uses reflection so some classes would get deleted
 -keep class org.apache.mina.** {*;}
+-keep class org.apache.sshd.** {*;}
 
 -keep class org.kde.kdeconnect.** {*;}
+
+-dontwarn org.mockito.**
+-dontwarn sun.reflect.**
+-dontwarn android.test.**
+-dontwarn java.lang.management.**
+-dontwarn javax.**

res/drawable-v21/list_divider.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:drawable="?attr/dividerHorizontal"
+    android:insetLeft="16dp"
+    android:insetRight="16dp"/>

res/drawable/disableable_button.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_enabled="true" android:color="@color/primary" />
+    <item android:state_enabled="false" android:color="@color/disabled_grey" />
+</selector>

res/drawable/drawer_header_noscale.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/drawer_header"
-    android:gravity="center|clip_vertical|clip_horizontal"
-    />

res/drawable/ic_add.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
+    <path
+        android:pathData="M0 0h24v24H0z" />
+</vector>

res/drawable/ic_album_art_placeholder.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="192dp"
+        android:height="192dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M12,3v10.55c-0.59,-0.34 -1.27,-0.55 -2,-0.55 -2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4V7h4V3h-6z"/>
+</vector>

res/drawable/ic_arrow_drop_down_24px.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M7,10l5,5 5,-5z"/>
+</vector>

res/drawable/ic_camera.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:width="24dp"
+    android:height="24dp">
+    <path
+        android:pathData="M15.2 12A3.2 3.2 0 0 1 12 15.2 3.2 3.2 0 0 1 8.8 12 3.2 3.2 0 0 1 12 8.8 3.2 3.2 0 0 1 15.2 12Z"
+        android:fillColor="#000000" />
+    <path
+        android:pathData="M9 2L7.17 4 4 4C2.9 4 2 4.9 2 6l0 12c0 1.1 0.9 2 2 2l16 0c1.1 0 2 -0.9 2 -2L22 6C22 4.9 21.1 4 20 4L16.83 4 15 2 9 2Zm3 15C9.24 17 7 14.76 7 12 7 9.24 9.24 7 12 7c2.76 0 5 2.24 5 5 0 2.76 -2.24 5 -5 5z"
+        android:fillColor="#000000" />
+</vector>

res/drawable/ic_delete.xml

@@ -0,0 +1,7 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:width="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path android:fillColor="#FFF" android:pathData="M19,4H15.5L14.5,3H9.5L8.5,4H5V6H19M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19Z" />
+</vector>

res/drawable/ic_next_white.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/>
+</vector>

res/drawable/ic_pause_white.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
+</vector>

res/drawable/ic_play_white.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M8,5v14l11,-7z"/>
+</vector>

res/drawable/ic_previous_white.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z"/>
+</vector>

res/drawable/ic_share_white.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
+</vector>

res/drawable/ic_stop.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:pathData="M0 0h24v24H0z" />
+    <path
+        android:fillColor="#000000"
+        android:pathData="M6 6h12v12H6z" />
+</vector>

res/drawable/ic_volume_mute_black.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#000000"
+        android:pathData="M7 9v6h4l5 5V4l-5 5H7z" />
+    <path
+        android:pathData="M0 0h24v24H0z" />
+</vector>

res/drawable/list_divider.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<inset
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:drawable="@drawable/divider_horizontal_holo_light"
+    android:insetLeft="16dp"
+    android:insetRight="16dp"/>

res/drawable/state_list_drawer_background_dark.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@color/primary" android:state_checked="true" />
+    <item android:drawable="@color/darkStatusBarBackground" android:state_checked="false" />
+</selector>

res/layout-land/activity_mpris.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal"
+    android:paddingBottom="25dp"
+    android:paddingLeft="25dp"
+    android:paddingRight="25dp"
+    android:paddingTop="25dp">
+
+    <ImageView
+        android:id="@+id/album_art"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_marginRight="25dp"
+        android:layout_marginEnd="25dp"
+        android:layout_weight="1"
+        android:contentDescription="@string/mpris_coverart_description"
+        android:scaleType="fitCenter" />
+
+    <include
+        layout="@layout/mpris_control"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1" />
+
+</LinearLayout>

res/layout-v21/custom_device_item.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/colorButtonNormal">
+
+
+    <TextView
+        android:id="@+id/deviceNameOrIPBackdrop"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:drawableEnd="@drawable/ic_delete"
+        android:drawableStart="@drawable/ic_delete"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingRight"
+        android:paddingStart="?android:attr/listPreferredItemPaddingLeft"/>
+
+    <FrameLayout
+        android:id="@+id/swipeableView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?android:colorBackground">
+
+        <TextView
+            android:id="@+id/deviceNameOrIP"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?android:selectableItemBackground"
+            android:gravity="center_vertical"
+            android:minHeight="?android:attr/listPreferredItemHeightSmall"
+            android:paddingEnd="?android:attr/listPreferredItemPaddingRight"
+            android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
+            android:textAppearance="?android:attr/textAppearanceListItemSmall"
+            android:visibility="visible"
+            tools:text="192.168.0.1"/>
+
+    </FrameLayout>
+
+</FrameLayout>

res/layout/activity_custom_devices.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:listitem="@layout/custom_device_item"/>
+
+    <TextView
+        android:id="@+id/emptyListMessage"
+        style="@style/TextAppearance.AppCompat.Medium"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_vertical"
+        android:layout_marginLeft="@dimen/activity_horizontal_margin"
+        android:layout_marginRight="@dimen/activity_horizontal_margin"
+        android:gravity="center_horizontal"
+        android:text="@string/custom_device_list_help"
+        />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/floatingActionButton"
+        style="@style/Widget.MaterialComponents.FloatingActionButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="@dimen/fab_margin"
+        app:elevation="@dimen/fab_elevation"
+        app:srcCompat="@drawable/ic_add"/>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

res/layout/activity_device.xml

@@ -1,106 +1,122 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="@dimen/activity_vertical_margin"
+    android:orientation="vertical"
-    tools:context="org.kde.kdeconnect.UserInterface.DeviceFragment"
+    tools:context="org.kde.kdeconnect.UserInterface.DeviceFragment">
-    android:orientation="vertical">
 
     <LinearLayout
+        android:id="@+id/pairing_buttons"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_gravity="center"
         android:orientation="vertical"
-        android:id="@+id/pairing_buttons"
+        android:padding="@dimen/activity_vertical_margin"
-        android:layout_gravity="center">
+        android:visibility="gone">
 
         <ProgressBar
-            android:visibility="gone"
+            android:id="@+id/pair_progress"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:id="@+id/pair_progress" />
+            android:visibility="gone"/>
 
         <TextView
+            android:id="@+id/pair_message"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="8dip"
-            android:textAppearance="?android:attr/textAppearanceMedium"
             android:text="@string/device_not_paired"
-            android:id="@+id/pair_message"
+            android:textAppearance="?android:attr/textAppearanceMedium"/>
-        />
 
         <Button
             android:id="@+id/pair_button"
-            android:background="@drawable/button_round"
-            android:textColor="@android:color/white"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="@drawable/button_round"
             android:text="@string/request_pairing"
-        />
+            android:textColor="@android:color/white"/>
 
 
         <LinearLayout
+            android:id="@+id/pair_request_buttons"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:visibility="gone"
+            android:layout_gravity="center"
-            android:id="@+id/pair_request"
+            android:visibility="gone">
-            android:layout_gravity="center">
 
             <Button
-                android:background="@drawable/button_round"
-                android:textColor="@android:color/white"
-                android:layout_margin="4dip"
                 android:id="@+id/accept_button"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/pairing_accept"
+                android:layout_margin="4dip"
                 android:layout_weight="1"
-            />
+                android:background="@drawable/button_round"
+                android:text="@string/pairing_accept"
+                android:textColor="@android:color/white"/>
 
             <Button
-                android:background="@drawable/button_round"
-                android:textColor="@android:color/white"
-                android:layout_margin="4dip"
                 android:id="@+id/reject_button"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
+                android:layout_margin="4dip"
+                android:layout_weight="1"
+                android:background="@drawable/button_round"
                 android:text="@string/pairing_reject"
-                android:layout_weight="1" />
+                android:textColor="@android:color/white"/>
 
         </LinearLayout>
     </LinearLayout>
 
-    <TextView
+    <LinearLayout
-        android:id="@+id/not_reachable_message"
+        android:id="@+id/error_message_container"
-        android:visibility="gone"
         android:layout_width="match_parent"
-        android:drawableStart="@drawable/ic_error_outline_black_48dp"
-        android:drawableLeft="@drawable/ic_error_outline_black_48dp"
-        android:drawablePadding="8dip"
         android:layout_height="match_parent"
-        android:gravity="center_vertical"
+        android:gravity="center"
-        android:text="@string/unreachable_description"
+        android:orientation="horizontal"
-        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:padding="16dp"
-        />
+        android:visibility="gone">
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/error_message_icon"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:importantForAccessibility="no"
+            android:paddingEnd="8dip"
+            android:paddingLeft="0dip"
+            android:paddingRight="8dip"
+            android:paddingStart="0dip"
+            android:src="@drawable/ic_error_outline_black_48dp"
+            app:tint="?attr/colorHighContrast"
+            tools:ignore="UnusedAttribute"/>
+
+        <TextView
+            android:id="@+id/not_reachable_message"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:text="@string/unreachable_description"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/on_data_message"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:text="@string/on_data_message"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:visibility="gone"/>
+    </LinearLayout>
 
-    <TextView
-        android:id="@+id/on_data_message"
-        android:visibility="gone"
-        android:layout_width="match_parent"
-        android:drawableStart="@drawable/ic_error_outline_black_48dp"
-        android:drawableLeft="@drawable/ic_error_outline_black_48dp"
-        android:drawablePadding="8dip"
-        android:layout_height="match_parent"
-        android:gravity="center_vertical"
-        android:text="@string/on_data_message"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        />
 
     <ListView
         android:id="@+id/buttons_list"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:fillViewport="true"
+        android:divider="@drawable/list_divider"
         tools:context=".DeviceActivity"
-        />
+        tools:listitem="@layout/list_item_with_icon_entry"/>
-
 </LinearLayout>

res/layout/activity_find_my_phone.xml

@@ -2,25 +2,22 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
     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.FindMyPhonePlugin.FindMyPhoneActivity">
 
 
-
     <Button
+        android:id="@+id/bFindMyPhone"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:text="@string/findmyphone_found"
-        android:textSize="50dp"
-        android:id="@+id/bFindMyPhone"
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true" />
+        android:layout_alignParentStart="true"
-
+        android:text="@string/findmyphone_found"
-
+        android:textSize="50sp" />
 
 
 </RelativeLayout>

res/layout/activity_list.xml

@@ -1,11 +0,0 @@
-<ListView 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="16dip"
-    android:paddingRight="16dip"
-    tools:context="org.kde.kdeconnect.UserInterface.MaterialActivity"
-    android:id="@+id/listView1"
-    android:addStatesFromChildren="true"
-    android:orientation="vertical">
-</ListView>

res/layout/activity_main.xml

@@ -1,45 +1,43 @@
-<android.support.v4.widget.DrawerLayout
+<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+                                           xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
+                                           xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+                                           android:id="@+id/drawer_layout"
-    android:id="@+id/drawer_layout"
+                                           android:layout_width="match_parent"
-    android:layout_width="match_parent"
+                                           android:layout_height="match_parent"
-    android:layout_height="match_parent"
+                                           android:fitsSystemWindows="true">  <!-- fitSystemWindows to make the drawer slide below the Lollipop transparent status bar -->
-    android:fitsSystemWindows="true"
-    tools:context="org.kde.kdeconnect.UserInterface.MaterialActivity">  <!-- fitSystemWindows to make the drawer slide below the Lollipop transparent status bar -->
 
-    <LinearLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:id="@+id/coordinatorLayout"
         android:layout_height="match_parent"
         android:layout_width="match_parent"
-        android:orientation="vertical">
+        tools:context="org.kde.kdeconnect.UserInterface.MainActivity">
 
-        <android.support.v7.widget.Toolbar
+        <com.google.android.material.appbar.AppBarLayout
-            android:id="@+id/toolbar"
+            android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
+            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
-            app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+            <androidx.appcompat.widget.Toolbar
-            android:elevation="8dp"
+                android:id="@+id/toolbar"
-            android:background="?attr/colorPrimary" />
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:elevation="8dp"/>
+        </com.google.android.material.appbar.AppBarLayout>
 
         <FrameLayout
             android:id="@+id/container"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
-        </FrameLayout>
+            app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
 
-    </LinearLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-    <android.support.design.widget.NavigationView
+    <com.google.android.material.navigation.NavigationView
         android:id="@+id/navigation_drawer"
-        android:background="@drawable/state_list_drawer_background"
-        app:itemBackground="@drawable/state_list_drawer_background"
-        app:itemTextColor="@color/state_list_drawer_text"
-        app:itemIconTint="@color/state_list_drawer_text"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="start"
         app:headerLayout="@layout/nav_header"
-        />
+        style="?attr/mainNavigationViewStyle" />
 
-</android.support.v4.widget.DrawerLayout>
+</androidx.drawerlayout.widget.DrawerLayout>

res/layout/activity_mousepad.xml

@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:keepScreenOn="true"
+    android:id="@+id/mousepad_view"
-    android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:id="@+id/mousepad_view">
+    android:keepScreenOn="true"
+    android:orientation="vertical">
 
     <TextView
+        style="@android:style/TextAppearance.Medium"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/mousepad_info"
-        android:gravity="center"
-        style="@android:style/TextAppearance.Medium"
         android:layout_centerInParent="true"
-        android:padding="12dip" />
+        android:gravity="center"
+        android:padding="12dip"
+        android:text="@string/mousepad_info" />
 
     <view
-        android:layout_width="wrap_content"
+        android:id="@+id/keyListener"
-        android:layout_height="wrap_content"
         class="org.kde.kdeconnect.Plugins.MousePadPlugin.KeyListenerView"
-        android:id="@+id/keyListener" />
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
 
 </RelativeLayout>

res/layout/activity_mpris.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingBottom="15dp"
+    android:paddingLeft="25dp"
+    android:paddingRight="25dp"
+    android:paddingTop="25dp">
+
+    <ImageView
+        android:id="@+id/album_art"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_marginBottom="25dp"
+        android:layout_weight="4"
+        android:contentDescription="@string/mpris_coverart_description"
+        android:scaleType="fitCenter" />
+
+    <include
+        layout="@layout/mpris_control"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <fragment android:name="org.kde.kdeconnect.Plugins.SystemvolumePlugin.SystemvolumeFragment"
+        android:id="@+id/systemvolume_fragment"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="5dp"/>
+
+</LinearLayout>

res/layout/activity_notification_filter.xml

@@ -6,27 +6,26 @@
     tools:context="org.kde.kdeconnect.Plugins.NotificationsPlugin.NotificationFilterActivity">
 
     <TextView
-        android:text="@string/filter_apps_info"
+        android:id="@+id/tFilter"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingBottom="16dp"
         android:paddingLeft="@dimen/activity_horizontal_margin"
         android:paddingRight="@dimen/activity_horizontal_margin"
         android:paddingTop="@dimen/activity_vertical_margin"
-        android:layout_width="wrap_content"
+        android:text="@string/filter_apps_info" />
-        android:layout_height="wrap_content"
-        android:paddingBottom="5dp"
-        android:id="@+id/tFilter"/>
 
     <ProgressBar
-        android:layout_marginTop="64dip"
+        android:id="@+id/spinner"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:id="@+id/spinner" />
+        android:layout_marginTop="64dip" />
 
     <ListView
+        android:id="@+id/lvFilterApps"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:id="@+id/lvFilterApps"
+        android:visibility="gone" />
-        android:visibility="gone"
-        />
 
 </LinearLayout>

res/layout/activity_plugin_settings.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/fragmentPlaceHolder"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"/>

res/layout/activity_presenter.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/mpris_control_view"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <Space
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/top_space"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="fill_parent"
+        android:layout_gravity="center"
+        android:orientation="horizontal"
+        android:layout_below="@id/top_space"
+        android:layout_above="@id/textView">
+
+        <ImageButton
+            android:id="@+id/previous_button"
+            android:layout_width="match_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="0.25"
+            android:contentDescription="@string/mpris_rew"
+            android:src="@drawable/ic_previous_black"
+            android:theme="@style/DisableableButton" />
+
+        <ImageButton
+            android:id="@+id/next_button"
+            android:layout_width="match_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="0.25"
+            android:contentDescription="@string/mpris_ff"
+            android:src="@drawable/ic_next_black"
+            android:theme="@style/DisableableButton" />
+
+    </LinearLayout>
+
+    <TextView
+        style="@android:style/TextAppearance.Medium"
+        android:padding="12dip"
+        android:id="@+id/textView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:text="@string/presenter_lock_tip" />
+
+</RelativeLayout>

res/layout/activity_refresh_list.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                                              xmlns:tools="http://schemas.android.com/tools"
-                                              android:id="@+id/refresh_list_layout"
-                                              android:layout_width="match_parent"
-                                              android:layout_height="match_parent">
-
-    <ListView android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingLeft="16dip"
-        android:paddingRight="16dip"
-        tools:context=".MainActivity"
-        android:id="@+id/listView1"
-        android:addStatesFromChildren="true"
-        android:orientation="vertical"/>
-
-</android.support.v4.widget.SwipeRefreshLayout>

res/layout/activity_runcommand.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+                                                     xmlns:app="http://schemas.android.com/apk/res-auto"
+                                                     android:layout_width="match_parent"
+                                                     android:layout_height="match_parent">
+
+    <ListView
+        android:id="@+id/runcommandslist"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="4dp"
+        android:addStatesFromChildren="true"
+        android:orientation="vertical" />
+
+    <com.google.android.material.floatingactionbutton.FloatingActionButton
+        android:id="@+id/add_command_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="16dp"
+        android:src="@drawable/ic_action_image_edit"
+        app:backgroundTint="@color/primary"
+        app:layout_anchor="@id/runcommandslist"
+        app:layout_anchorGravity="bottom|end" />
+
+    <TextView
+        android:id="@+id/addcomand_explanation"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:padding="30dp"
+        android:text="@string/addcommand_explanation"
+        android:textAlignment="center"
+        android:textSize="16sp" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>

res/layout/custom_device_item.xml

@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?attr/colorButtonNormal">
+
+
+    <TextView
+        android:id="@+id/deviceNameOrIPBackdrop"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:paddingEnd="?android:attr/listPreferredItemPaddingRight"
+        android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+        android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+        android:paddingStart="?android:attr/listPreferredItemPaddingLeft"/>
+
+    <FrameLayout
+        android:id="@+id/swipeableView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?android:colorBackground">
+
+        <TextView
+            android:id="@+id/deviceNameOrIP"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?selectableItemBackground"
+            android:gravity="center_vertical"
+            android:minHeight="?android:attr/listPreferredItemHeightSmall"
+            android:paddingEnd="?android:attr/listPreferredItemPaddingRight"
+            android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+            android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+            android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
+            android:textAppearance="?android:attr/textAppearanceListItemSmall"
+            android:visibility="visible"
+            tools:text="192.168.0.1"/>
+
+    </FrameLayout>
+
+</FrameLayout>

res/layout/custom_ip_list.xml

@@ -1,36 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    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"
-    android:orientation="vertical">
-
-    <ListView
-        android:layout_width="fill_parent"
-        android:layout_height="0dp"
-        android:id="@android:id/list"
-        android:layout_weight="1"
-    />
-
-    <TextView
-            android:layout_width="fill_parent"
-            android:layout_height="100dp"
-            android:text="@string/custom_dev_list_help"/>
-
-    <EditText
-            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
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/add_host"
-            android:id="@android:id/button1"/>
-
-
-</LinearLayout>

res/layout/devices_list.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/refresh_list_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ListView
+        android:id="@+id/devices_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:addStatesFromChildren="true"
+        android:divider="@null"
+        android:dividerHeight="0dp"
+        android:orientation="vertical"
+        android:paddingLeft="16dip"
+        android:paddingRight="16dip"
+        tools:context=".MainActivity" />
+
+</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

res/layout/edit_text_alert_dialog_view.xml

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    android:paddingTop="?dialogPreferredPadding"
+    android:paddingStart="?dialogPreferredPadding"
+    android:paddingLeft="?dialogPreferredPadding"
+    android:paddingEnd="?dialogPreferredPadding"
+    android:paddingRight="?dialogPreferredPadding">
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/textInputLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:hintEnabled="false"
+        style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox">
+
+        <!-- inputType="text" is needed, without it lines and maxLines is ignored https://issuetracker.google.com/issues/37118772 -->
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/textInputEditText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:lines="1"
+            android:maxLines="1"
+            android:inputType="text"
+            style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"/>
+
+    </com.google.android.material.textfield.TextInputLayout>
+</FrameLayout>

res/layout/fragment_storage_preference_dialog.xml

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingLeft="?attr/dialogPreferredPadding"
+    android:paddingRight="?attr/dialogPreferredPadding"
+    android:paddingTop="10dp">
+
+    <com.google.android.material.textfield.TextInputLayout
+        style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="5dp"
+        app:errorEnabled="true">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/storageLocation"
+            style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:cursorVisible="false"
+            android:hint="@string/sftp_storage_preference_storage_location"
+            android:lines="1"
+            android:longClickable="false"
+            android:maxLines="1"
+            android:scrollHorizontally="true"
+            android:ellipsize="end"
+            android:inputType="text"
+            android:text="@string/sftp_storage_preference_click_to_select"
+            android:textColor="@android:color/darker_gray"
+            android:editable="false"/>
+    </com.google.android.material.textfield.TextInputLayout>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/storageDisplayNameInputLayout"
+        style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox.Dense"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="5dp"
+        app:errorEnabled="true">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/storageDisplayName"
+            style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox.Dense"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/sftp_storage_preference_display_name"
+            android:lines="1"
+            android:maxLines="1"
+            android:scrollHorizontally="true"
+            android:ellipsize="end"
+            android:inputType="text"/>
+    </com.google.android.material.textfield.TextInputLayout>
+
+</LinearLayout>

res/layout/list_item_category.xml

@@ -1,34 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
-	android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
-	android:layout_height="wrap_content"
+    android:orientation="vertical">
-	android:orientation="vertical">
-
-    <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:drawableBottom="@drawable/text_section_header"
-        android:textStyle="bold"
-        android:layout_marginTop="8dp"
-        android:textColor="?android:textColorSecondary"
-        android:drawablePadding="4dp"
-        android:textSize="14sp"
-        android:textAllCaps="true"
-        android:paddingLeft="8dip"
-        android:paddingRight="8dip"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:id="@+id/list_item_category_text"
-        />
 
     <TextView
+        android:id="@+id/list_item_category_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:drawableBottom="@drawable/text_section_header"
+        android:drawablePadding="4dp"
+        android:paddingLeft="8dip"
+        android:paddingRight="8dip"
+        android:textAllCaps="true"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="14sp"
+        android:textStyle="bold" />
+
+    <TextView
+        android:id="@+id/list_item_category_empty_placeholder"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_gravity="center"
         android:layout_margin="10dip"
-        android:visibility="gone"
-        android:textAppearance="?android:attr/textAppearanceSmall"
         android:text="@string/device_list_empty"
-        android:id="@+id/list_item_category_empty_placeholder"
+        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:layout_gravity="center" />
+        android:visibility="gone" />
-
 
 </LinearLayout>

res/layout/list_item_entry.xml

@@ -1,37 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-  <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:baselineAligned="false"
     android:layout_height="wrap_content"
-    android:paddingLeft="12dip"
-    android:paddingStart="12dip"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize"
-    android:paddingEnd="?android:attr/scrollbarSize"
     android:background="@drawable/abc_list_selector_holo_dark"
-    android:orientation="vertical">
+    android:baselineAligned="false"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:orientation="vertical"
+    android:paddingEnd="?android:attr/scrollbarSize"
+    android:paddingLeft="12dip"
+    android:paddingRight="?android:attr/scrollbarSize"
+    android:paddingStart="12dip"
+    android:id="@+id/list_item_entry">
     <!-- We should use android:background="@android:/listChoiceBackgroundIndicator"
          instead of abc_list_selector_holo_dark but that's only supported from API11 -->
 
-    <TextView android:id="@+id/list_item_entry_title"
+    <TextView
+        android:id="@+id/list_item_entry_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:singleLine="true"
-        android:textAppearance="?android:attr/textAppearanceLarge"
         android:ellipsize="marquee"
         android:fadingEdge="horizontal"
-        android:text="" />
+        android:singleLine="true"
+        android:text=""
+        android:textAppearance="?android:attr/textAppearanceLarge" />
 
-    <TextView android:id="@+id/list_item_entry_summary"
+    <TextView
+        android:id="@+id/list_item_entry_summary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmall"
         android:singleLine="true"
-        android:visibility="gone"
+        android:text=""
+        android:textAppearance="?android:attr/textAppearanceSmall"
         android:textColor="@android:color/darker_gray"
-        android:text="" />
+        android:visibility="gone" />
-
 
 </LinearLayout>

res/layout/list_item_plugin_header.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+
+    android:paddingLeft="16dp"
+    android:paddingTop="28dp"
+    android:paddingRight="16dp"
+    android:paddingBottom="8dp" />

res/layout/list_item_systemvolume.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/systemvolume_label"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="5dp"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+
+    <LinearLayout
+        android:id="@+id/systemvolume_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="8dip"
+        android:orientation="horizontal">
+
+        <ImageButton
+            android:id="@+id/systemvolume_mute"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:background="@android:color/transparent"
+            android:contentDescription="@string/mute"
+            android:scaleType="fitXY"
+            android:src="@drawable/ic_volume_black"
+            app:tint="?attr/colorHighContrast" />
+
+        <SeekBar
+            android:id="@+id/systemvolume_seek"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:max="100" />
+
+    </LinearLayout>
+
+
+</LinearLayout>

res/layout/list_item_with_button_entry.xml

@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:baselineAligned="false"
-    android:layout_height="wrap_content"
-    android:paddingLeft="12dip"
-    android:paddingStart="12dip"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize"
-    android:paddingEnd="?android:attr/scrollbarSize"
-    android:orientation="horizontal">
-
-        <ImageView android:id="@+id/list_item_entry_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_gravity="center_vertical"
-            android:src="@drawable/ic_device_laptop"
-            android:layout_weight="0" />
-
-    <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="fill_parent"
-            android:layout_weight="1"
-            android:layout_height="wrap_content">
-
-        <TextView android:id="@+id/list_item_entry_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="8dip"
-                android:layout_marginStart="8dip"
-                android:singleLine="true"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:ellipsize="marquee"
-                android:fadingEdge="horizontal"
-                android:text=""/>
-
-
-        <TextView android:id="@+id/list_item_entry_summary"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:singleLine="true"
-                android:textColor="#CC2222"
-                android:visibility="gone"
-                android:text="" />
-
-        </LinearLayout>
-
-
-    <ProgressBar
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/progressBar"
-        android:layout_weight="0"
-        android:indeterminate="true" />
-
-    <Button
-        android:layout_width="wrap_content"
-        android:minWidth="128dip"
-        android:layout_height="wrap_content"
-        android:text="@string/request_pairing"
-        android:padding="8dip"
-        android:background="@drawable/button_round"
-        android:textColor="#FFFFFF"
-        android:id="@+id/entry_pair_button"
-        android:layout_weight="0"
-        android:nestedScrollingEnabled="false" />
-
-</LinearLayout>
-
-

res/layout/list_item_with_icon_entry.xml

@@ -1,53 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
-    android:layout_width="fill_parent"
+<LinearLayout
-    android:baselineAligned="false"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingLeft="12dip"
-    android:paddingStart="12dip"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize"
-    android:paddingEnd="?android:attr/scrollbarSize"
-    android:clickable="true"
     android:background="@drawable/abc_list_selector_holo_dark"
-    android:orientation="horizontal">
+    android:baselineAligned="false"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:orientation="horizontal"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp">
 
-    <ImageView android:id="@+id/list_item_entry_icon"
+        <androidx.appcompat.widget.AppCompatImageView
-        android:layout_width="wrap_content"
+            android:id="@+id/list_item_entry_icon"
-        android:layout_height="match_parent"
-        android:layout_gravity="center_vertical"
-        android:src="@drawable/ic_device_laptop"
-        />
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:orientation="vertical"
-        android:layout_height="wrap_content">
-
-        <TextView android:id="@+id/list_item_entry_title"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_gravity="center_vertical"
-            android:layout_marginLeft="8dip"
+            android:layout_marginLeft="12dp"
-            android:layout_marginStart="8dip"
+            android:layout_marginStart="12dp"
-            android:singleLine="true"
+            android:contentDescription="@string/device_icon_description"
-            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:src="@drawable/ic_device_laptop"
-            android:ellipsize="marquee"
+            app:tint="?attr/colorControlNormal"/>
-            android:fadingEdge="horizontal"
-            android:text="" />
 
-        <TextView android:id="@+id/list_item_entry_summary"
+        <LinearLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="8dip"
+            android:orientation="vertical">
-            android:layout_marginStart="8dip"
+
-            android:textAppearance="?android:attr/textAppearanceSmall"
+            <TextView
-            android:singleLine="true"
+                android:id="@+id/list_item_entry_title"
-            android:textColor="#CC2222"
+                android:layout_width="wrap_content"
-            android:visibility="gone"
+                android:layout_height="wrap_content"
-            android:text="" />
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="8dip"
+                android:layout_marginStart="8dip"
+                android:ellipsize="marquee"
+                android:fadingEdge="horizontal"
+                android:singleLine="true"
+                android:text=""
+                android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+            <TextView
+                android:id="@+id/list_item_entry_summary"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="8dip"
+                android:layout_marginStart="8dip"
+                android:singleLine="true"
+                android:text=""
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="#CC2222"
+                android:visibility="gone"/>
+
+        </LinearLayout>
 
     </LinearLayout>
-
-</LinearLayout>

res/layout/mpris_control.xml

@@ -2,183 +2,171 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
+    android:id="@+id/mpris_control_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:id="@+id/mpris_control_view"
+    android:layout_gravity="center"
     android:gravity="center"
-    android:paddingLeft="30dip"
+    android:orientation="vertical">
-    android:paddingTop="5dip"
-    android:paddingRight="30dip"
-    android:paddingBottom="5dip">
 
     <TextView
+        android:id="@+id/no_players"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:layout_gravity="center_horizontal"
         android:text="@string/no_players_connected"
-        android:id="@+id/no_players"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
-        android:layout_gravity="center_horizontal" />
 
     <Spinner
+        android:id="@+id/player_spinner"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/player_spinner"
+        android:layout_gravity="center" />
-        android:layout_gravity="center"
-    />
 
     <TextView
+        android:id="@+id/now_playing_textview"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:layout_gravity="center"
-        android:id="@+id/now_playing_textview"
         android:ellipsize="marquee"
+        android:gravity="center"
         android:marqueeRepeatLimit="marquee_forever"
+        android:padding="8dip"
         android:scrollHorizontally="true"
         android:singleLine="true"
-        android:gravity="center"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
-        android:padding="8dip"
-        android:layout_gravity="center"
-    />
 
     <ImageButton
+        android:id="@+id/play_button"
         android:layout_width="fill_parent"
         android:layout_height="75dp"
-        android:id="@+id/play_button"
-        android:src="@drawable/ic_play_black"
-        android:contentDescription="@string/mpris_play"
         android:layout_gravity="center"
         android:layout_weight="0"
-        android:clickable="false"
         android:adjustViewBounds="false"
-        android:baselineAlignBottom="true" />
+        android:baselineAlignBottom="true"
+        android:clickable="false"
+        android:contentDescription="@string/mpris_play"
+        android:src="@drawable/ic_play_black"
+        android:theme="@style/DisableableButton" />
 
     <LinearLayout
-        android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="60dip"
         android:layout_gravity="center"
-    >
+        android:orientation="horizontal">
 
         <ImageButton
-            android:layout_width="match_parent"
-            android:layout_height="fill_parent"
             android:id="@+id/prev_button"
-            android:src="@drawable/ic_previous_black"
+            android:layout_width="match_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="0.25"
             android:contentDescription="@string/mpris_previous"
-            android:layout_weight="0.25"
+            android:src="@drawable/ic_previous_black"
-        />
+            android:theme="@style/DisableableButton" />
 
         <ImageButton
-            android:layout_width="match_parent"
-            android:layout_height="fill_parent"
             android:id="@+id/rew_button"
-            android:src="@drawable/ic_rewind_black"
+            android:layout_width="match_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="0.25"
             android:contentDescription="@string/mpris_rew"
-            android:layout_weight="0.25"
+            android:src="@drawable/ic_rewind_black"
-        />
+            android:theme="@style/DisableableButton" />
 
         <ImageButton
+            android:id="@+id/stop_button"
             android:layout_width="match_parent"
             android:layout_height="fill_parent"
+            android:layout_weight="0.25"
+            android:contentDescription="@string/mpris_stop"
+            android:src="@drawable/ic_stop"
+            android:theme="@style/DisableableButton" />
+
+
+        <ImageButton
             android:id="@+id/ff_button"
-            android:src="@drawable/ic_fast_forward_black"
-            android:contentDescription="@string/mpris_ff"
-            android:layout_weight="0.25"
-        />
-
-        <ImageButton
             android:layout_width="match_parent"
             android:layout_height="fill_parent"
-            android:id="@+id/next_button"
-            android:src="@drawable/ic_next_black"
-            android:contentDescription="@string/mpris_next"
             android:layout_weight="0.25"
-        />
+            android:contentDescription="@string/mpris_ff"
+            android:src="@drawable/ic_fast_forward_black"
+            android:theme="@style/DisableableButton" />
+
+        <ImageButton
+            android:id="@+id/next_button"
+            android:layout_width="match_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="0.25"
+            android:contentDescription="@string/mpris_next"
+            android:src="@drawable/ic_next_black"
+            android:theme="@style/DisableableButton" />
 
     </LinearLayout>
 
     <LinearLayout
-        android:orientation="horizontal"
+        android:id="@+id/progress_slider"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/progress_slider">
+        android:orientation="horizontal">
 
         <TextView
+            android:id="@+id/progress_textview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_gravity="center"
-            android:id="@+id/progress_textview"
-            android:singleLine="true"
             android:gravity="center"
             android:padding="8dip"
-            android:layout_gravity="center"
+            android:singleLine="true"
-            android:text="00:00" />
+            android:text="00:00"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <SeekBar
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
             android:id="@+id/positionSeek"
-            android:layout_weight="1"
+            android:layout_width="0dp"
-            android:layout_gravity="center" />
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="1" />
 
         <TextView
+            android:id="@+id/time_textview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:layout_gravity="center"
-            android:id="@+id/time_textview"
-            android:singleLine="true"
             android:gravity="center"
             android:padding="8dip"
-            android:layout_gravity="center"
+            android:singleLine="true"
-            android:text="00:00" />
+            android:text="00:00"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
     </LinearLayout>
 
     <LinearLayout
-            android:orientation="horizontal"
+        android:id="@+id/volume_layout"
-            android:layout_width="match_parent"
+        android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+        android:layout_height="wrap_content"
-            android:id="@+id/volume_layout"
+        android:layout_gravity="center"
-            android:layout_gravity="center"
+        android:layout_marginTop="8dip"
-        android:layout_marginTop="8dip">
+        android:orientation="horizontal">
 
-        <ImageView
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/imageView"
             android:layout_width="30dip"
             android:layout_height="30dip"
-            android:maxWidth="30dip"
-            android:layout_marginRight="10dip"
             android:layout_marginEnd="10dip"
-            android:id="@+id/imageView"
+            android:layout_marginRight="10dip"
             android:layout_weight="0"
             android:contentDescription="@string/mpris_volume"
+            android:maxWidth="30dip"
             android:src="@drawable/ic_volume_black"
-        />
+            app:tint="?attr/colorHighContrast" />
 
 
         <SeekBar
+            android:id="@+id/volume_seek"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/volume_seek"
-            android:layout_weight="1"
-            android:max="100"
             android:layout_gravity="center"
-        />
+            android:layout_weight="1"
+            android:max="100" />
 
     </LinearLayout>
-
-    <!--
-        <ImageButton
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/pause_button"
-                android:src="@android:drawable/ic_media_pause"
-                android:layout_gravity="center"/>
-
-        <ImageButton
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/pause_button"
-                android:src="@android:drawable/ic_media_stop"
-                android:layout_gravity="center"/>
-    -->
 </LinearLayout>

res/layout/nav_header.xml

@@ -3,51 +3,34 @@
     android:layout_width="match_parent"
     android:layout_height="160dp"
     android:background="@drawable/drawer_header"
-    android:orientation="vertical"
+    android:gravity="bottom"
-    android:gravity="bottom">
+    android:orientation="vertical">
 
     <TextView
+        android:id="@+id/kdeconnect_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="KDE Connect"
+        android:paddingEnd="48dp"
-        android:textColor="#FFF"
-        android:textStyle="bold"
-        android:id="@+id/kdeconnect_label"
         android:paddingLeft="16dp"
+        android:paddingRight="48dp"
         android:paddingStart="16dp"
         android:paddingTop="8dp"
-        android:paddingRight="48dp"
+        android:text="@string/kde_connect"
-        android:paddingEnd="48dp"
+        android:textColor="#FFF"
-        />
+        android:textStyle="bold" />
 
     <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="My device"
         android:id="@+id/device_name"
-        android:layout_marginBottom="0dp"
-        android:textColor="#fff"
-        android:paddingBottom="16dp"
-        android:paddingTop="4dp"
-        android:paddingRight="48dp"
-        android:paddingEnd="48dp"
-        android:paddingStart="16dp"
-        android:paddingLeft="16dp" />
-
-    <!--
-    <ImageView
-        android:src="@drawable/ic_action_image_edit"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="0dp"
-        android:layout_alignParentRight="true"
+        android:paddingBottom="16dp"
-        android:layout_alignParentEnd="true"
+        android:paddingEnd="48dp"
-        android:clickable="true"
+        android:paddingLeft="16dp"
-        android:background="@drawable/abc_list_selector_holo_dark"
+        android:paddingRight="48dp"
-        android:layout_gravity="center_vertical"
+        android:paddingStart="16dp"
-        android:contentDescription="@string/rename_device"
+        android:paddingTop="4dp"
-        android:id="@+id/rename"
+        android:text="My device"
-    />
+        android:textColor="#fff" />
-    -->
 
 </LinearLayout>

res/layout/popup_notificationsfilter.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ListView
+        android:id="@+id/extra_options_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</LinearLayout>

res/layout/preference_checkbox.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<CheckBox
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/checkbox"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:focusable="false"
+    android:clickable="false"
+    android:background="@null"/>

res/layout/preference_with_button.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!-- Copyright (C) 2006 The Android Open Source Project
-<!-- Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -17,61 +16,71 @@
 <!-- Layout for a Preference in a PreferenceActivity. The
      Preference is able to place a specific widget for its particular
      type in the "widget_frame" layout. -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:background="?attr/selectableItemBackground"
     android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeight"
     android:paddingEnd="?android:attr/scrollbarSize"
-    android:paddingRight="?android:attr/scrollbarSize"
-    android:paddingStart="12dip"
     android:paddingLeft="12dip"
-    android:background="?attr/selectableItemBackground">
+    android:paddingRight="?android:attr/scrollbarSize"
+    android:paddingStart="12dip">
 
     <!-- Preference will place its actual preference widget here. -->
-    <LinearLayout android:id="@android:id/widget_frame"
+    <LinearLayout
+        android:id="@android:id/widget_frame"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:gravity="center_vertical"
+        android:gravity="left|center_vertical|start"
-        android:orientation="vertical" />
+        android:minWidth="56dp"
+        android:orientation="vertical">
+
+    </LinearLayout>
 
     <RelativeLayout
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="12dip"
-        android:layout_marginLeft="12dip"
-        android:layout_marginEnd="4dip"
-        android:layout_marginRight="4dip"
-        android:layout_marginTop="6dip"
         android:layout_marginBottom="6dip"
+        android:layout_marginEnd="4dip"
+        android:layout_marginLeft="4dip"
+        android:layout_marginRight="4dip"
+        android:layout_marginStart="4dip"
+        android:layout_marginTop="6dip"
         android:layout_weight="1">
 
-        <TextView android:id="@+android:id/title"
+        <TextView
+            android:id="@android:id/title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceMedium"
             android:ellipsize="marquee"
-            android:fadingEdge="horizontal" />
+            android:fadingEdge="horizontal"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <TextView android:id="@android:id/summary"
+        <TextView
+            android:id="@android:id/summary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@android:id/title"
-            android:layout_alignStart="@android:id/title"
             android:layout_alignLeft="@android:id/title"
+            android:layout_alignStart="@android:id/title"
+            android:layout_below="@android:id/title"
+            android:maxLines="3"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorSecondary"
+            android:textColor="?android:attr/textColorSecondary" />
-            android:maxLines="3" />
 
     </RelativeLayout>
 
-    <ImageButton
+    <androidx.appcompat.widget.AppCompatImageButton
+        android:id="@+id/settingsButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/settingsButton"
-        android:padding="8dip"
         android:background="@drawable/abc_btn_borderless_material"
-        android:src="@drawable/ic_action_settings_inverted"/>
+        android:contentDescription="@string/settings_icon_description"
+        android:padding="8dip"
+        app:tint="?attr/colorControlNormal"
+        android:src="@drawable/ic_action_settings_inverted" />
 
 </LinearLayout>

res/layout/privacy_options.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <CheckBox
+        android:id="@+id/checkbox_contents"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Block notification contents" />
+
+    <CheckBox
+        android:id="@+id/checkbox_images"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:text="Block notification images" />
+</LinearLayout>

res/layout/widget_remotecommandplugin.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:background="#FFFFFF"
+    android:layout_height="match_parent">
+    <LinearLayout
+        android:id="@+id/runcommandWidgetTitleHeader"
+        android:background="@color/primary"
+        android:gravity="center_vertical|left"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <ImageView
+            android:paddingTop="6dip"
+            android:paddingBottom="6dip"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:src="@drawable/icon"
+            android:contentDescription="@string/device_icon_description"/>
+
+        <TextView
+            android:id="@+id/runcommandWidgetTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal"
+            android:singleLine="true"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+    </LinearLayout>
+    <ListView
+        android:id="@+id/runcommandslist"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="4dp"
+        android:addStatesFromChildren="true"
+        android:visibility="gone"
+        android:orientation="vertical" />
+
+    <TextView
+        android:id="@+id/not_reachable_message"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:drawableLeft="@drawable/ic_error_outline_black_48dp"
+        android:drawablePadding="8dip"
+        android:paddingLeft="8dip"
+        android:drawableStart="@drawable/ic_error_outline_black_48dp"
+        android:gravity="center_vertical"
+        android:text="@string/unreachable_description"
+        android:textAppearance="?android:attr/textAppearanceMedium" />
+</LinearLayout>

res/layout/widget_remotecommandplugin_dialog.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:padding="20dp">
+
+    <ListView
+        android:id="@+id/runcommandsdevicelist"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="4dp"
+        android:addStatesFromChildren="true"
+        android:orientation="vertical" />
+
+</LinearLayout>

res/menu/menu_mousepad.xml

@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-xmlns:kdeconnect="http://schemas.android.com/apk/res-auto/android">
+    xmlns:kdeconnect="http://schemas.android.com/apk/res-auto">
 
-    <item android:id="@+id/menu_show_keyboard"
+    <item
-        android:title="@string/show_keyboard"
+        android:id="@+id/menu_show_keyboard"
         android:icon="@drawable/ic_action_keyboard"
+        android:title="@string/show_keyboard"
         kdeconnect:showAsAction="ifRoom" />
 
-    <item android:id="@+id/menu_right_click"
+    <item
+        android:id="@+id/menu_right_click"
         android:title="@string/right_click"
         kdeconnect:showAsAction="never" />
 
-    <item android:id="@+id/menu_middle_click"
+    <item
+        android:id="@+id/menu_middle_click"
         android:title="@string/middle_click"
         kdeconnect:showAsAction="never" />
 

res/menu/menu_presenter.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/fullscreen"
+        android:title="@string/presenter_fullscreen" />
+
+    <item
+        android:id="@+id/exit_presentation"
+        android:title="@string/presenter_exit" />
+</menu>

res/menu/pairing.xml

@@ -1,26 +1,17 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:kdeconnect="http://schemas.android.com/apk/res-auto/android">
+    xmlns:kdeconnect="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/menu_refresh"
         android:icon="@drawable/ic_action_refresh"
         android:orderInCategory="200"
-        kdeconnect:showAsAction="never"
         android:title="@string/refresh"
-        />
+        kdeconnect:showAsAction="never" />
 
     <item
-        android:id="@+id/menu_rename"
-        android:orderInCategory="300"
-        android:title="@string/device_rename_title"
-        kdeconnect:showAsAction="never"
-        />
-
-       <item
         android:id="@+id/menu_custom_device_list"
         android:orderInCategory="900"
         android:title="@string/custom_device_list"
-        kdeconnect:showAsAction="never"
+        kdeconnect:showAsAction="never" />
-        />
 
 </menu>

res/menu/refresh.xml

@@ -1,12 +1,11 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:kdeconnect="http://schemas.android.com/apk/res-auto/android">
+    xmlns:kdeconnect="http://schemas.android.com/apk/res-auto">
 
     <item
-            android:id="@+id/menu_refresh"
+        android:id="@+id/menu_refresh"
-            android:icon="@drawable/ic_action_refresh"
+        android:icon="@drawable/ic_action_refresh"
-            android:orderInCategory="200"
+        android:orderInCategory="200"
-            kdeconnect:showAsAction="never"
+        android:title="@string/refresh"
-            android:title="@string/refresh"
+        kdeconnect:showAsAction="never" />
-        />
 
 </menu>

res/menu/runcommand_context.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/copy_url_to_clipboard"
+        android:title="@string/copy_url_to_clipboard" />
+</menu>

res/menu/sftp_settings_action_mode.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:app="http://schemas.android.com/apk/res-auto"
+      xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/delete"
+        android:title="@string/sftp_action_mode_menu_delete"
+        app:showAsAction="ifRoom"
+        android:icon="@drawable/ic_delete"/>
+</menu>

res/values-ar/strings.xml

@@ -1,7 +1,6 @@
 <?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>
@@ -47,10 +46,17 @@
     <item>الأسرع قليلًا</item>
     <item>الأسرع</item>
   </string-array>
+  <string-array name="mousepad_acceleration_profile_entries">
+    <item>No Acceleration</item>
+    <item>Weakest</item>
+    <item>Weaker</item>
+    <item>Medium</item>
+    <item>Stronger</item>
+    <item>Strongest</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>
@@ -72,16 +78,7 @@
   <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_text">%1s</string>
   <string name="tap_to_answer">المس للإجابة</string>
   <string name="reconnect">أعد الاتّصال</string>
   <string name="right_click">أرسل نقرة باليمين</string>
@@ -93,8 +90,6 @@
   <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>
@@ -103,7 +98,6 @@
   <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>
@@ -111,7 +105,6 @@
     <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>
@@ -130,15 +123,12 @@
   <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">أضف مضيفًا/م​إ</string>
-  <string name="add_host_hint">اسم المضيف أو عنوان IP</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>
   <string name="send_files">أرسل ملفّات</string>
   <string name="pairing_title">أجهزة «كدي المتّصل»</string>

res/values-ast/strings.xml

@@ -1,57 +1,127 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
+  <string name="kde_connect">KDE Connect</string>
   <string name="pref_plugin_telephony">Avisador telefónicu</string>
-  <string name="pref_plugin_telephony_desc">Unvia avisos pa SMS y llamaes</string>
+  <string name="pref_plugin_telephony_desc">Unvia avisos de les llamaes entrantes</string>
-  <string name="pref_plugin_battery">Informe de batería</string>
+  <string name="pref_plugin_battery">Informe de la batería</string>
-  <string name="pref_plugin_battery_desc">Informe periódicu del estáu de la batería</string>
+  <string name="pref_plugin_battery_desc">Informa davezu del estáu de la batería</string>
-  <string name="pref_plugin_sftp_desc">Permite restolar remotamente a esti preséu</string>
+  <string name="pref_plugin_sftp_desc">Permite restolar remotamente\'l sistema de ficheros d\'esti preséu</string>
   <string name="pref_plugin_clipboard">Sincronización del cartafueyu</string>
   <string name="pref_plugin_clipboard_desc">Comparte\'l conteníu del cartafueyu</string>
   <string name="pref_plugin_mousepad">Entrada remota</string>
-  <string name="pref_plugin_mousepad_desc">Usa\'l to teléfonu o tableta como panel táutil y tecláu</string>
+  <string name="pref_plugin_mousepad_desc">Usa\'l preséu como panel táutil y tecláu</string>
-  <string name="pref_plugin_remotekeyboard">Pulsaciones remotes</string>
   <string name="pref_plugin_mpris">Controles multimedia</string>
-  <string name="pref_plugin_mpris_desc">Forne un control remotu pal to reproductor multimedia</string>
   <string name="pref_plugin_runcommand">Execución de comandos</string>
-  <string name="pref_plugin_runcommand_desc">Aiciona comandos remotos del to teléfonu o tableta</string>
+  <string name="pref_plugin_runcommand_desc">Aiciona comandos remotos dende\'l preséu</string>
-  <string name="pref_plugin_ping">Ping</string>
+  <string name="pref_plugin_contacts">Sincronizador de contautos</string>
-  <string name="pref_plugin_ping_desc">Unvia y recibe pings</string>
+  <string name="pref_plugin_notifications_desc">Accede a los avisos n\'otros preseos</string>
-  <string name="pref_plugin_notifications">Sincronización d\'avisos</string>
-  <string name="pref_plugin_notifications_desc">Accede a los tos avisos d\'otros preseos</string>
-  <string name="pref_plugin_receive_notifications">Recibir avisos</string>
-  <string name="pref_plugin_receive_notifications_desc">Recibe avisos d\'otros preseos y amuésalos n\'Android</string>
-  <string name="pref_plugin_sharereceiver">Compartir y recibir</string>
-  <string name="pref_plugin_sharereceiver_desc">Comparte ficheros y URLs ente preseos</string>
-  <string name="plugin_not_available">Esta carauterística nun ta disponible na to versión d\'Android</string>
-  <string name="device_list_empty">Ensin preseos</string>
-  <string name="ok">Aceutar</string>
   <string name="cancel">Encaboxar</string>
-  <string name="open_settings">Abrir axustes</string>
-  <string name="no_permissions">¡</string>
-  <string name="send_ping">Unviar ping</string>
   <string name="open_mpris_controls">Control multimedia</string>
+  <string name="open_mousepad">Entrada remota</string>
   <string-array name="mousepad_tap_entries">
-    <item>Right click</item>
+    <item>Clic drechu</item>
-    <item>Middle click</item>
+    <item>Clic d\'en mediu</item>
-    <item>Nothing</item>
+    <item>Nada</item>
   </string-array>
   <string-array name="mousepad_sensitivity_entries">
-    <item>Slowest</item>
+    <item>Perlenta</item>
-    <item>Above Slowest</item>
+    <item>Lenta</item>
     <item>Default</item>
-    <item>Above Default</item>
+    <item>Rápida</item>
-    <item>Fastest</item>
+    <item>Perrápida</item>
   </string-array>
-  <string name="error_timed_out">Escosó\'l tiempu</string>
+  <string-array name="mousepad_acceleration_profile_entries">
+    <item>Ensin aceleración</item>
+    <item>Weakest</item>
+    <item>Weaker</item>
+    <item>Normal</item>
+    <item>Fuerte</item>
+    <item>Perfuerte</item>
+  </string-array>
+  <string name="category_connected_devices">Preseos coneutaos</string>
+  <string name="category_not_paired_devices">Preseos disponibles</string>
+  <string name="category_remembered_devices">Preseos recordaos</string>
+  <string name="device_menu_unpair">Desempareyar</string>
+  <string name="pair_new_device">Empareya un preséu nuevu</string>
+  <plurals name="incoming_file_title">
+    <item quantity="one">Recibiendo %1$d ficheru de %2$s</item>
+    <item quantity="other">Recibiendo %1$d ficheros de %2$s</item>
+  </plurals>
+  <plurals name="incoming_files_text">
+    <item quantity="one">Ficheru: %1s</item>
+    <item quantity="other">(Ficheru %2$d de %3$d): %1$s</item>
+  </plurals>
+  <plurals name="outgoing_file_title">
+    <item quantity="one">Unviando %1$d ficheru a %2$s</item>
+    <item quantity="other">Unviando %1$d ficheros a %2$s</item>
+  </plurals>
+  <plurals name="outgoing_files_text">
+    <item quantity="one">Ficheru: %1$s</item>
+    <item quantity="other">(Ficheru %2$d de %3$d): %1$s</item>
+  </plurals>
+  <plurals name="received_files_fail_title">
+    <item quantity="one">Fallu al recibir el ficheru de %1$s</item>
+    <item quantity="other">Fallu al recibir %2$d de los %3$d ficheros de %1$s</item>
+  </plurals>
+  <plurals name="send_files_fail_title">
+    <item quantity="one">Fallu al unviar el ficheru de %1$s</item>
+    <item quantity="other">Fallu al unviar %2$d de los %3$d ficheros de %1$s</item>
+  </plurals>
+  <string name="cannot_create_file">Nun pue crease\'l ficheru %s</string>
+  <string name="right_click">Unviar un clic drechu</string>
+  <string name="middle_click">Unviar un clic d\'en mediu</string>
+  <string name="show_keyboard">Amosar el tecláu</string>
+  <string name="device_not_paired">Nun s\'empareyó\'l preséu</string>
+  <string name="request_pairing">Solicitar l\'empareyamientu</string>
+  <string name="device">Preséu</string>
+  <string name="mpris_volume">Volume</string>
   <string-array name="mpris_time_entries">
-    <item>10 seconds</item>
+    <item>10 segundos</item>
-    <item>20 seconds</item>
+    <item>20 segundos</item>
-    <item>30 seconds</item>
+    <item>30 segundos</item>
-    <item>1 minute</item>
+    <item>1 minutu</item>
-    <item>2 minutes</item>
+    <item>2 minutos</item>
   </string-array>
-  <string name="no_file_browser">Nun hai restoladores de ficheros instalaos</string>
+  <string name="protocol_version_older">Esti preséu una una versión vieya del protocolu</string>
-  <string name="pref_plugin_telepathy_desc">Unvia mensaxes de testu dende\'l to escritoriu</string>
+  <string name="protocol_version_newer">Esti preséu una una versión nueva del protocolu</string>
-  <string name="plugin_not_supported">Esti complementu nun lu sofita\'l preséu</string>
+  <string name="general_settings">Axustes xenerales</string>
-  <string name="findmyphone_description">Fai sonar el teléfonu pa qu\'asina pueas alcontralu</string>
+  <string name="plugin_settings">Axustes</string>
+  <string name="device_name_preference_summary">%s</string>
+  <string name="custom_devices_settings">Llista de preseos personalizaos</string>
+  <string name="custom_device_list">Amestar preseos pola IP</string>
+  <string name="share_notification_preference">Avisos sonoros</string>
+  <string name="share_notification_preference_summary">Vibra y reproduz un soníu al recibir un ficheru</string>
+  <string name="share_destination_customize_summary_disabled">Los ficheros recibíos van apaecer en Descargues</string>
+  <string name="share_destination_folder_preference">Direutoriu de destín</string>
+  <string name="title_activity_notification_filter">Peñera d\'avisos</string>
+  <string name="filter_apps_info">Van sincronizase los avisos de les aplicaciones esbillaes.</string>
+  <string name="sftp_sdcard">Tarxeta SD</string>
+  <string name="add_device_dialog_title">Amiestu d\'un preséu</string>
+  <string name="add_device_hint">Nome d\'agopiu o direición IP</string>
+  <string name="no_players_connected">Nun s\'alcontraron reproductores</string>
+  <string name="send_files">Unviar ficheros</string>
+  <string name="pairing_description">Equí deberíen apaecer los demás preseos que tean na mesma rede y executando KDE Connect.</string>
+  <string name="device_rename_title">Renomáu del preséu</string>
+  <string name="device_rename_confirm">Renomar</string>
+  <string name="refresh">Refrescar</string>
+  <string name="pref_plugin_telepathy_desc">Unvia SMS dende l\'ordenador</string>
+  <string name="findmyphone_description">Fai qu\'esti preséu suene pa que pueas alcontralu</string>
+  <string name="telephony_pref_blocked_title">Númberos bloquiaos</string>
+  <string name="presenter_fullscreen">Pantalla completa</string>
+  <string name="presenter_exit">Colar de la presentación</string>
+  <string name="addcommand_explanation">Nun hai comandos rexistraos.</string>
+  <string name="add_command_description">Pues amestar más comandos nel escritoriu</string>
+  <string name="dark_theme">Estilu escuru</string>
+  <string name="notification_channel_persistent">Indicador permanente</string>
+  <string name="clipboard_toast">Copióse al cartafueyu</string>
+  <string name="pref_plugin_systemvolume">Volume del sistema</string>
+  <string name="pref_plugin_systemvolume_desc">Controla\'l volume del sistema del preséu remotu</string>
+  <string name="devices">Preseos</string>
+  <string name="settings_dark_mode">Estilu escuru</string>
+  <string name="settings_more_settings_title">Más axustes</string>
+  <string name="setting_persistent_notification_oreo">Avisu permanente</string>
+  <string name="extra_options">Opciones adicionales</string>
+  <string name="new_notification">Avisu nuevu</string>
+  <string name="notification_channel_receivenotification">Avisos d\'otros preseos</string>
+  <string name="plugin_photo_desc">Llanza l\'aplicación de la cámarra p\'acenciellar la fechura y tresferencia de semeyes</string>
 </resources>

res/values-bg/strings.xml

@@ -1,7 +1,6 @@
 <?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>
@@ -30,9 +29,16 @@
     <item>Above Default</item>
     <item>Fastest</item>
   </string-array>
+  <string-array name="mousepad_acceleration_profile_entries">
+    <item>No Acceleration</item>
+    <item>Weakest</item>
+    <item>Weaker</item>
+    <item>Medium</item>
+    <item>Stronger</item>
+    <item>Strongest</item>
+  </string-array>
   <string name="category_connected_devices">Свързани устройства</string>
   <string name="category_remembered_devices">Запомнени устройства</string>
-  <string name="plugins_failed_to_load">Неуспешно зареждане на приставки (докоснете за подробности)</string>
   <string name="device_menu_unpair">Разкачване</string>
   <string name="unknown_device">Неизвестно устройство</string>
   <string name="error_not_reachable">Устройството е недостъпно</string>
@@ -53,8 +59,6 @@
   <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>
@@ -68,7 +72,6 @@
     <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>

res/values-bs/strings.xml

@@ -1,7 +1,6 @@
 <?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>
@@ -33,10 +32,17 @@
     <item>Above Default</item>
     <item>Fastest</item>
   </string-array>
+  <string-array name="mousepad_acceleration_profile_entries">
+    <item>No Acceleration</item>
+    <item>Weakest</item>
+    <item>Weaker</item>
+    <item>Medium</item>
+    <item>Stronger</item>
+    <item>Strongest</item>
+  </string-array>
   <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>
@@ -53,15 +59,7 @@
   <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_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>
@@ -73,8 +71,6 @@
   <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>
@@ -83,7 +79,6 @@
   <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>
@@ -91,7 +86,6 @@
     <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>
@@ -108,14 +102,11 @@
   <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

@@ -1,8 +1,11 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
+  <string name="kde_connect">KDE Connect</string>
+  <string name="foreground_notification_no_devices">No està connectat a cap dispositiu</string>
+  <string name="foreground_notification_devices">Connectat a: %s</string>
   <string name="pref_plugin_telephony">Notificador de la telefonia</string>
-  <string name="pref_plugin_telephony_desc">Envia notificacions pels SMS i les trucades</string>
+  <string name="pref_plugin_telephony_desc">Envia notificacions per a les trucades entrants</string>
-  <string name="pref_plugin_battery">Informe de la bateria</string>
+  <string name="pref_plugin_battery">Informa de la bateria</string>
   <string name="pref_plugin_battery_desc">Informa periòdicament sobre l\'estat de la bateria</string>
   <string name="pref_plugin_sftp">Exposa el sistema de fitxers</string>
   <string name="pref_plugin_sftp_desc">Permet navegar de forma remota pel sistema de fitxers del dispositiu</string>
@@ -10,17 +13,21 @@
   <string name="pref_plugin_clipboard_desc">Comparteix el contingut del porta-retalls</string>
   <string name="pref_plugin_mousepad">Entrada remota</string>
   <string name="pref_plugin_mousepad_desc">Usa el vostre telèfon o tauleta com un ratolí i un teclat</string>
-  <string name="pref_plugin_remotekeyboard">S\'estan rebent pulsacions de tecla remotes</string>
+  <string name="pref_plugin_presenter">Presentació de diapositives remota</string>
-  <string name="pref_plugin_remotekeyboard_desc">S\'estan rebent esdeveniments de pulsacions de tecla des de dispositius remots</string>
+  <string name="pref_plugin_presenter_desc">Usa el dispositiu per a canviar les dispositives d\'una presentació</string>
+  <string name="pref_plugin_remotekeyboard">Rep les pulsacions remotes de tecla</string>
+  <string name="pref_plugin_remotekeyboard_desc">Rep els esdeveniments de pulsacions de tecla des de dispositius remots</string>
   <string name="pref_plugin_mpris">Controls multimèdia</string>
   <string name="pref_plugin_mpris_desc">Proporciona un comandament a distància pel reproductor multimèdia</string>
   <string name="pref_plugin_runcommand">Executa una ordre</string>
   <string name="pref_plugin_runcommand_desc">Activa les ordres remotes des del telèfon o tauleta</string>
+  <string name="pref_plugin_contacts">Sincronitzador dels contactes</string>
+  <string name="pref_plugin_contacts_desc">Permet sincronitzar la llibreta de contactes del dispositiu</string>
   <string name="pref_plugin_ping">Ping</string>
-  <string name="pref_plugin_ping_desc">Envia i rep els pings</string>
+  <string name="pref_plugin_ping_desc">Envia i rep els «ping»</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_receive_notifications">Recepció de les notificacions</string>
+  <string name="pref_plugin_receive_notifications">Rep les notificacions</string>
   <string name="pref_plugin_receive_notifications_desc">Rep notificacions des d\'altres dispositius i mostrar-los a l\'Android</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>
@@ -30,6 +37,8 @@
   <string name="cancel">Cancel·la</string>
   <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="no_permission_mprisreceiver">Per a poder controlar els reproductors multimèdia cal atorgar accés a les notificacions</string>
+  <string name="no_permissions_remotekeyboard">Per a rebre les pulsacions de tecles, haureu d\'activar el teclat remot del KDE Connect</string>
   <string name="send_ping">Envia un ping</string>
   <string name="open_mpris_controls">Control multimèdia</string>
   <string name="remotekeyboard_editing_only_title">Fes servir les tecles remotes només en editar</string>
@@ -41,6 +50,7 @@
   <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_sensitivity_settings_title">Estableix la sensibilitat del ratolí tàctil</string>
+  <string name="mousepad_acceleration_profile_settings_title">Estableix l\'acceleració de l\'apuntador</string>
   <string name="mousepad_scroll_direction_title">Inverteix la direcció del desplaçament</string>
   <string-array name="mousepad_tap_entries">
     <item>Clic dret</item>
@@ -54,10 +64,17 @@
     <item>Ràpida</item>
     <item>La més ràpida</item>
   </string-array>
+  <string-array name="mousepad_acceleration_profile_entries">
+    <item>Sense acceleració</item>
+    <item>La més feble</item>
+    <item>Feble</item>
+    <item>Mitjana</item>
+    <item>Forta</item>
+    <item>La més forta</item>
+  </string-array>
   <string name="category_connected_devices">Dispositius connectats</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">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>
@@ -79,19 +96,40 @@
   <string name="pairing_request_from">S\'ha demanat aparellar des de %1s</string>
   <string name="received_url_title">S\'ha rebut un vincle des de %1s</string>
   <string name="received_url_text">Puntegeu per obrir «%1s»</string>
-  <string name="incoming_file_title">Fitxer entrant des de %1s</string>
+  <plurals name="incoming_file_title">
-  <string name="incoming_file_text">%1s</string>
+    <item quantity="one">S\'està rebent %1$d fitxer des de %2$s</item>
-  <string name="outgoing_file_title">S\'està enviant el fitxer a %1s</string>
+    <item quantity="other">S\'estan rebent %1$d fitxers des de %2$s</item>
-  <string name="outgoing_files_title">S\'estan enviant fitxers a %1s</string>
+  </plurals>
-  <string name="outgoing_file_text">%1s</string>
+  <plurals name="incoming_files_text">
-  <string name="outgoing_files_text">S\'ha enviat %1$d de %2$d fitxers</string>
+    <item quantity="one">Fitxer: %1s</item>
-  <string name="received_file_title">Fitxer rebut des de %1s</string>
+    <item quantity="other">(Fitxer %2$d de %3$d): %1$s</item>
-  <string name="received_file_fail_title">Ha fallat en rebre el fitxer des de %1s</string>
+  </plurals>
+  <plurals name="outgoing_file_title">
+    <item quantity="one">S\'està enviant el fitxer %1$d a %2$s</item>
+    <item quantity="other">S\'estan enviant els fitxers %1$d a %2$s</item>
+  </plurals>
+  <plurals name="outgoing_files_text">
+    <item quantity="one">Fitxer: %1$s</item>
+    <item quantity="other">(Fitxer %2$d de %3$d): %1$s</item>
+  </plurals>
+  <plurals name="received_files_title">
+    <item quantity="one">S\'ha rebut un fitxer des de %1$s</item>
+    <item quantity="other">S\'han rebut %2$d fitxers des de %1$s</item>
+  </plurals>
+  <plurals name="received_files_fail_title">
+    <item quantity="one">Ha fallat en rebre un fitxer des de %1$s</item>
+    <item quantity="other">Ha fallat en rebre %2$d de %3$d fitxers des de %1$s</item>
+  </plurals>
+  <plurals name="sent_files_title">
+    <item quantity="one">Fitxer enviat a %1$s</item>
+    <item quantity="other">%2$d fitxers enviats a %1$s</item>
+  </plurals>
+  <plurals name="send_files_fail_title">
+    <item quantity="one">Ha fallat en enviar el fitxer a %1$s</item>
+    <item quantity="other">Ha fallat en enviar %2$d de %3$d fitxers a %1$s</item>
+  </plurals>
   <string name="received_file_text">Puntegeu per obrir «%1s»</string>
-  <string name="sent_file_title">Fitxer enviat a %1s</string>
+  <string name="cannot_create_file">No s\'ha pogut crear el fitxer %s</string>
-  <string name="sent_file_text">%1s</string>
-  <string name="sent_file_failed_title">Ha fallat en enviar el fitxer a %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>
@@ -103,9 +141,9 @@
   <string name="pairing_reject">Rebutja</string>
   <string name="device">Dispositiu</string>
   <string name="pair_device">Dispositiu parell</string>
-  <string name="remote_control">Comandament a distància</string>
+  <string name="settings">Arranjament</string>
-  <string name="settings">Arranjament del KDE Connect</string>
   <string name="mpris_play">Reprodueix</string>
+  <string name="mpris_pause">Pausa</string>
   <string name="mpris_previous">Anterior</string>
   <string name="mpris_rew">Rebobina</string>
   <string name="mpris_ff">Avanç ràpid</string>
@@ -113,7 +151,7 @@
   <string name="mpris_volume">Volum</string>
   <string name="mpris_settings">Arranjament multimèdia</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 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>
@@ -121,6 +159,8 @@
     <item>1 minut</item>
     <item>2 minuts</item>
   </string-array>
+  <string name="mpris_notification_settings_title">Mostra les notificacions dels reproductors</string>
+  <string name="mpris_notification_settings_summary">Permet controlar els reproductors multimèdia sense obrir el KDE Connect</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>
@@ -135,24 +175,49 @@
   <string name="pair_device_action">Aparella amb un dispositiu nou</string>
   <string name="unpair_device_action">Desparella %s</string>
   <string name="custom_device_list">Afegeix dispositius per la IP</string>
+  <string name="delete_custom_device">Suprimeixo %s?</string>
+  <string name="custom_device_deleted">S\'ha suprimit un dispositiu personalitzat</string>
+  <string name="custom_device_list_help">Si el dispositiu no es detecta automàticament, podeu afegir la seva adreça IP o el nom de la màquina fent clic al botó flotant d\'acció</string>
+  <string name="custom_device_fab_hint">Afegeix un dispositiu</string>
+  <string name="undo">Desfés</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="share_destination_customize">Personalitza el directori de destinació</string>
   <string name="share_destination_customize_summary_disabled">Els fitxers rebuts apareixeran a Baixades</string>
   <string name="share_destination_customize_summary_enabled">Els fitxers seran emmagatzemats al directori de sota</string>
   <string name="share_destination_folder_preference">Directori de destinació</string>
+  <string name="share">Comparteix</string>
+  <string name="share_received_file">Comparteix «%s»</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_device_dialog_title">Afegeix un dispositiu</string>
+  <string name="add_device_hint">Nom de la màquina o adreça IP</string>
+  <string name="sftp_preference_detected_sdcards">S\'han detectat targetes SD</string>
+  <string name="sftp_preference_edit_sdcard_title">Edita una targeta SD</string>
+  <string name="sftp_preference_configured_storage_locations">Ubicacions d\'emmagatzematge configurades</string>
+  <string name="sftp_preference_add_storage_location_title">Afegeix una ubicació d\'emmagatzematge</string>
+  <string name="sftp_preference_edit_storage_location">Edita una ubicació d\'emmagatzematge</string>
+  <string name="sftp_preference_add_camera_shortcut">Afegeix una drecera a la carpeta de càmera</string>
+  <string name="sftp_preference_add_camera_shortcut_summary_on">Afegeix una drecera a la carpeta de la càmera</string>
+  <string name="sftp_preference_add_camera_shortcut_summary_off">No afegeixis cap drecera a la carpeta de la càmera</string>
+  <string name="sftp_storage_preference_storage_location">Ubicació d\'emmagatzematge</string>
+  <string name="sftp_storage_preference_storage_location_already_configured">Aquesta ubicació ja s\'ha configurat</string>
+  <string name="sftp_storage_preference_click_to_select">clic per seleccionar</string>
+  <string name="sftp_storage_preference_display_name">Nom a mostrar</string>
+  <string name="sftp_storage_preference_display_name_already_used">Aquest nom a mostrar ja està en ús</string>
+  <string name="sftp_storage_preference_display_name_cannot_be_empty">El nom a mostrar no pot estar buit</string>
+  <string name="sftp_action_mode_menu_delete">Suprimeix</string>
+  <string name="sftp_no_sdcard_detected">No s\'ha detectat cap targeta SD</string>
+  <string name="sftp_no_storage_locations_configured">No s\'ha configurat cap ubicació d\'emmagatzematge</string>
+  <string name="sftp_saf_permission_explanation">Per accedir remotament als fitxer cal configurar les ubicacions d\'emmagatzematge</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>
   <string name="send_files">Envia els fitxers</string>
   <string name="pairing_title">Dispositius del KDE Connect</string>
@@ -167,9 +232,10 @@
   <string name="pref_plugin_telepathy">Envia un SMS</string>
   <string name="pref_plugin_telepathy_desc">Envia missatges de text des de l\'escriptori</string>
   <string name="plugin_not_supported">Aquest connector no és admès pel dispositiu</string>
-  <string name="findmyphone_title">Cerca el meu telèfon</string>
+  <string name="findmyphone_title">Troba el meu telèfon</string>
-  <string name="findmyphone_title_tablet">Cerca la meva tauleta</string>
+  <string name="findmyphone_title_tablet">Troba la meva tauleta</string>
-  <string name="findmyphone_description">Fa sonar aquest dispositiu perquè el pugueu trobar.</string>
+  <string name="findmyphone_title_tv">Troba la meva TV</string>
+  <string name="findmyphone_description">Fa sonar aquest dispositiu perquè el pugueu trobar</string>
   <string name="findmyphone_found">L\'he trobat</string>
   <string name="open">Obre</string>
   <string name="close">Tanca</string>
@@ -178,9 +244,61 @@
   <string name="permission_explanation">Aquest connector necessita permisos per a funcionar</string>
   <string name="optional_permission_explanation">Us caldrà concedir permisos extres per accedir a totes les característiques</string>
   <string name="plugins_need_optional_permission">Alguns connectors tenen característiques desactivades per la falta de permís (puntegeu per a més informació):</string>
-  <string name="sftp_permission_explanation">Per accedir als fitxers des del PC, l\'aplicació necessita permís per accedir a l\'emmagatzematge del telèfon</string>
   <string name="share_optional_permission_explanation">Per a compartir fitxers entre el telèfon i l\'escriptori, haureu de donar accés a l\'emmagatzematge del telèfon</string>
   <string name="telepathy_permission_explanation">Per a llegir i escriure SMS des de l\'escriptori, haureu de donar permís als SMS</string>
-  <string name="telephony_permission_explanation">Per a veure les trucades telefòniques i SMS des de l\'escriptori, haureu de donar permís a les trucades telefòniques i SMS</string>
+  <string name="telephony_permission_explanation">Per a veure les trucades telefòniques des de l\'escriptori, haureu de donar permís d\'accés al registre de trucades telefòniques i a l\'estat del telèfon</string>
   <string name="telephony_optional_permission_explanation">Per a veure un nom de contacte en comptes d\'un número de telèfon, haureu de donar permís als contactes del telèfon</string>
+  <string name="contacts_permission_explanation">Per a compartir els vostres contactes amb l\'escriptori, caldrà que els hi doneu permís</string>
+  <string name="select_ringtone">Seleccioneu un to de la trucada</string>
+  <string name="telephony_pref_blocked_title">Nombres blocats</string>
+  <string name="telephony_pref_blocked_dialog_desc">No es mostren ni les trucades ni els SMS d\'aquests números. Especifiqueu un número per línia</string>
+  <string name="mpris_coverart_description">Caràtula del suport actual</string>
+  <string name="device_icon_description">Icona del dispositiu</string>
+  <string name="settings_icon_description">Icona d\'arranjament</string>
+  <string name="presenter_fullscreen">Pantalla completa</string>
+  <string name="presenter_exit">Surt de la presentació</string>
+  <string name="presenter_lock_tip">Podeu bloquejar el dispositiu i emprar les tecles de volum per anar a la diapositiva anterior/següent</string>
+  <string name="add_command">Afegeix una ordre</string>
+  <string name="addcommand_explanation">No hi ha cap ordre registrada</string>
+  <string name="addcommand_explanation2">Podeu afegir ordres noves a l\'Arranjament del sistema del KDE Connect</string>
+  <string name="add_command_description">Podeu afegir ordres per a l\'escriptori</string>
+  <string name="pref_plugin_mprisreceiver">Control del reproductor multimèdia</string>
+  <string name="pref_plugin_mprisreceiver_desc">Controla els reproductors multimèdia dels telèfons des d\'un altre dispositiu</string>
+  <string name="dark_theme">Tema fosc</string>
+  <string name="notification_channel_default">Altres notificacions</string>
+  <string name="notification_channel_persistent">Indicador de persistent</string>
+  <string name="notification_channel_media_control">Control multimèdia</string>
+  <string name="notification_channel_filetransfer">Transferència de fitxers</string>
+  <string name="mpris_stop">Atura el reproductor actual</string>
+  <string name="copy_url_to_clipboard">Copia l\'URL al porta-retalls</string>
+  <string name="clipboard_toast">Copiat al porta-retalls</string>
+  <string name="runcommand_notreachable">No es pot accedir al dispositiu</string>
+  <string name="runcommand_notpaired">El dispositiu no està aparellat</string>
+  <string name="runcommand_nosuchdevice">No existeix aquest dispositiu</string>
+  <string name="runcommand_noruncommandplugin">Aquest dispositiu no té el connector d\'executar ordres activat</string>
+  <string name="pref_plugin_findremotedevice">Cerca el dispositiu remot</string>
+  <string name="pref_plugin_findremotedevice_desc">Truca al dispositiu remot</string>
+  <string name="ring">Truca</string>
+  <string name="pref_plugin_systemvolume">Volum del sistema</string>
+  <string name="pref_plugin_systemvolume_desc">Controla el volum del sistema des del dispositiu remot</string>
+  <string name="mute">Silencia</string>
+  <string name="all">Tot</string>
+  <string name="devices">Dispositius</string>
+  <string name="settings_rename">Nom del dispositiu</string>
+  <string name="settings_dark_mode">Tema fosc</string>
+  <string name="settings_more_settings_title">Més ajustaments</string>
+  <string name="settings_more_settings_text">Els ajustaments per dispositiu es poden trobar a «Arranjament del connector» des d\'un dispositiu.</string>
+  <string name="setting_persistent_notification">Mostra les notificacions persistents</string>
+  <string name="setting_persistent_notification_oreo">Notificacions persistents</string>
+  <string name="setting_persistent_notification_description">Tocar per a des/activar els ajustaments de les notificacions</string>
+  <string name="extra_options">Opcions extres</string>
+  <string name="privacy_options">Opcions de privadesa</string>
+  <string name="set_privacy_options">Establiu les opcions de privadesa</string>
+  <string name="new_notification">Notificació nova</string>
+  <string name="block_contents">Bloca el contingut de les notificacions</string>
+  <string name="block_images">Bloca les imatges a les notificacions</string>
+  <string name="notification_channel_receivenotification">Notificacions des d\'altres dispositius</string>
+  <string name="take_picture">Llança la càmera</string>
+  <string name="plugin_photo_desc">Llança l\'aplicació de la càmera per facilitar la presa i la transferència de fotografies</string>
+  <string name="no_app_for_opening">No s\'ha trobat cap aplicació adequada per obrir aquest fitxer</string>
 </resources>

res/values-cs/strings.xml

@@ -1,7 +1,10 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
+  <string name="kde_connect">KDE Connect</string>
+  <string name="foreground_notification_no_devices">Žádná připojená zařízení</string>
+  <string name="foreground_notification_devices">Připojen k: %s</string>
   <string name="pref_plugin_telephony">Upozornění telefonie</string>
-  <string name="pref_plugin_telephony_desc">Posílat upozornění na SMS a hovory</string>
+  <string name="pref_plugin_telephony_desc">Posílat upozornění na příchozí hovory</string>
   <string name="pref_plugin_battery">Hlášení baterie</string>
   <string name="pref_plugin_battery_desc">Periodicky hlásit stav baterky</string>
   <string name="pref_plugin_sftp">Přístup k souborovému systému</string>
@@ -10,12 +13,15 @@
   <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 nebo tablet jako touchpad a klávesnici</string>
+  <string name="pref_plugin_presenter_desc">Použijte své zařízení pro přepínání snímků prezentace</string>
   <string name="pref_plugin_remotekeyboard">Přijímat stisky kláves se vzdálených zařízení</string>
   <string name="pref_plugin_remotekeyboard_desc">Přijímat události stisku kláves ze vzdálených zařízení</string>
   <string name="pref_plugin_mpris">Ovládání multimédií</string>
   <string name="pref_plugin_mpris_desc">Poskytuje dálkové ovládání přehrávačů médií</string>
   <string name="pref_plugin_runcommand">Spustit příkaz</string>
   <string name="pref_plugin_runcommand_desc">Spouštějte příkazy vzdáleně z vašeho telefonu</string>
+  <string name="pref_plugin_contacts">Synchronizace kontaktů</string>
+  <string name="pref_plugin_contacts_desc">Povolit synchronizaci kontaktů zařízení</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>
@@ -30,6 +36,7 @@
   <string name="cancel">Zrušit</string>
   <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="no_permission_mprisreceiver">Abyste byli schopni ovládat vaše přehrávače médií, musíte udělit přístup k oznámením</string>
   <string name="send_ping">Poslat ping</string>
   <string name="open_mpris_controls">Ovládání multimédií</string>
   <string name="remotekeyboard_editing_only_title">Ovládat vzdálené klávesy při editaci</string>
@@ -37,9 +44,11 @@
   <string name="remotekeyboard_connected">Vzdálené připojení klávesnice je aktivní</string>
   <string name="remotekeyboard_multiple_connections">Je k dispozici více než jedno připojení klávesnice. Vyberte zařízení pro jeho nastavení.</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. Použijte 2 prsty pro posunování. 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_sensitivity_settings_title">Nastavit citlivost touchpadu</string>
+  <string name="mousepad_acceleration_profile_settings_title">Nastavit akceleraci ukazatele</string>
   <string name="mousepad_scroll_direction_title">Obrácený směr posunu</string>
   <string-array name="mousepad_tap_entries">
     <item>Kliknutí pravým tlačítkem myši</item>
@@ -53,10 +62,17 @@
     <item>Rychlejší</item>
     <item>Nejrychlejší</item>
   </string-array>
+  <string-array name="mousepad_acceleration_profile_entries">
+    <item>Bez akcelerace</item>
+    <item>Nejslabší</item>
+    <item>Slabší</item>
+    <item>Střední</item>
+    <item>Silná</item>
+    <item>Nejsilnější</item>
+  </string-array>
   <string name="category_connected_devices">Připojená 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">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>
@@ -78,19 +94,32 @@
   <string name="pairing_request_from">Požadavek o párování z %1s</string>
   <string name="received_url_title">Přijat odkaz od %1s</string>
   <string name="received_url_text">Ťukněte pro otevření \'%1s\'</string>
-  <string name="incoming_file_title">Příchozí soubor od %1s</string>
+  <plurals name="incoming_file_title">
-  <string name="incoming_file_text">%1s</string>
+    <item quantity="one">Přijímám %1$d soubor z %2$s</item>
-  <string name="outgoing_file_title">Odesílám soubor do %1s</string>
+    <item quantity="few">Přijímám %1$d soubory z %2$s</item>
-  <string name="outgoing_files_title">Odesílám soubory do %1s</string>
+    <item quantity="many">Přijímám %1$d souborů z %2$s</item>
-  <string name="outgoing_file_text">%1s</string>
+    <item quantity="other"/>
-  <string name="outgoing_files_text">Odesláno %1$d ze %2$d souborů</string>
+  </plurals>
-  <string name="received_file_title">Přijat soubor od %1s</string>
+  <plurals name="incoming_files_text">
-  <string name="received_file_fail_title">Selhalo přijímání souboru od %1s</string>
+    <item quantity="one">Soubor: %1s</item>
+    <item quantity="few">(Soubor %2$d of %3$d) : %1$s</item>
+    <item quantity="many">(Soubor %2$d of %3$d) : %1$s</item>
+    <item quantity="other"/>
+  </plurals>
+  <plurals name="received_files_title">
+    <item quantity="one">Přijat soubor z %1$s</item>
+    <item quantity="few">Přijaty %2$d soubory z %1$s</item>
+    <item quantity="many">Přijato %2$d souborů z %1$s</item>
+    <item quantity="other"/>
+  </plurals>
+  <plurals name="received_files_fail_title">
+    <item quantity="one">Selhalo přijímání souboru z %1$s</item>
+    <item quantity="few">Selhalo přijímání %2$d ze %3$d souborů z %1$s</item>
+    <item quantity="many">Selhalo přijímání %2$d ze %3$d souborů z %1$s</item>
+    <item quantity="other"/>
+  </plurals>
   <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="cannot_create_file">Nelze vytvořit soubor %s</string>
-  <string name="sent_file_text">%1s</string>
-  <string name="sent_file_failed_title">Odesílání souborů na %1s selhalo</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>
@@ -102,9 +131,9 @@
   <string name="pairing_reject">Odmítnout</string>
   <string name="device">Zařízení</string>
   <string name="pair_device">Spárovat zařízení</string>
-  <string name="remote_control">Vzdálené ovládání</string>
+  <string name="settings">Nastavení</string>
-  <string name="settings">Nastavení KDE Connect</string>
   <string name="mpris_play">Přehrát</string>
+  <string name="mpris_pause">Pozastavit</string>
   <string name="mpris_previous">Předchozí</string>
   <string name="mpris_rew">Přetočit zpět</string>
   <string name="mpris_ff">Rychle vpřed</string>
@@ -112,7 +141,7 @@
   <string name="mpris_volume">Hlasitost</string>
   <string name="mpris_settings">Nastavení multimédií</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 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>
@@ -120,6 +149,8 @@
     <item>1 minuta</item>
     <item>2 minuty</item>
   </string-array>
+  <string name="mpris_notification_settings_title">Obrazit upozornění pro ovládání médií</string>
+  <string name="mpris_notification_settings_summary">Umožnit ovládání přehrávače médií bez otevření KDE Connect</string>
   <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>
@@ -134,16 +165,18 @@
   <string name="pair_device_action">Spárovat nové zařízení</string>
   <string name="unpair_device_action">Zrušit párování %s</string>
   <string name="custom_device_list">Přidat zařízení podle IP</string>
+  <string name="delete_custom_device">Smazat %s?</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="share_destination_customize">Přizpůsobte si cílový adresář</string>
   <string name="share_destination_customize_summary_disabled">Přijaté soubory se objeví v Downloads</string>
   <string name="share_destination_customize_summary_enabled">Soubory budou ukládány v adresáři níže</string>
   <string name="share_destination_folder_preference">Cílový adresář</string>
+  <string name="share">Sdílet</string>
+  <string name="share_received_file">Sdílet \"%s\"</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>
   <string name="sftp_sdcard">SD karta</string>
   <string name="sftp_readonly">(pouze ke čtení)</string>
@@ -151,7 +184,6 @@
   <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 name="mpris_player_on_device">%1$s na %2$s</string>
   <string name="send_files">Odeslat soubory</string>
   <string name="pairing_title">Zařízení KDE Connect</string>
@@ -168,6 +200,7 @@
   <string name="plugin_not_supported">Tento modul zařízení nepodporuje</string>
   <string name="findmyphone_title">Najít můj telefon</string>
   <string name="findmyphone_title_tablet">Najít můj tablet</string>
+  <string name="findmyphone_title_tv">Najít mou TV</string>
   <string name="findmyphone_description">Prozvoní toto zařízení, takže jej můžete najít</string>
   <string name="findmyphone_found">Nalezeno</string>
   <string name="open">Otevřít</string>
@@ -177,9 +210,56 @@
   <string name="permission_explanation">Tento modul potřebuje pro práci povolení</string>
   <string name="optional_permission_explanation">Pro zpřístupnění všech funkcí potřebujete další oprávnění</string>
   <string name="plugins_need_optional_permission">Některé moduly mají vypnuté vlastnosti, kvůli nedostatečným oprávněním (ťukněte pro více informací):</string>
-  <string name="sftp_permission_explanation">Pro přístup k souborům z vašeho počítače aplikace potřebuje oprávnění k úložišti telefonu</string>
   <string name="share_optional_permission_explanation">Pro sdílení souborů mezi telefonem a počítačem potřebujete udělit oprávnění k úložišti telefonu</string>
   <string name="telepathy_permission_explanation">Pro čtení a psaní SMS z počítače musíte udělit oprávnění k SMS</string>
-  <string name="telephony_permission_explanation">Pro zobrazení telefonátů a SMS v počítači musíte udělit oprávnění k telefonování a SMS</string>
   <string name="telephony_optional_permission_explanation">Pro zobrazení jména kontaktu u telefonního čísla je potřeba udělit oprávnění ke kontaktům v telefonu</string>
+  <string name="contacts_permission_explanation">Pro sdílení knihy kontaktů s pracovním prostředím, musíte udělit přístup ke kontaktům</string>
+  <string name="select_ringtone">Vybrat vyzváněcí tón</string>
+  <string name="telephony_pref_blocked_title">Blokovaná čísla</string>
+  <string name="telephony_pref_blocked_dialog_desc">Nezobrazovat volnání a SMS z těchto čísel. Prosím, zadejte pouze jedno slovo na řádek.</string>
+  <string name="mpris_coverart_description">Obal současného média</string>
+  <string name="device_icon_description">Ikona zařízení</string>
+  <string name="settings_icon_description">Ikona nastavení</string>
+  <string name="presenter_fullscreen">Celá obrazovka</string>
+  <string name="presenter_exit">Ukončit prezentaci</string>
+  <string name="add_command">Přidat příkaz</string>
+  <string name="addcommand_explanation">Nejsou registrovány žádné příkazy</string>
+  <string name="addcommand_explanation2">Nové příkazy můžete přidat v nastavení systému KDE Connect</string>
+  <string name="add_command_description">V pracovním prostředí můžete přidat příkazy</string>
+  <string name="pref_plugin_mprisreceiver">Ovládání přehrávače médií</string>
+  <string name="pref_plugin_mprisreceiver_desc">Ovládejte přehrávače médií na vašem telefonu z jiného zařízení</string>
+  <string name="dark_theme">Tmavý motiv</string>
+  <string name="notification_channel_default">Ostatní oznámení</string>
+  <string name="notification_channel_persistent">Stálý ukazatel</string>
+  <string name="notification_channel_media_control">Ovládání médií</string>
+  <string name="notification_channel_filetransfer">Přenos souboru</string>
+  <string name="mpris_stop">Zastavit současný přehrávač</string>
+  <string name="copy_url_to_clipboard">Kopírovat URL do schránky</string>
+  <string name="clipboard_toast">Zkopírováno do schránky</string>
+  <string name="runcommand_notreachable">Zařízení je nedostupné</string>
+  <string name="runcommand_notpaired">Zařízení není spárováno</string>
+  <string name="runcommand_nosuchdevice">Není zde žádné takové zařízení</string>
+  <string name="runcommand_noruncommandplugin">Toto zařízení nemá povolený modul pro spouštění příkazů</string>
+  <string name="pref_plugin_findremotedevice">Najít vzdálené zařízení</string>
+  <string name="pref_plugin_findremotedevice_desc">Prozvonit vzdálené zařízení</string>
+  <string name="ring">Prozvonit</string>
+  <string name="pref_plugin_systemvolume">Hlasitost systému</string>
+  <string name="pref_plugin_systemvolume_desc">Ovládejte hlasitost systému vzdáleného zařízení</string>
+  <string name="mute">Ztlumit</string>
+  <string name="all">Vše</string>
+  <string name="devices">Zařízení</string>
+  <string name="settings_rename">Název zařízení</string>
+  <string name="settings_dark_mode">Tmavý motiv</string>
+  <string name="settings_more_settings_title">Více nastavení</string>
+  <string name="settings_more_settings_text">Nastavení \"pro každé zařízení\" lze najít v \'Nastavení modulu\' v zařízení.</string>
+  <string name="setting_persistent_notification">Ukázat stálé upozornění</string>
+  <string name="setting_persistent_notification_oreo">Perzistentní upozornění</string>
+  <string name="setting_persistent_notification_description">Ťuknutím povolíte/zakážete v nastavení upozornění</string>
+  <string name="extra_options">Další možnosti</string>
+  <string name="privacy_options">Možnosti soukromí</string>
+  <string name="set_privacy_options">Nastavte své možnosti soukromí</string>
+  <string name="new_notification">Nové oznámení</string>
+  <string name="block_contents">Blokovat obsah oznámení</string>
+  <string name="block_images">Blokovat obrázky z upozornění</string>
+  <string name="notification_channel_receivenotification">Oznamování z ostatních zařízení</string>
 </resources>