Increased version number to release

Switched to the standard abc_list_selector_holo_dark, that has no problems
in the current appcompat library. Using it from XML file instead of source.

This reverts changes from 03ede77bd1

.gitignore

@@ -2,6 +2,13 @@ local.properties
 .gradle/
 .idea/
 out/
+gen/
+bin/
 build/
 target/
-classes/
+classes/
+gradle
+gradlew
+gradlew.bat
+*.iml
+*.keystore

AndroidManifest.xml

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.kde.kdeconnect_tp"
-    android:versionCode="720"
-    android:versionName="0.7.2">
+    android:versionCode="736"
+    android:versionName="0.7.3.6">
 
     <uses-sdk android:minSdkVersion="9"
-              android:targetSdkVersion="19" />
+              android:targetSdkVersion="21" />
 
     <supports-screens
         android:smallScreens="true"
@@ -88,6 +88,26 @@
                 android:value="org.kde.kdeconnect.UserInterface.DeviceActivity" />
         </activity>
 
+
+        <activity
+                android:name="org.kde.kdeconnect.UserInterface.CustomDevicesActivity"
+                android:label="@string/custom_devices_settings"
+                android:parentActivityName="org.kde.kdeconnect.UserInterface.DeviceActivity"
+                >
+            <meta-data android:name="android.support.PARENT_ACTIVITY"
+                       android:value="org.kde.kdeconnect.UserInterface.DeviceActivity" />
+        </activity>
+
+
+        <activity
+            android:name="org.kde.kdeconnect.UserInterface.PluginSettingsActivity"
+            android:label="@string/mpris_settings"
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.SettingsActivity"
+            >
+            <meta-data android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.kde.kdeconnect.UserInterface.SettingsActivity" />
+        </activity>
+
         <receiver android:name="org.kde.kdeconnect.KdeConnectBroadcastReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_REPLACED" />
@@ -129,6 +149,8 @@
             android:theme="@style/Theme.AppCompat"
             android:name="org.kde.kdeconnect.Plugins.MousePadPlugin.MousePadActivity"
             android:label="@string/remote_control"
+            android:windowSoftInputMode="stateHidden|adjustResize"
+            android:configChanges="orientation|keyboardHidden|screenSize"
             android:screenOrientation="fullSensor"
             android:parentActivityName="org.kde.kdeconnect.UserInterface.DeviceActivity"
             >

StaticMessages.sh

@@ -7,7 +7,7 @@ function export_pot_file # First parameter will be the path of the pot file we h
 {
 	potfile=$1
 	mkdir outdir
-	a2po export --android src/main/res/ --gettext outdir
+	a2po export --android res/ --gettext outdir
 	mv outdir/template.pot $potfile
 	rm -rf outdir
 }
@@ -15,7 +15,7 @@ function export_pot_file # First parameter will be the path of the pot file we h
 function import_po_files # First parameter will be a path that will contain several .po files with the format LANG.po
 {
 	podir=$1
-	a2po import --android src/main/res/ --gettext $podir
+	a2po import --android res/ --gettext $podir
 }
 
 

build.gradle

