diff --git a/CMakeLists.txt b/CMakeLists.txt index 71cd9edd1..c9cdf4544 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,5 +18,6 @@ add_subdirectory(kcm) #add_subdirectory(kio) add_subdirectory(plasmoid) add_subdirectory(icon) +add_subdirectory(cli) add_subdirectory(tests) diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt new file mode 100644 index 000000000..6bc525e79 --- /dev/null +++ b/cli/CMakeLists.txt @@ -0,0 +1,7 @@ +include_directories(${CMAKE_SOURCE_DIR}) + +add_executable(kdeconnect-cli kdeconnect-cli.cpp) + +target_link_libraries(kdeconnect-cli kdeconnect ${QT_QTGUI_LIBRARY} ${KDE4_KDEUI_LIBS}) + +install(TARGETS kdeconnect-cli ${INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/cli/kdeconnect-cli.cpp b/cli/kdeconnect-cli.cpp new file mode 100644 index 000000000..1e8793738 --- /dev/null +++ b/cli/kdeconnect-cli.cpp @@ -0,0 +1,74 @@ +/* + * Copyright 2013 Aleix Pol Gonzalez + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License or (at your option) version 3 or any later version + * accepted by the membership of KDE e.V. (or its successor approved + * by the membership of KDE e.V.), which shall act as a proxy + * defined in Section 14 of version 3 of the license. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#include +#include +#include +#include +#include +#include + +int main(int argc, char** argv) +{ + KAboutData about("kctool", 0, ki18n(("kctool")), "1.0", ki18n("KDE Connect CLI tool"), + KAboutData::License_GPL, ki18n("(C) 2013 Aleix Pol Gonzalez")); + about.addAuthor( ki18n("Aleix Pol Gonzalez"), KLocalizedString(), "aleixpol@kde.org" ); + KCmdLineArgs::init(argc, argv, &about); + KCmdLineOptions options; + options.add("l") + .add("list-devices", ki18n("List all devices")); + options.add("share ", ki18n("Share a file")); + options.add("device ", ki18n("Device ID")); + KCmdLineArgs::addCmdLineOptions( options ); + KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); + KApplication app; + if(args->isSet("l")) { + DevicesModel devices; + devices.setDisplayFilter(DevicesModel::StatusUnknown); + for(int i=0, rows=devices.rowCount(); iisSet("device")) { + KCmdLineArgs::usageError(i18n("No device specified")); + } + device = args->getOption("device"); + QUrl url; + if(args->isSet("share")) { + url = args->makeURL(args->getOption("share").toLatin1()); + } + args->clear(); + + if(!url.isEmpty() && !device.isEmpty()) { + QDBusMessage msg = QDBusMessage::createMethodCall("org.kde.kdeconnect", "/modules/kdeconnect/devices/"+device+"/share", "org.kde.kdeconnect.device.share", "shareUrl"); + msg.setArguments(QVariantList() << url.toString()); + + QDBusConnection::sessionBus().call(msg); + } else + KCmdLineArgs::usageError(i18n("Nothing to be done with the device")); + } + QMetaObject::invokeMethod(&app, "quit", Qt::QueuedConnection); + + return app.exec(); +} diff --git a/kcm/kcm.cpp b/kcm/kcm.cpp index 78c897b61..daaac3a14 100644 --- a/kcm/kcm.cpp +++ b/kcm/kcm.cpp @@ -73,8 +73,6 @@ KdeConnectKcm::KdeConnectKcm(QWidget *parent, const QVariantList&) this, SLOT(unpair())); connect(kcmUi->ping_button, SIGNAL(pressed()), this, SLOT(sendPing())); - connect(kcmUi->browse_button, SIGNAL(clicked(bool)), - this, SLOT(browseFilesystem())); } @@ -253,9 +251,3 @@ void KdeConnectKcm::sendPing() if (!currentDevice) return; currentDevice->sendPing(); } - -void KdeConnectKcm::browseFilesystem() -{ - if (!currentDevice) return; - SftpDbusInterface(currentDevice->id(), this).startBrowsing(); -} diff --git a/kcm/kcm.h b/kcm/kcm.h index 950460d58..072c544bc 100644 --- a/kcm/kcm.h +++ b/kcm/kcm.h @@ -58,7 +58,6 @@ private Q_SLOTS: void requestPair(); void pluginsConfigChanged(); void sendPing(); - void browseFilesystem(); void resetSelection(); void pairingSuccesful(); void pairingFailed(const QString& error); diff --git a/kcm/kcm.ui b/kcm/kcm.ui index 8177ffa19..a92d283f8 100644 --- a/kcm/kcm.ui +++ b/kcm/kcm.ui @@ -169,13 +169,6 @@ - - - - Browse - - - diff --git a/kcm/kcm_kdeconnect.desktop b/kcm/kcm_kdeconnect.desktop index fdd0a8ef0..982ae74b0 100755 --- a/kcm/kcm_kdeconnect.desktop +++ b/kcm/kcm_kdeconnect.desktop @@ -12,15 +12,19 @@ X-KDE-System-Settings-Parent-Category=hardware Name=KDE Connect Name[bs]=Konekcija KDE +Name[cs]=KDE Connect Name[da]=KDE Connect Name[de]=KDE-Connect Name[es]=KDE Connect Name[fr]=KDE Connect Name[hu]=KDE csatlakozás Name[it]=KDE Connect +Name[ko]=KDE Connect Name[nl]=KDE Connect +Name[pl]=KDE Connect Name[pt]=KDE Connect Name[pt_BR]=KDE Connect +Name[ro]=KDE Connect Name[ru]=KDE Connect Name[sk]=KDE Connect Name[sv]=KDE anslut @@ -30,13 +34,16 @@ Name[x-test]=xxKDE Connectxx Comment=Connect and sync your devices with KDE Comment[bs]=Konektuj se i 'prijavi' svoj uređaj sa KDE +Comment[cs]=Připojte a synchronizujte svá zařízení s KDE Comment[da]=Forbind og synkronisér dine enheder med KDE Comment[de]=Verbinden und Abgleichen Ihrer Geräte mit KDE Comment[es]=Conectar y sincronizar dispositivos con KDE Comment[fr]=Connectez et synchronisez vos périphériques avec KDE Comment[hu]=Eszközök csatlakoztatása és szinkronizálása a KDE-vel Comment[it]=Connetti e sincronizza i tuoi dispositivi con KDE +Comment[ko]=내 장치와 KDE 동기화 Comment[nl]=Uw apparaten met KDE verbinden en synchroniseren +Comment[pl]=Podłącz i zsynchronizuj swoje urządzenia w KDE Comment[pt]=Ligue e sincronize os seus dispositivos com o KDE Comment[pt_BR]=Conecta e sincroniza seus dispositivos com o KDE Comment[ru]=Подключение и синхронизация устройств с KDE @@ -48,13 +55,16 @@ Comment[x-test]=xxConnect and sync your devices with KDExx X-KDE-Keywords=Network,Android,Devices X-KDE-Keywords[bs]=Mreža,Android,Uređaji +X-KDE-Keywords[cs]=Síť,Android,Zařízení X-KDE-Keywords[da]=Netværk,Android,Enheder X-KDE-Keywords[de]=Netzwerk,Android,Geräte X-KDE-Keywords[es]=Red,Android,Dispositivos X-KDE-Keywords[fr]=Réseau,Android,Périphériques X-KDE-Keywords[hu]=Hálózat,Android,Eszközök X-KDE-Keywords[it]=Rete,Android,Dispositivi +X-KDE-Keywords[ko]=Network,Android,Devices,네트워크,안드로이드,장치 X-KDE-Keywords[nl]=Netwerk,Android,Apparaten +X-KDE-Keywords[pl]=Sieć,Android,Urządzenia X-KDE-Keywords[pt]=Rede,Android,Dispositivos X-KDE-Keywords[pt_BR]=Rede,Android,Dispositivos X-KDE-Keywords[ru]=Network,Android,Devices,сеть,Андроид, устройства diff --git a/kcm/kdeconnect.desktop b/kcm/kdeconnect.desktop index 26ab792db..bfe7146ff 100755 --- a/kcm/kdeconnect.desktop +++ b/kcm/kdeconnect.desktop @@ -5,15 +5,19 @@ Terminal=false Exec=kcmshell4 kcm_kdeconnect Name=KDE Connect Name[bs]=Konekcija KDE +Name[cs]=KDE Connect Name[da]=KDE Connect Name[de]=KDE-Connect Name[es]=KDE Connect Name[fr]=KDE Connect Name[hu]=KDE csatlakozás Name[it]=KDE Connect +Name[ko]=KDE Connect Name[nl]=KDE Connect +Name[pl]=KDE Connect Name[pt]=KDE Connect Name[pt_BR]=KDE Connect +Name[ro]=KDE Connect Name[ru]=KDE Connect Name[sk]=KDE Connect Name[sv]=KDE anslut @@ -21,11 +25,14 @@ Name[tr]=KDE Bağlan Name[uk]=З’єднання KDE Name[x-test]=xxKDE Connectxx GenericName=Connect smartphones to your KDE Plasma Workspace +GenericName[cs]=Připojte své telefony k Pracovní ploše Plasma GenericName[da]=Forbind smartphones med din KDE Plasma Workspace GenericName[de]=Verbindung von Smartphones mit demKDE-Plasma-Arbeitsbereich GenericName[fr]=Connectez votre smartphone à votre espace de travail KDE Plasma GenericName[hu]=Okostelefonok csatlakoztatása a KDE Plasma munkaterülethez +GenericName[ko]=KDE Plasma 작업 공간으로 스마트폰 연결 GenericName[nl]=Smartphones verbinden met uw KDE Plasma werkruimte +GenericName[pl]=Podłącz smartfony do swojej Przestrzeni Roboczej Plazmy KDE GenericName[pt]=Ligue os 'smartphones' à sua Área de Trabalho do KDE GenericName[pt_BR]=Conecte os smartphones ao Espaço de Trabalho Plasma do KDE GenericName[sk]=Pripojiť smartfóny k vašej pracovnej ploche KDE Plasma diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt index ec1c968c0..e2dcb2157 100644 --- a/kded/CMakeLists.txt +++ b/kded/CMakeLists.txt @@ -1,5 +1,4 @@ add_subdirectory(plugins) -add_subdirectory(autotests) find_package (QJSON 0.8.1 REQUIRED) find_package (QCA2 REQUIRED) diff --git a/kded/autotests/CMakeLists.txt b/kded/autotests/CMakeLists.txt deleted file mode 100644 index 1495c6af8..000000000 --- a/kded/autotests/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -set(_testname testsocketlinereader) -qt4_generate_moc(${_testname}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testname}.moc) -include_directories(${QT_INCLUDES} ${KDE4_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}) -kde4_add_unit_test(${_testname} ${_testname}.cpp ${_testname}.moc ../backends/lan/socketlinereader.cpp ../kdebugnamespace.cpp) -target_link_libraries(${_testname} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY}) \ No newline at end of file diff --git a/kded/daemon.cpp b/kded/daemon.cpp index c4ee42746..fb1c1662e 100644 --- a/kded/daemon.cpp +++ b/kded/daemon.cpp @@ -45,6 +45,7 @@ Daemon::Daemon(QObject *parent) : QObject(parent) //uuids contain charcaters that are not exportable in dbus paths uuid = uuid.mid(1, uuid.length() - 2).replace("-", "_"); config->group("myself").writeEntry("id", uuid); + config->sync(); kDebug(kdeconnect_kded()) << "My id:" << uuid; } @@ -72,21 +73,24 @@ Daemon::Daemon(QObject *parent) : QObject(parent) if (!privKey.setPermissions(strict)) { kWarning(kdeconnect_kded()) << "Error: KDE Connect could not set permissions for private file: " << privateKeyPath; - //return; } - //http://delta.affinix.com/docs/qca/rsatest_8cpp-example.html - privKey.write(QCA::KeyGenerator().createRSA(2048).toPEM().toAscii()); + //http://delta.affinix.com/docs/qca/rsatest_8cpp-example.html + if (config->group("myself").hasKey("privateKey")) { + //Migration from older versions of KDE Connect + privKey.write(config->group("myself").readEntry("privateKey",QCA::KeyGenerator().createRSA(2048).toPEM()).toAscii()); + } else { + privKey.write(QCA::KeyGenerator().createRSA(2048).toPEM().toAscii()); + } privKey.close(); - + config->group("myself").writeEntry("privateKeyPath", privateKeyPath); + config->sync(); } if (QFile::permissions(config->group("myself").readEntry("privateKeyPath")) != strict) { kWarning(kdeconnect_kded()) << "Error: KDE Connect detects wrong permissions for private file " << config->group("myself").readEntry("privateKeyPath"); - //FIXME: Do not silently fail, because user won't notice the problem - //return; } //Debugging diff --git a/kded/device.cpp b/kded/device.cpp index 3b4b09f76..20059d4c7 100644 --- a/kded/device.cpp +++ b/kded/device.cpp @@ -430,6 +430,7 @@ void Device::storeAsTrusted() config->group("trusted_devices").group(id()).writeEntry("publicKey", m_publicKey.toPEM()); config->group("trusted_devices").group(id()).writeEntry("deviceName", name()); config->group("trusted_devices").group(id()).writeEntry("deviceType", type2str(m_deviceType)); + config->sync(); } QStringList Device::availableLinks() const diff --git a/kded/filetransferjob.h b/kded/filetransferjob.h index 2378fc3d3..0969dce0e 100644 --- a/kded/filetransferjob.h +++ b/kded/filetransferjob.h @@ -52,6 +52,7 @@ public Q_SLOTS: protected: virtual bool doKill(); + private: void startTransfer(); QSharedPointer mOrigin; diff --git a/kded/kdeconnect.desktop b/kded/kdeconnect.desktop index 086df1070..c5ed0c02e 100644 --- a/kded/kdeconnect.desktop +++ b/kded/kdeconnect.desktop @@ -10,15 +10,19 @@ X-KDE-Kded-phase=1 Name=KDE Connect Name[bs]=Konekcija KDE +Name[cs]=KDE Connect Name[da]=KDE Connect Name[de]=KDE-Connect Name[es]=KDE Connect Name[fr]=KDE Connect Name[hu]=KDE csatlakozás Name[it]=KDE Connect +Name[ko]=KDE Connect Name[nl]=KDE Connect +Name[pl]=KDE Connect Name[pt]=KDE Connect Name[pt_BR]=KDE Connect +Name[ro]=KDE Connect Name[ru]=KDE Connect Name[sk]=KDE Connect Name[sv]=KDE anslut @@ -28,13 +32,16 @@ Name[x-test]=xxKDE Connectxx Comment=Connect KDE with your smartphone Comment[bs]=Konektujte se na KDE sa Vašim mobitelom +Comment[cs]=Propojte KDE s vaším telefonem Comment[da]=Forbind KDE med din smartphone Comment[de]=KDE mit Ihren Smartphone verbinden Comment[es]=Conecte KDE con su teléfono móvil Comment[fr]=Connectez KDE avec votre smartphone Comment[hu]=A KDE csatlakoztatása az okostelefonnal Comment[it]=Connetti KDE con il tuo smartphone +Comment[ko]=KDE와 스마트폰 연결 Comment[nl]=KDE met uw smartphone verbinden +Comment[pl]=Podłącz swój smartfon do KDE Comment[pt]=Ligue o KDE ao seu telemóvel Comment[pt_BR]=Conecte o KDE ao seu celular Comment[ru]=Подключайте смартфон к KDE diff --git a/kded/kdeconnect.notifyrc b/kded/kdeconnect.notifyrc index 2b6bab876..313bf832a 100644 --- a/kded/kdeconnect.notifyrc +++ b/kded/kdeconnect.notifyrc @@ -2,15 +2,19 @@ IconName=kdeconnect Name=KDE Connect Name[bs]=Konekcija KDE +Name[cs]=KDE Connect Name[da]=KDE Connect Name[de]=KDE-Connect Name[es]=KDE Connect Name[fr]=KDE Connect Name[hu]=KDE csatlakozás Name[it]=KDE Connect +Name[ko]=KDE Connect Name[nl]=KDE Connect +Name[pl]=KDE Connect Name[pt]=KDE Connect Name[pt_BR]=KDE Connect +Name[ro]=KDE Connect Name[ru]=KDE Connect Name[sk]=KDE Connect Name[sv]=KDE anslut @@ -19,15 +23,19 @@ Name[uk]=З’єднання KDE Name[x-test]=xxKDE Connectxx Comment=Notifications from your devices Comment[bs]=Notifikacija sa Vašeg uređaja +Comment[cs]=Oznamování z vašich zařízení Comment[da]=Bekendtgørelser fra dine enheder Comment[de]=Benachrichtigungen von Ihren Geräten Comment[es]=Notificaciones de sus dispositivos Comment[fr]=Notifications provenant de vos périphériques Comment[hu]=Az eszközökről származó értesítések Comment[it]=Notifiche dai tuoi dispositivi +Comment[ko]=장치에 표시된 알림 Comment[nl]=Meldingen van uw apparaten +Comment[pl]=Powiadomienia z urządzeń Comment[pt]=Notificações dos seus dispositivos Comment[pt_BR]=Notificações dos seus dispositivos +Comment[ro]=Notificări de pe dispozitivele dumneavoastră Comment[ru]=Уведомления от устройств Comment[sk]=Oznámenia z vašich zariadení Comment[sv]=Underrättelser från dina apparater @@ -45,9 +53,12 @@ Name[es]=Llamando Name[fr]=Appel Name[hu]=Hívás Name[it]=Chiamata +Name[ko]=전화 거는 중 Name[nl]=Oproep +Name[pl]=Dzwonienie Name[pt]=A Chamar Name[pt_BR]=Chamando +Name[ro]=Apelare Name[ru]=Вызов Name[sk]=Volanie Name[sv]=Samtal @@ -56,15 +67,19 @@ Name[uk]=Виклик Name[x-test]=xxCallingxx Comment=Someone is calling you Comment[bs]=Neko Vas zove +Comment[cs]=Někdo vám volá Comment[da]=Nogen ringer til dig Comment[de]=Sie werden angerufen Comment[es]=Alguien le está llamando Comment[fr]=Quelqu'un vous appelle Comment[hu]=Valaki hívja önt Comment[it]=Chiamata in arrivo +Comment[ko]=누군가가 전화를 걸었음 Comment[nl]=Iemand belt u op +Comment[pl]=Ktoś do ciebie dzwoni Comment[pt]=Alguém está a ligar-lhe Comment[pt_BR]=Alguém está chamando você +Comment[ro]=Cineva vă apelează Comment[ru]=Вас кто-то вызывает Comment[sk]=Niekto vám volá Comment[sv]=Någon ringer till dig @@ -83,9 +98,12 @@ Name[es]=Perdida Name[fr]=Pas de réponse Name[hu]=Nem fogadott Name[it]=Chiamata persa +Name[ko]=부재 중 전화 Name[nl]=Gemist +Name[pl]=Nie odebrano Name[pt]=Não Atendida Name[pt_BR]=Não atendidas +Name[ro]=Nepreluat Name[ru]=Пропущен Name[sk]=Zmeškané Name[sv]=Missat @@ -101,9 +119,12 @@ Comment[es]=Tiene una llamada perdida Comment[fr]=Vous avez un appel manqué Comment[hu]=Nem fogadott hívása van Comment[it]=Hai una chiamata persa +Comment[ko]=부재 중 전화가 있음 Comment[nl]=U hebt een gemiste oproep +Comment[pl]=Nie odebrałeś połączenia Comment[pt]=Tem uma chamada não atendida Comment[pt_BR]=Você tem uma chamada não atendida +Comment[ro]=Ați pierdut un apel Comment[ru]=У вас есть пропущенный вызов Comment[sk]=Máte zmeškaný hovor Comment[sv]=Du har missat ett samtal @@ -122,9 +143,12 @@ Name[es]=SMS Name[fr]=SMS Name[hu]=SMS Name[it]=SMS +Name[ko]=SMS Name[nl]=SMS +Name[pl]=SMS Name[pt]=SMS Name[pt_BR]=SMS +Name[ro]=SMS Name[ru]=SMS Name[sk]=SMS Name[sv]=SMS @@ -133,15 +157,19 @@ Name[uk]=SMS Name[x-test]=xxSMSxx Comment=Someone sent you an SMS Comment[bs]=Neko Vam je poslao SMS poruku +Comment[cs]=Někdo vám poslal SMS Comment[da]=Nogen sendte dig en SMS Comment[de]=Jemand hat Ihnen eine SMS gesendet Comment[es]=Alguien le ha enviado un SMS Comment[fr]=Quelqu'un vous a envoyé un SMS Comment[hu]=Valaki SMS-t küldött önnek Comment[it]=Hai ricevuto un SMS +Comment[ko]=누군가가 문자 메시지를 보냄 Comment[nl]=Iemand heeft u een SMS gestuurd +Comment[pl]=Ktoś do ciebie wysłał SMSa Comment[pt]=Alguém lhe enviou um SMS Comment[pt_BR]=Alguém lhe enviou um SMS +Comment[ro]=Cineva v-a trimis un SMS Comment[ru]=У вас новое SMS сообщение Comment[sk]=Niekto vám poslal SMS Comment[sv]=Någon skickade ett SMS till dig @@ -160,9 +188,12 @@ Name[es]=Batería Name[fr]=Batterie Name[hu]=Akkumulátor Name[it]=Batteria +Name[ko]=배터리 Name[nl]=Batterij +Name[pl]=Bateria Name[pt]=Bateria Name[pt_BR]=Bateria +Name[ro]=Acumulator Name[ru]=Батарея Name[sk]=Batéria Name[sv]=Batteri @@ -171,15 +202,19 @@ Name[uk]=Акумулятор Name[x-test]=xxBatteryxx Comment=Your battery is in low state Comment[bs]=Vaša baterija je gotovo prazna +Comment[cs]=Máte slabou baterii Comment[da]=Dit batteri er på lavt niveau Comment[de]=Der Ladestand Ihres Akkus ist niedrig Comment[es]=La batería está en estado bajo Comment[fr]=Votre batterie est faible Comment[hu]=Az akkumulátora feszültsége alacsony Comment[it]=La tua batteria è al livello basso +Comment[ko]=배터리가 부족함 Comment[nl]=Uw batterij is bijna leeg +Comment[pl]=Twoja bateria ma niski poziom naładowania Comment[pt]=A sua bateria está fraca Comment[pt_BR]=Sua bateria está com carga baixa +Comment[ro]=Acumulatorul are un nivel scăzut Comment[ru]=Низкий заряд батареи Comment[sk]=Vaša batéria je na nízkom stave Comment[sv]=Batteriet är nästan slut @@ -198,9 +233,12 @@ Name[es]=Ping Name[fr]=Commande « Ping » Name[hu]=Ping Name[it]=Ping +Name[ko]=핑 Name[nl]=Ping +Name[pl]=Ping Name[pt]=Pedido de Rede Name[pt_BR]=Ping +Name[ro]=Ping Name[ru]=Пинг Name[sk]=Ping Name[sv]=Ping @@ -209,15 +247,19 @@ Name[uk]=Луна Name[x-test]=xxPingxx Comment=Ping received Comment[bs]=Primili ste ping +Comment[cs]=Ping přijat Comment[da]=Ping modtaget Comment[de]=Ping empfangen Comment[es]=Ping recibido Comment[fr]=Commande « Ping » reçue Comment[hu]=Ping érkezett Comment[it]=Hai ricevuto un ping +Comment[ko]=핑 받음 Comment[nl]=Ping ontvangen +Comment[pl]=Otrzymano ping Comment[pt]=Pedido de rede recebido Comment[pt_BR]=Ping recebido +Comment[ro]=Ping primit Comment[ru]=Пинг получен Comment[sk]=Prijatý ping Comment[sv]=Ping mottaget @@ -236,9 +278,12 @@ Name[es]=Notificación Name[fr]=Notification Name[hu]=Értesítés Name[it]=Notifica +Name[ko]=알림 Name[nl]=Melding +Name[pl]=Powiadomienie Name[pt]=Notificação Name[pt_BR]=Notificação +Name[ro]=Notificare Name[ru]=Уведомление Name[sk]=Upozornenie Name[sv]=Underrättelse @@ -247,15 +292,19 @@ Name[uk]=Сповіщення Name[x-test]=xxNotificationxx Comment=Notification received Comment[bs]=Primjeno obavještenje +Comment[cs]=Bylo přijato upozornění Comment[da]=Bekendtgørelse modtaget Comment[de]=Benachrichtigung eingegangen Comment[es]=Notificación recibida Comment[fr]=Notification reçue Comment[hu]=Értesítés érkezett Comment[it]=Hai ricevuto una notifica +Comment[ko]=알림 받음 Comment[nl]=Melding ontvangen +Comment[pl]=Otrzymano powiadomienie Comment[pt]=Notificação recebida Comment[pt_BR]=Notificação recebida +Comment[ro]=Notificare primită Comment[ru]=Уведомление получено Comment[sk]=Prijaté oznámenie Comment[sv]=Underrättelse mottagen @@ -274,9 +323,12 @@ Name[es]=Desconocido Name[fr]=Inconnu Name[hu]=Ismeretlen Name[it]=Sconsciuto +Name[ko]=알 수 없음 Name[nl]=Onbekend +Name[pl]=Nieznana Name[pt]=Desconhecido Name[pt_BR]=Desconhecido +Name[ro]=Necunoscut Name[ru]=Неизвестно Name[sk]=Neznáme Name[sv]=Okänt @@ -285,15 +337,19 @@ Name[uk]=Невідомо Name[x-test]=xxUnknownxx Comment=Something unknown happened Comment[bs]=Nešto se nepoznato dogodilo +Comment[cs]=Stalo se něco neznámého Comment[da]=Der skete noget ukendt Comment[de]=Etwas unbekanntes ist aufgetreten Comment[es]=Ha ocurrido algo desconocido Comment[fr]=Un évènement inconnu est survenu Comment[hu]=Valami ismeretlen történt Comment[it]=Errore imprevisto +Comment[ko]=알 수 없는 일이 일어남 Comment[nl]=Er is iets onbekends gebeurd +Comment[pl]=Stało się coś nieznanego Comment[pt]=Algo de inesperado aconteceu Comment[pt_BR]=Ocorreu algo inesperado +Comment[ro]=S-a întîmplat ceva necunoscut Comment[ru]=Произошло неизвестное событие Comment[sk]=Stalo sa niečo neznáme Comment[sv]=Någonting okänt inträffade @@ -304,25 +360,33 @@ Action=Popup [Event/mounted] Name=Mounted +Name[cs]=Připojen Name[da]=Monteret Name[de]=Eingebunden Name[fr]=Monté Name[hu]=Csatolva +Name[ko]=마운트됨 Name[nl]=Aangekoppeld +Name[pl]=Zamontowany Name[pt]=Montado Name[pt_BR]=Montado +Name[ro]=Montat Name[sk]=Pripojené Name[sv]=Monterat Name[uk]=Змонтовано Name[x-test]=xxMountedxx Comment=Filesystem mounted +Comment[cs]=Souborový systém byl připojen Comment[da]=Filsystem monteret Comment[de]=Dateisystem eingebunden Comment[fr]=Système de fichiers monté Comment[hu]=Fájlrendszer csatolva +Comment[ko]=파일 시스템 마운트됨 Comment[nl]=Bestandssysteem aangekoppeld +Comment[pl]=Zamontowano system plików Comment[pt]=Sistema de ficheiros montado Comment[pt_BR]=Sistema de arquivos montado +Comment[ro]=Sistem de fișiere montat Comment[sk]=Súborový systém pripojený Comment[sv]=Filsystem monterat Comment[uk]=Файлову систему змонтовано @@ -331,25 +395,33 @@ Action=None [Event/unmounted] Name=Unmounted +Name[cs]=Odpojen Name[da]=Afmonteret Name[de]=Einbindung gelöst Name[fr]=Libéré Name[hu]=Leválasztva +Name[ko]=마운트 해제됨 Name[nl]=Afgekoppeld +Name[pl]=Odmontowano Name[pt]=Desmontado Name[pt_BR]=Desmontado +Name[ro]=Nemontat Name[sk]=Nepripojený Name[sv]=Avmonterat Name[uk]=Демонтовано Name[x-test]=xxUnmountedxx Comment=Filesystem unmounted +Comment[cs]=Souborový systém byl odpojen Comment[da]=Filsystem afmonteret Comment[de]=Einbindung des Dateisystems gelöst Comment[fr]=Système de fichiers libéré Comment[hu]=Fájlrendszer leválasztva +Comment[ko]=파일 시스템 마운트 해제됨 Comment[nl]=Bestandssysteem afgekoppeld +Comment[pl]=Odmontowano system plików Comment[pt]=Sistema de ficheiros desmontado Comment[pt_BR]=Sistema de arquivos desmontado +Comment[ro]=Sistem de fișiere nemontat Comment[sk]=Súborový systém odpojený Comment[sv]=Filsystem avmonterat Comment[uk]=Файлову систему демонтовано diff --git a/kded/kdeconnectd.cpp b/kded/kdeconnectd.cpp index 365b9ca3c..c0d966ee4 100644 --- a/kded/kdeconnectd.cpp +++ b/kded/kdeconnectd.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include @@ -70,11 +70,10 @@ int main(int argc, char* argv[]) KCmdLineArgs::init(argc, argv, &aboutData); - KApplication app(true); // WARNING GUI required for QClipboard access + KUniqueApplication app(true); // WARNING GUI required for QClipboard access app.disableSessionManagement(); app.setQuitOnLastWindowClosed(false); - //Force daemon to destroy when KApplications in alive //belongs to bug KApplications resoure freeing Daemon* daemon = new Daemon(0); diff --git a/kded/plugins/battery/batterydbusinterface.h b/kded/plugins/battery/batterydbusinterface.h index d9f412e56..2fef9f637 100644 --- a/kded/plugins/battery/batterydbusinterface.h +++ b/kded/plugins/battery/batterydbusinterface.h @@ -33,8 +33,8 @@ public: explicit BatteryDbusInterface(QObject *parent); virtual ~BatteryDbusInterface(); - Q_SCRIPTABLE int charge() { return mCharge; } - Q_SCRIPTABLE bool isCharging() { return mIsCharging; } + Q_SCRIPTABLE int charge() const { return mCharge; } + Q_SCRIPTABLE bool isCharging() const { return mIsCharging; } void updateValues(bool isCharging, int currentCharge); diff --git a/kded/plugins/battery/kdeconnect_battery.desktop b/kded/plugins/battery/kdeconnect_battery.desktop index 5e5e7551b..f39d83ca4 100644 --- a/kded/plugins/battery/kdeconnect_battery.desktop +++ b/kded/plugins/battery/kdeconnect_battery.desktop @@ -20,9 +20,12 @@ Name[es]=Monitor de la batería Name[fr]=Moniteur de batterie Name[hu]=Akkumulátorfigyelő Name[it]=Monitor batteria +Name[ko]=배터리 모니터 Name[nl]=Batterijmonitor +Name[pl]=Monitor baterii Name[pt]=Monitor da bateria Name[pt_BR]=Monitor de bateria +Name[ro]=Monitorul acumulatorului Name[ru]=Индикатор батареи Name[sk]=Monitor batérie Name[sv]=Batteriövervakare @@ -31,13 +34,16 @@ Name[uk]=Монітор акумулятора Name[x-test]=xxBattery monitorxx Comment=Show your phone battery next to your computer battery Comment[bs]=Prikažite Vašu bateriju sa mobilnog telefona poted Vaše računarske baterije +Comment[cs]=Zobrazit baterku vašeho telefonu vedle baterie vašeho notebooku Comment[da]=Vis dit telefonbatteri ved siden af din computers batteri Comment[de]=Zeigt den Akku Ihres Telefons neben dem Akku des Rechners Comment[es]=Muestra la batería de su teléfono junto a la batería de su equipo Comment[fr]=Affichez la batterie de votre téléphone près de la batterie de votre téléphone Comment[hu]=A telefon akkumulátorának megjelenítése a számítógép akkumulátora mellett Comment[it]=Mostra il livello batteria del tuo telefono accanto a quella del computer +Comment[ko]=폰 배터리와 컴퓨터 배터리 동시 확인 Comment[nl]=Uw telefoonbatterij naast uw computerbatterij tonen +Comment[pl]=Pokaż baterię swojego telefonu obok baterii komputera Comment[pt]=Mostra a bateria do seu telemóvel ao lado da do computador Comment[pt_BR]=Mostra a bateria do seu celular ao lado da bateria do computador Comment[ru]=Показывать значок батареи устройства рядом со значком батареи компьютера diff --git a/kded/plugins/clipboard/kdeconnect_clipboard.desktop b/kded/plugins/clipboard/kdeconnect_clipboard.desktop index 658029626..5b1f3ab4e 100644 --- a/kded/plugins/clipboard/kdeconnect_clipboard.desktop +++ b/kded/plugins/clipboard/kdeconnect_clipboard.desktop @@ -20,9 +20,12 @@ Name[es]=Portapapeles Name[fr]=Presse-papiers Name[hu]=Vágólap Name[it]=Appunti +Name[ko]=클립보드 Name[nl]=Klembord +Name[pl]=Schowek Name[pt]=Área de Transferência Name[pt_BR]=Área de transferência +Name[ro]=Clipboard Name[ru]=Буфер обмена Name[sk]=Schránka Name[sv]=Klippbord @@ -31,15 +34,19 @@ Name[uk]=Буфер обміну Name[x-test]=xxClipboardxx Comment=Share the clipboard between devices Comment[bs]=Podijeli Clipboard među uređajima +Comment[cs]=Sdílejte schránku mezi zařízeními Comment[da]=Del indholdet af udklipsholderen mellem enheder Comment[de]=Die Zwischenablage mit Geräten teilen Comment[es]=Compartir el portapapeles entre dispositivos Comment[fr]=Partagez le presse-papiers entre périphériques Comment[hu]=Vágólap megosztása az eszközök között Comment[it]=Condividi gli appunti tra i dispositivi +Comment[ko]=장치간 클립보드 공유 Comment[nl]=Het klembord tussen apparaten delen +Comment[pl]=Współdziel schowek pomiędzy urządzeniami Comment[pt]=Partilhar a área de transferência entre dispositivos Comment[pt_BR]=Compartilhar a área de transferência entre dispositivos +Comment[ro]=Partajează clipboardul între dispozitive Comment[ru]=Общий буфер обмена для всех устройств Comment[sk]=Zdieľať schránku medzi zariadeniami Comment[sv]=Dela klippbordet mellan apparater diff --git a/kded/plugins/kdeconnect_plugin.desktop b/kded/plugins/kdeconnect_plugin.desktop index c98b52d3e..1faccc9d2 100644 --- a/kded/plugins/kdeconnect_plugin.desktop +++ b/kded/plugins/kdeconnect_plugin.desktop @@ -4,15 +4,19 @@ X-KDE-ServiceType=KdeConnect/Plugin X-KDE-Derived=KPluginInfo Name=KDEConnect Plugin Name[bs]=Priključak za KDE konekciju +Name[cs]=Modul KDEConnect Name[da]=KDEConnect-plugin Name[de]=KDEConnect-Modul Name[es]=Complemento de KDEConnect Name[fr]=Module externe KDEConnect Name[hu]=KDEConnect bővítmény Name[it]=Estensione KDEConnect +Name[ko]=KDEConnect 플러그인 Name[nl]=Plug-in van KDEConnect +Name[pl]=Wtyczka KDEConnect Name[pt]='Plugin' do KDEConnect Name[pt_BR]=Plugin do KDEConnect +Name[ro]=Extensie KDEConnect Name[ru]=Модуль KDEConnect Name[sk]=Plugin KDEConnect Name[sv]=KDE anslutningsinsticksprogram diff --git a/kded/plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop b/kded/plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop index 0717188fd..462ac9bec 100644 --- a/kded/plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop +++ b/kded/plugins/mpriscontrol/kdeconnect_mpriscontrol.desktop @@ -13,13 +13,16 @@ X-KDE-PluginInfo-EnabledByDefault=true Icon=media-playback-start Name=Multimedia control receiver Name[bs]=Multimedijalni kontrolni primaoc +Name[cs]=Přijímač ovládání multimédií Name[da]=Modtager til multimediebetjening Name[de]=Steuerung für Multimedia-Empfänger Name[es]=Receptor de control multimedia Name[fr]=Receveur de contrôle multimédia Name[hu]=Multimédia vezérlés vevő Name[it]=Ricevitore telecomando multimediale +Name[ko]=멀티미디어 제어 수신기 Name[nl]=Ontvanger van bediening voor multimedia +Name[pl]=Odbiornik sterowania multimediami Name[pt]=Receptor de controlo multimédia Name[pt_BR]=Receptor de controle multimídia Name[ru]=Ресивер аудио/видео @@ -30,13 +33,16 @@ Name[uk]=Отримувач команд щодо керування мульт Name[x-test]=xxMultimedia control receiverxx Comment=Remote control your music and videos Comment[bs]=Daljinsko upravljenje Vaše muzike i videa +Comment[cs]=Vzdálené ovládání pro vaši hudbu a videa Comment[da]=Fjernbetjening til din musik og dine videoer Comment[de]=Fernbedienung für Musik und Videos Comment[es]=Controle a distancia su música y sus vídeos Comment[fr]=Contrôlez à distance votre musique et vos vidéos Comment[hu]=Távirányító a zenékhez és videókhoz Comment[it]=Controlla la riproduzione audio/video del pc dal telefono +Comment[ko]=음악과 동영상 원격 제어 Comment[nl]=Op afstand bedienen van uw muziek en video's +Comment[pl]=Steruj zdalnie swoją muzyką i filmami Comment[pt]=Comande à distância a sua música e vídeos Comment[pt_BR]=Controle suas músicas e vídeos remotamente Comment[ru]=Дистанционное управление музыкой и видео diff --git a/kded/plugins/notifications/kdeconnect_notifications.desktop b/kded/plugins/notifications/kdeconnect_notifications.desktop index b33eb2ada..ba5e65343 100644 --- a/kded/plugins/notifications/kdeconnect_notifications.desktop +++ b/kded/plugins/notifications/kdeconnect_notifications.desktop @@ -13,15 +13,19 @@ X-KDE-PluginInfo-EnabledByDefault=true Icon=preferences-desktop-notification Name=Notification sync Name[bs]=Sinhronizovano obavještenje +Name[cs]=Synchronizace hlášení Name[da]=Synk. af bekendtgørelser Name[de]=Benachrichtigungs-Abgleich Name[es]=Sincronizar notificaciones Name[fr]=Synchronisation de notifications Name[hu]=Értesítés szinkronizáció Name[it]=Sincronizzazione notifiche +Name[ko]=알림 동기화 Name[nl]=Synchronisatie van meldingen +Name[pl]=Powiadomienia synchronizacji Name[pt]=Sincronização de notificações Name[pt_BR]=Sincronização de notificações +Name[ro]=Sincronizare notificări Name[ru]=Синхронизация уведомлений Name[sk]=Synchronizácia pripomienok Name[sv]=Synkronisering av underrättelser @@ -30,13 +34,16 @@ Name[uk]=Синхронізація сповіщень Name[x-test]=xxNotification syncxx Comment=Show phone notifications in KDE and keep them in sync Comment[bs]=Prikaži objavještenja sa mobitela u KDE i održavaj ih sinhronizovanim +Comment[cs]=Zobrazit upozornění z telefonu v KDE a udržovat je synchronizovaná Comment[da]=Vis telefonbekendtgørelser i KDE og hold dem synkroniseret Comment[de]=Benachrichtigungen in KDE anzeigen und abgleichen Comment[es]=Mostrar las notificaciones del teléfono en KDE y mantenerlas sincronizadas Comment[fr]=Affichez les notifications du téléphone dans KDE et conservez-les lors de la synchronisation Comment[hu]=Telefonértesítések megjelenítése a KDE-ben és szinkronizálva tartása Comment[it]=Mostra e sincronizza le notifiche del telefono in KDE +Comment[ko]=폰 알림을 KDE에 표시하고 동기화 유지 Comment[nl]=Telefoonmeldingen in KDE tonen en ze gesynchroniseerd houden +Comment[pl]=Pokaż powiadomienia telefonu w KDE i synchronizuj je Comment[pt]=Mostrar as notificações do telefone no KDE e mantê-las sincronizadas Comment[pt_BR]=Mostra as notificações do celular no KDE e as mantem sincronizadas Comment[ru]=Показывать телефонные уведомления в KDE и синхронизировать их diff --git a/kded/plugins/notifications/notification.h b/kded/plugins/notifications/notification.h index a97d48704..1ce53456d 100644 --- a/kded/plugins/notifications/notification.h +++ b/kded/plugins/notifications/notification.h @@ -41,11 +41,11 @@ public: Notification(const NetworkPackage& np, const QString& iconPath, QObject* parent); virtual ~Notification(); - QString internalId() { return mId; } - QString appName() { return mAppName; } - QString ticker() { return mTicker; } - QString iconPath() { return mIconPath; } - bool dismissable() { return mDismissable; } + QString internalId() const { return mId; } + QString appName() const { return mAppName; } + QString ticker() const { return mTicker; } + QString iconPath() const { return mIconPath; } + bool dismissable() const { return mDismissable; } public Q_SLOTS: Q_SCRIPTABLE void dismiss(); diff --git a/kded/plugins/pausemusic/kdeconnect_pausemusic.desktop b/kded/plugins/pausemusic/kdeconnect_pausemusic.desktop index c3b48beef..41672ee19 100644 --- a/kded/plugins/pausemusic/kdeconnect_pausemusic.desktop +++ b/kded/plugins/pausemusic/kdeconnect_pausemusic.desktop @@ -13,13 +13,16 @@ X-KDE-PluginInfo-EnabledByDefault=true Icon=speaker Name=Pause media during calls Name[bs]=Pauziraj medij prilikom poziva +Name[cs]=Pozastavit média během hovoru Name[da]=Sæt medier på pause under opkald Name[de]=Medium bei Anrufen anhalten Name[es]=Pausar multimedia durante las llamadas Name[fr]=Mettre en pause le média pendant les appels Name[hu]=Média szüneteltetése hívások közben Name[it]=Pausa durante le chiamate +Name[ko]=통화 중 미디어 일시 정지 Name[nl]=Media pauzeren tijdens oproepen +Name[pl]=Wstrzymaj multimedia przy dzwonieniu Name[pt]=Pausar os conteúdos durante as chamadas Name[pt_BR]=Pausar os conteúdos multimídia durante as chamadas Name[ru]=Останавливать проигрывание мультимедия во время звонков @@ -30,13 +33,16 @@ Name[uk]=Призупинка відтворення під час дзвінк Name[x-test]=xxPause media during callsxx Comment=Pause music/videos during a phone call Comment[bs]=Stopiraj muziku/videe prilikom poziva +Comment[cs]=Pozastavit hudbu/videa během hovoru Comment[da]=Sæt musik/video på pause under telefonopkald Comment[de]=Hält Musik oder Videos währen eines Anrufs an Comment[es]=Pausar la música y los vídeos durante una llamada telefónica -Comment[fr]=Mettre en pause la musique / les vidéos pendant un appel téléphonique +Comment[fr]=Mettre en pause la musique / les vidéos pendant un appel téléphonique Comment[hu]=Zenék vagy videók szüneteltetése telefonhívás közben Comment[it]=Mette in pausa la riproduzione audio/video durante una chiamata +Comment[ko]=통화 중 음악/동영상 일시 정지 Comment[nl]=Muziek/video's pauzeren tijdens een telefoongesprek +Comment[pl]=Wstrzymaj muzykę/film przy dzwonieniu Comment[pt]=Pausar a música/vídeo durante uma chamada Comment[pt_BR]=Pausa a música/vídeo durante uma chamada Comment[ru]=Приостанавливать музыку/видео во время телефонного звонка diff --git a/kded/plugins/pausemusic/kdeconnect_pausemusic_config.desktop b/kded/plugins/pausemusic/kdeconnect_pausemusic_config.desktop index 1f536e098..2da13db12 100644 --- a/kded/plugins/pausemusic/kdeconnect_pausemusic_config.desktop +++ b/kded/plugins/pausemusic/kdeconnect_pausemusic_config.desktop @@ -6,11 +6,14 @@ X-KDE-Library=kdeconnect_pausemusic_config X-KDE-ParentComponents=kdeconnect_pausemusic Name=Pause Music plugin settings +Name[cs]=Nastavení modulu Pozastavení hudby Name[da]=Indstilling af plugin til at sætte musik på pause Name[de]=Modul-Einstellungen für das Anhalten der Musikwiedergabe Name[fr]=Paramètres du module de mise en pause Name[hu]=Zene szüneteltetése bővítmény beállításai +Name[ko]=음악 일시 정지 플러그인 설정 Name[nl]=Plug-in-instellingen voor muziek pauzeren +Name[pl]=Ustawienia wtyczki wstrzymywania muzyki Name[pt]=Configuração do 'plugin' de Pausa da Música Name[pt_BR]=Pausar as configurações do plugin Músicas Name[sk]=Nastavenia pluginu pozastavenia hudby diff --git a/kded/plugins/pausemusic/pausemusicplugin.cpp b/kded/plugins/pausemusic/pausemusicplugin.cpp index 8c39d5519..3ca8e06d8 100644 --- a/kded/plugins/pausemusic/pausemusicplugin.cpp +++ b/kded/plugins/pausemusic/pausemusicplugin.cpp @@ -76,8 +76,8 @@ bool PauseMusicPlugin::receivePackage(const NetworkPackage& np) if (pauseConditionFulfilled) { if (use_mute) { QDBusInterface kmixInterface("org.kde.kmix", "/kmix/KMixWindow/actions/mute", "org.qtproject.Qt.QAction"); - if (isKMixMuted()) { - pausedSources.insert("mute"); + if (!isKMixMuted()) { + pausedSources.insert("mute"); //Fake source kmixInterface.call("trigger"); } } else { diff --git a/kded/plugins/ping/kdeconnect_ping.desktop b/kded/plugins/ping/kdeconnect_ping.desktop index a94f75143..685d0549a 100644 --- a/kded/plugins/ping/kdeconnect_ping.desktop +++ b/kded/plugins/ping/kdeconnect_ping.desktop @@ -20,9 +20,12 @@ Name[es]=Ping Name[fr]=Commande « Ping » Name[hu]=Ping Name[it]=Ping +Name[ko]=핑 Name[nl]=Ping +Name[pl]=Ping Name[pt]=Pedido de Rede Name[pt_BR]=Ping +Name[ro]=Ping Name[ru]=Пинг Name[sk]=Ping Name[sv]=Ping @@ -38,9 +41,12 @@ Comment[es]=Enviar y recibir pings Comment[fr]=Envoyez et recevez des « ping » Comment[hu]=Pingek küldése és fogadása Comment[it]=Invia e ricevi ping +Comment[ko]=핑 보내고 받기 Comment[nl]=Pings verzenden en ontvangen +Comment[pl]=Wysyłaj i otrzymuj pingi Comment[pt]=Enviar e receber pedidos de rede Comment[pt_BR]=Envia e recebe pings +Comment[ro]=Trimite și primește ping-uri Comment[ru]=Посылать и получать пинги Comment[sk]=Poslať a prijať pingy Comment[sv]=Skicka och ta emot ping diff --git a/kded/plugins/sftp/kdeconnect_sftp.desktop b/kded/plugins/sftp/kdeconnect_sftp.desktop index 10efd1eda..dd1f31ec2 100644 --- a/kded/plugins/sftp/kdeconnect_sftp.desktop +++ b/kded/plugins/sftp/kdeconnect_sftp.desktop @@ -12,11 +12,14 @@ X-KDE-PluginInfo-License=GPL X-KDE-PluginInfo-EnabledByDefault=true Icon=system-file-manager Name=Remote filesystem browser +Name[cs]=Prohlížeč vzdáleného souborového systému Name[da]=Gennemse eksternt filsystem Name[de]=Datei-Browser für entferne Systeme Name[fr]=Contrôlez à distance le navigateur du système de fichiers Name[hu]=Távoli fájlrendszer böngésző +Name[ko]=원격 파일 시스템 탐색기 Name[nl]=Bestandssysteembrowser op afstand +Name[pl]=Przeglądarka zdalnego systemu plików Name[pt]=Navegador do sistema de ficheiros remoto Name[pt_BR]=Navegador do sistema de arquivos remoto Name[sk]=Prehliadač vzdialeného súborového systému @@ -24,11 +27,14 @@ Name[sv]=Fjärrfilsystembläddrare Name[uk]=Перегляд віддалених файлових систем Name[x-test]=xxRemote filesystem browserxx Comment=Browse the remote device filesystem using SFTP +Comment[cs]=Prohlížení souborového systému na zařízení pomocí SFTP Comment[da]=Gennemse filsystemet på den eksterne enhed med SFTP Comment[de]=Browsen im Dateisystem des entfernten Geräts mit SFTP Comment[fr]=Visualiser le système de fichiers de l'appareil distant en utilisant SFTP Comment[hu]=A távoli eszköz fájlrendszerének böngészése SFTP használatával +Comment[ko]=SFTP로 원격 파일 시스템 탐색 Comment[nl]=Blader door het bestandssysteem met SFTP op het apparaat op afstand +Comment[pl]=Przeglądaj zdalny system plików przy użyciu SFTP Comment[pt]=Navegue pelo sistema de ficheiros do dispositivo por SFTP Comment[pt_BR]=Navegue pelo sistema de arquivos do dispositivo usando SFTP Comment[sk]=Prehliadať súborový systém vzdialeného zariadenia pomocou SFTP diff --git a/kded/plugins/sftp/kdeconnect_sftp_config.desktop b/kded/plugins/sftp/kdeconnect_sftp_config.desktop index ea8943559..479b81216 100644 --- a/kded/plugins/sftp/kdeconnect_sftp_config.desktop +++ b/kded/plugins/sftp/kdeconnect_sftp_config.desktop @@ -6,11 +6,14 @@ X-KDE-Library=kdeconnect_sftp_config X-KDE-ParentComponents=kdeconnect_sftp Name=SFTP filebrowser plugin settings +Name[cs]=Nastavení modulu pro prohlížení souborů přes SFTP Name[da]=Indstilling af filhåndteringens SFTP-plugin Name[de]=Modul-Einstellungen für SFTP-Dateibrowser Name[fr]=Paramètres du module du navigateur de fichiers SFTP Name[hu]=SFTP fájlböngésző bővítmény beállításai +Name[ko]=SFTP 파일 탐색기 플러그인 설정 Name[nl]=Plug-in-instellingen van SFTP-bestandenbrowser +Name[pl]=Ustawienia wtyczki przeglądarki plików SFTP Name[pt]=Configuração do 'plugin' de navegação de ficheiros por SFTP Name[pt_BR]=Configurações do plugin de navegação de arquivos por SFTP Name[sk]=Nastavenia pluginu prehliadača súborov SFTP diff --git a/kded/plugins/sftp/mounter.h b/kded/plugins/sftp/mounter.h index 5e0d0922c..91b6bade6 100644 --- a/kded/plugins/sftp/mounter.h +++ b/kded/plugins/sftp/mounter.h @@ -37,7 +37,7 @@ public: virtual ~Mounter(); bool wait(); - bool isMounted() const {return m_started;} + bool isMounted() const { return m_started; } Q_SIGNALS: void mounted(); diff --git a/kded/plugins/sftp/sftpplugin.cpp b/kded/plugins/sftp/sftpplugin.cpp index 7fb751452..e64e2fad7 100644 --- a/kded/plugins/sftp/sftpplugin.cpp +++ b/kded/plugins/sftp/sftpplugin.cpp @@ -123,7 +123,7 @@ bool SftpPlugin::mountAndWait() return m_d->mounter->wait(); } -bool SftpPlugin::isMounted() +bool SftpPlugin::isMounted() const { return m_d->mounter && m_d->mounter->isMounted(); } diff --git a/kded/plugins/sftp/sftpplugin.h b/kded/plugins/sftp/sftpplugin.h index c59030146..24b556052 100644 --- a/kded/plugins/sftp/sftpplugin.h +++ b/kded/plugins/sftp/sftpplugin.h @@ -56,7 +56,7 @@ public Q_SLOTS: Q_SCRIPTABLE void mount(); Q_SCRIPTABLE void unmount(); Q_SCRIPTABLE bool mountAndWait(); - Q_SCRIPTABLE bool isMounted(); + Q_SCRIPTABLE bool isMounted() const; Q_SCRIPTABLE bool startBrowsing(); Q_SCRIPTABLE QString mountPoint(); diff --git a/kded/plugins/share/kdeconnect_share.desktop b/kded/plugins/share/kdeconnect_share.desktop index e3179a0a1..bf2fce8de 100644 --- a/kded/plugins/share/kdeconnect_share.desktop +++ b/kded/plugins/share/kdeconnect_share.desktop @@ -17,19 +17,25 @@ Name[da]=Del og modtag Name[de]=Veröffentlichen und Empfangen Name[fr]=Partager et recevoir Name[hu]=Megosztás és fogadás +Name[ko]=공유하고 받기 Name[nl]=Delen en ontvangen +Name[pl]=Udostępniaj i otrzymuj Name[pt]=Partilhar e receber Name[pt_BR]=Compartilhar e receber +Name[ro]=Partajează și primește Name[sk]=Zdieľať a prijať Name[sv]=Dela och ta emot Name[uk]=Оприлюднення і отримання Name[x-test]=xxShare and receivexx Comment=Receive and send files, URLs or plain text easily +Comment[cs]=Jednoduše přijímejte a posílejte soubory, URL nebo čistý text Comment[da]=Modtag og send filer, URL'er eller klartekst på nem måde Comment[de]=Empfang und Senden von Dateien, URLs oder einfacher Text Comment[fr]=Recevoir et envoyer des fichiers, des URLs ou du texte brut facilement Comment[hu]=Fájlok, URL-ek vagy egyszerű szövegek könnyű fogadása és küldése +Comment[ko]=파일, URL, 일반 텍스트를 주고받기 Comment[nl]=Bestanden, URL's of platte tekst gemakkelijk ontvangen en verzenden +Comment[pl]=Udostępniaj i otrzymuj pliki, adresy URL lub zwykły tekst z łatwością Comment[pt]=Receber e enviar ficheiros, URL's ou texto de forma simples Comment[pt_BR]=Recebe e envia facilmente arquivos, URLs ou texto simples Comment[sk]=Prijať a poslať súbory, URL alebo čisté texty jednoducho diff --git a/kded/plugins/share/kdeconnect_share_config.desktop b/kded/plugins/share/kdeconnect_share_config.desktop index 54599b535..166f4b131 100644 --- a/kded/plugins/share/kdeconnect_share_config.desktop +++ b/kded/plugins/share/kdeconnect_share_config.desktop @@ -6,11 +6,14 @@ X-KDE-Library=kdeconnect_share_config X-KDE-ParentComponents=kdeconnect_share Name=Share plugin settings +Name[cs]=Nastavení modulu sdílení Name[da]=Indstilling af deling-plugin Name[de]=Modul-Einstellungen für Veröffentlichung Name[fr]=Paramètres du module de partage Name[hu]=Megosztás bővítmény beállításai +Name[ko]=공유 플러그인 설정 Name[nl]=Plug-in-instellingen van delen +Name[pl]=Ustawienia wtyczki udostępniania Name[pt]=Configuração do 'plugin' de partilha Name[pt_BR]=Compartilhar as configurações do plugin Name[sk]=Nastavenia pluginu zdieľania diff --git a/kded/plugins/telephony/kdeconnect_telephony.desktop b/kded/plugins/telephony/kdeconnect_telephony.desktop index fb1f560d5..dc284d6a7 100644 --- a/kded/plugins/telephony/kdeconnect_telephony.desktop +++ b/kded/plugins/telephony/kdeconnect_telephony.desktop @@ -13,15 +13,19 @@ X-KDE-PluginInfo-EnabledByDefault=true Icon=call-start Name=Telephony integration Name[bs]=Telefonska integracija +Name[cs]=Integrace telefonie Name[da]=Telefoni-integration Name[de]=Telefon-Integration Name[es]=Integración de telefonía Name[fr]=Intégration de la téléphonie Name[hu]=Telefon integráció Name[it]=Integrazione telefono +Name[ko]=전화 통합 Name[nl]=Telefoonintegratie +Name[pl]=Integracja z telefonem Name[pt]=Integração telefónica Name[pt_BR]=Integração telefônica +Name[ro]=Integrare telefonie Name[ru]=Интеграция телефонии Name[sk]=Integrácia telefónie Name[sv]=Integrering av telefoni @@ -30,13 +34,16 @@ Name[uk]=Інтеграція з системою телефонії Name[x-test]=xxTelephony integrationxx Comment=Show notifications for calls and SMS (answering coming soon) Comment[bs]=Prikaži obavlještenja za pozive i SMS poruke(Odgovor slijedi uskoro) +Comment[cs]=Zobrazit upozornění na volání a SMS (odpovídání bude brzy k dispozici) Comment[da]=Vis bekendtgørelser af opkald og SMS (at svare kommer snart) Comment[de]=Zeigt Benachrichtigungen für Anrufe und SMS Comment[es]=Mostrar notificaciones de llamadas y SMS (en breve se podrá responder) Comment[fr]=Affichez les notifications pour les appelles et les SMS (la réponse arrive bientôt) Comment[hu]=Értesítések megjelenítése hívásokhoz és SMS-ekhez (a fogadásuk hamarosan) Comment[it]=Mostra le notifiche di chiamate ed SMS (a breve anche per rispondere) +Comment[ko]=전화 통화 및 문자 메시지 알림 표시(응답 구현 예정) Comment[nl]=Meldingen tonen van oproepen en SMSjes (beantwoorden komt spoedig) +Comment[pl]=Pokaż powiadomienia dla dzwonienia i SMS (odpowiadanie wkrótce) Comment[pt]=Mostrar notificações para as chamadas e SMS's (resposta em breve) Comment[pt_BR]=Mostra notificações para chamadas e SMS (resposta em breve) Comment[ru]=Показывать уведомления о звонках и SMS (ответы на звонки тоже скоро будут доступны) diff --git a/plasmoid/package/metadata.desktop b/plasmoid/package/metadata.desktop index 4c41a48ed..5e85e389d 100644 --- a/plasmoid/package/metadata.desktop +++ b/plasmoid/package/metadata.desktop @@ -8,9 +8,12 @@ Name[es]=KdeConnect Name[fr]=KdeConnect Name[hu]=KdeConnect Name[it]=KdeConnect +Name[ko]=KdeConnect Name[nl]=KdeConnect +Name[pl]=KdeConnect Name[pt]=KDEConnect Name[pt_BR]=KdeConnect +Name[ro]=KdeConnect Name[ru]=KdeConnect Name[sk]=KdeConnect Name[sv]=KDE anslut @@ -19,13 +22,16 @@ Name[uk]=KdeConnect Name[x-test]=xxKdeConnectxx Comment=Show notifications from your devices using KDE Connect Comment[bs]=Prikaži obavlještenja sa uređaja koji koriste KDE konekciju +Comment[cs]=Zobrazit upozornění z vašich zařízení pomocí KDE Connect Comment[da]=Vis bekendtgørelser fra dine enheder med KDE Connect Comment[de]=Zeigt Benachrichtigungen von Ihren Geräten mit KDE-Connect Comment[es]=Mostrar notificaciones de sus dispositivos usando KDE Connect -Comment[fr]=Afficher les notifications provenant de vos périphériques à l'aide de KDE Connect +Comment[fr]=Afficher les notifications provenant de vos périphériques à l'aide de KDE Connect Comment[hu]=Az eszközökről származó értesítések megjelenítése a KDE csatlakozás használatával Comment[it]=Mostra le notifiche dei tuoi dispositivi tramite KDE Connect +Comment[ko]=KDE Connect로 장치에 표시된 알림 보기 Comment[nl]=Meldingen van uw apparaten met KDE Connect tonen +Comment[pl]=Pokaż powiadomienia ze swoich urządzeń przy użyciu KDE Connect Comment[pt]=Mostrar notificações dos seus dispositivos usando o KDE Connect Comment[pt_BR]=Mostrar notificações dos seus dispositivos usando o KDE Connect Comment[ru]=Показывать уведомления от устройств с помощью KDE Connect diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index b559abf04..68a8872a1 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -27,3 +27,9 @@ set(kdeconnect_libraries kde4_add_unit_test(kdeconnect_tests ../kded/networkpackage.cpp ../kded/kdebugnamespace.cpp ../kded/filetransferjob.cpp networkpackagetests.cpp) target_link_libraries(kdeconnect_tests ${kdeconnect_libraries}) +#Socketlinereader +set(_testname testsocketlinereader) +qt4_generate_moc(${_testname}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testname}.moc) +include_directories(${QT_INCLUDES} ${KDE4_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}) +kde4_add_unit_test(${_testname} ${_testname}.cpp ${_testname}.moc ../kded/backends/lan/socketlinereader.cpp ../kded/kdebugnamespace.cpp) +target_link_libraries(${_testname} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY}) diff --git a/kded/autotests/testsocketlinereader.cpp b/tests/testsocketlinereader.cpp similarity index 95% rename from kded/autotests/testsocketlinereader.cpp rename to tests/testsocketlinereader.cpp index 576250402..e3198ab74 100644 --- a/kded/autotests/testsocketlinereader.cpp +++ b/tests/testsocketlinereader.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * *************************************************************************************/ -#include "../backends/lan/socketlinereader.h" +#include "../kded/backends/lan/socketlinereader.h" #include #include @@ -84,6 +84,9 @@ void TestSocketLineReader::socketLineReader() mTimer.start(); mLoop.exec(); + /* remove the empty line before compare */ + dataToSend.removeOne("\n"); + QCOMPARE(mPackages.count(), 5);//We expect 5 Packages for(int x = 0;x < 5; ++x) { QCOMPARE(mPackages[x], dataToSend[x]);