From a05ab9f84100c9c92772f147d55ca777dd14f94a Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 2 Dec 2016 05:47:37 +0100 Subject: [PATCH 1/7] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- plugins/battery/kdeconnect_battery.json | 2 +- plugins/clipboard/kdeconnect_clipboard.json | 2 +- plugins/findmyphone/kdeconnect_findmyphone.json | 2 +- plugins/lockdevice/kdeconnect_lockdevice.json | 2 +- plugins/mousepad/kdeconnect_mousepad.json | 2 +- plugins/mpriscontrol/kdeconnect_mpriscontrol.json | 2 +- plugins/mprisremote/kdeconnect_mprisremote.json | 2 +- plugins/notifications/kdeconnect_notifications.json | 2 +- plugins/pausemusic/kdeconnect_pausemusic.json | 2 +- plugins/ping/kdeconnect_ping.json | 2 +- plugins/remotecommands/kdeconnect_remotecommands.json | 2 +- plugins/remotecontrol/kdeconnect_remotecontrol.json | 2 +- plugins/runcommand/kdeconnect_runcommand.json | 2 +- plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json | 2 +- plugins/sendnotifications/kdeconnect_sendnotifications.json | 2 +- plugins/sftp/kdeconnect_sftp.json | 2 +- plugins/share/kdeconnect_share.json | 2 +- plugins/telephony/kdeconnect_telephony.json | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/plugins/battery/kdeconnect_battery.json b/plugins/battery/kdeconnect_battery.json index 18ce8c4fa..2baa4489e 100644 --- a/plugins/battery/kdeconnect_battery.json +++ b/plugins/battery/kdeconnect_battery.json @@ -76,4 +76,4 @@ "X-KdeConnect-SupportedPackageType": [ "kdeconnect.battery" ] -} \ No newline at end of file +} diff --git a/plugins/clipboard/kdeconnect_clipboard.json b/plugins/clipboard/kdeconnect_clipboard.json index 273c7c91b..abffb3895 100644 --- a/plugins/clipboard/kdeconnect_clipboard.json +++ b/plugins/clipboard/kdeconnect_clipboard.json @@ -76,4 +76,4 @@ "X-KdeConnect-SupportedPackageType": [ "kdeconnect.clipboard" ] -} \ No newline at end of file +} diff --git a/plugins/findmyphone/kdeconnect_findmyphone.json b/plugins/findmyphone/kdeconnect_findmyphone.json index c57a09feb..6a5917486 100644 --- a/plugins/findmyphone/kdeconnect_findmyphone.json +++ b/plugins/findmyphone/kdeconnect_findmyphone.json @@ -66,4 +66,4 @@ "X-KdeConnect-OutgoingPackageType": [ "kdeconnect.findmyphone.request" ] -} \ No newline at end of file +} diff --git a/plugins/lockdevice/kdeconnect_lockdevice.json b/plugins/lockdevice/kdeconnect_lockdevice.json index 371fe768e..1c8c895da 100644 --- a/plugins/lockdevice/kdeconnect_lockdevice.json +++ b/plugins/lockdevice/kdeconnect_lockdevice.json @@ -75,4 +75,4 @@ "kdeconnect.lock.request", "kdeconnect.lock" ] -} \ No newline at end of file +} diff --git a/plugins/mousepad/kdeconnect_mousepad.json b/plugins/mousepad/kdeconnect_mousepad.json index b3d8a346d..bb502d8e3 100644 --- a/plugins/mousepad/kdeconnect_mousepad.json +++ b/plugins/mousepad/kdeconnect_mousepad.json @@ -73,4 +73,4 @@ "X-KdeConnect-SupportedPackageType": [ "kdeconnect.mousepad.request" ] -} \ No newline at end of file +} diff --git a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json index 0695c2cf7..884775ff7 100644 --- a/plugins/mpriscontrol/kdeconnect_mpriscontrol.json +++ b/plugins/mpriscontrol/kdeconnect_mpriscontrol.json @@ -76,4 +76,4 @@ "X-KdeConnect-SupportedPackageType": [ "kdeconnect.mpris.request" ] -} \ No newline at end of file +} diff --git a/plugins/mprisremote/kdeconnect_mprisremote.json b/plugins/mprisremote/kdeconnect_mprisremote.json index e581caffc..c61e444b9 100644 --- a/plugins/mprisremote/kdeconnect_mprisremote.json +++ b/plugins/mprisremote/kdeconnect_mprisremote.json @@ -59,4 +59,4 @@ "X-KdeConnect-SupportedPackageType": [ "kdeconnect.mpris" ] -} \ No newline at end of file +} diff --git a/plugins/notifications/kdeconnect_notifications.json b/plugins/notifications/kdeconnect_notifications.json index 2a84b715e..f5f4f64cc 100644 --- a/plugins/notifications/kdeconnect_notifications.json +++ b/plugins/notifications/kdeconnect_notifications.json @@ -64,4 +64,4 @@ "X-KdeConnect-SupportedPackageType": [ "kdeconnect.notification" ] -} \ No newline at end of file +} diff --git a/plugins/pausemusic/kdeconnect_pausemusic.json b/plugins/pausemusic/kdeconnect_pausemusic.json index 23cf0a9b1..3ad600335 100644 --- a/plugins/pausemusic/kdeconnect_pausemusic.json +++ b/plugins/pausemusic/kdeconnect_pausemusic.json @@ -73,4 +73,4 @@ "X-KdeConnect-SupportedPackageType": [ "kdeconnect.telephony" ] -} \ No newline at end of file +} diff --git a/plugins/ping/kdeconnect_ping.json b/plugins/ping/kdeconnect_ping.json index ef53a0485..3bbc68e21 100644 --- a/plugins/ping/kdeconnect_ping.json +++ b/plugins/ping/kdeconnect_ping.json @@ -59,4 +59,4 @@ "X-KdeConnect-SupportedPackageType": [ "kdeconnect.ping" ] -} \ No newline at end of file +} diff --git a/plugins/remotecommands/kdeconnect_remotecommands.json b/plugins/remotecommands/kdeconnect_remotecommands.json index 7c124222d..d69c705b7 100644 --- a/plugins/remotecommands/kdeconnect_remotecommands.json +++ b/plugins/remotecommands/kdeconnect_remotecommands.json @@ -59,4 +59,4 @@ "X-KdeConnect-SupportedPackageType": [ "kdeconnect.runcommand" ] -} \ No newline at end of file +} diff --git a/plugins/remotecontrol/kdeconnect_remotecontrol.json b/plugins/remotecontrol/kdeconnect_remotecontrol.json index f034d8bbe..dd0b8442c 100644 --- a/plugins/remotecontrol/kdeconnect_remotecontrol.json +++ b/plugins/remotecontrol/kdeconnect_remotecontrol.json @@ -71,4 +71,4 @@ "kdeconnect.mousepad.request" ], "X-KdeConnect-SupportedPackageType": [] -} \ No newline at end of file +} diff --git a/plugins/runcommand/kdeconnect_runcommand.json b/plugins/runcommand/kdeconnect_runcommand.json index dfe7c8664..7767e900a 100644 --- a/plugins/runcommand/kdeconnect_runcommand.json +++ b/plugins/runcommand/kdeconnect_runcommand.json @@ -73,4 +73,4 @@ "X-KdeConnect-SupportedPackageType": [ "kdeconnect.runcommand.request" ] -} \ No newline at end of file +} diff --git a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json index 79d5615b8..c2f7e3a71 100644 --- a/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json +++ b/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json @@ -70,4 +70,4 @@ "Version": "0.1", "Website": "http://albertvaka.wordpress.com" } -} \ No newline at end of file +} diff --git a/plugins/sendnotifications/kdeconnect_sendnotifications.json b/plugins/sendnotifications/kdeconnect_sendnotifications.json index e5405041f..b64de92bc 100644 --- a/plugins/sendnotifications/kdeconnect_sendnotifications.json +++ b/plugins/sendnotifications/kdeconnect_sendnotifications.json @@ -64,4 +64,4 @@ "X-KdeConnect-SupportedPackageType": [ "kdeconnect.notification.request" ] -} \ No newline at end of file +} diff --git a/plugins/sftp/kdeconnect_sftp.json b/plugins/sftp/kdeconnect_sftp.json index 02be1c9f9..11d052df8 100644 --- a/plugins/sftp/kdeconnect_sftp.json +++ b/plugins/sftp/kdeconnect_sftp.json @@ -77,4 +77,4 @@ "X-KdeConnect-SupportedPackageType": [ "kdeconnect.sftp" ] -} \ No newline at end of file +} diff --git a/plugins/share/kdeconnect_share.json b/plugins/share/kdeconnect_share.json index 384e2ef2f..42a4eed64 100644 --- a/plugins/share/kdeconnect_share.json +++ b/plugins/share/kdeconnect_share.json @@ -76,4 +76,4 @@ "X-KdeConnect-SupportedPackageType": [ "kdeconnect.share.request" ] -} \ No newline at end of file +} diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json index 59680455b..d6e16bc8a 100644 --- a/plugins/telephony/kdeconnect_telephony.json +++ b/plugins/telephony/kdeconnect_telephony.json @@ -69,4 +69,4 @@ "X-KdeConnect-SupportedPackageType": [ "kdeconnect.telephony" ] -} \ No newline at end of file +} From 0f643d9c573083c1ea3b5dd42594f65352e19253 Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Thu, 8 Dec 2016 23:49:06 +0100 Subject: [PATCH 2/7] Revert "Add album art support for mpris plugin" This was very poorly implemented and can't stay as it is right now: - Every second or so the art image was being loaded from disk, scaled, base64 encoded and sent over the freakin network! - The Android interface didn't take into account small screens, and adding the image would cut stuff out of the screen. - Didn't manage "edge cases" like playing a song without cover after one with cover (previous image was still being shown) or changing players. This reverts commit e66096d05acae401c9150eb43bdf5aa976b278f7. # Conflicts: # plugins/mpriscontrol/mpriscontrolplugin.cpp --- CMakeLists.txt | 2 +- plugins/mpriscontrol/CMakeLists.txt | 2 +- plugins/mpriscontrol/mpriscontrolplugin.cpp | 30 --------------------- 3 files changed, 2 insertions(+), 32 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7151741a7..b1cba2009 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,7 +10,7 @@ cmake_minimum_required(VERSION 2.8.12) find_package(ECM 0.0.9 REQUIRED NO_MODULE) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} ${CMAKE_SOURCE_DIR}/cmake) -find_package(Qt5 5.2 REQUIRED COMPONENTS Quick Gui) +find_package(Qt5 5.2 REQUIRED COMPONENTS Quick) find_package(KF5 REQUIRED COMPONENTS I18n ConfigWidgets DBusAddons) find_package(KF5DocTools) find_package(Qca-qt5 2.1.0 REQUIRED) diff --git a/plugins/mpriscontrol/CMakeLists.txt b/plugins/mpriscontrol/CMakeLists.txt index fb5239535..5203f1f19 100644 --- a/plugins/mpriscontrol/CMakeLists.txt +++ b/plugins/mpriscontrol/CMakeLists.txt @@ -16,4 +16,4 @@ qt5_add_dbus_interface( kdeconnect_add_plugin(kdeconnect_mpriscontrol JSON kdeconnect_mpriscontrol.json SOURCES ${kdeconnect_mpriscontrol_SRCS}) -target_link_libraries(kdeconnect_mpriscontrol Qt5::DBus kdeconnectcore Qt5::Gui) +target_link_libraries(kdeconnect_mpriscontrol Qt5::DBus kdeconnectcore) diff --git a/plugins/mpriscontrol/mpriscontrolplugin.cpp b/plugins/mpriscontrol/mpriscontrolplugin.cpp index 39777196f..6266b4a03 100644 --- a/plugins/mpriscontrol/mpriscontrolplugin.cpp +++ b/plugins/mpriscontrol/mpriscontrolplugin.cpp @@ -28,10 +28,6 @@ #include #include -#include -#include -#include - #include #include @@ -142,32 +138,6 @@ void MprisControlPlugin::propertiesChanged(const QString& propertyInterface, con } somethingToSend = true; } - if (nowPlayingMap.contains(QStringLiteral("mpris:artUrl"))) { - const QUrl artUrl(nowPlayingMap[QStringLiteral("mpris:artUrl")].toString()); - - /* - * We only handle images stored locally right now but it should be easy - * enough to download remote images and send them. - */ - const int artMaxWidth = 512; - const int artMaxHeight = 512; - if (artUrl.isLocalFile()) { - QImage artImage(artUrl.path()); - - // Scale the image to a sane size - artImage = artImage.scaled({artMaxWidth, artMaxHeight}, Qt::KeepAspectRatio, Qt::SmoothTransformation); - - QByteArray imageBufferArray; - QBuffer imageBuffer(&imageBufferArray); - imageBuffer.open(QIODevice::WriteOnly); - artImage.save(&imageBuffer, "PNG"); - - const QString base64Image = QString::fromLatin1(imageBufferArray.toBase64()); - np.set(QStringLiteral("artImage"), base64Image); - somethingToSend = true; - } - - } } if (properties.contains(QStringLiteral("PlaybackStatus"))) { From c95f769aadd167dbee0fedde35d2a6df63491f4f Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 17 Dec 2016 07:40:02 +0100 Subject: [PATCH 3/7] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- plugins/remotecommands/kdeconnect_remotecommands.json | 1 + plugins/telephony/kdeconnect_telephony.json | 1 + 2 files changed, 2 insertions(+) diff --git a/plugins/remotecommands/kdeconnect_remotecommands.json b/plugins/remotecommands/kdeconnect_remotecommands.json index d69c705b7..9348abf44 100644 --- a/plugins/remotecommands/kdeconnect_remotecommands.json +++ b/plugins/remotecommands/kdeconnect_remotecommands.json @@ -37,6 +37,7 @@ "Name[cs]": "Přijímat vzdálené příkazy", "Name[da]": "Vært for eksterne kommandoer", "Name[es]": "Órdenes en servidor remoto", + "Name[et]": "Kaugkäsud", "Name[fi]": "Etäkomennot", "Name[it]": "Comandi remoti host", "Name[nl]": "Commando's op afstand hosten", diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json index d6e16bc8a..bb3e63b3f 100644 --- a/plugins/telephony/kdeconnect_telephony.json +++ b/plugins/telephony/kdeconnect_telephony.json @@ -15,6 +15,7 @@ "Description[da]": "Vis bekendtgørelser for opkald og SMS'er", "Description[de]": "Benachrichtigungen für Anrufe und SMS anzeigen", "Description[es]": "Mostrar notificaciones de llamadas y SMS", + "Description[et]": "Kõnede ja SMS-ide märguannete näitamine", "Description[fi]": "Näytä puhelujen ja tekstiviestien ilmoitukset", "Description[it]": "Mostra notifiche per le chiamate e per gli SMS", "Description[nl]": "Meldingen tonen van oproepen en SMSjes", From f708b4431dfc1a4cbbea724d06720457493ddf3e Mon Sep 17 00:00:00 2001 From: David Faure Date: Sun, 15 Jan 2017 22:12:49 +0100 Subject: [PATCH 4/7] fix compilation with gcc 4.8 --- tests/downloadjobtest.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/downloadjobtest.cpp b/tests/downloadjobtest.cpp index 55576fce3..30692271c 100644 --- a/tests/downloadjobtest.cpp +++ b/tests/downloadjobtest.cpp @@ -59,7 +59,7 @@ void DownloadJobTest::failToConnectShouldDestroyTheJob() // no initServer test = new DownloadJob(QHostAddress::LocalHost, {{"port", 8694}}); - QSignalSpy spy(test, &KJob::finished); + QSignalSpy spy(test.data(), &KJob::finished); test->start(); QVERIFY(spy.count() || spy.wait()); @@ -71,7 +71,7 @@ void DownloadJobTest::closingTheConnectionShouldDestroyTheJob() { initServer(); test = new DownloadJob(QHostAddress::LocalHost, {{"port", 8694}}); - QSignalSpy spy(test, &KJob::finished); + QSignalSpy spy(test.data(), &KJob::finished); test->start(); mServer->close(); From 0f68d6efc7607b9b1aad5a5bba32e5557db160c5 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Mon, 23 Jan 2017 07:36:38 +0100 Subject: [PATCH 5/7] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- plugins/findmyphone/kdeconnect_findmyphone.json | 2 ++ plugins/kdeconnect.notifyrc | 1 + plugins/notifications/kdeconnect_notifications.json | 2 ++ plugins/remotecommands/kdeconnect_remotecommands.json | 2 ++ plugins/runcommand/kdeconnect_runcommand.json | 2 ++ plugins/runcommand/kdeconnect_runcommand_config.desktop | 1 + plugins/sendnotifications/kdeconnect_sendnotifications.json | 2 ++ .../kdeconnect_sendnotifications_config.desktop | 1 + plugins/telephony/kdeconnect_telephony.json | 1 + 9 files changed, 14 insertions(+) diff --git a/plugins/findmyphone/kdeconnect_findmyphone.json b/plugins/findmyphone/kdeconnect_findmyphone.json index 6a5917486..1fc1aad92 100644 --- a/plugins/findmyphone/kdeconnect_findmyphone.json +++ b/plugins/findmyphone/kdeconnect_findmyphone.json @@ -22,6 +22,7 @@ "Description[et]": "Kaotsi läinud telefoni leidmine sellel häireheli esitamisega", "Description[fi]": "Löydä hukkaamasi puhelin laittamalla se soittamaan hälytysääntä", "Description[it]": "Trova il tuo telefono smarrito facendogli suonare un allarme sonoro", + "Description[ko]": "알람 소리를 울려서 잃어버린 휴대폰 찾기", "Description[nl]": "Zoek uw verloren telefoon door het een wekkersignaal te laten spelen", "Description[nn]": "Finn telefonen din ved å la han spela eit lydsignal", "Description[pl]": "Znajdź twój zgubiony telefon odgrywając na nim dźwięk", @@ -47,6 +48,7 @@ "Name[et]": "Helista minu telefonile", "Name[fi]": "Soita puhelimeeni", "Name[it]": "Fai squillare il mio telefono", + "Name[ko]": "내 휴대폰 울리기", "Name[nl]": "Bel mijn telefoon", "Name[nn]": "Ring telefonen", "Name[pl]": "Dzwoń z mojego telefonu", diff --git a/plugins/kdeconnect.notifyrc b/plugins/kdeconnect.notifyrc index b3e8a6dbe..1e0ea44e8 100644 --- a/plugins/kdeconnect.notifyrc +++ b/plugins/kdeconnect.notifyrc @@ -105,6 +105,7 @@ Comment[es]=Petición de vinculación recibida desde un dispositivo Comment[et]=Seadmelt saadi paardumissoov Comment[fi]=Saatiin paripyyntö laitteelta Comment[it]=Richiesta di associazione ricevuta da un dispositivo +Comment[ko]=장치에서 연결 요청을 받음 Comment[nl]=Verzoek om een paar te maken ontvangen van een apparaat Comment[nn]=Fekk parringsførespurnad frå eining Comment[pl]=Otrzymano żądanie parowania z urządzenia diff --git a/plugins/notifications/kdeconnect_notifications.json b/plugins/notifications/kdeconnect_notifications.json index f5f4f64cc..7d2f3c399 100644 --- a/plugins/notifications/kdeconnect_notifications.json +++ b/plugins/notifications/kdeconnect_notifications.json @@ -18,6 +18,7 @@ "Description[et]": "Seadme märguannete näitamine arvutis ja nende sünkroonis hoidmine", "Description[fi]": "Näytä laitteen ilmoitukset tällä tietokoneella ja pidä ne ajan tasalla", "Description[it]": "Mostra le notifiche del telefono sul tuo computer e tienile sincronizzate", + "Description[ko]": "휴대폰 알림을 컴퓨터에 표시하고 동기화하기", "Description[nl]": "Apparaatmeldingen op deze computer tonen en ze gesynchroniseerd houden", "Description[nn]": "Vis telefonvarslingar på datamaskina og hald dei synkronisert", "Description[pl]": "Pokaż powiadomienia urządzenia na swoim komputerze i synchronizuj je", @@ -42,6 +43,7 @@ "Name[et]": "Märguannete vastuvõtmine", "Name[fi]": "Vastaanota ilmoituksia", "Name[it]": "Ricevi notifiche", + "Name[ko]": "알림 받기", "Name[nl]": "Meldingen ontvangen", "Name[nn]": "Få varslingar", "Name[pl]": "Otrzymuj powiadomienia", diff --git a/plugins/remotecommands/kdeconnect_remotecommands.json b/plugins/remotecommands/kdeconnect_remotecommands.json index 9348abf44..bb509ed39 100644 --- a/plugins/remotecommands/kdeconnect_remotecommands.json +++ b/plugins/remotecommands/kdeconnect_remotecommands.json @@ -18,6 +18,7 @@ "Description[et]": "Kaugseadmes määratud käskude käivitamine", "Description[fi]": "Suorita ennakkoon määriteltyjä komentoja etälaitteella", "Description[it]": "Innesca comandi predefiniti sul dispositivo remoto", + "Description[ko]": "원격 장치에 미리 정의한 트리거 명령", "Description[nl]": "Start commando's voorgedefinieerd op het apparaat op afstand", "Description[nn]": "Løys ut ferdigdefinerte kommandoar på eininga", "Description[pl]": "Wyzwalaj polecenia określone na zdalnym urządzeniu", @@ -40,6 +41,7 @@ "Name[et]": "Kaugkäsud", "Name[fi]": "Etäkomennot", "Name[it]": "Comandi remoti host", + "Name[ko]": "호스트 원격 명령", "Name[nl]": "Commando's op afstand hosten", "Name[nn]": "Fjernkommandoar", "Name[pl]": "Wykonuj polecenia zdalne", diff --git a/plugins/runcommand/kdeconnect_runcommand.json b/plugins/runcommand/kdeconnect_runcommand.json index 7767e900a..5f87b53fd 100644 --- a/plugins/runcommand/kdeconnect_runcommand.json +++ b/plugins/runcommand/kdeconnect_runcommand.json @@ -23,6 +23,7 @@ "Description[et]": "Konsoolikäskude kaugkäivitamine", "Description[fi]": "Suorita konsolikomentoja etänä", "Description[it]": "Esegui da remoto comandi della console", + "Description[ko]": "원격으로 콘솔 명령 실행", "Description[nl]": "Commando's in de terminal op afstand laten uitvoeren", "Description[nn]": "Køyr konsollkommandoar på eininga", "Description[pl]": "Wykonaj polecenie konsoli zdalnie", @@ -49,6 +50,7 @@ "Name[et]": "Käskude käivitamine", "Name[fi]": "Suorita komentoja", "Name[it]": "Esegui comandi", + "Name[ko]": "명령 실행", "Name[nl]": "Commando's uitvoeren", "Name[nn]": "Køyr kommandoar", "Name[pl]": "Wykonywanie polecenie", diff --git a/plugins/runcommand/kdeconnect_runcommand_config.desktop b/plugins/runcommand/kdeconnect_runcommand_config.desktop index 6c59cb388..75770c1d3 100644 --- a/plugins/runcommand/kdeconnect_runcommand_config.desktop +++ b/plugins/runcommand/kdeconnect_runcommand_config.desktop @@ -16,6 +16,7 @@ Name[es]=Ajustes del complemento de ejecución de órdenes Name[et]=Käsu käivitamise plugina seadistused Name[fi]=Suorita komento -liitännäisen asetukset Name[it]=Impostazioni estensione Esegui comando +Name[ko]=명령 실행 플러그인 설정 Name[nl]=Plug-in-instellingen van commando Uitvoeren Name[nn]=Innstillingar for kommandokøyring Name[pl]=Ustawienia wtyczki wykonywania polecenia diff --git a/plugins/sendnotifications/kdeconnect_sendnotifications.json b/plugins/sendnotifications/kdeconnect_sendnotifications.json index b64de92bc..3b5bede66 100644 --- a/plugins/sendnotifications/kdeconnect_sendnotifications.json +++ b/plugins/sendnotifications/kdeconnect_sendnotifications.json @@ -19,6 +19,7 @@ "Description[et]": "Arvuti märguannete levitamine, et neid oleks näha ka teistes seadmetes", "Description[fi]": "Lähetä tämän tietokoneen ilmoitukset, jotta ne voidaan näyttää muilla laitteilla.", "Description[it]": "Trasmetti le notifiche di questo computer, affinché possano essere mostrate su altri dispositivi.", + "Description[ko]": "이 컴퓨터의 알림을 다른 장치에도 표시합니다.", "Description[nl]": "De meldingen van deze computer rondsturen, zodat ze op andere apparaten getoond kunnen worden.", "Description[nn]": "Vidaresend varslingar frå datamaskina til andre einingar.", "Description[pl]": "Rozgłaszaj powiadomienia tego komputera, tak aby można je było wyświetlać na innych urządzeniach.", @@ -42,6 +43,7 @@ "Name[et]": "Märguannete saatmine", "Name[fi]": "Lähetä ilmoituksia", "Name[it]": "Invia notifiche", + "Name[ko]": "알림 보내기", "Name[nl]": "Stuur meldingen", "Name[nn]": "Send varslingar", "Name[pl]": "Wysyłaj powiadomienia", diff --git a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop index 6a126a517..d78cb2258 100644 --- a/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop +++ b/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop @@ -16,6 +16,7 @@ Name[es]=Preferencias del complemento de sincronización de notificaciones Name[et]=Märguande sünkroonimise plugina seaditused Name[fi]=Ilmoitusten synkronointiliitännäisen asetukset Name[it]=Impostazioni dell'estensione di sincronizzazione delle notifiche +Name[ko]=알림 동기화 플러그인 설정 Name[nl]=Instellingen voor meldingen van synchronisatie plug-in Name[nn]=Innstillingar for tillegg for synkronisering av varslingar Name[pl]=Ustawienia wtyczki synchronizującej powiadomienia diff --git a/plugins/telephony/kdeconnect_telephony.json b/plugins/telephony/kdeconnect_telephony.json index bb3e63b3f..59cd90dc2 100644 --- a/plugins/telephony/kdeconnect_telephony.json +++ b/plugins/telephony/kdeconnect_telephony.json @@ -18,6 +18,7 @@ "Description[et]": "Kõnede ja SMS-ide märguannete näitamine", "Description[fi]": "Näytä puhelujen ja tekstiviestien ilmoitukset", "Description[it]": "Mostra notifiche per le chiamate e per gli SMS", + "Description[ko]": "통화와 SMS 알림 표시", "Description[nl]": "Meldingen tonen van oproepen en SMSjes", "Description[nn]": "Vis varslingar for oppringingar og SMS", "Description[pl]": "Powiadamiaj o dzwonieniu i esemesach", From ba17222da5dee7aff7bc4f9bdef0e0d78d586540 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Fri, 3 Feb 2017 07:59:01 +0100 Subject: [PATCH 6/7] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- app/org.kde.kdeconnect.app.desktop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/org.kde.kdeconnect.app.desktop b/app/org.kde.kdeconnect.app.desktop index 692f9b2cf..c3a77a700 100644 --- a/app/org.kde.kdeconnect.app.desktop +++ b/app/org.kde.kdeconnect.app.desktop @@ -10,7 +10,7 @@ Name[es]=Aplicación KDE Connect Name[et]=KDE Connecti rakendus Name[fi]=KDE Connect -sovellus Name[fr]=Application KDE Connect -Name[gl]=Programa de KDE Connect +Name[gl]=Aplicativo de KDE Connect Name[hu]=KDE Connect alkalmazás Name[it]=Applicazione KDE Connect Name[ko]=KDE Connect 프로그램 From 12a3027be625ac94789f37e7d738c18872263e29 Mon Sep 17 00:00:00 2001 From: Albert Vaca Date: Sun, 5 Feb 2017 16:07:56 +0100 Subject: [PATCH 7/7] Wrong order, condition was always false. --- core/backends/lan/lanpairinghandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/backends/lan/lanpairinghandler.cpp b/core/backends/lan/lanpairinghandler.cpp index 35c41d00b..485a805d7 100644 --- a/core/backends/lan/lanpairinghandler.cpp +++ b/core/backends/lan/lanpairinghandler.cpp @@ -65,10 +65,10 @@ void LanPairingHandler::packageReceived(const NetworkPackage& np) qCDebug(KDECONNECT_CORE) << "Unpair request"; - setInternalPairStatus(NotPaired); if (isPairRequested()) { Q_EMIT pairingError(i18n("Canceled by other peer")); } + setInternalPairStatus(NotPaired); } }