@@ -1,20 +1,29 @@
 buildscript {
     repositories {
-        mavenCentral()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.+'
+        classpath 'com.android.tools.build:gradle:0.12.+' //Update to 14 when Studio 0.9 gets to beta
     }
 }
 
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 19
-    buildToolsVersion '20.0.0'
+    compileSdkVersion 21
+    buildToolsVersion '21.1.1'
     defaultConfig {
         minSdkVersion 9
-        targetSdkVersion 19
+        targetSdkVersion 21
+    }
+	sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = ['src']
+            resources.srcDirs = ['resources']
+            res.srcDirs = ['res']
+            assets.srcDirs = ['assets']
+        }
     }
     packagingOptions {
         exclude "META-INF/DEPENDENCIES"
@@ -26,8 +35,6 @@ android {
     lintOptions {
         abortOnError false
     }
-    productFlavors {
-    }
     buildTypes {
     }
 }
@@ -36,11 +43,11 @@ dependencies {
     repositories {
         mavenCentral()
     }
-    compile 'com.android.support:support-v4:19.1.+'
-    compile 'com.android.support:appcompat-v7:19.1.+'
-    compile 'org.apache.mina:mina-core:2.0.+'
-    compile 'org.bouncycastle:bcprov-jdk16:1.45'
+    compile 'com.android.support:support-v4:21.0.2'
+    compile 'com.android.support:appcompat-v7:21.0.2'
+    compile 'org.apache.mina:mina-core:2.0.9'
     compile 'org.apache.sshd:sshd-core:0.8.0'
-    compile 'tomcat:tomcat-apr:5.5.+'
+    compile 'org.bouncycastle:bcprov-jdk16:1.46'
+
     //compile fileTree(dir: 'libs', include: '*.jar')
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +0,0 @@
-#Mon Jun 09 09:51:48 CEST 2014
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip

gradlew

@@ -1,164 +0,0 @@
-#!/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
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# 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\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
-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"`
-
-    # 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

@@ -1,90 +0,0 @@
-@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

kdeconnect-android.iml

@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="android" name="Android">
-      <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="debug" />
-        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
-        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
-        <option name="ALLOW_USER_CONFIGURATION" value="false" />
-        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
-        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
-        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
-      </configuration>
-    </facet>
-    <facet type="android-gradle" name="Android-Gradle">
-      <configuration>
-        <option name="GRADLE_PROJECT_PATH" value=":" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates" />
-      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
-    </content>
-    <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="sshd-core-0.8.0" level="project" />
-    <orderEntry type="library" exported="" name="tomcat-apr-5.5.15" level="project" />
-    <orderEntry type="library" exported="" name="slf4j-api-1.6.6" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-19.1.0" level="project" />
-    <orderEntry type="library" exported="" name="support-v4-19.1.0" level="project" />
-    <orderEntry type="library" exported="" name="bcprov-jdk16-1.45" level="project" />
-    <orderEntry type="library" exported="" name="mina-core-2.0.7" level="project" />
-  </component>
-</module>
-

res/layout/activity_device.xml

@@ -0,0 +1,13 @@
+<ListView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/buttons_list"
+    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:fillViewport="true"
+    android:divider="@null"
+    tools:context=".MainActivity"
+    />

res/layout/activity_mousepad.xml

@@ -15,4 +15,13 @@
         android:layout_centerInParent="true"
         android:padding="12dip" />
 
+    <view
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        class="org.kde.kdeconnect.Plugins.MousePadPlugin.KeyListenerView"
+        android:id="@+id/keyListener"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="58dp" />
+
 </RelativeLayout>

res/layout/custom_ip_list.xml

@@ -0,0 +1,36 @@
+<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="fill_parent"
+        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:id="@+id/ip_edittext"/>
+
+    <Button
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/add_host"
+            android:onClick="addNewIp"
+            android:id="@android:id/button1"/>
+
+
+</LinearLayout>

res/layout/list_item_entry.xml

@@ -4,11 +4,14 @@
     android:layout_width="fill_parent"
     android:baselineAligned="false"
     android:layout_height="wrap_content"
+    android:paddingLeft="12dip"
     android:minHeight="?android:attr/listPreferredItemHeight"
     android:gravity="center_vertical"
     android:paddingRight="?android:attr/scrollbarSize"
+    android:background="@drawable/abc_list_selector_holo_dark"
     android:orientation="vertical">
-
+    <!-- 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"
         android:layout_width="wrap_content"

res/layout/mpris_control.xml

@@ -1,43 +1,52 @@
 <?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:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/mpris_control_view"
-    android:gravity="center">
+    android:gravity="center"
+    android:paddingLeft="60dip"
+    android:paddingTop="5dip"
+    android:paddingRight="60dip"
+    android:paddingBottom="5dip">
 
     <Spinner
-        android:layout_width="200dip"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:id="@+id/player_spinner"
         android:layout_gravity="center"
     />
 
     <TextView
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:id="@+id/now_playing_textview"
         android:singleLine="true"
         android:gravity="center"
-        android:padding="5dip"
+        android:padding="8dip"
         android:layout_gravity="center"
     />
 
-    <ImageButton
-        android:layout_width="200dip"
+    <org.kde.kdeconnect.UserInterface.MaxWidthImageButton
+        android:layout_width="fill_parent"
         android:layout_height="75dip"
+        app:maxWidth="300dip"
         android:id="@+id/play_button"
         android:src="@android:drawable/ic_media_play"
         android:contentDescription="@string/mpris_play"
         android:layout_gravity="center"
-    />
+        android:layout_weight="0"
+        android:clickable="false"
+        android:adjustViewBounds="false"
+        android:baselineAlignBottom="true" />
 
     <LinearLayout
         android:orientation="horizontal"
-        android:layout_width="200dip"
-        android:layout_height="50dip"
+        android:layout_width="match_parent"
+        android:layout_height="60dip"
         android:layout_gravity="center"
     >
 
@@ -81,17 +90,18 @@
 
     <LinearLayout
             android:orientation="horizontal"
-            android:layout_width="200dip"
+            android:layout_width="match_parent"
             android:layout_height="70dip"
             android:id="@+id/volume_layout"
             android:layout_gravity="center">
 
         <ImageView
-            android:layout_width="50dip"
-            android:layout_height="50dip"
+            android:layout_width="30dip"
+            android:layout_height="30dip"
+            android:maxWidth="30dip"
             android:layout_marginRight="10dip"
             android:id="@+id/imageView"
-            android:layout_weight="1"
+            android:layout_weight="0"
             android:layout_gravity="left|center_vertical"
             android:contentDescription="@string/mpris_volume"
             android:src="@drawable/ic_volume"
@@ -99,7 +109,7 @@
 
 
         <SeekBar
-            android:layout_width="fill_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/volume_seek"
             android:layout_weight="1"

res/menu/main.xml

@@ -24,4 +24,13 @@
         android:title="@string/settings"
         kdeconnect:showAsAction="never"
         />
-</menu>
+
+       <item
+        android:id="@+id/menu_custom_device_list"
+        android:icon="@drawable/ic_action_settings"
+        android:orderInCategory="900"
+        android:title="@string/custom_device_list"
+        kdeconnect:showAsAction="never"
+        />
+
+</menu>

res/menu/menu_mousepad.xml

@@ -2,6 +2,11 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
 xmlns:kdeconnect="http://schemas.android.com/apk/res-auto/android">
 
+    <item android:id="@+id/menu_show_keyboard"
+        android:title="@string/show_keyboard"
+        android:icon="@drawable/ic_action_keyboard"
+        kdeconnect:showAsAction="ifRoom" />
+
     <item android:id="@+id/menu_right_click"
         android:title="@string/right_click"
         kdeconnect:showAsAction="never" />
@@ -9,4 +14,5 @@ xmlns:kdeconnect="http://schemas.android.com/apk/res-auto/android">
     <item android:id="@+id/menu_middle_click"
         android:title="@string/middle_click"
         kdeconnect:showAsAction="never" />
-</menu>
+
+</menu>

res/values-bg/strings.xml

@@ -60,11 +60,25 @@
   <string name="mpris_ff">Превъртане напред</string>
   <string name="mpris_next">Следващ</string>
   <string name="mpris_volume">Сила на звука</string>
+  <string name="mpris_settings">Отдалечен мултимедиен контрол</string>
   <string name="share_to">Споделяне...</string>
   <string name="protocol_version_older">Това устройство използва стара версия на протокола</string>
   <string name="protocol_version_newer">Това устройство използва по-нова версия на протокола</string>
   <string name="general_settings">Общи настройки</string>
+  <string name="plugin_settings">Общи настройки</string>
+  <string name="plugin_settings_with_name">Отваряне на настройките</string>
   <string name="device_name">Име на устройството</string>
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">Невалидно име на устройство</string>
+  <string name="custom_devices_settings">Няма устройства</string>
+  <string name="custom_device_list">Няма устройства</string>
+  <string name="custom_device_list_summary">Няма устройства</string>
+  <string name="share_notification_preference">Синхронизиране на уведомленията</string>
+  <string-array name="mpris_time_entries">
+    <item>10 seconds</item>
+    <item>20 seconds</item>
+    <item>30 seconds</item>
+    <item>1 minute</item>
+    <item>2 minutes</item>
+  </string-array>
 </resources>

res/values-bs/strings.xml

@@ -5,4 +5,12 @@
   <string name="pref_plugin_ping">Ping</string>
   <string name="pref_plugin_ping_desc">Šalji i primaj ping-ove</string>
   <string name="pref_plugin_notifications">Sinhronizovano obavještenje</string>
+  <string name="share_notification_preference">Sinhronizovano obavještenje</string>
+  <string-array name="mpris_time_entries">
+    <item>10 seconds</item>
+    <item>20 seconds</item>
+    <item>30 seconds</item>
+    <item>1 minute</item>
+    <item>2 minutes</item>
+  </string-array>
 </resources>

res/values-ca/strings.xml

@@ -8,8 +8,8 @@
   <string name="pref_plugin_sftp_desc">Permet navegar de forma remota pel sistema de fitxers del telèfon</string>
   <string name="pref_plugin_clipboard">Sincronitza el porta-retalls</string>
   <string name="pref_plugin_clipboard_desc">Comparteix el contingut del porta-retalls</string>
-  <string name="pref_plugin_mousepad">Comandament a distància del ratolí</string>
-  <string name="pref_plugin_mousepad_desc">Controla el vostre ratolí de forma remota</string>
+  <string name="pref_plugin_mousepad">Entrada remota</string>
+  <string name="pref_plugin_mousepad_desc">Usa el vostre telèfon com un ratolí i un teclat</string>
   <string name="pref_plugin_mpris">Comandament a distància multimèdia</string>
   <string name="pref_plugin_mpris_desc">Controla l\'àudio i el vídeo del vostre telèfon</string>
   <string name="pref_plugin_ping">Ping</string>
@@ -28,6 +28,10 @@
   <string name="open_mpris_controls">Obre el comandament a distància</string>
   <string name="open_mousepad">Obre el control pel plafó tàctil</string>
   <string name="mousepad_info">Moveu un dit per la pantalla per a moure el cursor del ratolí</string>
+  <string name="mousepad_double_tap_settings_title">Estableix l\'acció de tocar amb dos dits</string>
+  <string name="mousepad_triple_tap_settings_title">Estableix l\'acció de tocar amb tres dits</string>
+  <string name="mousepad_right_click">Clic dret</string>
+  <string name="mousepad_middle_click">Clic del mig</string>
   <string name="category_connected_devices">Dispositius connectats</string>
   <string name="category_not_paired_devices">Dispositius sense aparellar</string>
   <string name="category_remembered_devices">Dispositius recordats</string>
@@ -56,6 +60,7 @@
   <string name="reconnect">Reconnecta</string>
   <string name="right_click">Envia un clic del botó dret</string>
   <string name="middle_click">Envia un clic del botó del mig</string>
+  <string name="show_keyboard">Mostra el teclat</string>
   <string name="device_not_paired">El dispositiu no està aparellat</string>
   <string name="request_pairing">Demana aparellar</string>
   <string name="pairing_accept">Accepta</string>
@@ -70,12 +75,37 @@
   <string name="mpris_ff">Avanç ràpid</string>
   <string name="mpris_next">Següent</string>
   <string name="mpris_volume">Volum</string>
+  <string name="mpris_settings">Arranjament multimèdia</string>
+  <string name="mpris_time_settings_title">Interval de temps</string>
+  <string name="mpris_time_settings_summary">Ajusta el temps per avançar o rebobinar un fitxer multimèdia.</string>
   <string name="share_to">Comparteix amb...</string>
   <string name="protocol_version_older">Aquest dispositiu usa una versió antiga del protocol</string>
   <string name="protocol_version_newer">Aquest dispositiu usa una versió nova del protocol</string>
   <string name="general_settings">Arranjament general</string>
+  <string name="plugin_settings">Arranjament</string>
+  <string name="plugin_settings_with_name">Ajustaments de %s</string>
   <string name="device_name">Nom del dispositiu</string>
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">El nom del dispositiu no és vàlid</string>
   <string name="shareplugin_text_saved">S\'ha rebut text i s\'ha desat al porta-retalls</string>
+  <string name="custom_devices_settings">Llista personalitzada de dispositius</string>
+  <string name="custom_device_list">Llista personalitzada de dispositius</string>
+  <string name="custom_device_list_summary">Llista personalitzada de dispositius</string>
+  <string name="share_notification_preference">Rebombori de les notificacions</string>
+  <string name="share_notification_preference_summary">Vibra i reprodueix un so en rebre un fitxer</string>
+  <string name="sftp_internal_storage">Emmagatzematge intern</string>
+  <string name="sftp_all_files">Tots els fitxers</string>
+  <string name="sftp_sdcard_num">Targeta SD %d</string>
+  <string name="sftp_sdcard">Targeta SD</string>
+  <string name="sftp_readonly">(només de lectura)</string>
+  <string name="sftp_camera">Imatges de la càmera</string>
+  <string name="add_host">Afegeix una màquina/IP</string>
+  <string name="custom_dev_list_help">Empreu aquesta opció només si el dispositiu no és detectat automàticament. Introduïu a sota l\'adreça IP o nom de la màquina i premeu el botó per afegir-lo a la llista. Seleccioneu un element existent per eliminar-lo de la llista.</string>
+  <string-array name="mpris_time_entries">
+    <item>10 segons</item>
+    <item>20 segons</item>
+    <item>30 segons</item>
+    <item>1 minut</item>
+    <item>2 minuts</item>
+  </string-array>
 </resources>

res/values-cs/strings.xml

@@ -1,20 +1,20 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-  <string name="pref_plugin_telephony">Oznamování telefonie</string>
-  <string name="pref_plugin_telephony_desc">Posílat upozorňování na SMS a hovory</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_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>
   <string name="pref_plugin_sftp_desc">Umožní vám vzdáleně prohlížet souborový systém telefonu</string>
   <string name="pref_plugin_clipboard">Synchronizace schránky</string>
   <string name="pref_plugin_clipboard_desc">Sdílet obsah schránky</string>
-  <string name="pref_plugin_mousepad">Vzdálené ovládání myši</string>
-  <string name="pref_plugin_mousepad_desc">Ovládejte svou myš vzdáleně</string>
+  <string name="pref_plugin_mousepad">Vzdálený vstup</string>
+  <string name="pref_plugin_mousepad_desc">Používejte svůj telefon jako myš a klávesnici</string>
   <string name="pref_plugin_mpris">Vzdálené ovládání multimédií</string>
   <string name="pref_plugin_mpris_desc">Ovládejte audio/video z vašeho telefonu</string>
   <string name="pref_plugin_ping">Ping</string>
   <string name="pref_plugin_ping_desc">Posílat a přijímat ping</string>
-  <string name="pref_plugin_notifications">Synchronizace hlášení</string>
+  <string name="pref_plugin_notifications">Synchronizace upozornění</string>
   <string name="pref_plugin_notifications_desc">Zpřístupněte si upozornění z jiných zařízení</string>
   <string name="pref_plugin_sharereceiver">Sdílet příjemce</string>
   <string name="pref_plugin_sharereceiver_desc">Ukládat příchozí soubory do úložiště telefonu</string>
@@ -28,6 +28,10 @@
   <string name="open_mpris_controls">Otevřít vzdálené ovládání</string>
   <string name="open_mousepad">Otevřít dotykové ovládání</string>
   <string name="mousepad_info">Pohybujte prstem po monitoru pro pohybování kurzorem myši</string>
+  <string name="mousepad_double_tap_settings_title">Nastavit činnost pro ťuknutí dvěma prsty</string>
+  <string name="mousepad_triple_tap_settings_title">Nastavit činnost pro ťuknutí třemi prsty</string>
+  <string name="mousepad_right_click">Kliknutí pravým tlačítkem myši</string>
+  <string name="mousepad_middle_click">Kliknutí prostředním tlačítkem myši</string>
   <string name="category_connected_devices">Připojená zařízení</string>
   <string name="category_not_paired_devices">Nespárovaná zařízení</string>
   <string name="category_remembered_devices">Zapamatovaná zařízení</string>
@@ -56,6 +60,7 @@
   <string name="reconnect">Znovu připojit</string>
   <string name="right_click">Poslat kliknutí pravým tlačítkem</string>
   <string name="middle_click">Poslat kliknutí prostředním tlačítkem</string>
+  <string name="show_keyboard">Zobrazit klávesnici</string>
   <string name="device_not_paired">Zařízení není spárované</string>
   <string name="request_pairing">Vyžádat párování</string>
   <string name="pairing_accept">Přijmout</string>
@@ -70,12 +75,37 @@
   <string name="mpris_ff">Rychle vpřed</string>
   <string name="mpris_next">Následující</string>
   <string name="mpris_volume">Hlasitost</string>
+  <string name="mpris_settings">Nastavení multimédií</string>
+  <string name="mpris_time_settings_title">Časový interval</string>
+  <string name="mpris_time_settings_summary">Upravit čas pro rychlý posun multimediálním souborem vpřed a zpět.</string>
   <string name="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>
   <string name="general_settings">Obecná nastavení</string>
+  <string name="plugin_settings">Nastavení</string>
+  <string name="plugin_settings_with_name">Nastavení %s</string>
   <string name="device_name">Název zařízení</string>
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">Neplatný název zařízení</string>
   <string name="shareplugin_text_saved">Přijatý text byl uložen do schránky</string>
+  <string name="custom_devices_settings">Seznam vlastních zařízení</string>
+  <string name="custom_device_list">Seznam vlastních zařízení</string>
+  <string name="custom_device_list_summary">Seznam vlastních zařízení</string>
+  <string name="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="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>
+  <string name="sftp_camera">Obrázky z fotoaparátu</string>
+  <string name="add_host">Přidat stroj/IP</string>
+  <string name="custom_dev_list_help">Použijte tuto možnost pouze pokud není vaše zařízení automaticky detekováno. Zadejte níže IP adresu a název hostitele a stiskněte tlačítko pro přidání do seznamu. Stiskněte existující položku pro odstranění ze seznamu.</string>
+  <string-array name="mpris_time_entries">
+    <item>10 sekund</item>
+    <item>20 sekund</item>
+    <item>30 sekund</item>
+    <item>1 minuta</item>
+    <item>2 minuty</item>
+  </string-array>
 </resources>

res/values-da/strings.xml

@@ -8,14 +8,15 @@
   <string name="pref_plugin_sftp_desc">Muliggør at gennemsøge telefonens filsystem eksternt</string>
   <string name="pref_plugin_clipboard">Synk. af udklipsholder</string>
   <string name="pref_plugin_clipboard_desc">Del indholdet af udklipsholderen</string>
-  <string name="pref_plugin_mousepad">Fjernbetjening af mus</string>
-  <string name="pref_plugin_mousepad_desc">Styrer din mus på afstand</string>
+  <string name="pref_plugin_mousepad">Fjernbetjening</string>
   <string name="pref_plugin_mpris">Fjernbetjening af multimedie</string>
   <string name="pref_plugin_mpris_desc">Styr lyd og video fra din telefon</string>
   <string name="pref_plugin_ping">Ping</string>
   <string name="pref_plugin_ping_desc">Send og modtag ping</string>
   <string name="pref_plugin_notifications">Synk. af bekendtgørelser</string>
   <string name="pref_plugin_notifications_desc">Tilgå dine bekendtgørelser fra andre enheder</string>
+  <string name="pref_plugin_sharereceiver">Del modtager</string>
+  <string name="pref_plugin_sharereceiver_desc">Gem indkommende filer til telefonens lager</string>
   <string name="plugin_not_available">Denne funktion er ikke tilgængelig i din Android-version</string>
   <string name="device_list_empty">Ingen enheder</string>
   <string name="ok">O.k.</string>
@@ -24,8 +25,10 @@
   <string name="no_permissions">Du skal give tilladelse for at tilgå bekendtgørelser</string>
   <string name="send_ping">Send ping</string>
   <string name="open_mpris_controls">Åbn fjernbetjening</string>
-  <string name="open_mousepad">Åbn museplade-kontrol</string>
-  <string name="mousepad_info">Bevæg din tommelfinger på skærmen for at flytte musemarkøren</string>
+  <string name="open_mousepad">Åbn touchpad-kontrol</string>
+  <string name="mousepad_info">Bevæg en finger på skærmen for at flytte musemarkøren</string>
+  <string name="mousepad_right_click">Send højreklik</string>
+  <string name="mousepad_middle_click">Send midterklik</string>
   <string name="category_connected_devices">Forbundne enheder</string>
   <string name="category_not_paired_devices">Ikke parrede enheder</string>
   <string name="category_remembered_devices">Huskede enheder</string>
@@ -44,10 +47,17 @@
   <string name="error_invalid_key">Ugyldige nøgle modtaget</string>
   <string name="pair_requested">Anmodet om parring</string>
   <string name="pairing_request_from">Parringsanmodning fra %1s</string>
-  <string name="incoming_file_title">Parringsanmodning fra %1s</string>
-  <string name="incoming_file_text">%s</string>
+  <string name="received_url_title">Modtog link fra %1s</string>
+  <string name="received_url_text">Tap for at åbne \"%1s\"</string>
+  <string name="incoming_file_title">Indkommende fil fra %1s</string>
+  <string name="incoming_file_text">%1s</string>
+  <string name="received_file_title">Modtog fil fra %1s</string>
+  <string name="received_file_text">Tap for at åbne \"%1s\"</string>
   <string name="tap_to_answer">Tap for at svare</string>
   <string name="reconnect">Forbind igen</string>
+  <string name="right_click">Send højreklik</string>
+  <string name="middle_click">Send midterklik</string>
+  <string name="show_keyboard">Vis tastatur</string>
   <string name="device_not_paired">Enhed ikke parret</string>
   <string name="request_pairing">Anmod om parring</string>
   <string name="pairing_accept">Acceptér</string>
@@ -62,11 +72,26 @@
   <string name="mpris_ff">Spol frem</string>
   <string name="mpris_next">Næste</string>
   <string name="mpris_volume">Lydstyrke</string>
+  <string name="mpris_settings">Fjernbetjening af multimedie</string>
   <string name="share_to">Del på...</string>
   <string name="protocol_version_older">Denne enhed bruger en gammel protokolversion</string>
   <string name="protocol_version_newer">Denne enhed bruger en nyere protokolversion</string>
   <string name="general_settings">Generelle indstillinger</string>
+  <string name="plugin_settings">Generelle indstillinger</string>
+  <string name="plugin_settings_with_name">Åbn indstillinger</string>
   <string name="device_name">Enhedsnavn</string>
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">Ugyldigt enhedsnavn</string>
+  <string name="shareplugin_text_saved">Modtog tekst, gemt til udklipsholder</string>
+  <string name="custom_devices_settings">Ingen enheder</string>
+  <string name="custom_device_list">Ingen enheder</string>
+  <string name="custom_device_list_summary">Ingen enheder</string>
+  <string name="share_notification_preference">Synk. af bekendtgørelser</string>
+  <string-array name="mpris_time_entries">
+    <item>10 seconds</item>
+    <item>20 seconds</item>
+    <item>30 seconds</item>
+    <item>1 minute</item>
+    <item>2 minutes</item>
+  </string-array>
 </resources>

res/values-de/strings.xml

@@ -15,6 +15,7 @@
   <string name="pref_plugin_ping_desc">Senden und Empfangen von Pings</string>
   <string name="pref_plugin_notifications">Benachrichtigungs-Abgleich</string>
   <string name="pref_plugin_notifications_desc">Zugriff auf Ihre Benachrichtigungen von anderen Geräten</string>
+  <string name="pref_plugin_sharereceiver_desc">Eingehende Dateien auf dem Telefonspeicher ablegen</string>
   <string name="plugin_not_available">Diese Funktion ist in Ihrer Android-Version nicht verfügbar</string>
   <string name="device_list_empty">Keine Geräte</string>
   <string name="ok">OK</string>
@@ -23,14 +24,16 @@
   <string name="no_permissions">Sie müssen die Erlaubnis zum Zugriff auf Benachrichtigungen erteilen</string>
   <string name="send_ping">Ping senden</string>
   <string name="open_mpris_controls">Fernbedienung öffnen</string>
-  <string name="open_mousepad">Fernbedienung öffnen</string>
+  <string name="open_mousepad">Touchpad-Steuerung öffnen</string>
+  <string name="mousepad_right_click">Rechtsklick</string>
+  <string name="mousepad_middle_click">Mittelklick</string>
   <string name="category_connected_devices">Verbundene Geräte</string>
   <string name="category_not_paired_devices">Keine angeschlossenen Geräte</string>
   <string name="category_remembered_devices">Gemerkte Geräte</string>
   <string name="plugins_failed_to_load">Laden der Module fehlgeschlagen, tippen Sie für weitere Details:</string>
   <string name="device_menu_plugins">Module auswählen</string>
   <string name="device_menu_unpair">Verbindung trennen</string>
-  <string name="device_not_reachable">Das Gerät ist nicht erreichbar</string>
+  <string name="device_not_reachable">Das angegeben Gerät ist nicht erreichbar</string>
   <string name="unknown_device">Unbekanntes Gerät</string>
   <string name="error_not_reachable">Das Gerät ist nicht erreichbar</string>
   <string name="error_already_requested">Die Verbindung wurde bereits angefragt</string>
@@ -42,10 +45,15 @@
   <string name="error_invalid_key">Ungültiger Schlüssel empfangen</string>
   <string name="pair_requested">Verbindung angefordert</string>
   <string name="pairing_request_from">Verbindungsanfrage von %1s</string>
-  <string name="incoming_file_title">Verbindungsanfrage von %1s</string>
-  <string name="incoming_file_text">%s</string>
+  <string name="received_url_title">Verknüpfung von %1s erhalten</string>
+  <string name="incoming_file_title">Eingehende Datei von %1s</string>
+  <string name="incoming_file_text">%1s</string>
+  <string name="received_file_title">Datei von %1s erhalten</string>
   <string name="tap_to_answer">Tippen zum Antworten</string>
   <string name="reconnect">Erneut verbinden</string>
+  <string name="right_click">Rechtsklick senden</string>
+  <string name="middle_click">Mittelklick senden</string>
+  <string name="show_keyboard">Tastatur anzeigen</string>
   <string name="device_not_paired">Das Gerät ist nicht verbunden</string>
   <string name="request_pairing">Verbindung angefordert</string>
   <string name="pairing_accept">Annehmen</string>
@@ -60,11 +68,34 @@
   <string name="mpris_ff">Vorlauf</string>
   <string name="mpris_next">Weiter</string>
   <string name="mpris_volume">Lautstärke</string>
+  <string name="mpris_settings">Multimedia-Einstellungen</string>
   <string name="share_to">Freigeben für ...</string>
   <string name="protocol_version_older">Dieses Gerät verwendet ein alte Protokollversion</string>
   <string name="protocol_version_newer">Dieses Gerät verwendet ein neuere Protokollversion</string>
   <string name="general_settings">Allgemeine Einstellungen</string>
+  <string name="plugin_settings">Einstellungen</string>
+  <string name="plugin_settings_with_name">%s-Einstellungen</string>
   <string name="device_name">Gerätename</string>
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">Ungültiger Gerätename</string>
+  <string name="shareplugin_text_saved">Text empfangen und in der Zwischenablage gespeichert</string>
+  <string name="custom_devices_settings">Benutzerdefinierte Geräteliste</string>
+  <string name="custom_device_list">Benutzerdefinierte Geräteliste</string>
+  <string name="custom_device_list_summary">Benutzerdefinierte Geräteliste</string>
+  <string name="share_notification_preference">Benachrichtigungs-Abgleich</string>
+  <string name="share_notification_preference_summary">Beim Empfang einer Datei vibrieren und einen Sound abspielen</string>
+  <string name="sftp_internal_storage">Interner Speicher</string>
+  <string name="sftp_all_files">Alle Dateien</string>
+  <string name="sftp_sdcard_num">SD-Karte %d</string>
+  <string name="sftp_sdcard">SD-Karte</string>
+  <string name="sftp_readonly">(Nur lesen)</string>
+  <string name="sftp_camera">Kamerabilder</string>
+  <string name="add_host">Rechner/IP hinzufügen</string>
+  <string-array name="mpris_time_entries">
+    <item>10 Sekunden</item>
+    <item>20 Sekunden</item>
+    <item>30 Sekunden</item>
+    <item>1 Minute</item>
+    <item>2 Minuten</item>
+  </string-array>
 </resources>

res/values-es/strings.xml

@@ -5,17 +5,20 @@
   <string name="pref_plugin_battery">Informe de la batería</string>
   <string name="pref_plugin_battery_desc">Informar periódicamente del estado de la batería</string>
   <string name="pref_plugin_sftp">Revelar el sistema de archivos</string>
-  <string name="pref_plugin_sftp_desc">Permite explorar de forma remota el sistema de archivos del teléfono</string>
+  <string name="pref_plugin_sftp_desc">Permite examinar de forma remota el sistema de archivos del teléfono</string>
   <string name="pref_plugin_clipboard">Sincronización del portapapeles</string>
   <string name="pref_plugin_clipboard_desc">Compartir el contenido del portapapeles</string>
-  <string name="pref_plugin_mousepad">Control remoto</string>
+  <string name="pref_plugin_mousepad">Entrada remota</string>
+  <string name="pref_plugin_mousepad_desc">Usar su teléfono como ratón y teclado</string>
   <string name="pref_plugin_mpris">Controles remotos multimedia</string>
   <string name="pref_plugin_mpris_desc">Controlar audio y vídeo desde el teléfono</string>
   <string name="pref_plugin_ping">Ping</string>
   <string name="pref_plugin_ping_desc">Enviar y recibir pings</string>
   <string name="pref_plugin_notifications">Sincronizar notificaciones</string>
   <string name="pref_plugin_notifications_desc">Acceder a las notificaciones desde otros dispositivos</string>
-  <string name="plugin_not_available">Esta función no está disponible en su versión de Android</string>
+  <string name="pref_plugin_sharereceiver">Compartir receptor</string>
+  <string name="pref_plugin_sharereceiver_desc">Guardar archivos entrantes en el almacenamiento del teléfono</string>
+  <string name="plugin_not_available">Esta funcionalidad no está disponible en su versión de Android</string>
   <string name="device_list_empty">Ningún dispositivo</string>
   <string name="ok">Aceptar</string>
   <string name="cancel">Cancelar</string>
@@ -23,7 +26,12 @@
   <string name="no_permissions">Debe otorgar permiso para acceder a las notificaciones</string>
   <string name="send_ping">Enviar ping</string>
   <string name="open_mpris_controls">Abrir control remoto</string>
-  <string name="open_mousepad">Abrir control remoto</string>
+  <string name="open_mousepad">Abrir control del panel táctil</string>
+  <string name="mousepad_info">Mueva un dedo sobre la pantalla para mover el cursor del ratón</string>
+  <string name="mousepad_double_tap_settings_title">Establecer la acción al golpetear con dos dedos</string>
+  <string name="mousepad_triple_tap_settings_title">Establecer la acción al golpetear con tres dedos</string>
+  <string name="mousepad_right_click">Clic derecho</string>
+  <string name="mousepad_middle_click">Clic del botón central</string>
   <string name="category_connected_devices">Dispositivos conectados</string>
   <string name="category_not_paired_devices">Dispositivos no vinculados</string>
   <string name="category_remembered_devices">Dispositivos recordados</string>
@@ -42,10 +50,17 @@
   <string name="error_invalid_key">Se ha recibido una clave no valida</string>
   <string name="pair_requested">Vinculación solicitada</string>
   <string name="pairing_request_from">Solicitud de vinculación de %1s</string>
-  <string name="incoming_file_title">Solicitud de vinculación de %1s</string>
-  <string name="incoming_file_text">%s</string>
+  <string name="received_url_title">Enlace recibido desde %1s</string>
+  <string name="received_url_text">Pulse para abrir «%1s»</string>
+  <string name="incoming_file_title">Archivo entrante desde %1s</string>
+  <string name="incoming_file_text">%1s</string>
+  <string name="received_file_title">Archivo recibido desde %1s</string>
+  <string name="received_file_text">Pulse para abrir «%1s»</string>
   <string name="tap_to_answer">Toque para responder</string>
   <string name="reconnect">Reconectar</string>
+  <string name="right_click">Enviar clic derecho</string>
+  <string name="middle_click">Enviar clic del botón central</string>
+  <string name="show_keyboard">Mostrar teclado</string>
   <string name="device_not_paired">Dispositivo no vinculado</string>
   <string name="request_pairing">Solicitar vinculación</string>
   <string name="pairing_accept">Aceptar</string>
@@ -60,11 +75,37 @@
   <string name="mpris_ff">Avance rápido</string>
   <string name="mpris_next">Siguiente</string>
   <string name="mpris_volume">Volumen</string>
+  <string name="mpris_settings">Preferencias multimedia</string>
+  <string name="mpris_time_settings_title">Intervalo de tiempo</string>
+  <string name="mpris_time_settings_summary">Ajustar el tiempo a avanzar o rebobinar un archivo multimedia.</string>
   <string name="share_to">Compartir con...</string>
   <string name="protocol_version_older">Este dispositivo usa una versión antigua del protocolo</string>
   <string name="protocol_version_newer">Este dispositivo usa una versión más reciente del protocolo</string>
   <string name="general_settings">Preferencias generales</string>
+  <string name="plugin_settings">Preferencias</string>
+  <string name="plugin_settings_with_name">Preferencias de %s</string>
   <string name="device_name">Nombre de dispositivo</string>
   <string name="device_name_preference_summary">%s</string>
-  <string name="invalid_device_name">Nombre de dispositivo no valido</string>
+  <string name="invalid_device_name">Nombre de dispositivo no válido</string>
+  <string name="shareplugin_text_saved">Texto recibido y guardado en el portapapeles</string>
+  <string name="custom_devices_settings">Lista de dispositivos personalizada</string>
+  <string name="custom_device_list">Lista de dispositivos personalizada</string>
+  <string name="custom_device_list_summary">Lista de dispositivos personalizada</string>
+  <string name="share_notification_preference">Notificaciones ruidosas</string>
+  <string name="share_notification_preference_summary">Vibrar y reproducir un sonido cuando se reciba un archivo</string>
+  <string name="sftp_internal_storage">Almacenamiento interno</string>
+  <string name="sftp_all_files">Todos los archivos</string>
+  <string name="sftp_sdcard_num">Tarjeta SD %d</string>
+  <string name="sftp_sdcard">Tarjeta SD</string>
+  <string name="sftp_readonly">(solo lectura)</string>
+  <string name="sftp_camera">Imágenes de la cámara</string>
+  <string name="add_host">Añadir IP/nombre</string>
+  <string name="custom_dev_list_help">Use esta opción solo si su dispositivo no es detectado automáticamente. Introduzca la dirección IP o nombre debajo y pulse el botón para añadirlo a la lista. Pulse un ítem existente para eliminarlo de la lista.</string>
+  <string-array name="mpris_time_entries">
+    <item>10 segundos</item>
+    <item>20 segundos</item>
+    <item>30 segundos</item>
+    <item>1 minuto</item>
+    <item>2 minutos</item>
+  </string-array>
 </resources>

res/values-fi/strings.xml

@@ -8,14 +8,16 @@
   <string name="pref_plugin_sftp_desc">Mahdollistaa puhelimen tiedostojärjestelmän etäselaamisen</string>
   <string name="pref_plugin_clipboard">Leikepöydän synkronointi</string>
   <string name="pref_plugin_clipboard_desc">Jaa leikepöydän sisältö</string>
-  <string name="pref_plugin_mousepad">Hiiren kauko-ohjain</string>
-  <string name="pref_plugin_mousepad_desc">Kauko-ohjaa hiirtä</string>
+  <string name="pref_plugin_mousepad">Kaukosyöte</string>
+  <string name="pref_plugin_mousepad_desc">Käytä puhelintasi hiirenä ja näppäimistönä</string>
   <string name="pref_plugin_mpris">Multimediakauko-ohjaimet</string>
   <string name="pref_plugin_mpris_desc">Ohjaa ääntä ja videota puhelimestasi</string>
   <string name="pref_plugin_ping">Tiedustelupaketti</string>
   <string name="pref_plugin_ping_desc">Lähetä ja vastaanota tiedustelupaketteja</string>
   <string name="pref_plugin_notifications">Ilmoitusten synkronointi</string>
   <string name="pref_plugin_notifications_desc">Näe ilmoituksesi muissa laitteissa</string>
+  <string name="pref_plugin_sharereceiver">Jaon vastaanottaja</string>
+  <string name="pref_plugin_sharereceiver_desc">Tallenna tulevat tiedoston puhelimen muistiin</string>
   <string name="plugin_not_available">Piirre ei ole käytettävissä Android-versiossasi</string>
   <string name="device_list_empty">Ei laitteita</string>
   <string name="ok">OK</string>
@@ -26,34 +28,45 @@
   <string name="open_mpris_controls">Avaa kauko-ohjain</string>
   <string name="open_mousepad">Avaa hiiren ohjain</string>
   <string name="mousepad_info">Liikuta hiiren osoitinta liikuttamalla sormeasi näytöllä</string>
+  <string name="mousepad_double_tap_settings_title">Aseta kahden sormen napautuksen toiminto</string>
+  <string name="mousepad_triple_tap_settings_title">Aseta kolmen sormen napautuksen toiminto</string>
+  <string name="mousepad_right_click">Oikea napsautus</string>
+  <string name="mousepad_middle_click">Keskinapsautus</string>
   <string name="category_connected_devices">Yhdistetyt laitteet</string>
-  <string name="category_not_paired_devices">Ei laitepareja</string>
+  <string name="category_not_paired_devices">Pariksi liitetyt laitteet</string>
   <string name="category_remembered_devices">Muistetut laitteet</string>
-  <string name="plugins_failed_to_load">Liitännäisten lataus epäonnistui (lisätietoa napsauttamalla):</string>
+  <string name="plugins_failed_to_load">Liitännäisten lataus epäonnistui (lisätietoa napauttamalla):</string>
   <string name="device_menu_plugins">Valitse liitännäiset</string>
-  <string name="device_menu_unpair">Irrota paritus</string>
+  <string name="device_menu_unpair">Poista laitepari</string>
   <string name="device_not_reachable">Laitepari tavoittamattomissa</string>
   <string name="unknown_device">Tuntematon laite</string>
   <string name="error_not_reachable">Laite tavoittamattomissa</string>
-  <string name="error_already_requested">Paritusta on jo pyydetty</string>
-  <string name="error_already_paired">Laitepari on jo muodostettu</string>
+  <string name="error_already_requested">Pariksi kytkemistä on jo pyydetty</string>
+  <string name="error_already_paired">Laite on jo kytketty pariksi</string>
   <string name="error_could_not_send_package">Ei voitu lähettää pakettia</string>
   <string name="error_timed_out">Aikakatkaisu</string>
   <string name="error_canceled_by_user">Käyttäjä perui</string>
   <string name="error_canceled_by_other_peer">Vertaiskäyttäjä perui</string>
   <string name="error_invalid_key">Vastaanotettiin väärä avain</string>
-  <string name="pair_requested">Parituspyyntö</string>
-  <string name="pairing_request_from">Parituspyyntö kohteesta %1s</string>
-  <string name="incoming_file_title">Parituspyyntö kohteesta %1s</string>
+  <string name="pair_requested">Paripyyntö</string>
+  <string name="pairing_request_from">Paripyyntö kohteesta %1s</string>
+  <string name="received_url_title">Vastaanotettiin linkki lähettäjältä %1s</string>
+  <string name="received_url_text">Avaa ”%1s” napauttamalla</string>
+  <string name="incoming_file_title">Saapuva tiedosto lähettäjältä %1s</string>
   <string name="incoming_file_text">%1s</string>
-  <string name="tap_to_answer">Vastaa napsauttamalla</string>
+  <string name="received_file_title">Vastaanotettiin tiedosto lähettäjältä %1s</string>
+  <string name="received_file_text">Avaa ”%1s” napauttamalla</string>
+  <string name="tap_to_answer">Vastaa napauttamalla</string>
   <string name="reconnect">Yhdistä uudelleen</string>
-  <string name="device_not_paired">Ei laiteparia</string>
-  <string name="request_pairing">Pyydä paritusta</string>
+  <string name="right_click">Lähetä oikean painikkeen napsautus</string>
+  <string name="middle_click">Lähetä keskipainikkeen napsautus</string>
+  <string name="show_keyboard">Näytä näppäimistö</string>
+  <string name="device_not_paired">Laitetta ei ole kytketty pariksi</string>
+  <string name="request_pairing">Pyydä pariksi kytkemistä</string>
   <string name="pairing_accept">Hyväksy</string>
   <string name="pairing_reject">Hylkää</string>
   <string name="device">Laite</string>
-  <string name="pair_device">Parita laite</string>
+  <string name="pair_device">Kytke laite pariksi</string>
   <string name="remote_control">Kauko-ohjain</string>
   <string name="settings">KDE Connectin asetukset</string>
   <string name="mpris_play">Toista</string>
@@ -62,11 +75,37 @@
   <string name="mpris_ff">Nopeasti eteenpäin</string>
   <string name="mpris_next">Seuraava</string>
   <string name="mpris_volume">Äänenvoimakkuus</string>
+  <string name="mpris_settings">Multimedia-asetukset</string>
+  <string name="mpris_time_settings_title">Aikaväli</string>
+  <string name="mpris_time_settings_summary">Säädä multimediatiedoston pikakelauksen aikaa.</string>
   <string name="share_to">Jaa…</string>
   <string name="protocol_version_older">Laite käyttää vanha yhteyskäytäntöversiota</string>
   <string name="protocol_version_newer">Laite käyttää uudempaa yhteyskäytäntöversiota</string>
   <string name="general_settings">Yleisasetukset</string>
+  <string name="plugin_settings">Asetukset</string>
+  <string name="plugin_settings_with_name">%s-asetukset</string>
   <string name="device_name">Laitenimi</string>
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">Virheellinen laitenimi</string>
+  <string name="shareplugin_text_saved">Vastaanotettiin tekstiä, tallennettiin leikepöydälle</string>
+  <string name="custom_devices_settings">Omien laitteiden luettelo</string>
+  <string name="custom_device_list">Omien laitteiden luettelo</string>
+  <string name="custom_device_list_summary">Omien laitteiden luettelo</string>
+  <string name="share_notification_preference">Äänekkäät ilmoitukset</string>
+  <string name="share_notification_preference_summary">Värise ja soita ääni tiedoston saapuessa</string>
+  <string name="sftp_internal_storage">Sisäinen muisti</string>
+  <string name="sftp_all_files">Kaikki tiedostot</string>
+  <string name="sftp_sdcard_num">SD-kortti %d</string>
+  <string name="sftp_sdcard">SD-kortti</string>
+  <string name="sftp_readonly">(vain luku)</string>
+  <string name="sftp_camera">Kamerakuvat</string>
+  <string name="add_host">Lisää kone/IP</string>
+  <string name="custom_dev_list_help">Käytä tätä vain, jos laitettasi ei tunnisteta automaattisesti. Kirjoita IP-osoite tai konenimi alle ja kosketa painiketta lisätäksesi sen luetteloon. Kosketa olemassa olevaa kohtaa poistaaksesi sen luettelosta.</string>
+  <string-array name="mpris_time_entries">
+    <item>10 sekuntia</item>
+    <item>20 sekuntia</item>
+    <item>30 sekuntia</item>
+    <item>1 minuutti</item>
+    <item>2 minuuttia</item>
+  </string-array>
 </resources>

res/values-fr/strings.xml

@@ -60,11 +60,25 @@
   <string name="mpris_ff">Avance rapide</string>
   <string name="mpris_next">Suivant</string>
   <string name="mpris_volume">Volume</string>
+  <string name="mpris_settings">Contrôles distants multimédia</string>
   <string name="share_to">Partager vers...</string>
   <string name="protocol_version_older">Le périphérique utilise une version ancienne du protocole</string>
   <string name="protocol_version_newer">Le périphérique utilise une version plus récente du protocole</string>
   <string name="general_settings">Paramètres généraux</string>
+  <string name="plugin_settings">Paramètres généraux</string>
+  <string name="plugin_settings_with_name">Accéder aux paramètres</string>
   <string name="device_name">Nom du périphérique</string>
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">Nom de périphérique non valable</string>
+  <string name="custom_devices_settings">Pas de périphériques</string>
+  <string name="custom_device_list">Pas de périphériques</string>
+  <string name="custom_device_list_summary">Pas de périphériques</string>
+  <string name="share_notification_preference">Synchronisation des notifications</string>
+  <string-array name="mpris_time_entries">
+    <item>10 seconds</item>
+    <item>20 seconds</item>
+    <item>30 seconds</item>
+    <item>1 minute</item>
+    <item>2 minutes</item>
+  </string-array>
 </resources>

res/values-hu/strings.xml

@@ -15,6 +15,8 @@
   <string name="pref_plugin_ping_desc">Pingek küldése és fogadása</string>
   <string name="pref_plugin_notifications">Értesítés szinkronizáció</string>
   <string name="pref_plugin_notifications_desc">Hozzáférés az értesítésekhez más eszközökről</string>
+  <string name="pref_plugin_sharereceiver">Megosztás vevő</string>
+  <string name="pref_plugin_sharereceiver_desc">Bejövő fájlok mentése a telefon háttértárára</string>
   <string name="plugin_not_available">Ez a funkció nem érhető el az ön Android verziójában</string>
   <string name="device_list_empty">Nincsenek eszközök</string>
   <string name="ok">OK</string>
@@ -23,7 +25,10 @@
   <string name="no_permissions">Jogot kell adnia az értesítésekhez való hozzáféréshez</string>
   <string name="send_ping">Ping küldése</string>
   <string name="open_mpris_controls">Távirányító megnyitása</string>
-  <string name="open_mousepad">Távirányító megnyitása</string>
+  <string name="open_mousepad">Érintőtábla vezérlő megnyitása</string>
+  <string name="mousepad_info">Mozgassa az ujját a képernyőn az egérkurzor mozgatásához</string>
+  <string name="mousepad_right_click">Jobb kattintás küldése</string>
+  <string name="mousepad_middle_click">Középső kattintás küldése</string>
   <string name="category_connected_devices">Csatlakoztatott eszközök</string>
   <string name="category_not_paired_devices">Nincsenek párosított eszközök</string>
   <string name="category_remembered_devices">Megjegyzett eszközök</string>
@@ -42,10 +47,16 @@
   <string name="error_invalid_key">Érvénytelen kulcs érkezett</string>
   <string name="pair_requested">Párosítás kérve</string>
   <string name="pairing_request_from">Párosítási kérés innen: %1s</string>
-  <string name="incoming_file_title">Párosítási kérés innen: %1s</string>
-  <string name="incoming_file_text">%s</string>
+  <string name="received_url_title">Hivatkozás érkezett innen: %1s</string>
+  <string name="received_url_text">Koppintson „%1s” megnyitásához</string>
+  <string name="incoming_file_title">Bejövő fájl innen: %1s</string>
+  <string name="incoming_file_text">%1s</string>
+  <string name="received_file_title">Fájl érkezett innen: %1s</string>
+  <string name="received_file_text">Koppintson „%1s” megnyitásához</string>
   <string name="tap_to_answer">Érintse meg a válaszhoz</string>
   <string name="reconnect">Újracsatlakozás</string>
+  <string name="right_click">Jobb kattintás küldése</string>
+  <string name="middle_click">Középső kattintás küldése</string>
   <string name="device_not_paired">Az eszköz nincs párosítva</string>
   <string name="request_pairing">Párosítás kérése</string>
   <string name="pairing_accept">Elfogadás</string>
@@ -60,11 +71,26 @@
   <string name="mpris_ff">Gyors előretekerés</string>
   <string name="mpris_next">Következő</string>
   <string name="mpris_volume">Hangerő</string>
+  <string name="mpris_settings">Multimedia távirányítók</string>
   <string name="share_to">Megosztás…</string>
   <string name="protocol_version_older">Ez az eszköz egy régi protokollverziót használ</string>
   <string name="protocol_version_newer">Ez az eszköz egy újabb protokollverziót használ</string>
   <string name="general_settings">Általános beállítások</string>
+  <string name="plugin_settings">Általános beállítások</string>
+  <string name="plugin_settings_with_name">Beállítások megnyitása</string>
   <string name="device_name">Eszköznév</string>
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">Érvénytelen eszköznév</string>
+  <string name="shareplugin_text_saved">Szöveg érkezett, elmentve a vágólapra</string>
+  <string name="custom_devices_settings">Nincsenek eszközök</string>
+  <string name="custom_device_list">Nincsenek eszközök</string>
+  <string name="custom_device_list_summary">Nincsenek eszközök</string>
+  <string name="share_notification_preference">Értesítés szinkronizáció</string>
+  <string-array name="mpris_time_entries">
+    <item>10 seconds</item>
+    <item>20 seconds</item>
+    <item>30 seconds</item>
+    <item>1 minute</item>
+    <item>2 minutes</item>
+  </string-array>
 </resources>

res/values-it/strings.xml

@@ -58,11 +58,25 @@
   <string name="mpris_ff">Avanti veloce</string>
   <string name="mpris_next">Successivo</string>
   <string name="mpris_volume">Volume</string>
+  <string name="mpris_settings">Telecomando multimediale</string>
   <string name="share_to">Condividi…</string>
   <string name="protocol_version_older">Questo dispositivo usa una vecchia versione del protocollo di rete</string>
   <string name="protocol_version_newer">Questo dispositivo usa una nuova versione del protocollo di rete</string>
   <string name="general_settings">Impostazioni generali</string>
+  <string name="plugin_settings">Impostazioni generali</string>
+  <string name="plugin_settings_with_name">Apri impostazioni</string>
   <string name="device_name">Nome dispositivo</string>
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">Nome non valido</string>
+  <string name="custom_devices_settings">Nessun dispositivo</string>
+  <string name="custom_device_list">Nessun dispositivo</string>
+  <string name="custom_device_list_summary">Nessun dispositivo</string>
+  <string name="share_notification_preference">Sincronizzazione notifiche</string>
+  <string-array name="mpris_time_entries">
+    <item>10 seconds</item>
+    <item>20 seconds</item>
+    <item>30 seconds</item>
+    <item>1 minute</item>
+    <item>2 minutes</item>
+  </string-array>
 </resources>

res/values-ja/strings.xml

@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+  <string-array name="mpris_time_entries">
+    <item>10 seconds</item>
+    <item>20 seconds</item>
+    <item>30 seconds</item>
+    <item>1 minute</item>
+    <item>2 minutes</item>
+  </string-array>
+</resources>

res/values-ko/strings.xml

@@ -60,11 +60,25 @@
   <string name="mpris_ff">빨리 감기</string>
   <string name="mpris_next">다음</string>
   <string name="mpris_volume">음량</string>
+  <string name="mpris_settings">멀티미디어 제어</string>
   <string name="share_to">다음으로 공유...</string>
   <string name="protocol_version_older">이 장치의 프로토콜 버전이 오래되었습니다</string>
   <string name="protocol_version_newer">이 장치의 프로토콜 버전이 더 새롭습니다</string>
   <string name="general_settings">일반 설정</string>
+  <string name="plugin_settings">일반 설정</string>
+  <string name="plugin_settings_with_name">설정 열기</string>
   <string name="device_name">장치 이름</string>
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">잘못된 장치 이름</string>
+  <string name="custom_devices_settings">장치 없음</string>
+  <string name="custom_device_list">장치 없음</string>
+  <string name="custom_device_list_summary">장치 없음</string>
+  <string name="share_notification_preference">알림 동기화</string>
+  <string-array name="mpris_time_entries">
+    <item>10 seconds</item>
+    <item>20 seconds</item>
+    <item>30 seconds</item>
+    <item>1 minute</item>
+    <item>2 minutes</item>
+  </string-array>
 </resources>

res/values-lt/strings.xml

@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='utf-8'?>
+<resources>
+  <string-array name="mpris_time_entries">
+    <item>10 seconds</item>
+    <item>20 seconds</item>
+    <item>30 seconds</item>
+    <item>1 minute</item>
+    <item>2 minutes</item>
+  </string-array>
+</resources>

res/values-nl/strings.xml

@@ -8,8 +8,8 @@
   <string name="pref_plugin_sftp_desc">Het bladeren in het bestandssysteem op afstand in de telefoon toestaan</string>
   <string name="pref_plugin_clipboard">Klembordsynchronisatie</string>
   <string name="pref_plugin_clipboard_desc">De inhoud van het klembord delen</string>
-  <string name="pref_plugin_mousepad">Afstandsbediening voor muis</string>
-  <string name="pref_plugin_mousepad_desc">Bedien uw muis van afstand</string>
+  <string name="pref_plugin_mousepad">Invoer op afstand</string>
+  <string name="pref_plugin_mousepad_desc">Uw telefoon gebruiken als een muis en toetsenbord</string>
   <string name="pref_plugin_mpris">Afstandsbediening van multimedia</string>
   <string name="pref_plugin_mpris_desc">Bedien de audio/video vanaf uw telefoon</string>
   <string name="pref_plugin_ping">Ping</string>
@@ -28,6 +28,10 @@
   <string name="open_mpris_controls">Afstandsbediening openen</string>
   <string name="open_mousepad">Afstandsbediening van touchpad openen</string>
   <string name="mousepad_info">Veeg met een vinger op het scherm om de muiscursor te verplaatsen</string>
+  <string name="mousepad_double_tap_settings_title">Klopactie met twee vingers instellen</string>
+  <string name="mousepad_triple_tap_settings_title">Klopactie met drie vingers instellen</string>
+  <string name="mousepad_right_click">Rechter muisklik</string>
+  <string name="mousepad_middle_click">Middelste muisklik</string>
   <string name="category_connected_devices">Verbonden apparaten</string>
   <string name="category_not_paired_devices">Geen gepaarde apparaten</string>
   <string name="category_remembered_devices">Onthouden apparaten</string>
@@ -56,6 +60,7 @@
   <string name="reconnect">Opnieuw verbinden</string>
   <string name="right_click">Verstuur een rechter muisklik</string>
   <string name="middle_click">Verstuur een middelste muisklik</string>
+  <string name="show_keyboard">Toetsenbord tonen</string>
   <string name="device_not_paired">Apparaat is niet gepaard</string>
   <string name="request_pairing">Verzoek voor maken van paar</string>
   <string name="pairing_accept">Accepteren</string>
@@ -70,12 +75,37 @@
   <string name="mpris_ff">Snel vooruit</string>
   <string name="mpris_next">Volgende</string>
   <string name="mpris_volume">Volume</string>
+  <string name="mpris_settings">Instellingen voor multimedia</string>
+  <string name="mpris_time_settings_title">Intervaltijd</string>
+  <string name="mpris_time_settings_summary">Pas de tijd aan om snel voorwaarts te gaan or terug te spoelen in een multimedia bestand.</string>
   <string name="share_to">Delen met...</string>
   <string name="protocol_version_older">Dit apparaat gebruikt een oude protocolversie</string>
   <string name="protocol_version_newer">Dit apparaat gebruikt een nieuwere protocolversie</string>
   <string name="general_settings">Algemene instellingen</string>
+  <string name="plugin_settings">Instellingen</string>
+  <string name="plugin_settings_with_name">Instellingen van %s</string>
   <string name="device_name">Apparaatnaam</string>
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">Ongeldige apparaatnaam</string>
   <string name="shareplugin_text_saved">Oontvangen tekst, opgeslagen op klembord</string>
+  <string name="custom_devices_settings">Aangepaste lijst apparaten</string>
+  <string name="custom_device_list">Aangepaste lijst apparaten</string>
+  <string name="custom_device_list_summary">Aangepaste lijst apparaten</string>
+  <string name="share_notification_preference">Luidruchtige meldingen</string>
+  <string name="share_notification_preference_summary">Vibreer en speel een geluidje bij ontvangen van een bestand</string>
+  <string name="sftp_internal_storage">Interne opslag</string>
+  <string name="sftp_all_files">Alle bestanden</string>
+  <string name="sftp_sdcard_num">SD-kaartje %d</string>
+  <string name="sftp_sdcard">SD-kaartje</string>
+  <string name="sftp_readonly">(alleen-lezen)</string>
+  <string name="sftp_camera">Afbeeldingen van camera</string>
+  <string name="add_host">Host/IP-adres toevoegen</string>
+  <string name="custom_dev_list_help">Deze optie alleen gebruiken als uw apparaat niet automatisch gedetecteerd wordt. Voer IP-adres of hostnaam hieronder in en klik op de knop om het aan de lijst toe te voegen. Klik op een bestaand item om het uit de lijst te verwijderen.</string>
+  <string-array name="mpris_time_entries">
+    <item>10 seconden</item>
+    <item>20 seconden</item>
+    <item>30 seconden</item>
+    <item>1 minuut</item>
+    <item>2 minuten</item>
+  </string-array>
 </resources>

res/values-pl/strings.xml

@@ -8,8 +8,8 @@
   <string name="pref_plugin_sftp_desc">Zezwala na zdalne przeglądanie systemu plików telefonu</string>
   <string name="pref_plugin_clipboard">Synchronizacja schowka</string>
   <string name="pref_plugin_clipboard_desc">Udostępnij zawartość schowka</string>
-  <string name="pref_plugin_mousepad">Zdalne sterowanie myszą</string>
-  <string name="pref_plugin_mousepad_desc">Steruj swoją myszą zdalnie</string>
+  <string name="pref_plugin_mousepad">Zdalne sterowanie</string>
+  <string name="pref_plugin_mousepad_desc">Użyj swojego telefonu jako myszy i klawiatury</string>
   <string name="pref_plugin_mpris">Zdalne sterowanie multimediami</string>
   <string name="pref_plugin_mpris_desc">Steruj dźwiękiem/obrazem ze swojego telefonu</string>
   <string name="pref_plugin_ping">Ping</string>
@@ -28,6 +28,10 @@
   <string name="open_mpris_controls">Otwórz zdalne sterowanie</string>
   <string name="open_mousepad">Otwórz sterowanie gładzikiem</string>
   <string name="mousepad_info">Przesuń kciukiem po ekranie, aby przesunąć wskaźnik myszy</string>
+  <string name="mousepad_double_tap_settings_title">Ustaw działanie po dwukrotnym stuknięciu palcem</string>
+  <string name="mousepad_triple_tap_settings_title">Ustaw działanie po trzykrotnym stuknięciu palcem</string>
+  <string name="mousepad_right_click">Naciśnięcie prawym</string>
+  <string name="mousepad_middle_click">Naciśnięcie środkowym</string>
   <string name="category_connected_devices">Podłączone urządzenia</string>
   <string name="category_not_paired_devices">Brak sparowanych urządzeń</string>
   <string name="category_remembered_devices">Zapamiętane urządzenia</string>
@@ -56,6 +60,7 @@
   <string name="reconnect">Połącz ponownie</string>
   <string name="right_click">Wyślij naciskając prawym</string>
   <string name="middle_click">Wyślij naciskając środkowym</string>
+  <string name="show_keyboard">Pokaż klawiaturę</string>
   <string name="device_not_paired">Urządzenie niesparowane</string>
   <string name="request_pairing">Zażądaj sparowania</string>
   <string name="pairing_accept">Przyjmij</string>
@@ -70,12 +75,37 @@
   <string name="mpris_ff">Przewiń do przodu</string>
   <string name="mpris_next">Następny</string>
   <string name="mpris_volume">Głośność</string>
+  <string name="mpris_settings">Ustawienia multimediów</string>
+  <string name="mpris_time_settings_title">Czas okresu</string>
+  <string name="mpris_time_settings_summary">Dostosuj czas do przewijania wprzód lub wstecz w pliku multimedialnym.</string>
   <string name="share_to">Współdziel z...</string>
   <string name="protocol_version_older">Urządzenie to używa starej wersji protokołu</string>
   <string name="protocol_version_newer">Urządzenie to używa nowszej wersji protokołu</string>
   <string name="general_settings">Ustawienia ogólne</string>
+  <string name="plugin_settings">Ustawienia</string>
+  <string name="plugin_settings_with_name">Ustawienia %s</string>
   <string name="device_name">Nazwa urządzenia</string>
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">Nieprawidłowa nazwa urządzenia</string>
   <string name="shareplugin_text_saved">Otrzymano tekst, zapisano do schowka</string>
+  <string name="custom_devices_settings">Lista własnych urządzeń</string>
+  <string name="custom_device_list">Lista własnych urządzeń</string>
+  <string name="custom_device_list_summary">Lista własnych urządzeń</string>
+  <string name="share_notification_preference">Hałaśliwe powiadomienia</string>
+  <string name="share_notification_preference_summary">Zadrżyj i odegraj dźwięk przy odebraniu pliku</string>
+  <string name="sftp_internal_storage">"Pamięć wewnętrzna "</string>
+  <string name="sftp_all_files">Wszystkie pliki</string>
+  <string name="sftp_sdcard_num">Karta SD %d</string>
+  <string name="sftp_sdcard">Karta SD</string>
+  <string name="sftp_readonly">(tylko do odczytu)</string>
+  <string name="sftp_camera">Zdjęcia z aparatu</string>
+  <string name="add_host">Dodaj gospodarza/IP</string>
+  <string name="custom_dev_list_help">Użyj tej opcji tylko wtedy, gdy twoje urządzenie nie jest samoczynnie wykrywane. Podaj adres IP i nazwę gospodarza poniżej i dotknij przycisku, aby dodać je do listy. Dotknij istniejącego elementu, aby usunąć go z listy.</string>
+  <string-array name="mpris_time_entries">
+    <item>10 sekund</item>
+    <item>20 sekund</item>
+    <item>30 sekund</item>
+    <item>1 minuta</item>
+    <item>2 minuty</item>
+  </string-array>
 </resources>

res/values-pt-rBR/strings.xml

@@ -8,8 +8,8 @@
   <string name="pref_plugin_sftp_desc">Permite navegar remotamente pelo sistema de arquivos telefone</string>
   <string name="pref_plugin_clipboard">Sincronizar área de transferência</string>
   <string name="pref_plugin_clipboard_desc">Compartilha o conteúdo da área de transferência</string>
-  <string name="pref_plugin_mousepad">Controle remoto do mouse</string>
-  <string name="pref_plugin_mousepad_desc">Controle seu mouse à distância</string>
+  <string name="pref_plugin_mousepad">Introdução de dados remota</string>
+  <string name="pref_plugin_mousepad_desc">Usar seu telefone como mouse ou teclado</string>
   <string name="pref_plugin_mpris">Controle remoto multimídia</string>
   <string name="pref_plugin_mpris_desc">Controla áudio e vídeo a partir do seu telefone</string>
   <string name="pref_plugin_ping">Ping</string>
@@ -28,6 +28,10 @@
   <string name="open_mpris_controls">Abra o controle remoto</string>
   <string name="open_mousepad">Abrir o controle do touchpad</string>
   <string name="mousepad_info">Mova um dedo na tela para mover o ponteiro do mouse</string>
+  <string name="mousepad_double_tap_settings_title">Definir a ação do toque com dois dedos</string>
+  <string name="mousepad_triple_tap_settings_title">Definir a ação do toque com três dedos</string>
+  <string name="mousepad_right_click">Botão direito</string>
+  <string name="mousepad_middle_click">Botão do meio</string>
   <string name="category_connected_devices">Dispositivos conectados</string>
   <string name="category_not_paired_devices">Dispositivos não emparelhados</string>
   <string name="category_remembered_devices">Dispositivos lembrados</string>
@@ -56,6 +60,7 @@
   <string name="reconnect">Reconectar</string>
   <string name="right_click">Enviar um Botão Direito</string>
   <string name="middle_click">Enviar um Botão do Meio</string>
+  <string name="show_keyboard">Mostrar teclado</string>
   <string name="device_not_paired">Dispositivo não emparelhado</string>
   <string name="request_pairing">Solicitar emparelhamento</string>
   <string name="pairing_accept">Aceitar</string>
@@ -70,12 +75,37 @@
   <string name="mpris_ff">Avançar rapidamente</string>
   <string name="mpris_next">Próximo</string>
   <string name="mpris_volume">Volume</string>
+  <string name="mpris_settings">Configurações de multimídia</string>
+  <string name="mpris_time_settings_title">Intervalo de tempo</string>
+  <string name="mpris_time_settings_summary">Ajuste o tempo para avançar ou retroceder um arquivo multimídia.</string>
   <string name="share_to">Compartilhar com...</string>
   <string name="protocol_version_older">Este dispositivo usa uma versão antiga do protocolo</string>
   <string name="protocol_version_newer">Este dispositivo usa uma versão mais recente do protocolo</string>
   <string name="general_settings">Configurações gerais</string>
+  <string name="plugin_settings">Configurações</string>
+  <string name="plugin_settings_with_name">Configurações do %s</string>
   <string name="device_name">Nome do dispositivo</string>
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">Nome do dispositivo inválido</string>
   <string name="shareplugin_text_saved">Texto recebido e salvo na área de transferência</string>
+  <string name="custom_devices_settings">Lista de dispositivos personalizada</string>
+  <string name="custom_device_list">Lista de dispositivos personalizada</string>
+  <string name="custom_device_list_summary">Lista de dispositivos personalizada</string>
+  <string name="share_notification_preference">Notificações barulhentas</string>
+  <string name="share_notification_preference_summary">Vibrar e tocar um som ao receber um arquivo</string>
+  <string name="sftp_internal_storage">Armazenamento interno</string>
+  <string name="sftp_all_files">Todos os arquivos</string>
+  <string name="sftp_sdcard_num">Cartão SD %d</string>
+  <string name="sftp_sdcard">Cartão SD</string>
+  <string name="sftp_readonly">(somente leitura)</string>
+  <string name="sftp_camera">Imagens da câmera</string>
+  <string name="add_host">Adicionar máquina/IP</string>
+  <string name="custom_dev_list_help">Use esta opção apenas se o seu dispositivo não for detectado automaticamente. Digite o endereço IP ou nome da máquina no campo abaixo e toque o botão para adicioná-lo à lista. Toque em um item existente para removê-lo da lista.</string>
+  <string-array name="mpris_time_entries">
+    <item>10 segundos</item>
+    <item>20 segundos</item>
+    <item>30 segundos</item>
+    <item>1 minuto</item>
+    <item>2 minutos</item>
+  </string-array>
 </resources>

res/values-pt/strings.xml

@@ -8,8 +8,8 @@
   <string name="pref_plugin_sftp_desc">Permite navegar pelo sistema de ficheiros remoto do telefone</string>
   <string name="pref_plugin_clipboard">Sincronização da área de transferência</string>
   <string name="pref_plugin_clipboard_desc">Partilhar o conteúdo da área de transferência</string>
-  <string name="pref_plugin_mousepad">Comando à Distância do Rato</string>
-  <string name="pref_plugin_mousepad_desc">Controlar o seu rato à distância</string>
+  <string name="pref_plugin_mousepad">Introdução remota de dados</string>
+  <string name="pref_plugin_mousepad_desc">Usar o seu telefone como um rato ou teclado</string>
   <string name="pref_plugin_mpris">Comando à distância multimédia</string>
   <string name="pref_plugin_mpris_desc">Controlar o áudio/vídeo a partir do seu telefone</string>
   <string name="pref_plugin_ping">Contacto</string>
@@ -28,6 +28,10 @@
   <string name="open_mpris_controls">Abrir o comando à distância</string>
   <string name="open_mousepad">Abrir o controlo do painel do rato</string>
   <string name="mousepad_info">Mova um dedo no ecrã para mover o cursor do rato</string>
+  <string name="mousepad_double_tap_settings_title">Definir a Acção do Toque com Dois Dedos</string>
+  <string name="mousepad_triple_tap_settings_title">Definir a Acção do Toque com Três Dedos</string>
+  <string name="mousepad_right_click">Botão direito</string>
+  <string name="mousepad_middle_click">Botão do meio</string>
   <string name="category_connected_devices">Dispositivos ligados</string>
   <string name="category_not_paired_devices">Dispositivos não emparelhados</string>
   <string name="category_remembered_devices">Dispositivos recordados</string>
@@ -56,6 +60,7 @@
   <string name="reconnect">Ligar de Novo</string>
   <string name="right_click">Enviar um Botão Direito</string>
   <string name="middle_click">Enviar um Botão do Meio</string>
+  <string name="show_keyboard">Mostrar o Teclado</string>
   <string name="device_not_paired">Dispositivo não emparelhado</string>
   <string name="request_pairing">Pedir o emparelhamento</string>
   <string name="pairing_accept">Aceitar</string>
@@ -70,12 +75,37 @@
   <string name="mpris_ff">Avançar</string>
   <string name="mpris_next">Seguinte</string>
   <string name="mpris_volume">Volume</string>
+  <string name="mpris_settings">Configuração Multimédia</string>
+  <string name="mpris_time_settings_title">Tempo do Intervalo</string>
+  <string name="mpris_time_settings_summary">Ajusta o tempo de avanço ou de recuo de um ficheiro multimédia.</string>
   <string name="share_to">Partilhar Com...</string>
   <string name="protocol_version_older">Este dispositivo usa uma versão antiga do protocolo</string>
   <string name="protocol_version_newer">Este dispositivo usa uma versão mais recente do protocolo</string>
   <string name="general_settings">Configuração Geral</string>
+  <string name="plugin_settings">Configuração</string>
+  <string name="plugin_settings_with_name">Configuração do %s</string>
   <string name="device_name">Nome do dispositivo</string>
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">Nome do dispositivo inválido</string>
   <string name="shareplugin_text_saved">Texto recebido e guardado na área de transferência</string>
+  <string name="custom_devices_settings">Lista de dispositivos personalizada</string>
+  <string name="custom_device_list">Lista de dispositivos personalizada</string>
+  <string name="custom_device_list_summary">Lista de dispositivos personalizada</string>
+  <string name="share_notification_preference">Notificações com ruído</string>
+  <string name="share_notification_preference_summary">Vibrar e tocar um som ao receber um ficheiro</string>
+  <string name="sftp_internal_storage">Armazenamento interno</string>
+  <string name="sftp_all_files">Todos os ficheiros</string>
+  <string name="sftp_sdcard_num">Cartão SD %d</string>
+  <string name="sftp_sdcard">Cartão SD</string>
+  <string name="sftp_readonly">(apenas para leitura)</string>
+  <string name="sftp_camera">Fotografias</string>
+  <string name="add_host">Adicionar uma máquina/IP</string>
+  <string name="custom_dev_list_help">Use esta opção apenas se o seu dispositivo não for detectado automaticamente. Indique o endereço IP ou nome da máquina em baixo e carregue no botão para a adicionar à lista. Carregue sobre um item existente para o remover da lista.</string>
+  <string-array name="mpris_time_entries">
+    <item>10 segundos</item>
+    <item>20 segundos</item>
+    <item>30 segundos</item>
+    <item>1 minuto</item>
+    <item>2 minutos</item>
+  </string-array>
 </resources>

res/values-ro/strings.xml

@@ -60,11 +60,25 @@
   <string name="mpris_ff">Derulare rapidă înainte</string>
   <string name="mpris_next">Următor</string>
   <string name="mpris_volume">Volum</string>
+  <string name="mpris_settings">Controale multimedia distante</string>
   <string name="share_to">Partajează cu...</string>
   <string name="protocol_version_older">Acest dispozitiv folosește o versiune veche a protocolului</string>
   <string name="protocol_version_newer">Acest dispozitiv folosește o versiune mai nouă a protocolului</string>
   <string name="general_settings">Configurări generale</string>
+  <string name="plugin_settings">Configurări generale</string>
+  <string name="plugin_settings_with_name">Deschide configurările</string>
   <string name="device_name">Denumire dispozitiv</string>
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">Denumire nevalidă a dispozitivului</string>
+  <string name="custom_devices_settings">Niciun dispozitiv</string>
+  <string name="custom_device_list">Niciun dispozitiv</string>
+  <string name="custom_device_list_summary">Niciun dispozitiv</string>
+  <string name="share_notification_preference">Sincronizare notificări</string>
+  <string-array name="mpris_time_entries">
+    <item>10 seconds</item>
+    <item>20 seconds</item>
+    <item>30 seconds</item>
+    <item>1 minute</item>
+    <item>2 minutes</item>
+  </string-array>
 </resources>

res/values-ru/strings.xml

@@ -55,10 +55,24 @@
   <string name="mpris_previous">Предыдущий</string>
   <string name="mpris_next">Следующее</string>
   <string name="mpris_volume">Громкость</string>
+  <string name="mpris_settings">ДУ для мультимедия</string>
   <string name="share_to">Сделать общим с...</string>
   <string name="protocol_version_older">Это устройство использует старую версию протокола</string>
   <string name="protocol_version_newer">Это устройство использует более свежую версию протокола</string>
   <string name="general_settings">Открыть настройки</string>
+  <string name="plugin_settings">Открыть настройки</string>
+  <string name="plugin_settings_with_name">Открыть настройки</string>
   <string name="device_name">Устройство не спарено</string>
   <string name="invalid_device_name">Недопустимый получатель ключа</string>
+  <string name="custom_devices_settings">Нет устройств</string>
+  <string name="custom_device_list">Нет устройств</string>
+  <string name="custom_device_list_summary">Нет устройств</string>
+  <string name="share_notification_preference">Синхронизация уведомлений</string>
+  <string-array name="mpris_time_entries">
+    <item>10 seconds</item>
+    <item>20 seconds</item>
+    <item>30 seconds</item>
+    <item>1 minute</item>
+    <item>2 minutes</item>
+  </string-array>
 </resources>

res/values-sk/strings.xml

@@ -8,8 +8,8 @@
   <string name="pref_plugin_sftp_desc">Umožní prístup na súborový systém telefónu vzdialene</string>
   <string name="pref_plugin_clipboard">Synchronizácia schránky</string>
   <string name="pref_plugin_clipboard_desc">Zdieľať obsah schránky</string>
-  <string name="pref_plugin_mousepad">Diaľkové ovládanie myšou</string>
-  <string name="pref_plugin_mousepad_desc">Ovládať vašu myš vzdialene</string>
+  <string name="pref_plugin_mousepad">Vzdialený vstup</string>
+  <string name="pref_plugin_mousepad_desc">Použiť váš telefón ako myš a klávesnicu</string>
   <string name="pref_plugin_mpris">Multimediálne diaľkové ovládače</string>
   <string name="pref_plugin_mpris_desc">Ovládať audio/video z vášho telefónu</string>
   <string name="pref_plugin_ping">Ping</string>
@@ -28,6 +28,10 @@
   <string name="open_mpris_controls">Otvoriť diaľkové ovládanie</string>
   <string name="open_mousepad">Otvoriť ovládanie touchpadu</string>
   <string name="mousepad_info">Presuňte prst na obrazovke na presun kurzora myši</string>
+  <string name="mousepad_double_tap_settings_title">Nastaviť akciu dvoch prstov</string>
+  <string name="mousepad_triple_tap_settings_title">Nastaviť akciu troch prstov</string>
+  <string name="mousepad_right_click">Kliknutie pravým tlačidlom</string>
+  <string name="mousepad_middle_click">Stredný klik</string>
   <string name="category_connected_devices">Pripojené zariadenia</string>
   <string name="category_not_paired_devices">Nespárované zariadenia</string>
   <string name="category_remembered_devices">Zapamätané zariadenia</string>
@@ -56,6 +60,7 @@
   <string name="reconnect">Znovu pripojiť</string>
   <string name="right_click">Poslať kliknutie pravým</string>
   <string name="middle_click">Poslať kliknutie stredným</string>
+  <string name="show_keyboard">Zobraziť klávesnicu</string>
   <string name="device_not_paired">Zariadenie nespárované</string>
   <string name="request_pairing">Požiadavka na spárovanie</string>
   <string name="pairing_accept">Prijať</string>
@@ -70,12 +75,37 @@
   <string name="mpris_ff">Pretočiť dopredu</string>
   <string name="mpris_next">Nasledovné</string>
   <string name="mpris_volume">Hlasitosť</string>
+  <string name="mpris_settings">Multimediálne nastavenia</string>
+  <string name="mpris_time_settings_title">Časový interval</string>
+  <string name="mpris_time_settings_summary">Prispôsobiť čas na pretáčanie dopredu alebo späť pre multimediálne súbory.</string>
   <string name="share_to">Zdieľať pre...</string>
   <string name="protocol_version_older">Toto zariadenie používa starú verziu protokolu</string>
   <string name="protocol_version_newer">Toto zariadenie používa novšiu verziu protokolu</string>
   <string name="general_settings">Všeobecné nastavenia</string>
+  <string name="plugin_settings">Nastavenia</string>
+  <string name="plugin_settings_with_name">%s nastavenia</string>
   <string name="device_name">Názov zariadenia</string>
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">Neplatný názov zariadenia</string>
   <string name="shareplugin_text_saved">Prijatý text, uložený do schránky</string>
+  <string name="custom_devices_settings">Zoznam vlastných zariadení</string>
+  <string name="custom_device_list">Zoznam vlastných zariadení</string>
+  <string name="custom_device_list_summary">Zoznam vlastných zariadení</string>
+  <string name="share_notification_preference">Hlučné pripomienky</string>
+  <string name="share_notification_preference_summary">Vibrovať a prehrať zvuk pri prijatí súboru</string>
+  <string name="sftp_internal_storage">Interné úložisko</string>
+  <string name="sftp_all_files">Všetky súbory</string>
+  <string name="sftp_sdcard_num">SD karta %d</string>
+  <string name="sftp_sdcard">SD karta</string>
+  <string name="sftp_readonly">(iba na čítanie)</string>
+  <string name="sftp_camera">Obrázky fotoaparátu</string>
+  <string name="add_host">Pridať hostiteľa/IP</string>
+  <string name="custom_dev_list_help">Túto voľbu použite iba vtedy, ak vaše zariadenie nie je automaticky detekované. Zadajte IP adresu alebo názov hostiteľa nižšie a kliknite na tlačidlo na pridanie do zoznamu. Kliknite na existujúcu položku na odstránenie jej zo zoznamu.</string>
+  <string-array name="mpris_time_entries">
+    <item>10 sekúnd</item>
+    <item>20 sekúnd</item>
+    <item>30 sekúnd</item>
+    <item>1 minúta</item>
+    <item>2 minúty</item>
+  </string-array>
 </resources>

res/values-sv/strings.xml

@@ -8,8 +8,7 @@
   <string name="pref_plugin_sftp_desc">Gör det möjligt att bläddra i telefonens filsystem från annan enhet</string>
   <string name="pref_plugin_clipboard">Synkronisera klippbord</string>
   <string name="pref_plugin_clipboard_desc">Dela klippbordets innehåll</string>
-  <string name="pref_plugin_mousepad">Musfjärrkontroll</string>
-  <string name="pref_plugin_mousepad_desc">Fjärrstyr musen</string>
+  <string name="pref_plugin_mousepad">Fjärrkontroll</string>
   <string name="pref_plugin_mpris">Fjärrkontroll av multimedia</string>
   <string name="pref_plugin_mpris_desc">Styr ljud och video från telefonen</string>
   <string name="pref_plugin_ping">Ping</string>
@@ -28,6 +27,8 @@
   <string name="open_mpris_controls">Öppna fjärrkontroll</string>
   <string name="open_mousepad">Öppna kontroll med tryckplatta</string>
   <string name="mousepad_info">Flytta ett finger på skärmen för att flytta muspekaren</string>
+  <string name="mousepad_right_click">Skicka högerklick</string>
+  <string name="mousepad_middle_click">Skicka mittenklick</string>
   <string name="category_connected_devices">Anslutna apparater</string>
   <string name="category_not_paired_devices">Inga parade apparater</string>
   <string name="category_remembered_devices">Ihågkomna apparater</string>
@@ -56,6 +57,7 @@
   <string name="reconnect">Anslut igen</string>
   <string name="right_click">Skicka högerklick</string>
   <string name="middle_click">Skicka mittenklick</string>
+  <string name="show_keyboard">Visa tangentbord</string>
   <string name="device_not_paired">Apparat inte ihopparad</string>
   <string name="request_pairing">Begära ihopparning</string>
   <string name="pairing_accept">Acceptera</string>
@@ -70,12 +72,35 @@
   <string name="mpris_ff">Snabbspola framåt</string>
   <string name="mpris_next">Nästa</string>
   <string name="mpris_volume">Volym</string>
+  <string name="mpris_settings">Multimediainställningar</string>
+  <string name="mpris_time_settings_title">Intervalltid</string>
+  <string name="mpris_time_settings_summary">Justera tiden för att snabbspola framåt eller tillbaka en multimediafil.</string>
   <string name="share_to">Dela med...</string>
   <string name="protocol_version_older">Apparaten använder en gammal protokollversion</string>
   <string name="protocol_version_newer">Apparaten använder en nyare protokollversion</string>
   <string name="general_settings">Allmänna inställningar</string>
+  <string name="plugin_settings">Inställningar</string>
+  <string name="plugin_settings_with_name">Öppna inställningarna</string>
   <string name="device_name">Apparatnamn</string>
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">Ogiltigt apparatnamn</string>
   <string name="shareplugin_text_saved">Tog emot text, spara på klippbordet</string>
+  <string name="custom_devices_settings">Inga apparater</string>
+  <string name="custom_device_list">Inga apparater</string>
+  <string name="custom_device_list_summary">Inga apparater</string>
+  <string name="share_notification_preference">Ljudliga underrättelser</string>
+  <string name="share_notification_preference_summary">Vibrera och spela ett ljud när en fil tas emot</string>
+  <string name="sftp_internal_storage">Intern lagring</string>
+  <string name="sftp_all_files">Alla filer</string>
+  <string name="sftp_sdcard_num">SD-kort %d</string>
+  <string name="sftp_sdcard">SD-kort</string>
+  <string name="sftp_readonly">(skrivskyddat)</string>
+  <string name="sftp_camera">Kamerabilder</string>
+  <string-array name="mpris_time_entries">
+    <item>10 sekunder</item>
+    <item>20 sekunder</item>
+    <item>30 sekunder</item>
+    <item>1 minut</item>
+    <item>2 minuter</item>
+  </string-array>
 </resources>

res/values-uk/strings.xml

@@ -8,8 +8,8 @@
   <string name="pref_plugin_sftp_desc">Надає змогу віддалено переглядати файлову систему телефону</string>
   <string name="pref_plugin_clipboard">Синхронізація буфера</string>
   <string name="pref_plugin_clipboard_desc">Спільне використання буфера обміну даними</string>
-  <string name="pref_plugin_mousepad">Дистанційне керування мишею</string>
-  <string name="pref_plugin_mousepad_desc">Віддалене керування вашою мишею</string>
+  <string name="pref_plugin_mousepad">Дистанційне введення</string>
+  <string name="pref_plugin_mousepad_desc">Скористайтеся телефоном як замінником миші і клавіатури</string>
   <string name="pref_plugin_mpris">Дистанційне керування відтворенням</string>
   <string name="pref_plugin_mpris_desc">Керування відтворенням звуку та відео з вашого телефону</string>
   <string name="pref_plugin_ping">Підтримання зв’язку</string>
@@ -28,6 +28,10 @@
   <string name="open_mpris_controls">Відкрити дистанційне керування</string>
   <string name="open_mousepad">Відкрити керування сенсорною панеллю</string>
   <string name="mousepad_info">Проведіть по екрану пальцем, щоб пересунути вказівник миші</string>
+  <string name="mousepad_double_tap_settings_title">Встановлення дії для торкання двома пальцями</string>
+  <string name="mousepad_triple_tap_settings_title">Встановлення дії для торкання трьома пальцями</string>
+  <string name="mousepad_right_click">Клацання правою</string>
+  <string name="mousepad_middle_click">Клацання середньою</string>
   <string name="category_connected_devices">З’єднані пристрої</string>
   <string name="category_not_paired_devices">Непов’язані пристрої</string>
   <string name="category_remembered_devices">Відомі пристрої</string>
@@ -56,6 +60,7 @@
   <string name="reconnect">З\'єднати знову</string>
   <string name="right_click">Надіслати клацання правою кнопкою</string>
   <string name="middle_click">Надіслати клацання лівою кнопкою</string>
+  <string name="show_keyboard">Показати клавіатуру</string>
   <string name="device_not_paired">Пристрій не пов’язано</string>
   <string name="request_pairing">Надіслати запит щодо пов’язування</string>
   <string name="pairing_accept">Прийняти</string>
@@ -70,12 +75,37 @@
   <string name="mpris_ff">Повний вперед</string>
   <string name="mpris_next">Далі</string>
   <string name="mpris_volume">Гучність</string>
+  <string name="mpris_settings">Мультимедійні параметри</string>
+  <string name="mpris_time_settings_title">Часовий інтервал</string>
+  <string name="mpris_time_settings_summary">Скоригувати час швидкого гортання вперед або назад у мультимедійному файлі.</string>
   <string name="share_to">Спільно використовувати з…</string>
   <string name="protocol_version_older">На цьому пристрої використовується стара версія протоколу</string>
   <string name="protocol_version_newer">На цьому пристрої використовується новіша версія протоколу</string>
   <string name="general_settings">Загальні параметри</string>
+  <string name="plugin_settings">Параметри</string>
+  <string name="plugin_settings_with_name">Параметри %s</string>
   <string name="device_name">Назва пристрою</string>
   <string name="device_name_preference_summary">%s</string>
   <string name="invalid_device_name">Некоректна назва пристрою</string>
   <string name="shareplugin_text_saved">Отримано текст, збережено до буфера обміну даними</string>
+  <string name="custom_devices_settings">Список нетипових пристроїв</string>
+  <string name="custom_device_list">Список нетипових пристроїв</string>
+  <string name="custom_device_list_summary">Список нетипових пристроїв</string>
+  <string name="share_notification_preference">Звукові сповіщення</string>
+  <string name="share_notification_preference_summary">Вібрація і відтворення звуку у відповідь на отримання файла</string>
+  <string name="sftp_internal_storage">Вбудоване сховище даних</string>
+  <string name="sftp_all_files">Усі файли</string>
+  <string name="sftp_sdcard_num">Картка SD %d</string>
+  <string name="sftp_sdcard">Картка SD</string>
+  <string name="sftp_readonly">(лише читання)</string>
+  <string name="sftp_camera">Знімки фотоапарата</string>
+  <string name="add_host">Додати вузол/IP</string>
+  <string name="custom_dev_list_help">Цим пунктом слід користуватися, лише якщо ваш пристрій не було визначено у автоматичному режимі. Введіть IP-адресу або назву вузла нижче і натисніть кнопку, щоб додати пункт до списку. Натисніть наявний пункт, щоб вилучити його зі списку.</string>
+  <string-array name="mpris_time_entries">
+    <item>10 секунд</item>
+    <item>20 секунд</item>
+    <item>30 секунд</item>
+    <item>1 хвилина</item>
+    <item>2 хвилини</item>
+  </string-array>
 </resources>

res/values/attrs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="MaxWidthImageButton">
+        <attr name="maxWidth" format="dimension" />
+    </declare-styleable>
+</resources>

res/values/strings.xml

@@ -9,8 +9,8 @@
     <string name="pref_plugin_sftp_desc">Allows to browse the phone\'s filesystem remotely</string>
     <string name="pref_plugin_clipboard">Clipboard sync</string>
     <string name="pref_plugin_clipboard_desc">Share the clipboard content</string>
-    <string name="pref_plugin_mousepad">Mouse Remote Control</string>
-    <string name="pref_plugin_mousepad_desc">Control your mouse remotely</string>
+    <string name="pref_plugin_mousepad">Remote input</string>
+    <string name="pref_plugin_mousepad_desc">Use your phone as a mouse and keyboard</string>
     <string name="pref_plugin_mpris">Multimedia remote controls</string>
     <string name="pref_plugin_mpris_desc">Control audio/video from your phone</string>
     <string name="pref_plugin_ping">Ping</string>
@@ -29,8 +29,18 @@
     <string name="open_mpris_controls">Open remote control</string>
     <string name="open_mousepad">Open touchpad control</string>
     <string name="mousepad_info">Move a finger on the screen to move the mouse cursor</string>
+    <string name="mousepad_double_tap_key" translatable="false">mousepad_double_tap_key</string>
+    <string name="mousepad_triple_tap_key" translatable="false">mousepad_triple_tap_key</string>
+    <string name="mousepad_right_value" translatable="false">right</string>
+    <string name="mousepad_middle_value" translatable="false">middle</string>
+    <string name="mousepad_double_tap_settings_title">Set Two Finger Tap Action</string>
+    <string name="mousepad_double_default" translatable="false">@string/mousepad_right_value</string>
+    <string name="mousepad_triple_default" translatable="false">@string/mousepad_middle_value</string>
+    <string name="mousepad_triple_tap_settings_title">Set Three Finger Tap Action</string>
+    <string name="mousepad_right_click">Right click</string>
+    <string name="mousepad_middle_click">Middle click</string>
     <string name="category_connected_devices">Connected devices</string>
-    <string name="category_not_paired_devices">Not paired devices</string>
+    <string name="category_not_paired_devices">Available devices</string>
     <string name="category_remembered_devices">Remembered devices</string>
     <string name="plugins_failed_to_load">Plugins failed to load (tap for more info):</string>
     <string name="device_menu_plugins">Select plugins</string>
@@ -57,6 +67,7 @@
     <string name="reconnect">Reconnect</string>
     <string name="right_click">Send Right Click</string>
     <string name="middle_click">Send Middle Click</string>
+    <string name="show_keyboard">Show Keyboard</string>
     <string name="device_not_paired">Device not paired</string>
     <string name="request_pairing">Request pairing</string>
     <string name="pairing_accept">Accept</string>
@@ -71,13 +82,59 @@
     <string name="mpris_ff">Fast-forward</string>
     <string name="mpris_next">Next</string>
     <string name="mpris_volume">Volume</string>
+    <string name="mpris_settings">Multimedia Settings</string>
+    <string name="mpris_time_settings_title">Interval Time</string>
+    <string name="mpris_time_settings_summary">Adjust the time to fast forward or rewind a multimedia file.</string>
+    <string name="mpris_time_key" translatable="false">mpris_interval_time</string>
+    <string name="mpris_time_default" translatable="false">10000000</string>
     <string name="share_to">Share To...</string>
     <string name="protocol_version_older">This device uses an old protocol version</string>
     <string name="protocol_version_newer">This device uses a newer protocol version</string>
     <string name="general_settings">General Settings</string>
+    <string name="plugin_settings">Settings</string>
+    <string name="plugin_settings_with_name">%s settings</string>
+    <string name="plugin_settings_key" translatable="false">_preferences</string>
     <string name="device_name">Device name</string>
     <string name="device_name_preference_summary">%s</string>
     <string name="invalid_device_name">Invalid device name</string>
     <string name="shareplugin_text_saved">Received text, saved to clipboard</string>
+    <string name="custom_devices_settings">Custom device list</string>
+    <string name="custom_device_list">Add devices by IP</string>
+    <string name="share_notification_preference">Noisy notifications</string>
+    <string name="share_notification_preference_summary">Vibrate and play a sound when receiving a file</string>
+    <string name="sftp_internal_storage">Internal storage</string>
+    <string name="sftp_all_files">All files</string>
+    <string name="sftp_sdcard_num">SD card %d</string>
+    <string name="sftp_sdcard">SD card</string>
+    <string name="sftp_readonly">(read only)</string>
+    <string name="sftp_camera">Camera pictures</string>
+    <string name="add_host">Add host/IP</string>
+    <string name="custom_dev_list_help">Use this option only if your device is not automatically detected. Enter IP address or hostname below and touch the button to add it to the list. Touch an existing item to remove it from the list.</string>
+
+    <string-array name="mpris_time_entries">
+        <item>10 seconds</item>
+        <item>20 seconds</item>
+        <item>30 seconds</item>
+        <item>1 minute</item>
+        <item>2 minutes</item>
+    </string-array>
+
+    <string-array name="mpris_time_entries_values" translatable="false">
+        <item>10000000</item>
+        <item>20000000</item>
+        <item>30000000</item>
+        <item>60000000</item>
+        <item>120000000</item>
+    </string-array>
+
+    <string-array name="mousepad_tap_entries" translatable="false">
+        <item>@string/mousepad_right_click</item>
+        <item>@string/mousepad_middle_click</item>
+    </string-array>
+
+    <string-array name="mousepad_tap_values" translatable="false">
+        <item>@string/mousepad_right_value</item>
+        <item>@string/mousepad_middle_value</item>
+    </string-array>
 
 </resources>

res/xml/plugin_mousepad_preferences.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ListPreference
+        android:id="@+id/mousepad_double_tap_preference"
+        android:key="@string/mousepad_double_tap_key"
+        android:title="@string/mousepad_double_tap_settings_title"
+        android:summary="%s"
+        android:entries="@array/mousepad_tap_entries"
+        android:entryValues="@array/mousepad_tap_values"
+        android:defaultValue="@string/mousepad_double_default" />
+
+    <ListPreference
+        android:id="@+id/mousepad_triple_tap_preference"
+        android:key="@string/mousepad_triple_tap_key"
+        android:title="@string/mousepad_triple_tap_settings_title"
+        android:summary="%s"
+        android:entries="@array/mousepad_tap_entries"
+        android:entryValues="@array/mousepad_tap_values"
+        android:defaultValue="@string/mousepad_triple_default" />
+
+</PreferenceScreen>

res/xml/plugin_mpris_preferences.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ListPreference
+        android:id="@+id/mpris_time_preference"
+        android:key="@string/mpris_time_key"
+        android:title="@string/mpris_time_settings_title"
+        android:summary="@string/mpris_time_settings_summary"
+        android:entries="@array/mpris_time_entries"
+        android:entryValues="@array/mpris_time_entries_values"
+        android:defaultValue="@string/mpris_time_default" />
+
+</PreferenceScreen>

res/xml/plugin_share_preferences.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <CheckBoxPreference
+        android:id="@+id/share_notification_preference"
+        android:key="share_notification_preference"
+        android:title="@string/share_notification_preference"
+        android:summary="@string/share_notification_preference_summary"
+        android:defaultValue="true" />
+
+</PreferenceScreen>

src/main/java/org/kde/kdeconnect/Backends/LoopbackBackend/LoopbackLinkProvider.java

@@ -1,43 +0,0 @@
-package org.kde.kdeconnect.Backends.LoopbackBackend;
-
-import android.content.Context;
-
-import org.kde.kdeconnect.Backends.BaseLinkProvider;
-import org.kde.kdeconnect.NetworkPackage;
-
-public class LoopbackLinkProvider extends BaseLinkProvider {
-
-    private final Context context;
-
-    public LoopbackLinkProvider(Context context) {
-        this.context = context;
-    }
-
-    @Override
-    public void onStart() {
-        onNetworkChange();
-    }
-
-    @Override
-    public void onStop() {
-
-    }
-
-    @Override
-    public void onNetworkChange() {
-
-        NetworkPackage np = NetworkPackage.createIdentityPackage(context);
-        connectionAccepted(np, new LoopbackLink(this));
-
-    }
-
-    @Override
-    public int getPriority() {
-        return 0;
-    }
-
-    @Override
-    public String getName() {
-        return "LoopbackLinkProvider";
-    }
-}

src/main/java/org/kde/kdeconnect/Helpers/ImagesHelper.java

@@ -1,23 +0,0 @@
-package org.kde.kdeconnect.Helpers;
-
-import android.graphics.Bitmap;
-import android.graphics.Canvas;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-
-public class ImagesHelper {
-
-    public static Bitmap drawableToBitmap (Drawable drawable) {
-        if (drawable instanceof BitmapDrawable) {
-            return ((BitmapDrawable)drawable).getBitmap();
-        }
-
-        Bitmap bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
-        Canvas canvas = new Canvas(bitmap);
-        drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
-        drawable.draw(canvas);
-
-        return bitmap;
-    }
-
-}

src/main/java/org/kde/kdeconnect/Plugins/SftpPlugin/SftpPlugin.java

@@ -1,79 +0,0 @@
-package org.kde.kdeconnect.Plugins.SftpPlugin;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.Context;
-import android.graphics.drawable.Drawable;
-import android.os.Environment;
-import android.widget.Button;
-
-import org.kde.kdeconnect.NetworkPackage;
-import org.kde.kdeconnect.Plugins.Plugin;
-import org.kde.kdeconnect_tp.R;
-
-public class SftpPlugin extends Plugin {
-
-    private static final SimpleSftpServer server = new SimpleSftpServer();
-
-    /*static {
-        PluginFactory.registerPlugin(SftpPlugin.class);
-    }*/
-
-    @Override
-    public String getPluginName() {return "plugin_sftp";}
-
-    @Override
-    public String getDisplayName() {
-        return context.getResources().getString(R.string.pref_plugin_sftp);
-    }
-
-    @Override
-    public String getDescription() {
-        return context.getResources().getString(R.string.pref_plugin_sftp_desc);
-    }
-
-    @Override
-    public Drawable getIcon() {
-        return context.getResources().getDrawable(R.drawable.icon);
-    }
-
-    @Override
-    public boolean isEnabledByDefault() {return true;}
-
-    @Override
-    public boolean onCreate() {
-        server.init(context, device);
-        return true;
-    }
-
-    @Override
-    public void onDestroy() {
-        server.stop();
-    }
-
-    @Override
-    public boolean onPackageReceived(NetworkPackage np) {
-        if (!np.getType().equals(NetworkPackage.PACKAGE_TYPE_SFTP)) return false;
-
-        if (np.getBoolean("startBrowsing")) {
-            if (server.start()) {
-                NetworkPackage np2 = new NetworkPackage(NetworkPackage.PACKAGE_TYPE_SFTP);
-                np2.set("ip", server.getLocalIpAddress());
-                np2.set("port", server.port);
-                np2.set("user", server.passwordAuth.getUser());
-                np2.set("password", server.passwordAuth.getPassword());
-                np2.set("path", Environment.getExternalStorageDirectory().getAbsolutePath());
-                device.sendPackage(np2);
-                return true;
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public AlertDialog getErrorDialog(Context baseContext) {return null;}
-
-    @Override
-    public Button getInterfaceButton(Activity activity) {return null;}
-
-}

src/main/java/org/kde/kdeconnect/UserInterface/List/ButtonItem.java

@@ -1,20 +0,0 @@
-package org.kde.kdeconnect.UserInterface.List;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.Button;
-
-public class ButtonItem implements ListAdapter.Item {
-
-	private final Button button;
-
-	public ButtonItem(Button b) {
-        this.button = b;
-	}
-
-    @Override
-    public View inflateView(LayoutInflater layoutInflater) {
-        return button;
-    }
-
-}

src/main/java/org/kde/kdeconnect/UserInterface/List/EntryItem.java

@@ -1,27 +0,0 @@
-package org.kde.kdeconnect.UserInterface.List;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.TextView;
-
-import org.kde.kdeconnect_tp.R;
-
-public class EntryItem implements ListAdapter.Item {
-
-	private final String title;
-
-	public EntryItem(String title) {
-		this.title = title;
-	}
-
-    @Override
-    public View inflateView(LayoutInflater layoutInflater) {
-        View v = layoutInflater.inflate(R.layout.list_item_entry, null);
-
-        TextView titleView = (TextView)v.findViewById(R.id.list_item_entry_title);
-        if (titleView != null) titleView.setText(title);
-
-        return v;
-    }
-
-}

src/main/java/org/kde/kdeconnect/UserInterface/List/ListAdapter.java

@@ -1,33 +0,0 @@
-package org.kde.kdeconnect.UserInterface.List;
-
-import android.content.Context;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-
-import java.util.ArrayList;
-
-public class ListAdapter extends ArrayAdapter<ListAdapter.Item> {
-
-    public interface Item {
-        public View inflateView(LayoutInflater layoutInflater);
-    }
-
-	private final ArrayList<Item> items;
-	private final LayoutInflater layoutInflater;
-
-	public ListAdapter(Context context, ArrayList<Item> items) {
-		super(context, 0, items);
-        this.items = items;
-		layoutInflater = (LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-	}
-
-
-	@Override
-	public View getView(int position, View convertView, ViewGroup parent) {
-		final Item i = items.get(position);
-        return i.inflateView(layoutInflater);
-    }
-
-}

src/main/java/org/kde/kdeconnect/UserInterface/List/SectionItem.java

@@ -1,38 +0,0 @@
-package org.kde.kdeconnect.UserInterface.List;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.TextView;
-
-import org.kde.kdeconnect_tp.R;
-
-public class SectionItem implements ListAdapter.Item {
-
-	private final String title;
-    public boolean isEmpty;
-
-	public SectionItem(String title) {
-		this.title = title;
-        this.isEmpty = false;
-	}
-
-    @Override
-    public View inflateView(LayoutInflater layoutInflater) {
-
-        View v = layoutInflater.inflate(R.layout.list_item_category, null);
-
-        v.setOnClickListener(null);
-        v.setOnLongClickListener(null);
-        v.setLongClickable(false);
-
-        TextView sectionView = (TextView) v.findViewById(R.id.list_item_category_text);
-        sectionView.setText(title);
-
-        if (isEmpty) {
-            v.findViewById(R.id.list_item_category_empty_placeholder).setVisibility(View.VISIBLE);
-        }
-
-        return v;
-
-    }
-}

src/main/java/org/kde/kdeconnect/UserInterface/List/TextItem.java

@@ -1,27 +0,0 @@
-package org.kde.kdeconnect.UserInterface.List;
-
-import android.view.LayoutInflater;
-import android.view.View;
-import android.widget.TextView;
-
-import android.R;
-
-public class TextItem implements ListAdapter.Item {
-
-	private final String title;
-
-	public TextItem(String title) {
-        this.title = title;
-    }
-
-    @Override
-    public View inflateView(LayoutInflater layoutInflater) {
-
-        TextView v = new TextView(layoutInflater.getContext());
-        v.setText(title);
-        v.setTextAppearance(layoutInflater.getContext(), R.style.TextAppearance_DeviceDefault_Medium);
-        return v;
-
-    }
-
-}

src/main/java/org/kde/kdeconnect/UserInterface/PreferenceListAdapter.java

@@ -1,27 +0,0 @@
-package org.kde.kdeconnect.UserInterface;
-
-import android.content.Context;
-import android.preference.Preference;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ArrayAdapter;
-
-import java.util.ArrayList;
-
-public class PreferenceListAdapter extends ArrayAdapter<Preference> {
-
-
-    private final ArrayList<Preference> localList;
-
-    public PreferenceListAdapter(Context context, ArrayList<Preference> items) {
-        super(context,0, items);
-        localList = items;
-    }
-
-    @Override
-    public View getView(int position, View convertView, ViewGroup parent) {
-        Preference preference = localList.get(position);
-        return preference.getView(convertView, parent);
-    }
-
-}

src/main/java/org/kde/kdeconnect/UserInterface/SettingsActivity.java

@@ -1,69 +0,0 @@
-package org.kde.kdeconnect.UserInterface;
-
-import android.app.ListActivity;
-import android.os.Bundle;
-import android.preference.CheckBoxPreference;
-import android.preference.Preference;
-import android.view.View;
-import android.widget.AdapterView;
-
-import org.kde.kdeconnect.BackgroundService;
-import org.kde.kdeconnect.Device;
-import org.kde.kdeconnect.Plugins.PluginFactory;
-
-import java.util.ArrayList;
-import java.util.Set;
-
-public class SettingsActivity extends ListActivity {
-
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        final String deviceId = getIntent().getStringExtra("deviceId");
-        BackgroundService.RunCommand(getApplicationContext(), new BackgroundService.InstanceCallback() {
-            @Override
-            public void onServiceStart(BackgroundService service) {
-
-                final Device device = service.getDevice(deviceId);
-                Set<String> plugins = PluginFactory.getAvailablePlugins();
-
-                final ArrayList<Preference> preferences = new ArrayList<Preference>();
-                for (final String pluginName : plugins) {
-                    CheckBoxPreference pref = new CheckBoxPreference(getBaseContext());
-                    PluginFactory.PluginInfo info = PluginFactory.getPluginInfo(getBaseContext(), pluginName);
-                    pref.setKey(pluginName);
-                    pref.setTitle(info.getDisplayName());
-                    pref.setSummary(info.getDescription());
-                    pref.setChecked(device.isPluginEnabled(pluginName));
-                    preferences.add(pref);
-                }
-
-                setListAdapter(new PreferenceListAdapter(SettingsActivity.this, preferences));
-                getListView().setOnItemClickListener(new AdapterView.OnItemClickListener() {
-                    @Override
-                    public void onItemClick(AdapterView<?> adapterView, View view, int i, long l) {
-
-                        CheckBoxPreference pref = (CheckBoxPreference)preferences.get(i);
-
-                        boolean enabled = device.isPluginEnabled(pref.getKey());
-                        device.setPluginEnabled(pref.getKey(), !enabled);
-
-                        pref.setChecked(!enabled);
-
-                        getListAdapter().getView(i, view, null); //This will refresh the view (yes, this is the way to do it)
-
-                    }
-                });
-
-                getListView().setPadding(16,16,16,16);
-
-            }
-        });
-
-
-
-    }
-
-
-}

src/main/res/layout/activity_device.xml

@@ -1,26 +0,0 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    tools:context=".MainActivity"
-    android:orientation="vertical">
-
-    <ListView
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:id="@+id/buttons_list"
-        android:layout_weight="1"
-    />
-
-    <ListView
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:id="@+id/errors_list"
-        android:layout_weight="1"
-    />
-
-</LinearLayout>

src/main/res/values-ja/strings.xml

@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources/>

src/main/res/values-lt/strings.xml

@@ -1,2 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources/>

src/main/res/values-sw600dp/dimens.xml

@@ -1,4 +0,0 @@
-<resources>
-    <!-- Customize dimensions originally defined in res/values/dimens.xml (such as
-         screen margins) for sw600dp devices (e.g. 7" tablets) here. -->
-</resources>

src/main/res/values-sw720dp-land/dimens.xml

@@ -1,5 +0,0 @@
-<resources>
-    <!-- Customize dimensions originally defined in res/values/dimens.xml (such as
-         screen margins) for sw720dp devices (e.g. 10" tablets) in landscape here. -->
-    <dimen name="activity_horizontal_margin">128dp</dimen>
-</resources>

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

@@ -1,3 +1,23 @@
+/*
+ * Copyright 2014 Albert Vaca Cintora <albertvaka@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+*/
+
 package org.kde.kdeconnect.Backends;
 
 import org.kde.kdeconnect.NetworkPackage;

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

@@ -1,3 +1,23 @@
+/*
+ * Copyright 2014 Albert Vaca Cintora <albertvaka@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+*/
+
 package org.kde.kdeconnect.Backends;
 
 import android.util.Log;
@@ -43,7 +63,7 @@ public abstract class BaseLinkProvider {
     public abstract void onStop();
     public abstract void onNetworkChange();
 
-    public abstract int getPriority();
+    //public abstract int getPriority();
     public abstract String getName();
 
 }

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

@@ -1,3 +1,23 @@
+/*
+ * Copyright 2014 Albert Vaca Cintora <albertvaka@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+*/
+
 package org.kde.kdeconnect.Backends.LanBackend;
 
 import android.util.Log;

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

@@ -1,9 +1,30 @@
+/*
+ * Copyright 2014 Albert Vaca Cintora <albertvaka@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+*/
+
 package org.kde.kdeconnect.Backends.LanBackend;
 
 import android.content.Context;
 import android.os.AsyncTask;
-import android.util.Log;
+import android.preference.PreferenceManager;
 import android.support.v4.util.LongSparseArray;
+import android.util.Log;
 
 import org.apache.mina.core.future.ConnectFuture;
 import org.apache.mina.core.future.IoFuture;
@@ -19,16 +40,19 @@ import org.apache.mina.transport.socket.nio.NioSocketAcceptor;
 import org.apache.mina.transport.socket.nio.NioSocketConnector;
 import org.kde.kdeconnect.Backends.BaseLinkProvider;
 import org.kde.kdeconnect.NetworkPackage;
+import org.kde.kdeconnect.UserInterface.CustomDevicesActivity;
 
 import java.net.DatagramPacket;
 import java.net.DatagramSocket;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.nio.charset.Charset;
+import java.util.ArrayList;
 import java.util.HashMap;
 
 public class LanLinkProvider extends BaseLinkProvider {
 
+    public static final String KEY_CUSTOM_DEVLIST_PREFERENCE  = "device_list_preference";
     private final static int port = 1714;
 
     private final Context context;
@@ -167,6 +191,10 @@ public class LanLinkProvider extends BaseLinkProvider {
         String deviceId = identityPackage.getString("deviceId");
         Log.i("LanLinkProvider","addLink to "+deviceId);
         LanLink oldLink = visibleComputers.get(deviceId);
+        if (oldLink == link) {
+            Log.e("KDEConnect", "LanLinkProvider: oldLink == link. This should not happen!");
+            return;
+        }
         visibleComputers.put(deviceId, link);
         connectionAccepted(identityPackage, link);
         if (oldLink != null) {
@@ -237,20 +265,29 @@ public class LanLinkProvider extends BaseLinkProvider {
         new AsyncTask<Void,Void,Void>() {
             @Override
             protected Void doInBackground(Void... voids) {
-
-                try {
-                    NetworkPackage identity = NetworkPackage.createIdentityPackage(context);
-                    identity.set("tcpPort",finalTcpPort);
-                    byte[] b = identity.serialize().getBytes("UTF-8");
-                    DatagramPacket packet = new DatagramPacket(b, b.length, InetAddress.getByAddress(new byte[]{-1,-1,-1,-1}), port);
-                    DatagramSocket socket = new DatagramSocket();
-                    socket.setReuseAddress(true);
-                    socket.setBroadcast(true);
-                    socket.send(packet);
-                    //Log.e("LanLinkProvider","Udp identity package sent");
-                } catch(Exception e) {
-                    e.printStackTrace();
-                    Log.e("LanLinkProvider","Sending udp identity package failed");
+                String deviceListPrefs = PreferenceManager.getDefaultSharedPreferences(context).getString(
+                        KEY_CUSTOM_DEVLIST_PREFERENCE, "");
+                ArrayList<String> iplist = new ArrayList<String>();
+                if (!deviceListPrefs.isEmpty()) {
+                    iplist = CustomDevicesActivity.deserializeIpList(deviceListPrefs);
+                }
+                iplist.add("255.255.255.255");
+                for (String ipstr : iplist) {
+                    try {
+                        InetAddress client = InetAddress.getByName(ipstr);
+                        NetworkPackage identity = NetworkPackage.createIdentityPackage(context);
+                        identity.set("tcpPort", finalTcpPort);
+                        byte[] b = identity.serialize().getBytes("UTF-8");
+                        DatagramPacket packet = new DatagramPacket(b, b.length, client, port);
+                        DatagramSocket socket = new DatagramSocket();
+                        socket.setReuseAddress(true);
+                        socket.setBroadcast(true);
+                        socket.send(packet);
+                        //Log.i("LanLinkProvider","Udp identity package sent to address "+packet.getAddress());
+                    } catch(Exception e) {
+                        e.printStackTrace();
+                        Log.e("LanLinkProvider","Sending udp identity package failed. Invalid address? ("+ipstr+")");
+                    }
                 }
 
                 return null;
@@ -263,25 +300,21 @@ public class LanLinkProvider extends BaseLinkProvider {
 
     @Override
     public void onNetworkChange() {
-
         onStop();
         onStart();
-
     }
 
     @Override
     public void onStop() {
-
         udpAcceptor.unbind();
         tcpAcceptor.unbind();
-
     }
-
+/*
     @Override
     public int getPriority() {
         return 1000;
     }
-
+*/
     @Override
     public String getName() {
         return "LanLinkProvider";

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

@@ -1,3 +1,23 @@
+/*
+ * Copyright 2014 Albert Vaca Cintora <albertvaka@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+*/
+
 package org.kde.kdeconnect.Backends.LoopbackBackend;
 
 import android.util.Log;

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

@@ -0,0 +1,60 @@
+/*
+ * Copyright 2014 Albert Vaca Cintora <albertvaka@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+*/
+
+package org.kde.kdeconnect.Backends.LoopbackBackend;
+
+import android.content.Context;
+
+import org.kde.kdeconnect.Backends.BaseLinkProvider;
+import org.kde.kdeconnect.NetworkPackage;
+
+public class LoopbackLinkProvider extends BaseLinkProvider {
+
+    private final Context context;
+
+    public LoopbackLinkProvider(Context context) {
+        this.context = context;
+    }
+
+    @Override
+    public void onStart() {
+        onNetworkChange();
+    }
+
+    @Override
+    public void onStop() {
+    }
+
+    @Override
+    public void onNetworkChange() {
+        NetworkPackage np = NetworkPackage.createIdentityPackage(context);
+        connectionAccepted(np, new LoopbackLink(this));
+    }
+/*
+    @Override
+    public int getPriority() {
+        return 0;
+    }
+*/
+    @Override
+    public String getName() {
+        return "LoopbackLinkProvider";
+    }
+}

src/org/kde/kdeconnect/BackgroundService.java

@@ -1,3 +1,23 @@
+/*
+ * Copyright 2014 Albert Vaca Cintora <albertvaka@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+*/
+
 package org.kde.kdeconnect;
 
 import android.app.Service;
@@ -272,7 +292,6 @@ public class BackgroundService extends Service {
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
         //This will be called for each intent launch, even if the service is already started and it is reused
-        Log.i("BackgroundService","onStartCommand");
         mutex.lock();
         for (InstanceCallback c : callbacks) {
             c.onServiceStart(this);

src/org/kde/kdeconnect/Device.java

@@ -1,3 +1,23 @@
+/*
+ * Copyright 2014 Albert Vaca Cintora <albertvaka@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+*/
+
 package org.kde.kdeconnect;
 
 import android.app.Notification;
@@ -321,12 +341,14 @@ public class Device implements BaseLink.PackageReceiver {
 
         Log.i("Device","addLink "+link.getLinkProvider().getName()+" -> "+getName() + " active links: "+ links.size());
 
+        /*
         Collections.sort(links, new Comparator<BaseLink>() {
             @Override
             public int compare(BaseLink o, BaseLink o2) {
                 return o2.getLinkProvider().getPriority() - o.getLinkProvider().getPriority();
             }
         });
+        */
 
         link.addPackageReceiver(this);
 
@@ -406,7 +428,7 @@ public class Device implements BaseLink.PackageReceiver {
                             .setTicker(res.getString(R.string.pair_requested))
                             .setSmallIcon(android.R.drawable.ic_menu_help)
                             .setAutoCancel(true)
-                            .setDefaults(Notification.DEFAULT_SOUND)
+                            .setDefaults(Notification.DEFAULT_ALL)
                             .build();
 
 
@@ -557,24 +579,25 @@ public class Device implements BaseLink.PackageReceiver {
             @Override
             public void run() {
 
+                boolean success;
                 try {
-                    boolean success = plugin.onCreate();
-                    if (!success) {
-                        Log.e("addPlugin", "plugin failed to load " + name);
-                        failedPlugins.put(name, plugin);
-                        return;
-                    }
+                    success = plugin.onCreate();
                 } catch (Exception e) {
-                    failedPlugins.put(name, plugin);
+                    success = false;
                     e.printStackTrace();
                     Log.e("addPlugin", "Exception loading plugin " + name);
                     return;
                 }
 
-                //Log.e("addPlugin","added " + name);
-
-                failedPlugins.remove(name);
-                plugins.put(name, plugin);
+                if (success) {
+                    //Log.e("addPlugin","added " + name);
+                    failedPlugins.remove(name);
+                    plugins.put(name, plugin);
+                } else {
+                    Log.e("addPlugin", "plugin failed to load " + name);
+                    plugins.remove(name);
+                    failedPlugins.put(name, plugin);
+                }
 
                 for (PluginsChangedListener listener : pluginsChangedListeners) {
                     listener.onPluginsChanged(Device.this);
@@ -592,6 +615,7 @@ public class Device implements BaseLink.PackageReceiver {
 
         if (plugin == null) {
             if (failedPlugin == null) {
+                //Not found
                 return false;
             }
             plugin = failedPlugin;
@@ -599,20 +623,17 @@ public class Device implements BaseLink.PackageReceiver {
 
         try {
             plugin.onDestroy();
+            //Log.e("removePlugin","removed " + name);
         } catch (Exception e) {
             e.printStackTrace();
             Log.e("removePlugin","Exception calling onDestroy for plugin "+name);
-            return false;
         }
 
-        //Log.e("removePlugin","removed " + name);
-
         for (PluginsChangedListener listener : pluginsChangedListeners) {
             listener.onPluginsChanged(this);
         }
 
         return true;
-
     }
 
     public void setPluginEnabled(String pluginName, boolean value) {
@@ -627,6 +648,9 @@ public class Device implements BaseLink.PackageReceiver {
         return enabled;
     }
 
+    public boolean hasPluginsLoaded() {
+        return !plugins.isEmpty() || !failedPlugins.isEmpty();
+    }
 
     public void reloadPluginsFromSettings() {
 
@@ -646,9 +670,7 @@ public class Device implements BaseLink.PackageReceiver {
             }
         }
 
-        for (PluginsChangedListener listener : pluginsChangedListeners) {
-            listener.onPluginsChanged(this);
-        }
+        //No need to call PluginsChangedListeners because addPlugin and removePlugin already do so
     }
 
     public HashMap<String,Plugin> getLoadedPlugins() {

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

@@ -1,3 +1,23 @@
+/*
+ * Copyright 2014 Albert Vaca Cintora <albertvaka@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+*/
+
 package org.kde.kdeconnect.Helpers;
 
 import android.content.Context;
@@ -49,4 +69,4 @@ public class AppsHelper {
 
 
 
-}
+}

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

@@ -1,3 +1,23 @@
+/*
+ * Copyright 2014 Albert Vaca Cintora <albertvaka@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+*/
+
 package org.kde.kdeconnect.Helpers;
 
 import android.content.Context;
@@ -43,4 +63,4 @@ public class ContactsHelper {
         return number;
 
     }
-}
+}

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

@@ -1,3 +1,23 @@
+/*
+ * Copyright 2014 Albert Vaca Cintora <albertvaka@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+*/
+
 package org.kde.kdeconnect.Helpers;
 
 import android.content.res.Configuration;

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

@@ -1,3 +1,23 @@
+/*
+ * Copyright 2014 Albert Vaca Cintora <albertvaka@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+*/
+
 package org.kde.kdeconnect.Helpers;
 
 import android.webkit.MimeTypeMap;

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

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2014 Albert Vaca Cintora <albertvaka@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+*/
+
+package org.kde.kdeconnect.Helpers;
+
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+
+public class ImagesHelper {
+
+    public static Bitmap drawableToBitmap (Drawable drawable) {
+        if (drawable instanceof BitmapDrawable) {
+            return ((BitmapDrawable)drawable).getBitmap();
+        }
+
+        Bitmap bitmap = Bitmap.createBitmap(drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(bitmap);
+        drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
+        drawable.draw(canvas);
+
+        return bitmap;
+    }
+
+}