From b7df5348c0ffe862a1fe4c78ceb4999822d735ba Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 20 Feb 2017 06:44:38 +0100 Subject: [PATCH 1/4] GIT_SILENT made messages (after extraction) --- res/values-ca/strings.xml | 1 + res/values-en-rGB/strings.xml | 1 + res/values-pl/strings.xml | 1 + res/values-pt/strings.xml | 1 + res/values-sk/strings.xml | 1 + res/values-sv/strings.xml | 7 +++++++ res/values-uk/strings.xml | 1 + 7 files changed, 13 insertions(+) diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 6d090953..728f9ec1 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -165,6 +165,7 @@ Reanomena Refresca Aquest dispositiu aparellat no és accessible. Assegureu-vos que està connectat a la mateixa xarxa. + Sembla que esteu amb una connexió de dades mòbils. El KDE Connect només funciona amb xarxes locals. No hi ha instal·lat cap explorador de fitxers. Envia un SMS Envia missatges de text des de l\'escriptori diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index 997ed5c8..de3f74d7 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -165,6 +165,7 @@ Rename Refresh This paired device is not reachable. Make sure it is connected to your same network. + It looks like you are on a mobile data connection. KDE Connect only works on local networks. There are no file browsers installed. Send SMS Send text messages from your desktop diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 33209741..d939294f 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -159,6 +159,7 @@ Zmień nazwę Odśwież To sparowane urządzenie jest nieosiągalne. Upewnij się, że jest podłączone do tej samej sieci. + Wygląda na to, że korzystasz z internetu mobilnego. KDE Connect działa tylko na lokalnych sieciach. Nie wgrano żadanych przeglądarek plików. Wyślij SMS-a Wyślij wiadomość tekstową z komputera diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index cb5a9096..193d21a1 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -165,6 +165,7 @@ Mudar o Nome Actualizar Este dispositivo emparelhado não está acessível. Certifique-se que está ligado à mesma rede que você. + Parece que está com uma ligação de dados móveis. O KDE Connect só se liga em redes locais. Não existem gestores de ficheiros instalados. Enviar um SMS Enviar mensagens de texto a partir do seu ambiente de trabalho diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 9b37c887..b158da24 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -165,6 +165,7 @@ Premenovať Obnoviť Toto spárované zariadenie nie je dosiahnuteľné. Prosím, uistite sa, že je pripojené do rovnakej siete. + Zdá sa, že ste na mobilom dátovom pripojení. KDE Connect funguje iba na lokálnej sieti. Nie sú nainštalované žiadne prehliadače. Poslať SMS Posielať textové správy z vášho počítača diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index 31311c26..4e614b96 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -10,6 +10,8 @@ Dela klippbordets innehåll Fjärrinmatning Använd telefonen eller surfplattan som mus och tangentbord + Ta emot fjärrtangentnedtryckningar + Ta emot tangentnedtryckningar från fjärrenheter Multimediakontroller Tillhandahåller en fjärrkontroll för mediaspelaren Kör kommando @@ -30,6 +32,10 @@ Du måste ge rättighet att komma åt underrättelser Skicka ping Kontroll av multimedia + Hantera bara fjärrtangenter vid redigering + Det finns ingen aktiv fjärrtangentbordsanslutning, upprätta en i KDE-anslut + Fjärrtangentbordsanslutning är aktiv + Det finns mer än en fjärrtangentbordsanslutning, välj enhet att anpassa Fjärrinmatning Flytta fingret på skärmen för att röra muspekaren. Rör för att klicka, och använd två eller tre fingrar för höger- och mittenknapparna. Använd en längre beröring för drag och släpp. Ställ in åtgärd vid två fingerberöringar @@ -159,6 +165,7 @@ Byt namn Uppdatera Den här ihopparade apparaten kan inte nås. Försäkra dig om att den är ansluten till samma nätverk. + Det verkar som om du använder en mobil dataanslutning. KDE-anslut fungerar bara på lokala nätverk. Det finns inga filbläddrare installerade. Skicka SMS Skicka textmeddelanden från skrivbordet diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 1b999ace..70e55b1e 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -165,6 +165,7 @@ Перейменувати Оновити Цей пов’язаний пристрій недоступний. Переконайтеся, що його з’єднано з вашою мережею. + Здається, мережа працює у режимі мобільного з’єднання. KDE Connect може працювати лише у локальних мережах. Програм для навігації файловою системою не встановлено. Надіслати SMS Надсилати текстові повідомлення з вашої робочої станції From ecad7ccea220f75880ae64e545ee37490d41757a Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Mon, 20 Feb 2017 20:20:06 +0100 Subject: [PATCH 2/4] Try not to lose filename extensions. Android's Storage Access Framework abstraction wants us to use mimetypes instead of file extensions, but for some file types it can't guess a useful mimetype. In those cases, provide the extension as part of the base name. BUG: 376638 --- .../kde/kdeconnect/Plugins/SharePlugin/SharePlugin.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/org/kde/kdeconnect/Plugins/SharePlugin/SharePlugin.java b/src/org/kde/kdeconnect/Plugins/SharePlugin/SharePlugin.java index 46969342..0e83fd7c 100644 --- a/src/org/kde/kdeconnect/Plugins/SharePlugin/SharePlugin.java +++ b/src/org/kde/kdeconnect/Plugins/SharePlugin/SharePlugin.java @@ -119,11 +119,15 @@ public class SharePlugin extends Plugin { final String defaultPath = ShareSettingsActivity.getDefaultDestinationDirectory().getAbsolutePath(); final String filename = customDestination? originalFilename : FilesHelper.findNonExistingNameForNewFile(defaultPath, originalFilename); - final String nameWithoutExtension = FilesHelper.getFileNameWithoutExt(filename); + String displayName = FilesHelper.getFileNameWithoutExt(filename); final String mimeType = FilesHelper.getMimeTypeFromFile(filename); + if ("*/*".equals(mimeType)) { + displayName = filename; + } + final DocumentFile destinationFolderDocument = ShareSettingsActivity.getDestinationDirectory(context); - final DocumentFile destinationDocument = destinationFolderDocument.createFile(mimeType, nameWithoutExtension); + final DocumentFile destinationDocument = destinationFolderDocument.createFile(mimeType, displayName); final OutputStream destinationOutput = context.getContentResolver().openOutputStream(destinationDocument.getUri()); final Uri destinationUri = destinationDocument.getUri(); From b3e1f6fbf86f6432ae6e36ff0a10157a47940af0 Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Mon, 20 Feb 2017 20:25:02 +0100 Subject: [PATCH 3/4] Preparing a hotfix release --- AndroidManifest.xml | 4 ++-- src/org/kde/kdeconnect/Helpers/NetworkHelper.java | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 86526521..dc03368d 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="1610" + android:versionName="1.6.1"> diff --git a/src/org/kde/kdeconnect/Helpers/NetworkHelper.java b/src/org/kde/kdeconnect/Helpers/NetworkHelper.java index 0f6d17cd..27abb3ba 100644 --- a/src/org/kde/kdeconnect/Helpers/NetworkHelper.java +++ b/src/org/kde/kdeconnect/Helpers/NetworkHelper.java @@ -8,9 +8,11 @@ import android.util.Log; public class NetworkHelper { public static boolean isOnMobileNetwork(Context context) { - final ConnectivityManager connMgr = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); + return false; //This looks a bit dangerous and I prefer not to use it in the next stable release. + /*final ConnectivityManager connMgr = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); NetworkInfo info = connMgr.getActiveNetworkInfo(); return (info != null && info.getType() == ConnectivityManager.TYPE_MOBILE); + */ } } From 337cdba68fda29759798a188df3e0856e48981af Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Mon, 20 Feb 2017 20:36:55 +0100 Subject: [PATCH 4/4] Prepare beta release --- AndroidManifest.xml | 4 ++-- src/org/kde/kdeconnect/Helpers/NetworkHelper.java | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index dc03368d..d4bcf729 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="1619" + android:versionName="1.6.2 Beta"> diff --git a/src/org/kde/kdeconnect/Helpers/NetworkHelper.java b/src/org/kde/kdeconnect/Helpers/NetworkHelper.java index 27abb3ba..0f6d17cd 100644 --- a/src/org/kde/kdeconnect/Helpers/NetworkHelper.java +++ b/src/org/kde/kdeconnect/Helpers/NetworkHelper.java @@ -8,11 +8,9 @@ import android.util.Log; public class NetworkHelper { public static boolean isOnMobileNetwork(Context context) { - return false; //This looks a bit dangerous and I prefer not to use it in the next stable release. - /*final ConnectivityManager connMgr = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); + final ConnectivityManager connMgr = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); NetworkInfo info = connMgr.getActiveNetworkInfo(); return (info != null && info.getType() == ConnectivityManager.TYPE_MOBILE); - */ } }