Increased version number to release

Sorry for the conflicts caused by moving the sources!

.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="732"
-    android:versionName="0.7.3.2">
+    android:versionCode="733"
+    android:versionName="0.7.3.3">
 
     <uses-sdk android:minSdkVersion="9"
-              android:targetSdkVersion="19" />
+              android:targetSdkVersion="21" />
 
     <supports-screens
         android:smallScreens="true"
@@ -88,6 +88,17 @@
                 android:value="org.kde.kdeconnect.UserInterface.DeviceActivity" />
         </activity>
 
+
+        <activity
+                android:name="org.kde.kdeconnect.UserInterface.CustomDevicesActivity"
+                android:label="@string/custom_device_list"
+                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"

build.gradle

@@ -3,18 +3,27 @@ buildscript {
         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"
@@ -34,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,92 +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="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
-        <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/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" 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/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" 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/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" 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/assets" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
-      <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="support-v4-19.1.0" level="project" />
-    <orderEntry type="library" exported="" name="sshd-core-0.8.0" level="project" />
-    <orderEntry type="library" exported="" name="bcprov-jdk16-1.45" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-19.1.0" level="project" />
-    <orderEntry type="library" exported="" name="mina-core-2.0.8" 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" />
-  </component>
-</module>
-

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/menu/main.xml

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

res/values-bg/strings.xml

@@ -66,6 +66,7 @@
   <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>

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>
@@ -79,6 +83,7 @@
   <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>

res/values-cs/strings.xml

@@ -8,8 +8,8 @@
   <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>
@@ -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>
@@ -79,6 +83,7 @@
   <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>

res/values-da/strings.xml

@@ -8,8 +8,7 @@
   <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>
@@ -28,6 +27,8 @@
   <string name="open_mpris_controls">Åbn fjernbetjening</string>
   <string name="open_mousepad">Åbn touchpad-kontrol</string>
   <string name="mousepad_info">Bevæg en finger på skærmen for at flytte musemarkøren</string>
+  <string name="mousepad_right_click">Send højreklik</string>
+  <string name="mousepad_middle_click">Send midterklik</string>
   <string name="category_connected_devices">Forbundne enheder</string>
   <string name="category_not_paired_devices">Ikke parrede enheder</string>
   <string name="category_remembered_devices">Huskede enheder</string>
@@ -77,6 +78,7 @@
   <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>

res/values-de/strings.xml

@@ -8,7 +8,7 @@
   <string name="pref_plugin_sftp_desc">Erlaubt das Browsen des Dateisystems auf dem entfernten Handy</string>
   <string name="pref_plugin_clipboard">Abgleich der Zwischenablage</string>
   <string name="pref_plugin_clipboard_desc">Inhalt der Zwischenablage freigeben</string>
-  <string name="pref_plugin_mousepad">Maus-Fernbedienung</string>
+  <string name="pref_plugin_mousepad">Fernbedienung</string>
   <string name="pref_plugin_mpris">Multimedia-Fernbedienungen</string>
   <string name="pref_plugin_mpris_desc">Audio und Video mit Ihrem Telefon steuern</string>
   <string name="pref_plugin_ping">Ping</string>
@@ -25,6 +25,8 @@
   <string name="send_ping">Ping senden</string>
   <string name="open_mpris_controls">Fernbedienung öffnen</string>
   <string name="open_mousepad">Touchpad-Steuerung öffnen</string>
+  <string name="mousepad_right_click">Rechtsklick</string>
+  <string name="mousepad_middle_click">Mittelklick</string>
   <string 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>
@@ -72,6 +74,7 @@
   <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>

res/values-es/strings.xml

@@ -8,8 +8,8 @@
   <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 del ratón</string>
-  <string name="pref_plugin_mousepad_desc">Controlar su ratón remotamente</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>
@@ -28,6 +28,10 @@
   <string name="open_mpris_controls">Abrir control remoto</string>
   <string name="open_mousepad">Abrir control del panel táctil</string>
   <string name="mousepad_info">Mueva un dedo sobre la pantalla para mover el cursor del ratón</string>
+  <string name="mousepad_double_tap_settings_title">Establecer la acción al golpetear con dos dedos</string>
+  <string name="mousepad_triple_tap_settings_title">Establecer la acción al golpetear con tres dedos</string>
+  <string name="mousepad_right_click">Clic derecho</string>
+  <string name="mousepad_middle_click">Clic del botón central</string>
   <string name="category_connected_devices">Dispositivos conectados</string>
   <string name="category_not_paired_devices">Dispositivos no vinculados</string>
   <string name="category_remembered_devices">Dispositivos recordados</string>
@@ -79,12 +83,19 @@
   <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 válido</string>
   <string name="shareplugin_text_saved">Texto recibido y guardado en el portapapeles</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-array name="mpris_time_entries">
     <item>10 segundos</item>
     <item>20 segundos</item>

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,10 +28,14 @@
   <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_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_not_reachable">Laitepari tavoittamattomissa</string>
@@ -44,10 +50,16 @@
   <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="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="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">Ei laiteparia</string>
   <string name="request_pairing">Pyydä paritusta</string>
@@ -64,20 +76,31 @@
   <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="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-array name="mpris_time_entries">
-    <item>10 seconds</item>
-    <item>20 seconds</item>
-    <item>30 seconds</item>
-    <item>1 minute</item>
-    <item>2 minutes</item>
+    <item>10 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

@@ -66,6 +66,7 @@
   <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>

res/values-hu/strings.xml

@@ -8,8 +8,7 @@
   <string name="pref_plugin_sftp_desc">Lehetővé teszi a telefon fájlrendszerének távolról történő tallózását</string>
   <string name="pref_plugin_clipboard">Vágólap szinkronizáció</string>
   <string name="pref_plugin_clipboard_desc">A vágólap tartalmának megosztása</string>
-  <string name="pref_plugin_mousepad">Egér távirányító</string>
-  <string name="pref_plugin_mousepad_desc">Az egér vezérlése távolról</string>
+  <string name="pref_plugin_mousepad">Távirányító</string>
   <string name="pref_plugin_mpris">Multimedia távirányítók</string>
   <string name="pref_plugin_mpris_desc">Hang vagy videó vezérlése a telefonról</string>
   <string name="pref_plugin_ping">Ping</string>
@@ -28,6 +27,8 @@
   <string name="open_mpris_controls">Távirányító megnyitása</string>
   <string name="open_mousepad">Érintőtábla vezérlő megnyitása</string>
   <string name="mousepad_info">Mozgassa az ujját a képernyőn az egérkurzor mozgatásához</string>
+  <string name="mousepad_right_click">Jobb kattintás küldése</string>
+  <string name="mousepad_middle_click">Középső kattintás küldése</string>
   <string 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>
@@ -76,6 +77,7 @@
   <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>

res/values-it/strings.xml

@@ -64,6 +64,7 @@
   <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>

res/values-ko/strings.xml

@@ -66,6 +66,7 @@
   <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>

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>
@@ -79,6 +83,7 @@
   <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>

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>
@@ -79,6 +83,7 @@
   <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>

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>
@@ -79,6 +83,7 @@
   <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>

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>
@@ -79,6 +83,7 @@
   <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>

res/values-ro/strings.xml

@@ -66,6 +66,7 @@
   <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>

res/values-ru/strings.xml

@@ -61,6 +61,7 @@
   <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="share_notification_preference">Синхронизация уведомлений</string>

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>
@@ -79,6 +83,7 @@
   <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>

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>
@@ -79,6 +80,7 @@
   <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>

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>
@@ -79,6 +83,7 @@
   <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>

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,6 +29,16 @@
     <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_remembered_devices">Remembered devices</string>
@@ -82,11 +92,15 @@
     <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">Custom device list</string>
+    <string name="custom_device_list_summary">Custom device list</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>
@@ -95,6 +109,8 @@
     <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>
@@ -112,4 +128,14 @@
         <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>