diff -Nru kdeconnect-1.2.1/app/CMakeLists.txt kdeconnect-1.3.0/app/CMakeLists.txt
--- kdeconnect-1.2.1/app/CMakeLists.txt 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/app/CMakeLists.txt 2018-04-08 14:35:04.000000000 +0000
@@ -1,4 +1,4 @@
-find_package(KF5 COMPONENTS Declarative)
+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Declarative)
qt5_add_resources(kcapp_SRCS resources.qrc)
diff -Nru kdeconnect-1.2.1/cli/CMakeLists.txt kdeconnect-1.3.0/cli/CMakeLists.txt
--- kdeconnect-1.2.1/cli/CMakeLists.txt 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/cli/CMakeLists.txt 2018-04-08 14:35:04.000000000 +0000
@@ -1,3 +1,4 @@
+add_definitions(-DTRANSLATION_DOMAIN=\"kdeconnect-cli\")
add_executable(kdeconnect-cli kdeconnect-cli.cpp)
ecm_mark_nongui_executable(kdeconnect-cli)
diff -Nru kdeconnect-1.2.1/cli/kdeconnect-cli.cpp kdeconnect-1.3.0/cli/kdeconnect-cli.cpp
--- kdeconnect-1.2.1/cli/kdeconnect-cli.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/cli/kdeconnect-cli.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -51,6 +51,8 @@
parser.addOption(QCommandLineOption(QStringList(QStringLiteral("l")) << QStringLiteral("list-devices"), i18n("List all devices")));
parser.addOption(QCommandLineOption(QStringList(QStringLiteral("a")) << QStringLiteral("list-available"), i18n("List available (paired and reachable) devices")));
parser.addOption(QCommandLineOption(QStringLiteral("id-only"), i18n("Make --list-devices or --list-available print only the devices id, to ease scripting")));
+ parser.addOption(QCommandLineOption(QStringLiteral("name-only"), i18n("Make --list-devices or --list-available print only the devices name, to ease scripting")));
+ parser.addOption(QCommandLineOption(QStringLiteral("id-name-only"), i18n("Make --list-devices or --list-available print only the devices id and name, to ease scripting")));
parser.addOption(QCommandLineOption(QStringLiteral("refresh"), i18n("Search for devices in the network and re-establish connections")));
parser.addOption(QCommandLineOption(QStringLiteral("pair"), i18n("Request pairing to a said device")));
parser.addOption(QCommandLineOption(QStringLiteral("ring"), i18n("Find the said device by ringing it.")));
@@ -90,9 +92,19 @@
}
const QStringList devices = blockOnReply(iface.devices(reachable, paired));
+ bool displayCount = true;
for (const QString& id : devices) {
if (parser.isSet(QStringLiteral("id-only"))) {
QTextStream(stdout) << id << endl;
+ displayCount = false;
+ } else if (parser.isSet(QStringLiteral("name-only"))) {
+ DeviceDbusInterface deviceIface(id);
+ QTextStream(stdout) << deviceIface.name() << endl;
+ displayCount = false;
+ } else if (parser.isSet(QStringLiteral("id-name-only"))) {
+ DeviceDbusInterface deviceIface(id);
+ QTextStream(stdout) << id << ' ' << deviceIface.name() << endl;
+ displayCount = false;
} else {
DeviceDbusInterface deviceIface(id);
QString statusInfo;
@@ -109,7 +121,7 @@
<< ": " << deviceIface.id() << ' ' << statusInfo << endl;
}
}
- if (!parser.isSet(QStringLiteral("id-only"))) {
+ if (displayCount) {
QTextStream(stdout) << i18np("1 device found", "%1 devices found", devices.size()) << endl;
} else if (devices.isEmpty()) {
QTextStream(stderr) << i18n("No devices found") << endl;
@@ -134,15 +146,27 @@
parser.showHelp(1);
}
- if(parser.isSet(QStringLiteral("share"))) {
- QUrl url = QUrl::fromUserInput(parser.value(QStringLiteral("share")), QDir::currentPath());
- parser.clearPositionalArguments();
- if(!url.isEmpty() && !device.isEmpty()) {
+ if (parser.isSet(QStringLiteral("share"))) {
+ QList urls;
+ QUrl url = QUrl::fromUserInput(parser.value(QStringLiteral("share")));
+ urls.append(url);
+
+ //In case there are more arguments, check if they are files and then send them
+ for (const QString& file : parser.positionalArguments()) {
+ QUrl url = QUrl::fromUserInput(file, QDir::currentPath());
+ if (!url.isLocalFile()) {
+ QTextStream(stderr) << i18n("Can't find the file: %1", url.toString()) << endl;
+ return 1;
+ } else {
+ urls.append(url);
+ }
+ }
+
+ for (const QUrl& url : urls) {
QDBusMessage msg = QDBusMessage::createMethodCall(QStringLiteral("org.kde.kdeconnect"), "/modules/kdeconnect/devices/"+device+"/share", QStringLiteral("org.kde.kdeconnect.device.share"), QStringLiteral("shareUrl"));
msg.setArguments(QVariantList() << url.toString());
blockOnReply(QDBusConnection::sessionBus().asyncCall(msg));
- } else {
- QTextStream(stderr) << (i18n("Couldn't share %1", url.toString())) << endl;
+ QTextStream(stdout) << i18n("Sent %1", url.toString()) << endl;
}
} else if(parser.isSet(QStringLiteral("pair"))) {
DeviceDbusInterface dev(device);
diff -Nru kdeconnect-1.2.1/CMakeLists.txt kdeconnect-1.3.0/CMakeLists.txt
--- kdeconnect-1.2.1/CMakeLists.txt 2018-01-16 22:46:44.000000000 +0000
+++ kdeconnect-1.3.0/CMakeLists.txt 2018-04-08 14:35:51.000000000 +0000
@@ -1,19 +1,22 @@
+cmake_minimum_required(VERSION 3.0)
+
project(kdeconnect)
set(KDECONNECT_VERSION_MAJOR 1)
-set(KDECONNECT_VERSION_MINOR 2)
-set(KDECONNECT_VERSION_PATCH 1)
+set(KDECONNECT_VERSION_MINOR 3)
+set(KDECONNECT_VERSION_PATCH 0)
set(KDECONNECT_VERSION "${KDECONNECT_VERSION_MAJOR}.${KDECONNECT_VERSION_MINOR}.${KDECONNECT_VERSION_PATCH}")
-cmake_minimum_required(VERSION 2.8.12)
+set(QT_MIN_VERSION "5.7.0")
+set(KF5_MIN_VERSION "5.42.0")
-find_package(ECM 0.0.9 REQUIRED NO_MODULE)
+find_package(ECM ${KF5_MIN_VERSION} 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)
+find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Quick)
-find_package(KF5 5.42.0 REQUIRED COMPONENTS I18n ConfigWidgets DBusAddons)
-find_package(KF5DocTools)
+find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS I18n ConfigWidgets DBusAddons IconThemes Notifications KIO KCMUtils)
+find_package(KF5 ${KF5_MIN_VERSION} COMPONENTS DocTools)
find_package(Qca-qt5 2.1.0 REQUIRED)
include_directories(${CMAKE_SOURCE_DIR})
@@ -55,6 +58,7 @@
add_subdirectory(indicator)
add_subdirectory(fileitemactionplugin)
add_subdirectory(urlhandler)
+add_subdirectory(nautilus-extension)
if(KF5DocTools_FOUND)
add_subdirectory(doc)
endif()
diff -Nru kdeconnect-1.2.1/core/backends/bluetooth/bluetoothdevicelink.cpp kdeconnect-1.3.0/core/backends/bluetooth/bluetoothdevicelink.cpp
--- kdeconnect-1.2.1/core/backends/bluetooth/bluetoothdevicelink.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/core/backends/bluetooth/bluetoothdevicelink.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -48,10 +48,10 @@
return "BluetoothLink"; // Should be same in both android and kde version
}
-bool BluetoothDeviceLink::sendPackage(NetworkPackage& np)
+bool BluetoothDeviceLink::sendPacket(NetworkPacket& np)
{
if (np.hasPayload()) {
- qCWarning(KDECONNECT_CORE) << "Sending packages with payload over bluetooth not yet supported";
+ qCWarning(KDECONNECT_CORE) << "Sending packets with payload over bluetooth not yet supported";
/*
BluetoothUploadJob* uploadJob = new BluetoothUploadJob(np.payload(), mBluetoothSocket->peerAddress(), this);
np.setPayloadTransferInfo(uploadJob->transferInfo());
@@ -78,27 +78,27 @@
{
if (mSocketReader->bytesAvailable() == 0) return;
- const QByteArray serializedPackage = mSocketReader->readLine();
+ const QByteArray serializedPacket = mSocketReader->readLine();
- //qCDebug(KDECONNECT_CORE) << "BluetoothDeviceLink dataReceived" << package;
+ //qCDebug(KDECONNECT_CORE) << "BluetoothDeviceLink dataReceived" << packet;
- NetworkPackage package(QString::null);
- NetworkPackage::unserialize(serializedPackage, &package);
+ NetworkPacket packet(QString::null);
+ NetworkPacket::unserialize(serializedPacket, &packet);
- if (package.type() == PACKAGE_TYPE_PAIR) {
+ if (packet.type() == PACKET_TYPE_PAIR) {
//TODO: Handle pair/unpair requests and forward them (to the pairing handler?)
- mPairingHandler->packageReceived(package);
+ mPairingHandler->packetReceived(packet);
return;
}
- if (package.hasPayloadTransferInfo()) {
+ if (packet.hasPayloadTransferInfo()) {
BluetoothDownloadJob* downloadJob = new BluetoothDownloadJob(mBluetoothSocket->peerAddress(),
- package.payloadTransferInfo(), this);
+ packet.payloadTransferInfo(), this);
downloadJob->start();
- package.setPayload(downloadJob->payload(), package.payloadSize());
+ packet.setPayload(downloadJob->payload(), packet.payloadSize());
}
- Q_EMIT receivedPackage(package);
+ Q_EMIT receivedPacket(packet);
if (mSocketReader->bytesAvailable() > 0) {
QMetaObject::invokeMethod(this, "dataReceived", Qt::QueuedConnection);
diff -Nru kdeconnect-1.2.1/core/backends/bluetooth/bluetoothdevicelink.h kdeconnect-1.3.0/core/backends/bluetooth/bluetoothdevicelink.h
--- kdeconnect-1.2.1/core/backends/bluetooth/bluetoothdevicelink.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/core/backends/bluetooth/bluetoothdevicelink.h 2018-04-08 14:35:04.000000000 +0000
@@ -38,7 +38,7 @@
BluetoothDeviceLink(const QString& deviceId, LinkProvider* parent, QBluetoothSocket* socket);
virtual QString name() override;
- bool sendPackage(NetworkPackage& np) override;
+ bool sendPacket(NetworkPacket& np) override;
virtual void userRequestsPair() override;
virtual void userRequestsUnpair() override;
diff -Nru kdeconnect-1.2.1/core/backends/bluetooth/bluetoothlinkprovider.cpp kdeconnect-1.3.0/core/backends/bluetooth/bluetoothlinkprovider.cpp
--- kdeconnect-1.2.1/core/backends/bluetooth/bluetoothlinkprovider.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/core/backends/bluetooth/bluetoothlinkprovider.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -172,27 +172,27 @@
disconnect(socket, SIGNAL(readyRead()), this, SLOT(clientIdentityReceived()));
- NetworkPackage receivedPackage("");
- bool success = NetworkPackage::unserialize(identityArray, &receivedPackage);
+ NetworkPacket receivedPacket("");
+ bool success = NetworkPacket::unserialize(identityArray, &receivedPacket);
- if (!success || receivedPackage.type() != PACKAGE_TYPE_IDENTITY) {
- qCWarning(KDECONNECT_CORE) << "Not an identity package";
+ if (!success || receivedPacket.type() != PACKET_TYPE_IDENTITY) {
+ qCWarning(KDECONNECT_CORE) << "Not an identity packet";
mSockets.remove(socket->peerAddress());
socket->close();
socket->deleteLater();
return;
}
- qCDebug(KDECONNECT_CORE()) << "Received identity package from" << socket->peerAddress();
+ qCDebug(KDECONNECT_CORE()) << "Received identity packet from" << socket->peerAddress();
disconnect(socket, SIGNAL(error(QBluetoothSocket::SocketError)), this, SLOT(connectError()));
- const QString& deviceId = receivedPackage.get("deviceId");
+ const QString& deviceId = receivedPacket.get("deviceId");
BluetoothDeviceLink* deviceLink = new BluetoothDeviceLink(deviceId, this, socket);
- NetworkPackage np2("");
- NetworkPackage::createIdentityPackage(&np2);
- success = deviceLink->sendPackage(np2);
+ NetworkPacket np2("");
+ NetworkPacket::createIdentityPacket(&np2);
+ success = deviceLink->sendPacket(np2);
if (success) {
@@ -201,7 +201,7 @@
connect(deviceLink, SIGNAL(destroyed(QObject*)),
this, SLOT(deviceLinkDestroyed(QObject*)));
- Q_EMIT onConnectionReceived(receivedPackage, deviceLink);
+ Q_EMIT onConnectionReceived(receivedPacket, deviceLink);
//We kill any possible link from this same device
addLink(deviceLink, deviceId);
@@ -232,16 +232,16 @@
connect(socket, SIGNAL(error(QBluetoothSocket::SocketError)), this, SLOT(connectError()));
connect(socket, SIGNAL(disconnected()), this, SLOT(socketDisconnected()));
- NetworkPackage np2("");
- NetworkPackage::createIdentityPackage(&np2);
+ NetworkPacket np2("");
+ NetworkPacket::createIdentityPacket(&np2);
socket->write(np2.serialize());
- qCDebug(KDECONNECT_CORE()) << "Sent identity package to" << socket->peerAddress();
+ qCDebug(KDECONNECT_CORE()) << "Sent identity packet to" << socket->peerAddress();
mSockets.insert(socket->peerAddress(), socket);
}
-//I'm the existing device and this is the answer to my identity package (data received)
+//I'm the existing device and this is the answer to my identity packet (data received)
void BluetoothLinkProvider::serverDataReceived()
{
QBluetoothSocket* socket = qobject_cast(sender());
@@ -255,26 +255,26 @@
disconnect(socket, SIGNAL(readyRead()), this, SLOT(serverDataReceived()));
disconnect(socket, SIGNAL(error(QBluetoothSocket::SocketError)), this, SLOT(connectError()));
- NetworkPackage receivedPackage("");
- bool success = NetworkPackage::unserialize(identityArray, &receivedPackage);
+ NetworkPacket receivedPacket("");
+ bool success = NetworkPacket::unserialize(identityArray, &receivedPacket);
- if (!success || receivedPackage.type() != PACKAGE_TYPE_IDENTITY) {
- qCWarning(KDECONNECT_CORE) << "Not an identity package.";
+ if (!success || receivedPacket.type() != PACKET_TYPE_IDENTITY) {
+ qCWarning(KDECONNECT_CORE) << "Not an identity packet.";
mSockets.remove(socket->peerAddress());
socket->close();
socket->deleteLater();
return;
}
- qCDebug(KDECONNECT_CORE()) << "Received identity package from" << socket->peerAddress();
+ qCDebug(KDECONNECT_CORE()) << "Received identity packet from" << socket->peerAddress();
- const QString& deviceId = receivedPackage.get("deviceId");
+ const QString& deviceId = receivedPacket.get("deviceId");
BluetoothDeviceLink* deviceLink = new BluetoothDeviceLink(deviceId, this, socket);
connect(deviceLink, SIGNAL(destroyed(QObject*)),
this, SLOT(deviceLinkDestroyed(QObject*)));
- Q_EMIT onConnectionReceived(receivedPackage, deviceLink);
+ Q_EMIT onConnectionReceived(receivedPacket, deviceLink);
addLink(deviceLink, deviceId);
}
diff -Nru kdeconnect-1.2.1/core/backends/bluetooth/bluetoothpairinghandler.cpp kdeconnect-1.3.0/core/backends/bluetooth/bluetoothpairinghandler.cpp
--- kdeconnect-1.2.1/core/backends/bluetooth/bluetoothpairinghandler.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/core/backends/bluetooth/bluetoothpairinghandler.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -24,7 +24,7 @@
#include "daemon.h"
#include "kdeconnectconfig.h"
#include "bluetoothpairinghandler.h"
-#include "networkpackagetypes.h"
+#include "networkpackettypes.h"
BluetoothPairingHandler::BluetoothPairingHandler(DeviceLink* deviceLink)
: PairingHandler(deviceLink)
@@ -35,9 +35,9 @@
connect(&m_pairingTimeout, &QTimer::timeout, this, &BluetoothPairingHandler::pairingTimeout);
}
-void BluetoothPairingHandler::packageReceived(const NetworkPackage& np)
+void BluetoothPairingHandler::packetReceived(const NetworkPacket& np)
{
- qCDebug(KDECONNECT_CORE) << "Pairing package received!" << np.serialize();
+ qCDebug(KDECONNECT_CORE) << "Pairing packet received!" << np.serialize();
m_pairingTimeout.stop();
@@ -89,10 +89,10 @@
;
}
- NetworkPackage np(PACKAGE_TYPE_PAIR);
+ NetworkPacket np(PACKET_TYPE_PAIR);
np.set("pair", true);
bool success;
- success = deviceLink()->sendPackage(np);
+ success = deviceLink()->sendPacket(np);
if (success) {
setInternalPairStatus(Requested);
m_pairingTimeout.start();
@@ -104,9 +104,9 @@
{
qCDebug(KDECONNECT_CORE) << "User accepts pairing";
m_pairingTimeout.stop(); // Just in case it is started
- NetworkPackage np(PACKAGE_TYPE_PAIR);
+ NetworkPacket np(PACKET_TYPE_PAIR);
np.set("pair", true);
- bool success = deviceLink()->sendPackage(np);
+ bool success = deviceLink()->sendPacket(np);
if (success) {
setInternalPairStatus(Paired);
}
@@ -116,24 +116,24 @@
void BluetoothPairingHandler::rejectPairing()
{
qCDebug(KDECONNECT_CORE) << "User rejects pairing";
- NetworkPackage np(PACKAGE_TYPE_PAIR);
+ NetworkPacket np(PACKET_TYPE_PAIR);
np.set("pair", false);
- deviceLink()->sendPackage(np);
+ deviceLink()->sendPacket(np);
setInternalPairStatus(NotPaired);
}
void BluetoothPairingHandler::unpair() {
- NetworkPackage np(PACKAGE_TYPE_PAIR);
+ NetworkPacket np(PACKET_TYPE_PAIR);
np.set("pair", false);
- deviceLink()->sendPackage(np);
+ deviceLink()->sendPacket(np);
setInternalPairStatus(NotPaired);
}
void BluetoothPairingHandler::pairingTimeout()
{
- NetworkPackage np(PACKAGE_TYPE_PAIR);
+ NetworkPacket np(PACKET_TYPE_PAIR);
np.set("pair", false);
- deviceLink()->sendPackage(np);
+ deviceLink()->sendPacket(np);
setInternalPairStatus(NotPaired); //Will emit the change as well
Q_EMIT pairingError(i18n("Timed out"));
}
diff -Nru kdeconnect-1.2.1/core/backends/bluetooth/bluetoothpairinghandler.h kdeconnect-1.3.0/core/backends/bluetooth/bluetoothpairinghandler.h
--- kdeconnect-1.2.1/core/backends/bluetooth/bluetoothpairinghandler.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/core/backends/bluetooth/bluetoothpairinghandler.h 2018-04-08 14:35:04.000000000 +0000
@@ -27,7 +27,7 @@
#include
-// This class is used pairing related stuff. It has direct access to links and can directly send packages
+// This class is used pairing related stuff. It has direct access to links and can directly send packets
class BluetoothPairingHandler
: public PairingHandler
{
@@ -43,7 +43,7 @@
BluetoothPairingHandler(DeviceLink* deviceLink);
virtual ~BluetoothPairingHandler() { }
- virtual void packageReceived(const NetworkPackage& np) Q_DECL_OVERRIDE;
+ virtual void packetReceived(const NetworkPacket& np) Q_DECL_OVERRIDE;
virtual bool requestPairing() Q_DECL_OVERRIDE;
virtual bool acceptPairing() Q_DECL_OVERRIDE;
virtual void rejectPairing() Q_DECL_OVERRIDE;
diff -Nru kdeconnect-1.2.1/core/backends/devicelinereader.cpp kdeconnect-1.3.0/core/backends/devicelinereader.cpp
--- kdeconnect-1.2.1/core/backends/devicelinereader.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/core/backends/devicelinereader.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -36,7 +36,7 @@
while(m_device->canReadLine()) {
const QByteArray line = m_device->readLine();
if (line.length() > 1) {
- m_packages.enqueue(line);//we don't want single \n
+ m_packets.enqueue(line);//we don't want single \n
}
}
@@ -48,8 +48,8 @@
return;
}
- //If we have any packages, tell it to the world.
- if (!m_packages.isEmpty()) {
+ //If we have any packets, tell it to the world.
+ if (!m_packets.isEmpty()) {
Q_EMIT readyRead();
}
}
diff -Nru kdeconnect-1.2.1/core/backends/devicelinereader.h kdeconnect-1.3.0/core/backends/devicelinereader.h
--- kdeconnect-1.2.1/core/backends/devicelinereader.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/core/backends/devicelinereader.h 2018-04-08 14:35:04.000000000 +0000
@@ -39,9 +39,9 @@
public:
DeviceLineReader(QIODevice* device, QObject* parent = 0);
- QByteArray readLine() { return m_packages.dequeue(); }
+ QByteArray readLine() { return m_packets.dequeue(); }
qint64 write(const QByteArray& data) { return m_device->write(data); }
- qint64 bytesAvailable() const { return m_packages.size(); }
+ qint64 bytesAvailable() const { return m_packets.size(); }
Q_SIGNALS:
void readyRead();
@@ -53,7 +53,7 @@
private:
QByteArray m_lastChunk;
QIODevice* m_device;
- QQueue m_packages;
+ QQueue m_packets;
};
diff -Nru kdeconnect-1.2.1/core/backends/devicelink.h kdeconnect-1.3.0/core/backends/devicelink.h
--- kdeconnect-1.2.1/core/backends/devicelink.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/core/backends/devicelink.h 2018-04-08 14:35:04.000000000 +0000
@@ -24,10 +24,10 @@
#include
#include
-#include "core/networkpackage.h"
+#include "core/networkpacket.h"
class PairingHandler;
-class NetworkPackage;
+class NetworkPacket;
class LinkProvider;
class Device;
@@ -47,7 +47,7 @@
const QString& deviceId() const { return m_deviceId; }
LinkProvider* provider() { return m_linkProvider; }
- virtual bool sendPackage(NetworkPackage& np) = 0;
+ virtual bool sendPacket(NetworkPacket& np) = 0;
//user actions
virtual void userRequestsPair() = 0;
@@ -64,7 +64,7 @@
void pairingRequestExpired(PairingHandler* handler);
void pairStatusChanged(DeviceLink::PairStatus status);
void pairingError(const QString& error);
- void receivedPackage(const NetworkPackage& np);
+ void receivedPacket(const NetworkPacket& np);
protected:
QCA::PrivateKey m_privateKey;
diff -Nru kdeconnect-1.2.1/core/backends/lan/landevicelink.cpp kdeconnect-1.3.0/core/backends/lan/landevicelink.cpp
--- kdeconnect-1.2.1/core/backends/lan/landevicelink.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/core/backends/lan/landevicelink.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -82,7 +82,7 @@
return QStringLiteral("LanLink"); // Should be same in both android and kde version
}
-bool LanDeviceLink::sendPackage(NetworkPackage& np)
+bool LanDeviceLink::sendPacket(NetworkPacket& np)
{
if (np.hasPayload()) {
np.setPayloadTransferInfo(sendPayload(np)->transferInfo());
@@ -90,13 +90,13 @@
int written = m_socketLineReader->write(np.serialize());
- //Actually we can't detect if a package is received or not. We keep TCP
+ //Actually we can't detect if a packet is received or not. We keep TCP
//"ESTABLISHED" connections that look legit (return true when we use them),
//but that are actually broken (until keepalive detects that they are down).
return (written != -1);
}
-UploadJob* LanDeviceLink::sendPayload(const NetworkPackage& np)
+UploadJob* LanDeviceLink::sendPayload(const NetworkPacket& np)
{
UploadJob* job = new UploadJob(np.payload(), deviceId());
job->start();
@@ -107,30 +107,30 @@
{
if (m_socketLineReader->bytesAvailable() == 0) return;
- const QByteArray serializedPackage = m_socketLineReader->readLine();
- NetworkPackage package(QString::null);
- NetworkPackage::unserialize(serializedPackage, &package);
+ const QByteArray serializedPacket = m_socketLineReader->readLine();
+ NetworkPacket packet(QString::null);
+ NetworkPacket::unserialize(serializedPacket, &packet);
- //qCDebug(KDECONNECT_CORE) << "LanDeviceLink dataReceived" << serializedPackage;
+ //qCDebug(KDECONNECT_CORE) << "LanDeviceLink dataReceived" << serializedPacket;
- if (package.type() == PACKAGE_TYPE_PAIR) {
+ if (packet.type() == PACKET_TYPE_PAIR) {
//TODO: Handle pair/unpair requests and forward them (to the pairing handler?)
- qobject_cast(provider())->incomingPairPackage(this, package);
+ qobject_cast(provider())->incomingPairPacket(this, packet);
return;
}
- if (package.hasPayloadTransferInfo()) {
+ if (packet.hasPayloadTransferInfo()) {
//qCDebug(KDECONNECT_CORE) << "HasPayloadTransferInfo";
- QVariantMap transferInfo = package.payloadTransferInfo();
+ QVariantMap transferInfo = packet.payloadTransferInfo();
//FIXME: The next two lines shouldn't be needed! Why are they here?
transferInfo.insert(QStringLiteral("useSsl"), true);
transferInfo.insert(QStringLiteral("deviceId"), deviceId());
DownloadJob* job = new DownloadJob(m_socketLineReader->peerAddress(), transferInfo);
job->start();
- package.setPayload(job->getPayload(), package.payloadSize());
+ packet.setPayload(job->getPayload(), packet.payloadSize());
}
- Q_EMIT receivedPackage(package);
+ Q_EMIT receivedPacket(packet);
if (m_socketLineReader->bytesAvailable() > 0) {
QMetaObject::invokeMethod(this, "dataReceived", Qt::QueuedConnection);
diff -Nru kdeconnect-1.2.1/core/backends/lan/landevicelink.h kdeconnect-1.3.0/core/backends/lan/landevicelink.h
--- kdeconnect-1.2.1/core/backends/lan/landevicelink.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/core/backends/lan/landevicelink.h 2018-04-08 14:35:04.000000000 +0000
@@ -44,8 +44,8 @@
void reset(QSslSocket* socket, ConnectionStarted connectionSource);
QString name() override;
- bool sendPackage(NetworkPackage& np) override;
- UploadJob* sendPayload(const NetworkPackage& np);
+ bool sendPacket(NetworkPacket& np) override;
+ UploadJob* sendPayload(const NetworkPacket& np);
void userRequestsPair() override;
void userRequestsUnpair() override;
diff -Nru kdeconnect-1.2.1/core/backends/lan/lanlinkprovider.cpp kdeconnect-1.3.0/core/backends/lan/lanlinkprovider.cpp
--- kdeconnect-1.2.1/core/backends/lan/lanlinkprovider.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/core/backends/lan/lanlinkprovider.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -132,8 +132,8 @@
QHostAddress destAddress = m_testMode? QHostAddress::LocalHost : QHostAddress(QStringLiteral("255.255.255.255"));
- NetworkPackage np(QLatin1String(""));
- NetworkPackage::createIdentityPackage(&np);
+ NetworkPacket np(QLatin1String(""));
+ NetworkPacket::createIdentityPacket(&np);
np.set(QStringLiteral("tcpPort"), m_tcpPort);
#ifdef Q_OS_WIN
@@ -176,32 +176,32 @@
if (sender.isLoopback() && !m_testMode)
continue;
- NetworkPackage* receivedPackage = new NetworkPackage(QLatin1String(""));
- bool success = NetworkPackage::unserialize(datagram, receivedPackage);
+ NetworkPacket* receivedPacket = new NetworkPacket(QLatin1String(""));
+ bool success = NetworkPacket::unserialize(datagram, receivedPacket);
- //qCDebug(KDECONNECT_CORE) << "udp connection from " << receivedPackage->;
+ //qCDebug(KDECONNECT_CORE) << "udp connection from " << receivedPacket->;
//qCDebug(KDECONNECT_CORE) << "Datagram " << datagram.data() ;
- if (!success || receivedPackage->type() != PACKAGE_TYPE_IDENTITY) {
- delete receivedPackage;
+ if (!success || receivedPacket->type() != PACKET_TYPE_IDENTITY) {
+ delete receivedPacket;
continue;
}
- if (receivedPackage->get(QStringLiteral("deviceId")) == KdeConnectConfig::instance()->deviceId()) {
+ if (receivedPacket->get(QStringLiteral("deviceId")) == KdeConnectConfig::instance()->deviceId()) {
//qCDebug(KDECONNECT_CORE) << "Ignoring my own broadcast";
- delete receivedPackage;
+ delete receivedPacket;
continue;
}
- int tcpPort = receivedPackage->get(QStringLiteral("tcpPort"));
+ int tcpPort = receivedPacket->get(QStringLiteral("tcpPort"));
- //qCDebug(KDECONNECT_CORE) << "Received Udp identity package from" << sender << " asking for a tcp connection on port " << tcpPort;
+ //qCDebug(KDECONNECT_CORE) << "Received Udp identity packet from" << sender << " asking for a tcp connection on port " << tcpPort;
QSslSocket* socket = new QSslSocket(this);
socket->setProxy(QNetworkProxy::NoProxy);
- m_receivedIdentityPackages[socket].np = receivedPackage;
- m_receivedIdentityPackages[socket].sender = sender;
+ m_receivedIdentityPackets[socket].np = receivedPacket;
+ m_receivedIdentityPackets[socket].sender = sender;
connect(socket, &QAbstractSocket::connected, this, &LanLinkProvider::connected);
connect(socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(connectError()));
socket->connectToHost(sender, tcpPort);
@@ -216,18 +216,18 @@
disconnect(socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(connectError()));
qCDebug(KDECONNECT_CORE) << "Fallback (1), try reverse connection (send udp packet)" << socket->errorString();
- NetworkPackage np(QLatin1String(""));
- NetworkPackage::createIdentityPackage(&np);
+ NetworkPacket np(QLatin1String(""));
+ NetworkPacket::createIdentityPacket(&np);
np.set(QStringLiteral("tcpPort"), m_tcpPort);
- m_udpSocket.writeDatagram(np.serialize(), m_receivedIdentityPackages[socket].sender, UDP_PORT);
+ m_udpSocket.writeDatagram(np.serialize(), m_receivedIdentityPackets[socket].sender, UDP_PORT);
//The socket we created didn't work, and we didn't manage
//to create a LanDeviceLink from it, deleting everything.
- delete m_receivedIdentityPackages.take(socket).np;
+ delete m_receivedIdentityPackets.take(socket).np;
delete socket;
}
-//We received a UDP package and answered by connecting to them by TCP. This gets called on a succesful connection.
+//We received a UDP packet and answered by connecting to them by TCP. This gets called on a succesful connection.
void LanLinkProvider::connected()
{
QSslSocket* socket = qobject_cast(sender());
@@ -238,16 +238,16 @@
configureSocket(socket);
- // If socket disconnects due to any reason after connection, link on ssl faliure
+ // If socket disconnects due to any reason after connection, link on ssl failure
connect(socket, &QAbstractSocket::disconnected, socket, &QObject::deleteLater);
- NetworkPackage* receivedPackage = m_receivedIdentityPackages[socket].np;
- const QString& deviceId = receivedPackage->get(QStringLiteral("deviceId"));
+ NetworkPacket* receivedPacket = m_receivedIdentityPackets[socket].np;
+ const QString& deviceId = receivedPacket->get(QStringLiteral("deviceId"));
//qCDebug(KDECONNECT_CORE) << "Connected" << socket->isWritable();
// If network is on ssl, do not believe when they are connected, believe when handshake is completed
- NetworkPackage np2(QLatin1String(""));
- NetworkPackage::createIdentityPackage(&np2);
+ NetworkPacket np2(QLatin1String(""));
+ NetworkPacket::createIdentityPacket(&np2);
socket->write(np2.serialize());
bool success = socket->waitForBytesWritten();
@@ -256,7 +256,7 @@
qCDebug(KDECONNECT_CORE) << "TCP connection done (i'm the existing device)";
// if ssl supported
- if (receivedPackage->get(QStringLiteral("protocolVersion")) >= MIN_VERSION_WITH_SSL_SUPPORT) {
+ if (receivedPacket->get(QStringLiteral("protocolVersion")) >= MIN_VERSION_WITH_SSL_SUPPORT) {
bool isDeviceTrusted = KdeConnectConfig::instance()->trustedDevices().contains(deviceId);
configureSslSocket(socket, deviceId, isDeviceTrusted);
@@ -271,20 +271,20 @@
socket->startServerEncryption();
- return; // Return statement prevents from deleting received package, needed in slot "encrypted"
+ return; // Return statement prevents from deleting received packet, needed in slot "encrypted"
} else {
- qWarning() << receivedPackage->get(QStringLiteral("deviceName")) << "uses an old protocol version, this won't work";
- //addLink(deviceId, socket, receivedPackage, LanDeviceLink::Remotely);
+ qWarning() << receivedPacket->get(QStringLiteral("deviceName")) << "uses an old protocol version, this won't work";
+ //addLink(deviceId, socket, receivedPacket, LanDeviceLink::Remotely);
}
} else {
//I think this will never happen, but if it happens the deviceLink
//(or the socket that is now inside it) might not be valid. Delete them.
qCDebug(KDECONNECT_CORE) << "Fallback (2), try reverse connection (send udp packet)";
- m_udpSocket.writeDatagram(np2.serialize(), m_receivedIdentityPackages[socket].sender, UDP_PORT);
+ m_udpSocket.writeDatagram(np2.serialize(), m_receivedIdentityPackets[socket].sender, UDP_PORT);
}
- delete m_receivedIdentityPackages.take(socket).np;
+ delete m_receivedIdentityPackets.take(socket).np;
//We don't delete the socket because now it's owned by the LanDeviceLink
}
@@ -300,13 +300,13 @@
Q_ASSERT(socket->mode() != QSslSocket::UnencryptedMode);
LanDeviceLink::ConnectionStarted connectionOrigin = (socket->mode() == QSslSocket::SslClientMode)? LanDeviceLink::Locally : LanDeviceLink::Remotely;
- NetworkPackage* receivedPackage = m_receivedIdentityPackages[socket].np;
- const QString& deviceId = receivedPackage->get(QStringLiteral("deviceId"));
+ NetworkPacket* receivedPacket = m_receivedIdentityPackets[socket].np;
+ const QString& deviceId = receivedPacket->get(QStringLiteral("deviceId"));
- addLink(deviceId, socket, receivedPackage, connectionOrigin);
+ addLink(deviceId, socket, receivedPacket, connectionOrigin);
- // Copied from connected slot, now delete received package
- delete m_receivedIdentityPackages.take(socket).np;
+ // Copied from connected slot, now delete received packet
+ delete m_receivedIdentityPackets.take(socket).np;
}
void LanLinkProvider::sslErrors(const QList& errors)
@@ -323,11 +323,11 @@
device->unpair();
}
- delete m_receivedIdentityPackages.take(socket).np;
+ delete m_receivedIdentityPackets.take(socket).np;
// Socket disconnects itself on ssl error and will be deleted by deleteLater slot, no need to delete manually
}
-//I'm the new device and this is the answer to my UDP identity package (no data received yet). They are connecting to us through TCP, and they should send an identity.
+//I'm the new device and this is the answer to my UDP identity packet (no data received yet). They are connecting to us through TCP, and they should send an identity.
void LanLinkProvider::newConnection()
{
//qCDebug(KDECONNECT_CORE) << "LanLinkProvider newConnection";
@@ -346,7 +346,7 @@
}
}
-//I'm the new device and this is the answer to my UDP identity package (data received)
+//I'm the new device and this is the answer to my UDP identity packet (data received)
void LanLinkProvider::dataReceived()
{
QSslSocket* socket = qobject_cast(sender());
@@ -355,22 +355,22 @@
//qCDebug(KDECONNECT_CORE) << "LanLinkProvider received reply:" << data;
- NetworkPackage* np = new NetworkPackage(QLatin1String(""));
- bool success = NetworkPackage::unserialize(data, np);
+ NetworkPacket* np = new NetworkPacket(QLatin1String(""));
+ bool success = NetworkPacket::unserialize(data, np);
if (!success) {
delete np;
return;
}
- if (np->type() != PACKAGE_TYPE_IDENTITY) {
+ if (np->type() != PACKET_TYPE_IDENTITY) {
qCWarning(KDECONNECT_CORE) << "LanLinkProvider/newConnection: Expected identity, received " << np->type();
delete np;
return;
}
// Needed in "encrypted" if ssl is used, similar to "connected"
- m_receivedIdentityPackages[socket].np = np;
+ m_receivedIdentityPackets[socket].np = np;
const QString& deviceId = np->get(QStringLiteral("deviceId"));
//qCDebug(KDECONNECT_CORE) << "Handshaking done (i'm the new device)";
@@ -396,7 +396,7 @@
} else {
qWarning() << np->get(QStringLiteral("deviceName")) << "uses an old protocol version, this won't work";
//addLink(deviceId, socket, np, LanDeviceLink::Locally);
- delete m_receivedIdentityPackages.take(socket).np;
+ delete m_receivedIdentityPackets.take(socket).np;
}
}
@@ -404,12 +404,15 @@
{
const QString id = destroyedDeviceLink->property("deviceId").toString();
//qCDebug(KDECONNECT_CORE) << "deviceLinkDestroyed" << id;
- Q_ASSERT(m_links.key(static_cast(destroyedDeviceLink)) == id);
QMap< QString, LanDeviceLink* >::iterator linkIterator = m_links.find(id);
+ Q_ASSERT(linkIterator != m_links.end());
if (linkIterator != m_links.end()) {
Q_ASSERT(linkIterator.value() == destroyedDeviceLink);
m_links.erase(linkIterator);
- m_pairingHandlers.take(id)->deleteLater();
+ auto pairingHandler = m_pairingHandlers.take(id);
+ if (pairingHandler) {
+ pairingHandler->deleteLater();
+ }
}
}
@@ -480,7 +483,7 @@
}
-void LanLinkProvider::addLink(const QString& deviceId, QSslSocket* socket, NetworkPackage* receivedPackage, LanDeviceLink::ConnectionStarted connectionOrigin)
+void LanLinkProvider::addLink(const QString& deviceId, QSslSocket* socket, NetworkPacket* receivedPacket, LanDeviceLink::ConnectionStarted connectionOrigin)
{
// Socket disconnection will now be handled by LanDeviceLink
disconnect(socket, &QAbstractSocket::disconnected, socket, &QObject::deleteLater);
@@ -503,7 +506,7 @@
m_pairingHandlers[deviceId]->setDeviceLink(deviceLink);
}
}
- Q_EMIT onConnectionReceived(*receivedPackage, deviceLink);
+ Q_EMIT onConnectionReceived(*receivedPacket, deviceLink);
}
LanPairingHandler* LanLinkProvider::createPairingHandler(DeviceLink* link)
@@ -530,9 +533,9 @@
ph->unpair();
}
-void LanLinkProvider::incomingPairPackage(DeviceLink* deviceLink, const NetworkPackage& np)
+void LanLinkProvider::incomingPairPacket(DeviceLink* deviceLink, const NetworkPacket& np)
{
LanPairingHandler* ph = createPairingHandler(deviceLink);
- ph->packageReceived(np);
+ ph->packetReceived(np);
}
diff -Nru kdeconnect-1.2.1/core/backends/lan/lanlinkprovider.h kdeconnect-1.3.0/core/backends/lan/lanlinkprovider.h
--- kdeconnect-1.2.1/core/backends/lan/lanlinkprovider.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/core/backends/lan/lanlinkprovider.h 2018-04-08 14:35:04.000000000 +0000
@@ -49,7 +49,7 @@
void userRequestsPair(const QString& deviceId);
void userRequestsUnpair(const QString& deviceId);
- void incomingPairPackage(DeviceLink* device, const NetworkPackage& np);
+ void incomingPairPacket(DeviceLink* device, const NetworkPacket& np);
static void configureSslSocket(QSslSocket* socket, const QString& deviceId, bool isDeviceTrusted);
static void configureSocket(QSslSocket* socket);
@@ -78,7 +78,7 @@
LanPairingHandler* createPairingHandler(DeviceLink* link);
void onNetworkConfigurationChanged(const QNetworkConfiguration& config);
- void addLink(const QString& deviceId, QSslSocket* socket, NetworkPackage* receivedPackage, LanDeviceLink::ConnectionStarted connectionOrigin);
+ void addLink(const QString& deviceId, QSslSocket* socket, NetworkPacket* receivedPacket, LanDeviceLink::ConnectionStarted connectionOrigin);
Server* m_server;
QUdpSocket m_udpSocket;
@@ -88,10 +88,10 @@
QMap m_pairingHandlers;
struct PendingConnect {
- NetworkPackage* np;
+ NetworkPacket* np;
QHostAddress sender;
};
- QMap m_receivedIdentityPackages;
+ QMap m_receivedIdentityPackets;
QNetworkConfiguration m_lastConfig;
const bool m_testMode;
QTimer m_combineBroadcastsTimer;
diff -Nru kdeconnect-1.2.1/core/backends/lan/lanpairinghandler.cpp kdeconnect-1.3.0/core/backends/lan/lanpairinghandler.cpp
--- kdeconnect-1.2.1/core/backends/lan/lanpairinghandler.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/core/backends/lan/lanpairinghandler.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -25,7 +25,7 @@
#include "kdeconnectconfig.h"
#include "landevicelink.h"
#include "lanpairinghandler.h"
-#include "networkpackagetypes.h"
+#include "networkpackettypes.h"
LanPairingHandler::LanPairingHandler(DeviceLink* deviceLink)
: PairingHandler(deviceLink)
@@ -36,7 +36,7 @@
connect(&m_pairingTimeout, &QTimer::timeout, this, &LanPairingHandler::pairingTimeout);
}
-void LanPairingHandler::packageReceived(const NetworkPackage& np)
+void LanPairingHandler::packetReceived(const NetworkPacket& np)
{
bool wantsPair = np.get(QStringLiteral("pair"));
@@ -80,8 +80,8 @@
return acceptPairing();
}
- NetworkPackage np(PACKAGE_TYPE_PAIR, {{"pair", true}});
- const bool success = deviceLink()->sendPackage(np);
+ NetworkPacket np(PACKET_TYPE_PAIR, {{"pair", true}});
+ const bool success = deviceLink()->sendPacket(np);
if (success) {
setInternalPairStatus(Requested);
}
@@ -90,8 +90,8 @@
bool LanPairingHandler::acceptPairing()
{
- NetworkPackage np(PACKAGE_TYPE_PAIR, {{"pair", true}});
- bool success = deviceLink()->sendPackage(np);
+ NetworkPacket np(PACKET_TYPE_PAIR, {{"pair", true}});
+ bool success = deviceLink()->sendPacket(np);
if (success) {
setInternalPairStatus(Paired);
}
@@ -100,21 +100,21 @@
void LanPairingHandler::rejectPairing()
{
- NetworkPackage np(PACKAGE_TYPE_PAIR, {{"pair", false}});
- deviceLink()->sendPackage(np);
+ NetworkPacket np(PACKET_TYPE_PAIR, {{"pair", false}});
+ deviceLink()->sendPacket(np);
setInternalPairStatus(NotPaired);
}
void LanPairingHandler::unpair() {
- NetworkPackage np(PACKAGE_TYPE_PAIR, {{"pair", false}});
- deviceLink()->sendPackage(np);
+ NetworkPacket np(PACKET_TYPE_PAIR, {{"pair", false}});
+ deviceLink()->sendPacket(np);
setInternalPairStatus(NotPaired);
}
void LanPairingHandler::pairingTimeout()
{
- NetworkPackage np(PACKAGE_TYPE_PAIR, {{"pair", false}});
- deviceLink()->sendPackage(np);
+ NetworkPacket np(PACKET_TYPE_PAIR, {{"pair", false}});
+ deviceLink()->sendPacket(np);
setInternalPairStatus(NotPaired); //Will emit the change as well
Q_EMIT pairingError(i18n("Timed out"));
}
diff -Nru kdeconnect-1.2.1/core/backends/lan/lanpairinghandler.h kdeconnect-1.3.0/core/backends/lan/lanpairinghandler.h
--- kdeconnect-1.2.1/core/backends/lan/lanpairinghandler.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/core/backends/lan/lanpairinghandler.h 2018-04-08 14:35:04.000000000 +0000
@@ -28,7 +28,7 @@
#include "backends/devicelink.h"
#include "backends/pairinghandler.h"
-// This class is used pairing related stuff. It has direct access to links and can directly send packages
+// This class is used pairing related stuff. It has direct access to links and can directly send packets
class LanPairingHandler
: public PairingHandler
{
@@ -46,7 +46,7 @@
LanPairingHandler(DeviceLink* deviceLink);
~LanPairingHandler() override { }
- void packageReceived(const NetworkPackage& np) override;
+ void packetReceived(const NetworkPacket& np) override;
bool requestPairing() override;
bool acceptPairing() override;
void rejectPairing() override;
diff -Nru kdeconnect-1.2.1/core/backends/lan/socketlinereader.cpp kdeconnect-1.3.0/core/backends/lan/socketlinereader.cpp
--- kdeconnect-1.2.1/core/backends/lan/socketlinereader.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/core/backends/lan/socketlinereader.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -34,7 +34,7 @@
while (m_socket->canReadLine()) {
const QByteArray line = m_socket->readLine();
if (line.length() > 1) { //we don't want a single \n
- m_packages.enqueue(line);
+ m_packets.enqueue(line);
}
}
@@ -46,8 +46,8 @@
return;
}
- //If we have any packages, tell it to the world.
- if (!m_packages.isEmpty()) {
+ //If we have any packets, tell it to the world.
+ if (!m_packets.isEmpty()) {
Q_EMIT readyRead();
}
}
diff -Nru kdeconnect-1.2.1/core/backends/lan/socketlinereader.h kdeconnect-1.3.0/core/backends/lan/socketlinereader.h
--- kdeconnect-1.2.1/core/backends/lan/socketlinereader.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/core/backends/lan/socketlinereader.h 2018-04-08 14:35:04.000000000 +0000
@@ -40,11 +40,11 @@
public:
explicit SocketLineReader(QSslSocket* socket, QObject* parent = nullptr);
- QByteArray readLine() { return m_packages.dequeue(); }
+ QByteArray readLine() { return m_packets.dequeue(); }
qint64 write(const QByteArray& data) { return m_socket->write(data); }
QHostAddress peerAddress() const { return m_socket->peerAddress(); }
QSslCertificate peerCertificate() const { return m_socket->peerCertificate(); }
- qint64 bytesAvailable() const { return m_packages.size(); }
+ qint64 bytesAvailable() const { return m_packets.size(); }
QSslSocket* m_socket;
@@ -56,7 +56,7 @@
private:
QByteArray m_lastChunk;
- QQueue m_packages;
+ QQueue m_packets;
};
diff -Nru kdeconnect-1.2.1/core/backends/linkprovider.h kdeconnect-1.3.0/core/backends/linkprovider.h
--- kdeconnect-1.2.1/core/backends/linkprovider.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/core/backends/linkprovider.h 2018-04-08 14:35:04.000000000 +0000
@@ -23,7 +23,7 @@
#include
-#include "core/networkpackage.h"
+#include "core/networkpacket.h"
#include "pairinghandler.h"
class DeviceLink;
@@ -54,7 +54,7 @@
//NOTE: The provider will destroy the DeviceLink when it's no longer accessible,
// and every user should listen to the destroyed signal to remove its references.
// That's the reason because there is no "onConnectionLost".
- void onConnectionReceived(const NetworkPackage& identityPackage, DeviceLink*) const;
+ void onConnectionReceived(const NetworkPacket& identityPacket, DeviceLink*) const;
};
diff -Nru kdeconnect-1.2.1/core/backends/loopback/loopbackdevicelink.cpp kdeconnect-1.3.0/core/backends/loopback/loopbackdevicelink.cpp
--- kdeconnect-1.2.1/core/backends/loopback/loopbackdevicelink.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/core/backends/loopback/loopbackdevicelink.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -33,10 +33,10 @@
return QStringLiteral("LoopbackLink");
}
-bool LoopbackDeviceLink::sendPackage(NetworkPackage& input)
+bool LoopbackDeviceLink::sendPacket(NetworkPacket& input)
{
- NetworkPackage output(QString::null);
- NetworkPackage::unserialize(input.serialize(), &output);
+ NetworkPacket output(QString::null);
+ NetworkPacket::unserialize(input.serialize(), &output);
//LoopbackDeviceLink does not need deviceTransferInfo
if (input.hasPayload()) {
@@ -45,7 +45,7 @@
output.setPayload(input.payload(), input.payloadSize());
}
- Q_EMIT receivedPackage(output);
+ Q_EMIT receivedPacket(output);
return true;
}
diff -Nru kdeconnect-1.2.1/core/backends/loopback/loopbackdevicelink.h kdeconnect-1.3.0/core/backends/loopback/loopbackdevicelink.h
--- kdeconnect-1.2.1/core/backends/loopback/loopbackdevicelink.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/core/backends/loopback/loopbackdevicelink.h 2018-04-08 14:35:04.000000000 +0000
@@ -33,7 +33,7 @@
LoopbackDeviceLink(const QString& d, LoopbackLinkProvider* a);
QString name() override;
- bool sendPackage(NetworkPackage& np) override;
+ bool sendPacket(NetworkPacket& np) override;
void userRequestsPair() override { setPairStatus(Paired); }
void userRequestsUnpair() override { setPairStatus(NotPaired); }
diff -Nru kdeconnect-1.2.1/core/backends/loopback/loopbacklinkprovider.cpp kdeconnect-1.3.0/core/backends/loopback/loopbacklinkprovider.cpp
--- kdeconnect-1.2.1/core/backends/loopback/loopbacklinkprovider.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/core/backends/loopback/loopbacklinkprovider.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -23,9 +23,9 @@
#include "core_debug.h"
LoopbackLinkProvider::LoopbackLinkProvider()
- : identityPackage(PACKAGE_TYPE_IDENTITY)
+ : identityPacket(PACKET_TYPE_IDENTITY)
{
- NetworkPackage::createIdentityPackage(&identityPackage);
+ NetworkPacket::createIdentityPacket(&identityPacket);
}
LoopbackLinkProvider::~LoopbackLinkProvider()
@@ -36,7 +36,7 @@
void LoopbackLinkProvider::onNetworkChange()
{
LoopbackDeviceLink* newLoopbackDeviceLink = new LoopbackDeviceLink(QStringLiteral("loopback"), this);
- Q_EMIT onConnectionReceived(identityPackage, newLoopbackDeviceLink);
+ Q_EMIT onConnectionReceived(identityPacket, newLoopbackDeviceLink);
if (loopbackDeviceLink) {
delete loopbackDeviceLink;
diff -Nru kdeconnect-1.2.1/core/backends/loopback/loopbacklinkprovider.h kdeconnect-1.3.0/core/backends/loopback/loopbacklinkprovider.h
--- kdeconnect-1.2.1/core/backends/loopback/loopbacklinkprovider.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/core/backends/loopback/loopbacklinkprovider.h 2018-04-08 14:35:04.000000000 +0000
@@ -42,7 +42,7 @@
private:
QPointer loopbackDeviceLink;
- NetworkPackage identityPackage;
+ NetworkPacket identityPacket;
};
diff -Nru kdeconnect-1.2.1/core/backends/pairinghandler.h kdeconnect-1.3.0/core/backends/pairinghandler.h
--- kdeconnect-1.2.1/core/backends/pairinghandler.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/core/backends/pairinghandler.h 2018-04-08 14:35:04.000000000 +0000
@@ -21,7 +21,7 @@
#ifndef KDECONNECT_PAIRINGHANDLER_H
#define KDECONNECT_PAIRINGHANDLER_H
-#include "networkpackage.h"
+#include "networkpacket.h"
#include "devicelink.h"
/*
@@ -47,7 +47,7 @@
DeviceLink* deviceLink() const;
void setDeviceLink(DeviceLink* dl);
- virtual void packageReceived(const NetworkPackage& np) = 0;
+ virtual void packetReceived(const NetworkPacket& np) = 0;
virtual void unpair() = 0;
static int pairingTimeoutMsec() { return 30 * 1000; } // 30 seconds of timeout (default), subclasses that use different values should override
diff -Nru kdeconnect-1.2.1/core/CMakeLists.txt kdeconnect-1.3.0/core/CMakeLists.txt
--- kdeconnect-1.2.1/core/CMakeLists.txt 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/core/CMakeLists.txt 2018-04-08 14:35:04.000000000 +0000
@@ -11,12 +11,10 @@
option(BLUETOOTH_ENABLED "Bluetooth support for kdeconnect" OFF)
if(BLUETOOTH_ENABLED)
- find_package(Qt5 REQUIRED COMPONENTS Bluetooth)
+ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Bluetooth)
add_subdirectory(backends/bluetooth)
endif()
-find_package(KF5Notifications 5.9 REQUIRED)
-
set(kdeconnectcore_SRCS
${backends_kdeconnect_SRCS}
@@ -31,7 +29,7 @@
kdeconnectconfig.cpp
dbushelper.cpp
- networkpackage.cpp
+ networkpacket.cpp
filetransferjob.cpp
daemon.cpp
device.cpp
diff -Nru kdeconnect-1.2.1/core/daemon.cpp kdeconnect-1.3.0/core/daemon.cpp
--- kdeconnect-1.2.1/core/daemon.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/core/daemon.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -21,13 +21,14 @@
#include "daemon.h"
#include
+#include
#include
#include
#include
#include "core_debug.h"
#include "kdeconnectconfig.h"
-#include "networkpackage.h"
+#include "networkpacket.h"
#ifdef KDECONNECT_BLUETOOTH
#include "backends/bluetooth/bluetoothlinkprovider.h"
@@ -90,6 +91,7 @@
}
//Register on DBus
+ qDBusRegisterMetaType< QMap >();
QDBusConnection::sessionBus().registerService(QStringLiteral("org.kde.kdeconnect"));
QDBusConnection::sessionBus().registerObject(QStringLiteral("/modules/kdeconnect"), this, QDBusConnection::ExportScriptableContents);
@@ -168,23 +170,34 @@
return ret;
}
-void Daemon::onNewDeviceLink(const NetworkPackage& identityPackage, DeviceLink* dl)
+QMap Daemon::deviceNames(bool onlyReachable, bool onlyTrusted) const
{
- const QString& id = identityPackage.get(QStringLiteral("deviceId"));
+ QMap ret;
+ for (Device* device : qAsConst(d->m_devices)) {
+ if (onlyReachable && !device->isReachable()) continue;
+ if (onlyTrusted && !device->isTrusted()) continue;
+ ret[device->id()] = device->name();
+ }
+ return ret;
+}
+
+void Daemon::onNewDeviceLink(const NetworkPacket& identityPacket, DeviceLink* dl)
+{
+ const QString& id = identityPacket.get(QStringLiteral("deviceId"));
//qCDebug(KDECONNECT_CORE) << "Device discovered" << id << "via" << dl->provider()->name();
if (d->m_devices.contains(id)) {
- qCDebug(KDECONNECT_CORE) << "It is a known device" << identityPackage.get(QStringLiteral("deviceName"));
+ qCDebug(KDECONNECT_CORE) << "It is a known device" << identityPacket.get(QStringLiteral("deviceName"));
Device* device = d->m_devices[id];
bool wasReachable = device->isReachable();
- device->addLink(identityPackage, dl);
+ device->addLink(identityPacket, dl);
if (!wasReachable) {
Q_EMIT deviceVisibilityChanged(id, true);
}
} else {
- qCDebug(KDECONNECT_CORE) << "It is a new device" << identityPackage.get(QStringLiteral("deviceName"));
- Device* device = new Device(this, identityPackage, dl);
+ qCDebug(KDECONNECT_CORE) << "It is a new device" << identityPacket.get(QStringLiteral("deviceName"));
+ Device* device = new Device(this, identityPacket, dl);
//we discard the connections that we created but it's not paired.
if (!isDiscoveringDevices() && !device->isTrusted() && !dl->linkShouldBeKeptAlive()) {
diff -Nru kdeconnect-1.2.1/core/daemon.h kdeconnect-1.3.0/core/daemon.h
--- kdeconnect-1.2.1/core/daemon.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/core/daemon.h 2018-04-08 14:35:04.000000000 +0000
@@ -28,7 +28,7 @@
#include "kdeconnectcore_export.h"
#include "device.h"
-class NetworkPackage;
+class NetworkPacket;
class DeviceLink;
class Device;
class QNetworkAccessManager;
@@ -71,8 +71,12 @@
//Returns a list of ids. The respective devices can be manipulated using the dbus path: "/modules/kdeconnect/Devices/"+id
Q_SCRIPTABLE QStringList devices(bool onlyReachable = false, bool onlyPaired = false) const;
+ Q_SCRIPTABLE QMap deviceNames(bool onlyReachable = false, bool onlyPaired = false) const;
+
Q_SCRIPTABLE QString deviceIdByName(const QString& name) const;
+ Q_SCRIPTABLE virtual void sendSimpleNotification(const QString &eventId, const QString &title, const QString &text, const QString &iconName) = 0;
+
Q_SIGNALS:
Q_SCRIPTABLE void deviceAdded(const QString& id);
Q_SCRIPTABLE void deviceRemoved(const QString& id); //Note that paired devices will never be removed
@@ -81,7 +85,7 @@
Q_SCRIPTABLE void pairingRequestsChanged();
private Q_SLOTS:
- void onNewDeviceLink(const NetworkPackage& identityPackage, DeviceLink* dl);
+ void onNewDeviceLink(const NetworkPacket& identityPacket, DeviceLink* dl);
void onDeviceStatusChanged();
private:
diff -Nru kdeconnect-1.2.1/core/device.cpp kdeconnect-1.3.0/core/device.cpp
--- kdeconnect-1.2.1/core/device.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/core/device.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -20,10 +20,6 @@
#include "device.h"
-#ifdef interface // MSVC language extension, QDBusConnection uses this as a variable name
-#undef interface
-#endif
-
#include
#include
@@ -37,7 +33,7 @@
#include "backends/devicelink.h"
#include "backends/lan/landevicelink.h"
#include "backends/linkprovider.h"
-#include "networkpackage.h"
+#include "networkpacket.h"
#include "kdeconnectconfig.h"
#include "daemon.h"
@@ -49,7 +45,7 @@
Device::Device(QObject* parent, const QString& id)
: QObject(parent)
, m_deviceId(id)
- , m_protocolVersion(NetworkPackage::s_protocolVersion) //We don't know it yet
+ , m_protocolVersion(NetworkPacket::s_protocolVersion) //We don't know it yet
{
KdeConnectConfig::DeviceInfo info = KdeConnectConfig::instance()->getTrustedDevice(id);
@@ -65,12 +61,12 @@
connect(this, &Device::pairingError, this, &warn);
}
-Device::Device(QObject* parent, const NetworkPackage& identityPackage, DeviceLink* dl)
+Device::Device(QObject* parent, const NetworkPacket& identityPacket, DeviceLink* dl)
: QObject(parent)
- , m_deviceId(identityPackage.get(QStringLiteral("deviceId")))
- , m_deviceName(identityPackage.get(QStringLiteral("deviceName")))
+ , m_deviceId(identityPacket.get(QStringLiteral("deviceId")))
+ , m_deviceName(identityPacket.get(QStringLiteral("deviceName")))
{
- addLink(identityPackage, dl);
+ addLink(identityPacket, dl);
//Register in bus
QDBusConnection::sessionBus().registerObject(dbusPath(), this, QDBusConnection::ExportScriptableContents | QDBusConnection::ExportAdaptors);
@@ -107,7 +103,7 @@
const KPluginMetaData service = loader->getPluginInfo(pluginName);
const bool pluginEnabled = isPluginEnabled(pluginName);
- const QSet incomingCapabilities = KPluginMetaData::readStringList(service.rawData(), QStringLiteral("X-KdeConnect-SupportedPackageType")).toSet();
+ const QSet incomingCapabilities = KPluginMetaData::readStringList(service.rawData(), QStringLiteral("X-KdeConnect-SupportedPacketType")).toSet();
if (pluginEnabled) {
KdeConnectPlugin* plugin = m_plugins.take(pluginName);
@@ -206,19 +202,19 @@
return p1->provider()->priority() > p2->provider()->priority();
}
-void Device::addLink(const NetworkPackage& identityPackage, DeviceLink* link)
+void Device::addLink(const NetworkPacket& identityPacket, DeviceLink* link)
{
//qCDebug(KDECONNECT_CORE) << "Adding link to" << id() << "via" << link->provider();
- setName(identityPackage.get(QStringLiteral("deviceName")));
- m_deviceType = str2type(identityPackage.get(QStringLiteral("deviceType")));
+ setName(identityPacket.get(QStringLiteral("deviceName")));
+ m_deviceType = str2type(identityPacket.get(QStringLiteral("deviceType")));
if (m_deviceLinks.contains(link))
return;
- m_protocolVersion = identityPackage.get(QStringLiteral("protocolVersion"), -1);
- if (m_protocolVersion != NetworkPackage::s_protocolVersion) {
- qCWarning(KDECONNECT_CORE) << m_deviceName << "- warning, device uses a different protocol version" << m_protocolVersion << "expected" << NetworkPackage::s_protocolVersion;
+ m_protocolVersion = identityPacket.get(QStringLiteral("protocolVersion"), -1);
+ if (m_protocolVersion != NetworkPacket::s_protocolVersion) {
+ qCWarning(KDECONNECT_CORE) << m_deviceName << "- warning, device uses a different protocol version" << m_protocolVersion << "expected" << NetworkPacket::s_protocolVersion;
}
connect(link, &QObject::destroyed,
@@ -230,15 +226,15 @@
//the old one before this is called), so we do not have to worry about destroying old links.
//-- Actually, we should not destroy them or the provider will store an invalid ref!
- connect(link, &DeviceLink::receivedPackage,
- this, &Device::privateReceivedPackage);
+ connect(link, &DeviceLink::receivedPacket,
+ this, &Device::privateReceivedPacket);
- qSort(m_deviceLinks.begin(), m_deviceLinks.end(), lessThan);
+ std::sort(m_deviceLinks.begin(), m_deviceLinks.end(), lessThan);
- const bool capabilitiesSupported = identityPackage.has(QStringLiteral("incomingCapabilities")) || identityPackage.has(QStringLiteral("outgoingCapabilities"));
+ const bool capabilitiesSupported = identityPacket.has(QStringLiteral("incomingCapabilities")) || identityPacket.has(QStringLiteral("outgoingCapabilities"));
if (capabilitiesSupported) {
- const QSet outgoingCapabilities = identityPackage.get(QStringLiteral("outgoingCapabilities")).toSet()
- , incomingCapabilities = identityPackage.get(QStringLiteral("incomingCapabilities")).toSet();
+ const QSet outgoingCapabilities = identityPacket.get(QStringLiteral("outgoingCapabilities")).toSet()
+ , incomingCapabilities = identityPacket.get(QStringLiteral("incomingCapabilities")).toSet();
m_supportedPlugins = PluginLoader::instance()->pluginsForCapabilities(incomingCapabilities, outgoingCapabilities);
//qDebug() << "new plugins for" << m_deviceName << m_supportedPlugins << incomingCapabilities << outgoingCapabilities;
@@ -320,32 +316,32 @@
}
}
-bool Device::sendPackage(NetworkPackage& np)
+bool Device::sendPacket(NetworkPacket& np)
{
- Q_ASSERT(np.type() != PACKAGE_TYPE_PAIR);
+ Q_ASSERT(np.type() != PACKET_TYPE_PAIR);
Q_ASSERT(isTrusted());
- //Maybe we could block here any package that is not an identity or a pairing package to prevent sending non encrypted data
+ //Maybe we could block here any packet that is not an identity or a pairing packet to prevent sending non encrypted data
for (DeviceLink* dl : qAsConst(m_deviceLinks)) {
- if (dl->sendPackage(np)) return true;
+ if (dl->sendPacket(np)) return true;
}
return false;
}
-void Device::privateReceivedPackage(const NetworkPackage& np)
+void Device::privateReceivedPacket(const NetworkPacket& np)
{
- Q_ASSERT(np.type() != PACKAGE_TYPE_PAIR);
+ Q_ASSERT(np.type() != PACKET_TYPE_PAIR);
if (isTrusted()) {
const QList plugins = m_pluginsByIncomingCapability.values(np.type());
if (plugins.isEmpty()) {
- qWarning() << "discarding unsupported package" << np.type() << "for" << name();
+ qWarning() << "discarding unsupported packet" << np.type() << "for" << name();
}
for (KdeConnectPlugin* plugin : plugins) {
- plugin->receivePackage(np);
+ plugin->receivePacket(np);
}
} else {
- qCDebug(KDECONNECT_CORE) << "device" << name() << "not paired, ignoring package" << np.type();
+ qCDebug(KDECONNECT_CORE) << "device" << name() << "not paired, ignoring packet" << np.type();
unpair();
}
diff -Nru kdeconnect-1.2.1/core/device.h kdeconnect-1.3.0/core/device.h
--- kdeconnect-1.2.1/core/device.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/core/device.h 2018-04-08 14:35:04.000000000 +0000
@@ -27,7 +27,7 @@
#include
#include
-#include "networkpackage.h"
+#include "networkpacket.h"
#include "backends/devicelink.h"
class DeviceLink;
@@ -69,7 +69,7 @@
*
* We know everything but we don't trust it yet
*/
- Device(QObject* parent, const NetworkPackage& np, DeviceLink* dl);
+ Device(QObject* parent, const NetworkPacket& np, DeviceLink* dl);
~Device() override;
@@ -82,7 +82,7 @@
Q_SCRIPTABLE QString encryptionInfo() const;
//Add and remove links
- void addLink(const NetworkPackage& identityPackage, DeviceLink*);
+ void addLink(const NetworkPacket& identityPacket, DeviceLink*);
void removeLink(DeviceLink*);
Q_SCRIPTABLE bool isTrusted() const;
@@ -107,9 +107,9 @@
QHostAddress getLocalIpAddress() const;
public Q_SLOTS:
- ///sends a @p np package to the device
+ ///sends a @p np packet to the device
///virtual for testing purposes.
- virtual bool sendPackage(NetworkPackage& np);
+ virtual bool sendPacket(NetworkPacket& np);
//Dbus operations
public Q_SLOTS:
@@ -122,7 +122,7 @@
Q_SCRIPTABLE bool hasPairingRequests() const;
private Q_SLOTS:
- void privateReceivedPackage(const NetworkPackage& np);
+ void privateReceivedPacket(const NetworkPacket& np);
void linkDestroyed(QObject* o);
void pairStatusChanged(DeviceLink::PairStatus current);
void addPairingRequest(PairingHandler* handler);
diff -Nru kdeconnect-1.2.1/core/kdeconnectconfig.cpp kdeconnect-1.3.0/core/kdeconnectconfig.cpp
--- kdeconnect-1.2.1/core/kdeconnectconfig.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/core/kdeconnectconfig.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -68,7 +68,7 @@
Daemon::instance()->reportError(
i18n("KDE Connect failed to start"),
i18n("Could not find support for RSA in your QCA installation. If your "
- "distribution provides separate packages for QCA-ossl and QCA-gnupg, "
+ "distribution provides separate packets for QCA-ossl and QCA-gnupg, "
"make sure you have them installed and try again."));
return;
}
diff -Nru kdeconnect-1.2.1/core/kdeconnectplugin.cpp kdeconnect-1.3.0/core/kdeconnectplugin.cpp
--- kdeconnect-1.2.1/core/kdeconnectplugin.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/core/kdeconnectplugin.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -66,14 +66,14 @@
return d->m_device;
}
-bool KdeConnectPlugin::sendPackage(NetworkPackage& np) const
+bool KdeConnectPlugin::sendPacket(NetworkPacket& np) const
{
if(!d->m_outgoingCapabilties.contains(np.type())) {
- qCWarning(KDECONNECT_CORE) << metaObject()->className() << "tried to send an unsupported package type" << np.type() << ". Supported:" << d->m_outgoingCapabilties;
+ qCWarning(KDECONNECT_CORE) << metaObject()->className() << "tried to send an unsupported packet type" << np.type() << ". Supported:" << d->m_outgoingCapabilties;
return false;
}
// qCWarning(KDECONNECT_CORE) << metaObject()->className() << "sends" << np.type() << ". Supported:" << d->mOutgoingTypes;
- return d->m_device->sendPackage(np);
+ return d->m_device->sendPacket(np);
}
QString KdeConnectPlugin::dbusPath() const
diff -Nru kdeconnect-1.2.1/core/kdeconnectplugin.h kdeconnect-1.3.0/core/kdeconnectplugin.h
--- kdeconnect-1.2.1/core/kdeconnectplugin.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/core/kdeconnectplugin.h 2018-04-08 14:35:04.000000000 +0000
@@ -26,7 +26,7 @@
#include "kdeconnectcore_export.h"
#include "kdeconnectpluginconfig.h"
-#include "networkpackage.h"
+#include "networkpacket.h"
#include "device.h"
struct KdeConnectPluginPrivate;
@@ -43,7 +43,7 @@
const Device* device();
Device const* device() const;
- bool sendPackage(NetworkPackage& np) const;
+ bool sendPacket(NetworkPacket& np) const;
KdeConnectPluginConfig* config() const;
@@ -51,10 +51,10 @@
public Q_SLOTS:
/**
- * Returns true if it has handled the package in some way
- * device.sendPackage can be used to send an answer back to the device
+ * Returns true if it has handled the packet in some way
+ * device.sendPacket can be used to send an answer back to the device
*/
- virtual bool receivePackage(const NetworkPackage& np) = 0;
+ virtual bool receivePacket(const NetworkPacket& np) = 0;
/**
* This method will be called when a device is connected to this computer.
diff -Nru kdeconnect-1.2.1/core/networkpackage.cpp kdeconnect-1.3.0/core/networkpackage.cpp
--- kdeconnect-1.2.1/core/networkpackage.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/core/networkpackage.cpp 1970-01-01 00:00:00.000000000 +0000
@@ -1,172 +0,0 @@
-/**
- * Copyright 2013 Albert Vaca
- *
- * 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 "networkpackage.h"
-#include "core_debug.h"
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include "dbushelper.h"
-#include "filetransferjob.h"
-#include "pluginloader.h"
-#include "kdeconnectconfig.h"
-
-QDebug operator<<(QDebug s, const NetworkPackage& pkg)
-{
- s.nospace() << "NetworkPackage(" << pkg.type() << ':' << pkg.body();
- if (pkg.hasPayload()) {
- s.nospace() << ":withpayload";
- }
- s.nospace() << ')';
- return s.space();
-}
-
-const int NetworkPackage::s_protocolVersion = 7;
-
-NetworkPackage::NetworkPackage(const QString& type, const QVariantMap& body)
- : m_id(QString::number(QDateTime::currentMSecsSinceEpoch()))
- , m_type(type)
- , m_body(body)
- , m_payload()
- , m_payloadSize(0)
-{
-}
-
-void NetworkPackage::createIdentityPackage(NetworkPackage* np)
-{
- KdeConnectConfig* config = KdeConnectConfig::instance();
- np->m_id = QString::number(QDateTime::currentMSecsSinceEpoch());
- np->m_type = PACKAGE_TYPE_IDENTITY;
- np->m_payload = QSharedPointer();
- np->m_payloadSize = 0;
- np->set(QStringLiteral("deviceId"), config->deviceId());
- np->set(QStringLiteral("deviceName"), config->name());
- np->set(QStringLiteral("deviceType"), config->deviceType());
- np->set(QStringLiteral("protocolVersion"), NetworkPackage::s_protocolVersion);
- np->set(QStringLiteral("incomingCapabilities"), PluginLoader::instance()->incomingCapabilities());
- np->set(QStringLiteral("outgoingCapabilities"), PluginLoader::instance()->outgoingCapabilities());
-
- //qCDebug(KDECONNECT_CORE) << "createIdentityPackage" << np->serialize();
-}
-
-template
-QVariantMap qobject2qvariant(const T* object)
-{
- QVariantMap map;
- auto metaObject = T::staticMetaObject;
- for(int i = metaObject.propertyOffset(); i < metaObject.propertyCount(); ++i) {
- QMetaProperty prop = metaObject.property(i);
- map.insert(QString::fromLatin1(prop.name()), prop.readOnGadget(object));
- }
-
- return map;
-}
-
-QByteArray NetworkPackage::serialize() const
-{
- //Object -> QVariant
- //QVariantMap variant;
- //variant["id"] = mId;
- //variant["type"] = mType;
- //variant["body"] = mBody;
- QVariantMap variant = qobject2qvariant(this);
-
- if (hasPayload()) {
- //qCDebug(KDECONNECT_CORE) << "Serializing payloadTransferInfo";
- variant[QStringLiteral("payloadSize")] = payloadSize();
- variant[QStringLiteral("payloadTransferInfo")] = m_payloadTransferInfo;
- }
-
- //QVariant -> json
- auto jsonDocument = QJsonDocument::fromVariant(variant);
- QByteArray json = jsonDocument.toJson(QJsonDocument::Compact);
- if (json.isEmpty()) {
- qCDebug(KDECONNECT_CORE) << "Serialization error:";
- } else {
- /*if (!isEncrypted()) {
- //qCDebug(KDECONNECT_CORE) << "Serialized package:" << json;
- }*/
- json.append('\n');
- }
-
- return json;
-}
-
-template
-void qvariant2qobject(const QVariantMap& variant, T* object)
-{
- for ( QVariantMap::const_iterator iter = variant.begin(); iter != variant.end(); ++iter )
- {
- const int propertyIndex = T::staticMetaObject.indexOfProperty(iter.key().toLatin1());
- if (propertyIndex < 0) {
- qCWarning(KDECONNECT_CORE) << "missing property" << object << iter.key();
- continue;
- }
-
- QMetaProperty property = T::staticMetaObject.property(propertyIndex);
- bool ret = property.writeOnGadget(object, *iter);
- if (!ret) {
- qCWarning(KDECONNECT_CORE) << "couldn't set" << object << "->" << property.name() << '=' << *iter;
- }
- }
-}
-
-bool NetworkPackage::unserialize(const QByteArray& a, NetworkPackage* np)
-{
- //Json -> QVariant
- QJsonParseError parseError;
- auto parser = QJsonDocument::fromJson(a, &parseError);
- if (parser.isNull()) {
- qCDebug(KDECONNECT_CORE) << "Unserialization error:" << parseError.errorString();
- return false;
- }
-
- auto variant = parser.toVariant().toMap();
- qvariant2qobject(variant, np);
-
- np->m_payloadSize = variant[QStringLiteral("payloadSize")].toInt(); //Will return 0 if was not present, which is ok
- if (np->m_payloadSize == -1) {
- np->m_payloadSize = np->get(QStringLiteral("size"), -1);
- }
- np->m_payloadTransferInfo = variant[QStringLiteral("payloadTransferInfo")].toMap(); //Will return an empty qvariantmap if was not present, which is ok
-
- //Ids containing characters that are not allowed as dbus paths would make app crash
- if (np->m_body.contains(QStringLiteral("deviceId")))
- {
- QString deviceId = np->get(QStringLiteral("deviceId"));
- DbusHelper::filterNonExportableCharacters(deviceId);
- np->set(QStringLiteral("deviceId"), deviceId);
- }
-
- return true;
-
-}
-
-FileTransferJob* NetworkPackage::createPayloadTransferJob(const QUrl& destination) const
-{
- return new FileTransferJob(payload(), payloadSize(), destination);
-}
-
diff -Nru kdeconnect-1.2.1/core/networkpackage.h kdeconnect-1.3.0/core/networkpackage.h
--- kdeconnect-1.2.1/core/networkpackage.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/core/networkpackage.h 1970-01-01 00:00:00.000000000 +0000
@@ -1,101 +0,0 @@
-/**
- * Copyright 2013 Albert Vaca
- *
- * 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 .
- */
-
-#ifndef NETWORKPACKAGE_H
-#define NETWORKPACKAGE_H
-
-#include "networkpackagetypes.h"
-
-#include
-#include
-#include
-#include
-//#include
-#include
-#include
-
-#include "kdeconnectcore_export.h"
-
-class FileTransferJob;
-
-class KDECONNECTCORE_EXPORT NetworkPackage
-{
- Q_GADGET
- Q_PROPERTY( QString id READ id WRITE setId )
- Q_PROPERTY( QString type READ type WRITE setType )
- Q_PROPERTY( QVariantMap body READ body WRITE setBody )
- Q_PROPERTY( QVariantMap payloadTransferInfo READ payloadTransferInfo WRITE setPayloadTransferInfo )
- Q_PROPERTY( qint64 payloadSize READ payloadSize WRITE setPayloadSize )
-
-public:
-
- //const static QCA::EncryptionAlgorithm EncryptionAlgorithm;
- const static int s_protocolVersion;
-
- explicit NetworkPackage(const QString& type, const QVariantMap& body = {});
-
- static void createIdentityPackage(NetworkPackage*);
-
- QByteArray serialize() const;
- static bool unserialize(const QByteArray& json, NetworkPackage* out);
-
- const QString& id() const { return m_id; }
- const QString& type() const { return m_type; }
- QVariantMap& body() { return m_body; }
- const QVariantMap& body() const { return m_body; }
-
- //Get and set info from body. Note that id and type can not be accessed through these.
- template T get(const QString& key, const T& defaultValue = {}) const {
- return m_body.value(key,defaultValue).template value(); //Important note: Awesome template syntax is awesome
- }
- template void set(const QString& key, const T& value) { m_body[key] = QVariant(value); }
- bool has(const QString& key) const { return m_body.contains(key); }
-
- QSharedPointer payload() const { return m_payload; }
- void setPayload(const QSharedPointer& device, qint64 payloadSize) { m_payload = device; m_payloadSize = payloadSize; Q_ASSERT(m_payloadSize >= -1); }
- bool hasPayload() const { return (m_payloadSize != 0); }
- qint64 payloadSize() const { return m_payloadSize; } //-1 means it is an endless stream
- FileTransferJob* createPayloadTransferJob(const QUrl& destination) const;
-
- //To be called by a particular DeviceLink
- QVariantMap payloadTransferInfo() const { return m_payloadTransferInfo; }
- void setPayloadTransferInfo(const QVariantMap& map) { m_payloadTransferInfo = map; }
- bool hasPayloadTransferInfo() const { return !m_payloadTransferInfo.isEmpty(); }
-
-private:
-
- void setId(const QString& id) { m_id = id; }
- void setType(const QString& t) { m_type = t; }
- void setBody(const QVariantMap& b) { m_body = b; }
- void setPayloadSize(qint64 s) { m_payloadSize = s; }
-
- QString m_id;
- QString m_type;
- QVariantMap m_body;
-
- QSharedPointer m_payload;
- qint64 m_payloadSize;
- QVariantMap m_payloadTransferInfo;
-
-};
-
-KDECONNECTCORE_EXPORT QDebug operator<<(QDebug s, const NetworkPackage& pkg);
-
-#endif // NETWORKPACKAGE_H
diff -Nru kdeconnect-1.2.1/core/networkpackagetypes.h kdeconnect-1.3.0/core/networkpackagetypes.h
--- kdeconnect-1.2.1/core/networkpackagetypes.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/core/networkpackagetypes.h 1970-01-01 00:00:00.000000000 +0000
@@ -1,27 +0,0 @@
-/**
- * Copyright 2013 Albert Vaca
- *
- * 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 .
- */
-
-#ifndef NETWORKPACKAGETYPES_H
-#define NETWORKPACKAGETYPES_H
-
-#define PACKAGE_TYPE_IDENTITY QStringLiteral("kdeconnect.identity")
-#define PACKAGE_TYPE_PAIR QStringLiteral("kdeconnect.pair")
-
-#endif // NETWORKPACKAGETYPES_H
diff -Nru kdeconnect-1.2.1/core/networkpacket.cpp kdeconnect-1.3.0/core/networkpacket.cpp
--- kdeconnect-1.2.1/core/networkpacket.cpp 1970-01-01 00:00:00.000000000 +0000
+++ kdeconnect-1.3.0/core/networkpacket.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -0,0 +1,172 @@
+/**
+ * Copyright 2013 Albert Vaca
+ *
+ * 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 "networkpacket.h"
+#include "core_debug.h"
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "dbushelper.h"
+#include "filetransferjob.h"
+#include "pluginloader.h"
+#include "kdeconnectconfig.h"
+
+QDebug operator<<(QDebug s, const NetworkPacket& pkg)
+{
+ s.nospace() << "NetworkPacket(" << pkg.type() << ':' << pkg.body();
+ if (pkg.hasPayload()) {
+ s.nospace() << ":withpayload";
+ }
+ s.nospace() << ')';
+ return s.space();
+}
+
+const int NetworkPacket::s_protocolVersion = 7;
+
+NetworkPacket::NetworkPacket(const QString& type, const QVariantMap& body)
+ : m_id(QString::number(QDateTime::currentMSecsSinceEpoch()))
+ , m_type(type)
+ , m_body(body)
+ , m_payload()
+ , m_payloadSize(0)
+{
+}
+
+void NetworkPacket::createIdentityPacket(NetworkPacket* np)
+{
+ KdeConnectConfig* config = KdeConnectConfig::instance();
+ np->m_id = QString::number(QDateTime::currentMSecsSinceEpoch());
+ np->m_type = PACKET_TYPE_IDENTITY;
+ np->m_payload = QSharedPointer();
+ np->m_payloadSize = 0;
+ np->set(QStringLiteral("deviceId"), config->deviceId());
+ np->set(QStringLiteral("deviceName"), config->name());
+ np->set(QStringLiteral("deviceType"), config->deviceType());
+ np->set(QStringLiteral("protocolVersion"), NetworkPacket::s_protocolVersion);
+ np->set(QStringLiteral("incomingCapabilities"), PluginLoader::instance()->incomingCapabilities());
+ np->set(QStringLiteral("outgoingCapabilities"), PluginLoader::instance()->outgoingCapabilities());
+
+ //qCDebug(KDECONNECT_CORE) << "createIdentityPacket" << np->serialize();
+}
+
+template
+QVariantMap qobject2qvariant(const T* object)
+{
+ QVariantMap map;
+ auto metaObject = T::staticMetaObject;
+ for(int i = metaObject.propertyOffset(); i < metaObject.propertyCount(); ++i) {
+ QMetaProperty prop = metaObject.property(i);
+ map.insert(QString::fromLatin1(prop.name()), prop.readOnGadget(object));
+ }
+
+ return map;
+}
+
+QByteArray NetworkPacket::serialize() const
+{
+ //Object -> QVariant
+ //QVariantMap variant;
+ //variant["id"] = mId;
+ //variant["type"] = mType;
+ //variant["body"] = mBody;
+ QVariantMap variant = qobject2qvariant(this);
+
+ if (hasPayload()) {
+ //qCDebug(KDECONNECT_CORE) << "Serializing payloadTransferInfo";
+ variant[QStringLiteral("payloadSize")] = payloadSize();
+ variant[QStringLiteral("payloadTransferInfo")] = m_payloadTransferInfo;
+ }
+
+ //QVariant -> json
+ auto jsonDocument = QJsonDocument::fromVariant(variant);
+ QByteArray json = jsonDocument.toJson(QJsonDocument::Compact);
+ if (json.isEmpty()) {
+ qCDebug(KDECONNECT_CORE) << "Serialization error:";
+ } else {
+ /*if (!isEncrypted()) {
+ //qCDebug(KDECONNECT_CORE) << "Serialized packet:" << json;
+ }*/
+ json.append('\n');
+ }
+
+ return json;
+}
+
+template
+void qvariant2qobject(const QVariantMap& variant, T* object)
+{
+ for ( QVariantMap::const_iterator iter = variant.begin(); iter != variant.end(); ++iter )
+ {
+ const int propertyIndex = T::staticMetaObject.indexOfProperty(iter.key().toLatin1());
+ if (propertyIndex < 0) {
+ qCWarning(KDECONNECT_CORE) << "missing property" << object << iter.key();
+ continue;
+ }
+
+ QMetaProperty property = T::staticMetaObject.property(propertyIndex);
+ bool ret = property.writeOnGadget(object, *iter);
+ if (!ret) {
+ qCWarning(KDECONNECT_CORE) << "couldn't set" << object << "->" << property.name() << '=' << *iter;
+ }
+ }
+}
+
+bool NetworkPacket::unserialize(const QByteArray& a, NetworkPacket* np)
+{
+ //Json -> QVariant
+ QJsonParseError parseError;
+ auto parser = QJsonDocument::fromJson(a, &parseError);
+ if (parser.isNull()) {
+ qCDebug(KDECONNECT_CORE) << "Unserialization error:" << parseError.errorString();
+ return false;
+ }
+
+ auto variant = parser.toVariant().toMap();
+ qvariant2qobject(variant, np);
+
+ np->m_payloadSize = variant[QStringLiteral("payloadSize")].toInt(); //Will return 0 if was not present, which is ok
+ if (np->m_payloadSize == -1) {
+ np->m_payloadSize = np->get(QStringLiteral("size"), -1);
+ }
+ np->m_payloadTransferInfo = variant[QStringLiteral("payloadTransferInfo")].toMap(); //Will return an empty qvariantmap if was not present, which is ok
+
+ //Ids containing characters that are not allowed as dbus paths would make app crash
+ if (np->m_body.contains(QStringLiteral("deviceId")))
+ {
+ QString deviceId = np->get(QStringLiteral("deviceId"));
+ DbusHelper::filterNonExportableCharacters(deviceId);
+ np->set(QStringLiteral("deviceId"), deviceId);
+ }
+
+ return true;
+
+}
+
+FileTransferJob* NetworkPacket::createPayloadTransferJob(const QUrl& destination) const
+{
+ return new FileTransferJob(payload(), payloadSize(), destination);
+}
+
diff -Nru kdeconnect-1.2.1/core/networkpacket.h kdeconnect-1.3.0/core/networkpacket.h
--- kdeconnect-1.2.1/core/networkpacket.h 1970-01-01 00:00:00.000000000 +0000
+++ kdeconnect-1.3.0/core/networkpacket.h 2018-04-08 14:35:04.000000000 +0000
@@ -0,0 +1,101 @@
+/**
+ * Copyright 2013 Albert Vaca
+ *
+ * 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 .
+ */
+
+#ifndef NETWORKPACKET_H
+#define NETWORKPACKET_H
+
+#include "networkpackettypes.h"
+
+#include
+#include
+#include
+#include
+//#include
+#include
+#include
+
+#include "kdeconnectcore_export.h"
+
+class FileTransferJob;
+
+class KDECONNECTCORE_EXPORT NetworkPacket
+{
+ Q_GADGET
+ Q_PROPERTY( QString id READ id WRITE setId )
+ Q_PROPERTY( QString type READ type WRITE setType )
+ Q_PROPERTY( QVariantMap body READ body WRITE setBody )
+ Q_PROPERTY( QVariantMap payloadTransferInfo READ payloadTransferInfo WRITE setPayloadTransferInfo )
+ Q_PROPERTY( qint64 payloadSize READ payloadSize WRITE setPayloadSize )
+
+public:
+
+ //const static QCA::EncryptionAlgorithm EncryptionAlgorithm;
+ const static int s_protocolVersion;
+
+ explicit NetworkPacket(const QString& type, const QVariantMap& body = {});
+
+ static void createIdentityPacket(NetworkPacket*);
+
+ QByteArray serialize() const;
+ static bool unserialize(const QByteArray& json, NetworkPacket* out);
+
+ const QString& id() const { return m_id; }
+ const QString& type() const { return m_type; }
+ QVariantMap& body() { return m_body; }
+ const QVariantMap& body() const { return m_body; }
+
+ //Get and set info from body. Note that id and type can not be accessed through these.
+ template T get(const QString& key, const T& defaultValue = {}) const {
+ return m_body.value(key,defaultValue).template value(); //Important note: Awesome template syntax is awesome
+ }
+ template void set(const QString& key, const T& value) { m_body[key] = QVariant(value); }
+ bool has(const QString& key) const { return m_body.contains(key); }
+
+ QSharedPointer payload() const { return m_payload; }
+ void setPayload(const QSharedPointer& device, qint64 payloadSize) { m_payload = device; m_payloadSize = payloadSize; Q_ASSERT(m_payloadSize >= -1); }
+ bool hasPayload() const { return (m_payloadSize != 0); }
+ qint64 payloadSize() const { return m_payloadSize; } //-1 means it is an endless stream
+ FileTransferJob* createPayloadTransferJob(const QUrl& destination) const;
+
+ //To be called by a particular DeviceLink
+ QVariantMap payloadTransferInfo() const { return m_payloadTransferInfo; }
+ void setPayloadTransferInfo(const QVariantMap& map) { m_payloadTransferInfo = map; }
+ bool hasPayloadTransferInfo() const { return !m_payloadTransferInfo.isEmpty(); }
+
+private:
+
+ void setId(const QString& id) { m_id = id; }
+ void setType(const QString& t) { m_type = t; }
+ void setBody(const QVariantMap& b) { m_body = b; }
+ void setPayloadSize(qint64 s) { m_payloadSize = s; }
+
+ QString m_id;
+ QString m_type;
+ QVariantMap m_body;
+
+ QSharedPointer m_payload;
+ qint64 m_payloadSize;
+ QVariantMap m_payloadTransferInfo;
+
+};
+
+KDECONNECTCORE_EXPORT QDebug operator<<(QDebug s, const NetworkPacket& pkg);
+
+#endif // NETWORKPACKET_H
diff -Nru kdeconnect-1.2.1/core/networkpackettypes.h kdeconnect-1.3.0/core/networkpackettypes.h
--- kdeconnect-1.2.1/core/networkpackettypes.h 1970-01-01 00:00:00.000000000 +0000
+++ kdeconnect-1.3.0/core/networkpackettypes.h 2018-04-08 14:35:04.000000000 +0000
@@ -0,0 +1,27 @@
+/**
+ * Copyright 2013 Albert Vaca
+ *
+ * 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 .
+ */
+
+#ifndef NETWORKPACKETTYPES_H
+#define NETWORKPACKETTYPES_H
+
+#define PACKET_TYPE_IDENTITY QStringLiteral("kdeconnect.identity")
+#define PACKET_TYPE_PAIR QStringLiteral("kdeconnect.pair")
+
+#endif // NETWORKPACKETTYPES_H
diff -Nru kdeconnect-1.2.1/core/pluginloader.cpp kdeconnect-1.3.0/core/pluginloader.cpp
--- kdeconnect-1.2.1/core/pluginloader.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/core/pluginloader.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -69,7 +69,7 @@
return ret;
}
- const QStringList outgoingInterfaces = KPluginMetaData::readStringList(service.rawData(), QStringLiteral("X-KdeConnect-OutgoingPackageType"));
+ const QStringList outgoingInterfaces = KPluginMetaData::readStringList(service.rawData(), QStringLiteral("X-KdeConnect-OutgoingPacketType"));
QVariant deviceVariant = QVariant::fromValue(device);
@@ -87,7 +87,7 @@
{
QSet ret;
for (const KPluginMetaData& service : qAsConst(plugins)) {
- ret += KPluginMetaData::readStringList(service.rawData(), QStringLiteral("X-KdeConnect-SupportedPackageType")).toSet();
+ ret += KPluginMetaData::readStringList(service.rawData(), QStringLiteral("X-KdeConnect-SupportedPacketType")).toSet();
}
return ret.toList();
}
@@ -96,7 +96,7 @@
{
QSet ret;
for (const KPluginMetaData& service : qAsConst(plugins)) {
- ret += KPluginMetaData::readStringList(service.rawData(), QStringLiteral("X-KdeConnect-OutgoingPackageType")).toSet();
+ ret += KPluginMetaData::readStringList(service.rawData(), QStringLiteral("X-KdeConnect-OutgoingPacketType")).toSet();
}
return ret.toList();
}
@@ -106,8 +106,8 @@
QSet ret;
for (const KPluginMetaData& service : qAsConst(plugins)) {
- const QSet pluginIncomingCapabilities = KPluginMetaData::readStringList(service.rawData(), QStringLiteral("X-KdeConnect-SupportedPackageType")).toSet();
- const QSet pluginOutgoingCapabilities = KPluginMetaData::readStringList(service.rawData(), QStringLiteral("X-KdeConnect-OutgoingPackageType")).toSet();
+ const QSet pluginIncomingCapabilities = KPluginMetaData::readStringList(service.rawData(), QStringLiteral("X-KdeConnect-SupportedPacketType")).toSet();
+ const QSet pluginOutgoingCapabilities = KPluginMetaData::readStringList(service.rawData(), QStringLiteral("X-KdeConnect-OutgoingPacketType")).toSet();
bool capabilitiesEmpty = (pluginIncomingCapabilities.isEmpty() && pluginOutgoingCapabilities.isEmpty());
#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
diff -Nru kdeconnect-1.2.1/daemon/CMakeLists.txt kdeconnect-1.3.0/daemon/CMakeLists.txt
--- kdeconnect-1.2.1/daemon/CMakeLists.txt 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/daemon/CMakeLists.txt 2018-04-08 14:35:04.000000000 +0000
@@ -1,7 +1,5 @@
project(kdeconnectd)
-find_package(KF5 REQUIRED COMPONENTS Notifications KIO)
-
add_definitions(-DTRANSLATION_DOMAIN="kdeconnect-kded")
add_executable(kdeconnectd kdeconnectd.cpp)
diff -Nru kdeconnect-1.2.1/daemon/kdeconnectd.cpp kdeconnect-1.3.0/daemon/kdeconnectd.cpp
--- kdeconnect-1.2.1/daemon/kdeconnectd.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/daemon/kdeconnectd.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -68,6 +68,17 @@
return m_nam;
}
+ Q_SCRIPTABLE void sendSimpleNotification(const QString &eventId, const QString &title, const QString &text, const QString &iconName) override
+ {
+ KNotification* notification = new KNotification(eventId); //KNotification::Persistent
+ notification->setIconName(iconName);
+ notification->setComponentName(QStringLiteral("kdeconnect"));
+ notification->setTitle(title);
+ notification->setText(text);
+ notification->sendEvent();
+ }
+
+
private:
QNetworkAccessManager* m_nam;
};
diff -Nru kdeconnect-1.2.1/debian/changelog kdeconnect-1.3.0/debian/changelog
--- kdeconnect-1.2.1/debian/changelog 2018-04-06 09:27:02.000000000 +0000
+++ kdeconnect-1.3.0/debian/changelog 2018-04-10 07:13:13.000000000 +0000
@@ -1,3 +1,11 @@
+kdeconnect (1.3.0-0ubuntu1) bionic; urgency=medium
+
+ * New upstream release (1.3.0) (LP: #1762479)
+ * Install nautilus extension script
+ * Update watchfile
+
+ -- Rik Mills Tue, 10 Apr 2018 08:13:13 +0100
+
kdeconnect (1.2.1-0ubuntu2) bionic; urgency=medium
* Add misssing qml module runtime dependencies.
diff -Nru kdeconnect-1.2.1/debian/kdeconnect.install kdeconnect-1.3.0/debian/kdeconnect.install
--- kdeconnect-1.2.1/debian/kdeconnect.install 2018-04-06 09:27:02.000000000 +0000
+++ kdeconnect-1.3.0/debian/kdeconnect.install 2018-04-10 07:13:13.000000000 +0000
@@ -36,5 +36,6 @@
usr/share/kservicetypes5/kdeconnect_plugin.desktop
usr/share/locale/
usr/share/metainfo/org.kde.kdeconnect.kcm.appdata.xml
+usr/share/nautilus-python/extensions/kdeconnect-share.py
usr/share/plasma/plasmoids/org.kde.kdeconnect/contents/ui/
usr/share/plasma/plasmoids/org.kde.kdeconnect/metadata.desktop
diff -Nru kdeconnect-1.2.1/debian/watch kdeconnect-1.3.0/debian/watch
--- kdeconnect-1.2.1/debian/watch 2018-04-06 09:27:02.000000000 +0000
+++ kdeconnect-1.3.0/debian/watch 2018-04-10 07:13:13.000000000 +0000
@@ -1,2 +1,2 @@
version=3
-http://download.kde.org/stable/kdeconnect/([\d\.]+)/src/kdeconnect-kde-v([\d\.]+[\w]*)\.tar\.xz
+http://download.kde.org/stable/kdeconnect/([\d\.]+)/src/kdeconnect-kde-([\d\.]+[\w]*)\.tar\.xz
diff -Nru kdeconnect-1.2.1/fileitemactionplugin/CMakeLists.txt kdeconnect-1.3.0/fileitemactionplugin/CMakeLists.txt
--- kdeconnect-1.2.1/fileitemactionplugin/CMakeLists.txt 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/fileitemactionplugin/CMakeLists.txt 2018-04-08 14:35:04.000000000 +0000
@@ -1,5 +1,3 @@
-find_package(KF5 REQUIRED COMPONENTS KIO)
-
add_definitions(-DTRANSLATION_DOMAIN="kdeconnect-fileitemaction")
include_directories(${CMAKE_SOURCE_DIR})
diff -Nru kdeconnect-1.2.1/fileitemactionplugin/sendfileitemaction.cpp kdeconnect-1.3.0/fileitemactionplugin/sendfileitemaction.cpp
--- kdeconnect-1.2.1/fileitemactionplugin/sendfileitemaction.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/fileitemactionplugin/sendfileitemaction.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -72,7 +72,7 @@
}
if (actions.count() > 1) {
- QAction* menuAction = new QAction(QIcon::fromTheme(QStringLiteral("preferences-system-network")), i18n("Send via KDE Connect"), parentWidget);
+ QAction* menuAction = new QAction(QIcon::fromTheme(QStringLiteral("kdeconnect")), i18n("Send via KDE Connect"), parentWidget);
QMenu* menu = new QMenu(parentWidget);
menu->addActions(actions);
menuAction->setMenu(menu);
diff -Nru kdeconnect-1.2.1/indicator/CMakeLists.txt kdeconnect-1.3.0/indicator/CMakeLists.txt
--- kdeconnect-1.2.1/indicator/CMakeLists.txt 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/indicator/CMakeLists.txt 2018-04-08 14:35:04.000000000 +0000
@@ -1,6 +1,3 @@
-find_package(KF5Notifications REQUIRED)
-find_package(KF5KCMUtils REQUIRED)
-
set(indicator_SRCS
main.cpp
deviceindicator.cpp
diff -Nru kdeconnect-1.2.1/interfaces/dbusinterfaces.cpp kdeconnect-1.3.0/interfaces/dbusinterfaces.cpp
--- kdeconnect-1.2.1/interfaces/dbusinterfaces.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/interfaces/dbusinterfaces.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -164,5 +164,3 @@
}
RemoteKeyboardDbusInterface::~RemoteKeyboardDbusInterface() = default;
-
-#include "dbusinterfaces.moc"
diff -Nru kdeconnect-1.2.1/interfaces/notificationsmodel.cpp kdeconnect-1.3.0/interfaces/notificationsmodel.cpp
--- kdeconnect-1.2.1/interfaces/notificationsmodel.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/interfaces/notificationsmodel.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -267,5 +267,6 @@
void NotificationsModel::notificationUpdated(const QString& id)
{
//TODO only emit the affected indices
+ Q_UNUSED(id);
Q_EMIT dataChanged(index(0,0), index(m_notificationList.size() - 1, 0));
}
diff -Nru kdeconnect-1.2.1/kcm/CMakeLists.txt kdeconnect-1.3.0/kcm/CMakeLists.txt
--- kdeconnect-1.2.1/kcm/CMakeLists.txt 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/kcm/CMakeLists.txt 2018-04-08 14:35:04.000000000 +0000
@@ -1,7 +1,5 @@
add_definitions(-DTRANSLATION_DOMAIN="kdeconnect-kcm")
-find_package(KF5KCMUtils 5.9 REQUIRED)
-
include_directories(${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}
diff -Nru kdeconnect-1.2.1/kcm/kcm_kdeconnect.desktop kdeconnect-1.3.0/kcm/kcm_kdeconnect.desktop
--- kdeconnect-1.2.1/kcm/kcm_kdeconnect.desktop 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/kcm/kcm_kdeconnect.desktop 2018-04-08 14:35:04.000000000 +0000
@@ -112,7 +112,7 @@
X-KDE-Keywords[it]=Rete,Android,Dispositivi
X-KDE-Keywords[ko]=Network,Android,Devices,네트워크,안드로이드,장치
X-KDE-Keywords[nl]=Netwerk,Android,Apparaten
-X-KDE-Keywords[nn]=nettverk,Android,einingar
+X-KDE-Keywords[nn]=nettverk,Android,einingar,smarttelefon
X-KDE-Keywords[pl]=Sieć,Android,Urządzenia
X-KDE-Keywords[pt]=Rede,Android,Dispositivos
X-KDE-Keywords[pt_BR]=Rede,Android,Dispositivos
diff -Nru kdeconnect-1.2.1/kcm/kcm.ui kdeconnect-1.3.0/kcm/kcm.ui
--- kdeconnect-1.2.1/kcm/kcm.ui 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/kcm/kcm.ui 2018-04-08 14:35:04.000000000 +0000
@@ -6,7 +6,7 @@
0
0
- 949
+ 965
528
@@ -65,14 +65,13 @@
-
-
+
-
+ Edit
-
-
+ ..
@@ -88,14 +87,13 @@
-
-
+
-
+ Save
-
-
+ ..
@@ -285,29 +283,6 @@
-
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
- No device selected.
-
-
- Qt::AlignCenter
-
-
-
- -
@@ -316,38 +291,7 @@
- <html><head/><body><p>If you own an Android device, make sure to install the <a href="https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp"><span style=" text-decoration: underline; ">KDE Connect Android app</span></a> (also available <a href="https://f-droid.org/repository/browse/?fdid=org.kde.kdeconnect_tp"><span style=" text-decoration: underline; ">from F-Droid</span></a>) and it should appear in the list.</p></body></html>
-
-
- Qt::RichText
-
-
- Qt::AlignCenter
-
-
- true
-
-
- 40
-
-
- true
-
-
- Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- <html><head/><body><p>If you are having problems, visit the <a href="https://community.kde.org/KDEConnect"><span style=" text-decoration: underline; ">KDE Connect Community wiki</span></a> for help.</p></body></html>
+ <html><head/><body><p>No device selected.<br><br>If you own an Android device, make sure to install the <a href="https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp"><span style=" text-decoration: underline; color:#4c6b8a;">KDE Connect Android app</span></a> (also available <a href="https://f-droid.org/repository/browse/?fdid=org.kde.kdeconnect_tp"><span style=" text-decoration: underline; color:#4c6b8a;">from F-Droid</span></a>) and it should appear in the list.<br><br>If you are having problems, visit the <a href="https://community.kde.org/KDEConnect"><span style=" text-decoration: underline; color:#4c6b8a;">KDE Connect Community wiki</span></a> for help.</p></body></html>
Qt::RichText
@@ -369,19 +313,6 @@
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
@@ -399,7 +330,7 @@
KMessageWidget
- QWidget
+ QFrame
1
diff -Nru kdeconnect-1.2.1/kcmplugin/CMakeLists.txt kdeconnect-1.3.0/kcmplugin/CMakeLists.txt
--- kdeconnect-1.2.1/kcmplugin/CMakeLists.txt 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/kcmplugin/CMakeLists.txt 2018-04-08 14:35:04.000000000 +0000
@@ -2,8 +2,6 @@
add_definitions(-DTRANSLATION_DOMAIN=\"kdeconnect-core\")
-find_package(KF5 REQUIRED COMPONENTS KCMUtils)
-
add_library(kdeconnectpluginkcm kdeconnectpluginkcm.cpp)
target_link_libraries(kdeconnectpluginkcm
PUBLIC
diff -Nru kdeconnect-1.2.1/kio/CMakeLists.txt kdeconnect-1.3.0/kio/CMakeLists.txt
--- kdeconnect-1.2.1/kio/CMakeLists.txt 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/kio/CMakeLists.txt 2018-04-08 14:35:04.000000000 +0000
@@ -1,6 +1,5 @@
include_directories(${CMAKE_SOURCE_DIR})
add_definitions(-DTRANSLATION_DOMAIN="kdeconnect-kio")
-find_package(KF5 REQUIRED COMPONENTS KIO)
set(kio_kdeconnect_PART_SRCS
kiokdeconnect.cpp
diff -Nru kdeconnect-1.2.1/nautilus-extension/CMakeLists.txt kdeconnect-1.3.0/nautilus-extension/CMakeLists.txt
--- kdeconnect-1.2.1/nautilus-extension/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000
+++ kdeconnect-1.3.0/nautilus-extension/CMakeLists.txt 2018-04-08 14:35:04.000000000 +0000
@@ -0,0 +1,4 @@
+
+set(NAUTILUS_PYTHON_EXTENSIONS_INSTALL_DIR "share/nautilus-python/extensions" CACHE PATH "Path for python-nautilus extensions")
+
+install(FILES kdeconnect-share.py DESTINATION ${NAUTILUS_PYTHON_EXTENSIONS_INSTALL_DIR})
diff -Nru kdeconnect-1.2.1/nautilus-extension/kdeconnect-share.py kdeconnect-1.3.0/nautilus-extension/kdeconnect-share.py
--- kdeconnect-1.2.1/nautilus-extension/kdeconnect-share.py 1970-01-01 00:00:00.000000000 +0000
+++ kdeconnect-1.3.0/nautilus-extension/kdeconnect-share.py 2018-04-08 14:35:04.000000000 +0000
@@ -0,0 +1,118 @@
+#!/usr/bin/python
+# -*- coding: UTF-8 -*-
+
+"""
+ * Copyright 2018 Albert Vaca Cintora
+ * Copyright 2018 Andy Holmes
+ *
+ * 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 .
+"""
+
+__author__ = "Albert Vaca Cintora "
+__version__ = "1.0"
+__appname__ = "kdeconnect-share"
+__app_disp_name__ = "Share files to your phone via KDE Connect"
+__website__ = "https://community.kde.org/KDEConnect"
+
+import gettext
+import locale
+
+from gi.repository import Nautilus, Gio, GLib, GObject
+
+_ = gettext.gettext
+
+class KdeConnectShareExtension(GObject.GObject, Nautilus.MenuProvider):
+ """A context menu for sending files via KDE Connect."""
+
+ def __init__(self):
+ GObject.GObject.__init__(self)
+
+ try:
+ locale.setlocale(locale.LC_ALL, '')
+ gettext.bindtextdomain('kdeconnect-nautilus-extension')
+ except Exception as e:
+ print(e)
+ pass
+
+ self.dbus = Gio.DBusProxy.new_for_bus_sync(
+ Gio.BusType.SESSION,
+ Gio.DBusProxyFlags.NONE,
+ None,
+ 'org.kde.kdeconnect',
+ '/modules/kdeconnect',
+ 'org.kde.kdeconnect.daemon',
+ None)
+
+ def send_files(self, menu, files, deviceId):
+ device_proxy = Gio.DBusProxy.new_for_bus_sync(
+ Gio.BusType.SESSION,
+ Gio.DBusProxyFlags.NONE,
+ None,
+ 'org.kde.kdeconnect',
+ '/modules/kdeconnect/devices/'+deviceId+'/share',
+ 'org.kde.kdeconnect.device.share',
+ None)
+
+ for file in files:
+ variant = GLib.Variant('(s)', (file.get_uri(),))
+ device_proxy.call_sync('shareUrl', variant, 0, -1, None)
+
+ def get_file_items(self, window, files):
+
+ #We can only send regular files
+ for uri in files:
+ if uri.get_uri_scheme() != 'file' or uri.is_directory():
+ return
+
+ try:
+ onlyReachable = True
+ onlyPaired = True
+ variant = GLib.Variant('(bb)', (onlyReachable, onlyPaired))
+ devices = self.dbus.call_sync('deviceNames', variant, 0, -1, None)
+ devices = devices.unpack()[0]
+ except Exception as e:
+ raise Exception('Error while getting reachable devices')
+
+ if len(devices) == 0:
+ return
+
+ if len(devices) == 1:
+ deviceId, deviceName = devices.items()[0]
+ item = Nautilus.MenuItem(
+ name='KdeConnectShareExtension::Devices::' + deviceId,
+ label=_("Send to %s via KDE Connect") % deviceName,
+ )
+ item.connect('activate', self.send_files, files, deviceId)
+ return item,
+ else:
+ menu = Nautilus.MenuItem(
+ name='KdeConnectShareExtension::Devices',
+ label=_('Send via KDE Connect'),
+ )
+ submenu = Nautilus.Menu()
+ menu.set_submenu(submenu)
+
+ for deviceId, deviceName in devices.items():
+ item = Nautilus.MenuItem(
+ name='KdeConnectShareExtension::Devices::' + deviceId,
+ label=deviceName,
+ )
+ item.connect('activate', self.send_files, files, deviceId)
+ submenu.append_item(item)
+
+ return menu,
+
diff -Nru kdeconnect-1.2.1/nautilus-extension/Messages.sh kdeconnect-1.3.0/nautilus-extension/Messages.sh
--- kdeconnect-1.2.1/nautilus-extension/Messages.sh 1970-01-01 00:00:00.000000000 +0000
+++ kdeconnect-1.3.0/nautilus-extension/Messages.sh 2018-04-08 14:35:04.000000000 +0000
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+$XGETTEXT `find . -name '*.py'` -o $podir/kdeconnect-nautilus-extension.pot
diff -Nru kdeconnect-1.2.1/org.kde.kdeconnect.kcm.appdata.xml kdeconnect-1.3.0/org.kde.kdeconnect.kcm.appdata.xml
--- kdeconnect-1.2.1/org.kde.kdeconnect.kcm.appdata.xml 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/org.kde.kdeconnect.kcm.appdata.xml 2018-04-08 14:35:04.000000000 +0000
@@ -59,7 +59,7 @@
Connessione trasparente dei tuoi dispositivi
장치와 항상 연결하기
Naadloze verbinding met uw apparaten
- Sømlaus integrering med andre einingar
+ Saumlaus integrering med andre einingar
Zintegrowane połączenia do twoich urządzeń
Ligação transparente aos seus dispositivos
Conexão transparente com seus dispositivos
@@ -83,7 +83,7 @@
Please note you will need to install KDE Connect on your computer for this app to work, and keep the desktop version up-to-date with the Android version for the latest features to work.
El KDE Connect proporciona diverses característiques per integrar el telèfon amb l'ordinador: Recordeu que haureu d'instal·lar el KDE Connect a l'ordinador perquè aquesta aplicació funcioni, i mantenir actualitzada la versió de l'escriptori amb la versió d'Android perquè funcionin les últimes característiques.
- El KDE Connect proporciona diverses característiques per integrar el telèfon amb l'ordinador: Recordeu que haureu d'instal·lar el KDE Connect a l'ordinador perquè esta aplicació funcione, i mantindre actualitzada la versió de l'escriptori amb la versió d'Android perquè funcionen les últimes característiques.
+ El KDE Connect proporciona diverses característiques per integrar el telèfon amb l'ordinador: Recordeu que haureu d'instal·lar el KDE Connect a l'ordinador perquè aquesta aplicació funcione, i mantindre actualitzada la versió de l'escriptori amb la versió d'Android perquè funcionen les últimes característiques.
KDE Connect poskytuje několik vlastností pro vzájemnou integraci vašeho telefonu a počítače: Prosím pamatujte, že pro správnou funkci této aplikace potřebujete nainstalovat KDE Connect na váš počítač a pro správnou funkci nejnovějších vlastností udržovat aplikaci na telefonu i počítači aktuální.
KDE Connect tilbyder adskillige funktioner, der integrerer din telefon og din computer: Bemærk at du vil skulle installere KDE Connect på din computer for at denne app virker, samt holde desktop-versionen opdateret sammen med Android-versionen, for at de nyeste funktioner vil virke.
KDE-Connect bietet mehrere Funktionen zur Integration Ihres Telefons und Ihres Rechners: Bitte beachten Sie, dass Sie KDE-Connect auf Ihrem Rechner installieren müssen, damit diese App funktioniert. Halten Sie die Arbeitsflächen-Version und Android-Version auf dem neusten Stand, damit Sie die neuesten Funktionen nutzen können
@@ -109,7 +109,7 @@
xxKDE Connect provides several features to integrate your phone and your computer: Please note you will need to install KDE Connect on your computer for this app to work, and keep the desktop version up-to-date with the Android version for the latest features to work.xx
KDE Connect 提供了很多整合手机和电脑的功能特性:请注意您需要在电脑上安装 KDE Connect 应用才能使其工作,为了使最新特性能够生效,您必须更新桌面应用和 Android 应用到最新版本。
- https://community.kde.org/KDEConnect/
+ https://community.kde.org/KDEConnect
https://bugs.kde.org/enter_bug.cgi?format=guided&product=kdeconnect
https://docs.kde.org/index.php?application=kdeconnect-kde&language=en
diff -Nru kdeconnect-1.2.1/plasmoid/package/contents/ui/CompactRepresentation.qml kdeconnect-1.3.0/plasmoid/package/contents/ui/CompactRepresentation.qml
--- kdeconnect-1.2.1/plasmoid/package/contents/ui/CompactRepresentation.qml 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plasmoid/package/contents/ui/CompactRepresentation.qml 1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-/**
- * Copyright 2013 Albert Vaca
- *
- * 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 .
- */
-
-import QtQuick 2.1
-import org.kde.plasma.core 2.0 as PlasmaCore
-
-MouseArea {
- id: view
-
- onClicked: plasmoid.expanded = !plasmoid.expanded
-
- PlasmaCore.IconItem {
- id: icon
- source: "kdeconnect"
- anchors.fill: parent
- }
-}
diff -Nru kdeconnect-1.2.1/plasmoid/package/contents/ui/DeviceDelegate.qml kdeconnect-1.3.0/plasmoid/package/contents/ui/DeviceDelegate.qml
--- kdeconnect-1.2.1/plasmoid/package/contents/ui/DeviceDelegate.qml 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plasmoid/package/contents/ui/DeviceDelegate.qml 2018-04-08 14:35:04.000000000 +0000
@@ -206,6 +206,7 @@
visible: notificationsModel.isAnyDimissable;
anchors.right: parent.right
iconSource: "window-close"
+ tooltip: i18n("Dismiss all notifications")
onClicked: notificationsModel.dismissAll();
}
}
@@ -241,6 +242,7 @@
enabled: repliable
anchors.right: dismissButton.left
iconSource: "mail-reply-sender"
+ tooltip: i18n("Reply")
onClicked: dbusInterface.reply();
}
PlasmaComponents.ToolButton {
@@ -249,6 +251,7 @@
enabled: dismissable
anchors.right: parent.right
iconSource: "window-close"
+ tooltip: i18n("Dismiss")
onClicked: dbusInterface.dismiss();
}
}
diff -Nru kdeconnect-1.2.1/plasmoid/package/contents/ui/main.qml kdeconnect-1.3.0/plasmoid/package/contents/ui/main.qml
--- kdeconnect-1.2.1/plasmoid/package/contents/ui/main.qml 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plasmoid/package/contents/ui/main.qml 2018-04-08 14:35:04.000000000 +0000
@@ -41,7 +41,6 @@
value: (connectDeviceModel.count > 0) ? PlasmaCore.Types.ActiveStatus : PlasmaCore.Types.PassiveStatus
}
- Plasmoid.compactRepresentation: CompactRepresentation {}
Plasmoid.fullRepresentation: FullRepresentation {
devicesModel: connectDeviceModel
}
diff -Nru kdeconnect-1.2.1/plasmoid/package/metadata.desktop kdeconnect-1.3.0/plasmoid/package/metadata.desktop
--- kdeconnect-1.2.1/plasmoid/package/metadata.desktop 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plasmoid/package/metadata.desktop 2018-04-08 14:35:04.000000000 +0000
@@ -51,7 +51,7 @@
Comment[de]=Zeigt Benachrichtigungen von Ihren Geräten mit KDE-Connect
Comment[el]=Προβολή ειδοποιήσεων από τις συσκευές σας με το KDE Connect
Comment[en_GB]=Show notifications from your devices using KDE Connect
-Comment[es]=Mostrar notificaciones de sus dispositivos usando KDE Connect
+Comment[es]=KDE Connect muestra las notificaciones de sus dispositivos
Comment[et]=Seadmete märguannete näitamine KDE Connecti vahendusel
Comment[eu]=Ikusi zure gailuetako jakinarazpenak KDE Connect erabiliz
Comment[fi]=Näytä laitteidesi ilmoitukset KDE Connectilla
diff -Nru kdeconnect-1.2.1/plugins/battery/batteryplugin.cpp kdeconnect-1.3.0/plugins/battery/batteryplugin.cpp
--- kdeconnect-1.2.1/plugins/battery/batteryplugin.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/battery/batteryplugin.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -20,11 +20,12 @@
#include "batteryplugin.h"
-#include
#include
#include
#include
+#include
+
#include "batterydbusinterface.h"
K_PLUGIN_FACTORY_WITH_JSON( KdeConnectPluginFactory, "kdeconnect_battery.json", registerPlugin< BatteryPlugin >(); )
@@ -43,8 +44,8 @@
void BatteryPlugin::connected()
{
- NetworkPackage np(PACKAGE_TYPE_BATTERY_REQUEST, {{"request",true}});
- sendPackage(np);
+ NetworkPacket np(PACKET_TYPE_BATTERY_REQUEST, {{"request",true}});
+ sendPacket(np);
}
BatteryPlugin::~BatteryPlugin()
@@ -58,7 +59,7 @@
//batteryDbusInterface->deleteLater();
}
-bool BatteryPlugin::receivePackage(const NetworkPackage& np)
+bool BatteryPlugin::receivePacket(const NetworkPacket& np)
{
bool isCharging = np.get(QStringLiteral("isCharging"), false);
int currentCharge = np.get(QStringLiteral("currentCharge"), -1);
@@ -71,12 +72,8 @@
}
if ( thresholdEvent == ThresholdBatteryLow && !isCharging ) {
- KNotification* notification = new KNotification(QStringLiteral("batteryLow"));
- notification->setIconName(QStringLiteral("battery-040"));
- notification->setComponentName(QStringLiteral("kdeconnect"));
- notification->setTitle(i18nc("device name: low battery", "%1: Low Battery", device()->name()));
- notification->setText(i18n("Battery at %1%", currentCharge));
- notification->sendEvent();
+ Daemon::instance()->sendSimpleNotification(QStringLiteral("batteryLow"), i18nc("device name: low battery", "%1: Low Battery", device()->name()), i18n("Battery at %1%", currentCharge), QStringLiteral("battery-040"));
+
}
return true;
diff -Nru kdeconnect-1.2.1/plugins/battery/batteryplugin.h kdeconnect-1.3.0/plugins/battery/batteryplugin.h
--- kdeconnect-1.2.1/plugins/battery/batteryplugin.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/battery/batteryplugin.h 2018-04-08 14:35:04.000000000 +0000
@@ -24,7 +24,7 @@
#include
#include
-#define PACKAGE_TYPE_BATTERY_REQUEST QStringLiteral("kdeconnect.battery.request")
+#define PACKET_TYPE_BATTERY_REQUEST QStringLiteral("kdeconnect.battery.request")
Q_DECLARE_LOGGING_CATEGORY(KDECONNECT_PLUGIN_BATTERY)
class BatteryDbusInterface;
@@ -38,7 +38,7 @@
explicit BatteryPlugin(QObject* parent, const QVariantList& args);
~BatteryPlugin() override;
- bool receivePackage(const NetworkPackage& np) override;
+ bool receivePacket(const NetworkPacket& np) override;
void connected() override;
private:
diff -Nru kdeconnect-1.2.1/plugins/battery/CMakeLists.txt kdeconnect-1.3.0/plugins/battery/CMakeLists.txt
--- kdeconnect-1.2.1/plugins/battery/CMakeLists.txt 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/battery/CMakeLists.txt 2018-04-08 14:35:04.000000000 +0000
@@ -1,5 +1,3 @@
-find_package(KF5 REQUIRED COMPONENTS Notifications)
-
set(kdeconnect_battery_SRCS
batteryplugin.cpp
batterydbusinterface.cpp
@@ -10,6 +8,6 @@
target_link_libraries(kdeconnect_battery
kdeconnectcore
Qt5::DBus
+ Qt5::Gui
KF5::I18n
- KF5::Notifications
)
diff -Nru kdeconnect-1.2.1/plugins/battery/kdeconnect_battery.json kdeconnect-1.3.0/plugins/battery/kdeconnect_battery.json
--- kdeconnect-1.2.1/plugins/battery/kdeconnect_battery.json 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/battery/kdeconnect_battery.json 2018-04-08 14:35:04.000000000 +0000
@@ -1,5 +1,4 @@
{
- "Encoding": "UTF-8",
"KPlugin": {
"Authors": [
{
@@ -91,10 +90,10 @@
"Version": "0.1",
"Website": "http://albertvaka.wordpress.com"
},
- "X-KdeConnect-OutgoingPackageType": [
+ "X-KdeConnect-OutgoingPacketType": [
"kdeconnect.battery.request"
],
- "X-KdeConnect-SupportedPackageType": [
+ "X-KdeConnect-SupportedPacketType": [
"kdeconnect.battery"
]
}
diff -Nru kdeconnect-1.2.1/plugins/clipboard/clipboardplugin.cpp kdeconnect-1.3.0/plugins/clipboard/clipboardplugin.cpp
--- kdeconnect-1.2.1/plugins/clipboard/clipboardplugin.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/clipboard/clipboardplugin.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -37,11 +37,11 @@
void ClipboardPlugin::propagateClipboard(const QString& content)
{
- NetworkPackage np(PACKAGE_TYPE_CLIPBOARD, {{"content", content}});
- sendPackage(np);
+ NetworkPacket np(PACKET_TYPE_CLIPBOARD, {{"content", content}});
+ sendPacket(np);
}
-bool ClipboardPlugin::receivePackage(const NetworkPackage& np)
+bool ClipboardPlugin::receivePacket(const NetworkPacket& np)
{
QString content = np.get(QStringLiteral("content"));
ClipboardListener::instance()->setText(content);
diff -Nru kdeconnect-1.2.1/plugins/clipboard/clipboardplugin.h kdeconnect-1.3.0/plugins/clipboard/clipboardplugin.h
--- kdeconnect-1.2.1/plugins/clipboard/clipboardplugin.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/clipboard/clipboardplugin.h 2018-04-08 14:35:04.000000000 +0000
@@ -27,7 +27,7 @@
#include
Q_DECLARE_LOGGING_CATEGORY(KDECONNECT_PLUGIN_CLIPBOARD)
-#define PACKAGE_TYPE_CLIPBOARD QStringLiteral("kdeconnect.clipboard")
+#define PACKET_TYPE_CLIPBOARD QStringLiteral("kdeconnect.clipboard")
class ClipboardPlugin
: public KdeConnectPlugin
@@ -37,7 +37,7 @@
public:
explicit ClipboardPlugin(QObject* parent, const QVariantList& args);
- bool receivePackage(const NetworkPackage& np) override;
+ bool receivePacket(const NetworkPacket& np) override;
void connected() override { }
private Q_SLOTS:
diff -Nru kdeconnect-1.2.1/plugins/clipboard/kdeconnect_clipboard.json kdeconnect-1.3.0/plugins/clipboard/kdeconnect_clipboard.json
--- kdeconnect-1.2.1/plugins/clipboard/kdeconnect_clipboard.json 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/clipboard/kdeconnect_clipboard.json 2018-04-08 14:35:04.000000000 +0000
@@ -1,5 +1,4 @@
{
- "Encoding": "UTF-8",
"KPlugin": {
"Authors": [
{
@@ -91,10 +90,10 @@
"Version": "0.1",
"Website": "http://albertvaka.wordpress.com"
},
- "X-KdeConnect-OutgoingPackageType": [
+ "X-KdeConnect-OutgoingPacketType": [
"kdeconnect.clipboard"
],
- "X-KdeConnect-SupportedPackageType": [
+ "X-KdeConnect-SupportedPacketType": [
"kdeconnect.clipboard"
]
}
diff -Nru kdeconnect-1.2.1/plugins/findmyphone/findmyphoneplugin.cpp kdeconnect-1.3.0/plugins/findmyphone/findmyphoneplugin.cpp
--- kdeconnect-1.2.1/plugins/findmyphone/findmyphoneplugin.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/findmyphone/findmyphoneplugin.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -36,7 +36,7 @@
{
}
-bool FindMyPhonePlugin::receivePackage(const NetworkPackage& np)
+bool FindMyPhonePlugin::receivePacket(const NetworkPacket& np)
{
Q_UNUSED(np);
return false;
@@ -44,8 +44,8 @@
void FindMyPhonePlugin::ring()
{
- NetworkPackage np(PACKAGE_TYPE_FINDMYPHONE_REQUEST);
- sendPackage(np);
+ NetworkPacket np(PACKET_TYPE_FINDMYPHONE_REQUEST);
+ sendPacket(np);
}
QString FindMyPhonePlugin::dbusPath() const
diff -Nru kdeconnect-1.2.1/plugins/findmyphone/findmyphoneplugin.h kdeconnect-1.3.0/plugins/findmyphone/findmyphoneplugin.h
--- kdeconnect-1.2.1/plugins/findmyphone/findmyphoneplugin.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/findmyphone/findmyphoneplugin.h 2018-04-08 14:35:04.000000000 +0000
@@ -25,7 +25,7 @@
#include
-#define PACKAGE_TYPE_FINDMYPHONE_REQUEST QStringLiteral("kdeconnect.findmyphone.request")
+#define PACKET_TYPE_FINDMYPHONE_REQUEST QStringLiteral("kdeconnect.findmyphone.request")
class FindMyPhonePlugin
: public KdeConnectPlugin
@@ -41,7 +41,7 @@
QString dbusPath() const override;
void connected() override {}
- bool receivePackage(const NetworkPackage& np) override;
+ bool receivePacket(const NetworkPacket& np) override;
};
#endif
diff -Nru kdeconnect-1.2.1/plugins/findmyphone/kdeconnect_findmyphone.json kdeconnect-1.3.0/plugins/findmyphone/kdeconnect_findmyphone.json
--- kdeconnect-1.2.1/plugins/findmyphone/kdeconnect_findmyphone.json 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/findmyphone/kdeconnect_findmyphone.json 2018-04-08 14:35:04.000000000 +0000
@@ -54,7 +54,6 @@
"Description[zh_CN]": "通过播放闹铃声来找到您不见的手机",
"Description[zh_TW]": "讓您的手機發出警報聲,讓您找到您遺失的手機。",
"EnabledByDefault": true,
- "Encoding": "UTF-8",
"Icon": "edit-find",
"Id": "kdeconnect_findmyphone",
"License": "GPL",
@@ -97,7 +96,7 @@
"Version": "0.1",
"Website": "http://kde.org"
},
- "X-KdeConnect-OutgoingPackageType": [
+ "X-KdeConnect-OutgoingPacketType": [
"kdeconnect.findmyphone.request"
]
}
diff -Nru kdeconnect-1.2.1/plugins/kdeconnect.notifyrc kdeconnect-1.3.0/plugins/kdeconnect.notifyrc
--- kdeconnect-1.2.1/plugins/kdeconnect.notifyrc 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/kdeconnect.notifyrc 2018-04-08 14:35:04.000000000 +0000
@@ -105,7 +105,7 @@
Name[it]=Richiesta di associazione
Name[ko]=연결 요청
Name[nl]=Verzoek om een paar te maken
-Name[nn]=Parringsførespurnad
+Name[nn]=Paringsførespurnad
Name[pl]=Żądanie parowania
Name[pt]=Pedido de Emparelhamento
Name[pt_BR]=Solicitação de emparelhamento
@@ -141,7 +141,7 @@
Comment[it]=Richiesta di associazione ricevuta da un dispositivo
Comment[ko]=장치에서 연결 요청을 받음
Comment[nl]=Verzoek om een paar te maken ontvangen van apparaten
-Comment[nn]=Fekk parringsførespurnad frå eining
+Comment[nn]=Fekk paringsførespurnad frå eining
Comment[pl]=Otrzymano żądanie parowania z urządzenia
Comment[pt]=Pedido de emparelhamento recebido de um dispositivo
Comment[pt_BR]=Solicitação de emparelhamento recebida de um dispositivo
@@ -384,7 +384,7 @@
Comment[it]=Hai ricevuto un SMS
Comment[ko]=누군가가 문자 메시지를 보냄
Comment[nl]=Iemand heeft u een SMS gestuurd
-Comment[nn]=Noko sende deg ein SMS
+Comment[nn]=Nokon sende deg ein SMS
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
@@ -459,7 +459,7 @@
Comment[eu]=Zure bateria egoera baxuan dago
Comment[fi]=Akkusi virta on vähissä
Comment[fr]=Votre batterie est faible
-Comment[gl]=A batería está esgotándose.
+Comment[gl]=A batería está nas últimas.
Comment[he]=הבטריה שלך הולכת להגמר
Comment[hu]=Az akkumulátora feszültsége alacsony
Comment[it]=La tua batteria è al livello basso
diff -Nru kdeconnect-1.2.1/plugins/lockdevice/kdeconnect_lockdevice.json kdeconnect-1.3.0/plugins/lockdevice/kdeconnect_lockdevice.json
--- kdeconnect-1.2.1/plugins/lockdevice/kdeconnect_lockdevice.json 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/lockdevice/kdeconnect_lockdevice.json 2018-04-08 14:35:04.000000000 +0000
@@ -1,5 +1,4 @@
{
- "Encoding": "UTF-8",
"KPlugin": {
"Authors": [
{
@@ -85,11 +84,11 @@
"Version": "0.1",
"Website": "https://kde.org"
},
- "X-KdeConnect-OutgoingPackageType": [
+ "X-KdeConnect-OutgoingPacketType": [
"kdeconnect.lock.request",
"kdeconnect.lock"
],
- "X-KdeConnect-SupportedPackageType": [
+ "X-KdeConnect-SupportedPacketType": [
"kdeconnect.lock.request",
"kdeconnect.lock"
]
diff -Nru kdeconnect-1.2.1/plugins/lockdevice/lockdeviceplugin.cpp kdeconnect-1.3.0/plugins/lockdevice/lockdeviceplugin.cpp
--- kdeconnect-1.2.1/plugins/lockdevice/lockdeviceplugin.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/lockdevice/lockdeviceplugin.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -52,11 +52,11 @@
}
void LockDevicePlugin::setLocked(bool locked)
{
- NetworkPackage np(PACKAGE_TYPE_LOCK_REQUEST, {{"setLocked", locked}});
- sendPackage(np);
+ NetworkPacket np(PACKET_TYPE_LOCK_REQUEST, {{"setLocked", locked}});
+ sendPacket(np);
}
-bool LockDevicePlugin::receivePackage(const NetworkPackage & np)
+bool LockDevicePlugin::receivePacket(const NetworkPacket & np)
{
if (np.has(QStringLiteral("isLocked"))) {
bool locked = np.get(QStringLiteral("isLocked"));
@@ -72,8 +72,8 @@
sendState = true;
}
if (sendState) {
- NetworkPackage np(PACKAGE_TYPE_LOCK, QVariantMap {{"isLocked", QVariant::fromValue(iface()->GetActive())}});
- sendPackage(np);
+ NetworkPacket np(PACKET_TYPE_LOCK, QVariantMap {{"isLocked", QVariant::fromValue(iface()->GetActive())}});
+ sendPacket(np);
}
return true;
@@ -91,8 +91,8 @@
void LockDevicePlugin::connected()
{
- NetworkPackage np(PACKAGE_TYPE_LOCK_REQUEST, {{"requestLocked", QVariant()}});
- sendPackage(np);
+ NetworkPacket np(PACKET_TYPE_LOCK_REQUEST, {{"requestLocked", QVariant()}});
+ sendPacket(np);
}
QString LockDevicePlugin::dbusPath() const
diff -Nru kdeconnect-1.2.1/plugins/lockdevice/lockdeviceplugin.h kdeconnect-1.3.0/plugins/lockdevice/lockdeviceplugin.h
--- kdeconnect-1.2.1/plugins/lockdevice/lockdeviceplugin.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/lockdevice/lockdeviceplugin.h 2018-04-08 14:35:04.000000000 +0000
@@ -27,8 +27,8 @@
class OrgFreedesktopScreenSaverInterface;
-#define PACKAGE_TYPE_LOCK QStringLiteral("kdeconnect.lock")
-#define PACKAGE_TYPE_LOCK_REQUEST QStringLiteral("kdeconnect.lock.request")
+#define PACKET_TYPE_LOCK QStringLiteral("kdeconnect.lock")
+#define PACKET_TYPE_LOCK_REQUEST QStringLiteral("kdeconnect.lock.request")
class Q_DECL_EXPORT LockDevicePlugin
: public KdeConnectPlugin
@@ -46,7 +46,7 @@
QString dbusPath() const override;
void connected() override;
- bool receivePackage(const NetworkPackage & np) override;
+ bool receivePacket(const NetworkPacket & np) override;
Q_SIGNALS:
void lockedChanged(bool locked);
diff -Nru kdeconnect-1.2.1/plugins/mousepad/CMakeLists.txt kdeconnect-1.3.0/plugins/mousepad/CMakeLists.txt
--- kdeconnect-1.2.1/plugins/mousepad/CMakeLists.txt 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/mousepad/CMakeLists.txt 2018-04-08 14:35:04.000000000 +0000
@@ -8,9 +8,9 @@
if (LibFakeKey_FOUND)
find_package(XTest REQUIRED)
find_package(X11 REQUIRED)
- find_package(Qt5X11Extras REQUIRED)
+ find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS X11Extras)
endif()
-find_package(KF5Wayland 5.3.90)
+find_package(KF5 ${KF5_MIN_VERSION} COMPONENTS Wayland)
set(HAVE_X11 ${LibFakeKey_FOUND})
set(HAVE_WAYLAND ${KF5Wayland_FOUND})
diff -Nru kdeconnect-1.2.1/plugins/mousepad/kdeconnect_mousepad.json kdeconnect-1.3.0/plugins/mousepad/kdeconnect_mousepad.json
--- kdeconnect-1.2.1/plugins/mousepad/kdeconnect_mousepad.json 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/mousepad/kdeconnect_mousepad.json 2018-04-08 14:35:04.000000000 +0000
@@ -1,5 +1,4 @@
{
- "Encoding": "UTF-8",
"KPlugin": {
"Authors": [
{
@@ -90,8 +89,8 @@
],
"Version": "0.1"
},
- "X-KdeConnect-OutgoingPackageType": [],
- "X-KdeConnect-SupportedPackageType": [
+ "X-KdeConnect-OutgoingPacketType": [],
+ "X-KdeConnect-SupportedPacketType": [
"kdeconnect.mousepad.request"
]
}
diff -Nru kdeconnect-1.2.1/plugins/mousepad/mousepadplugin.cpp kdeconnect-1.3.0/plugins/mousepad/mousepadplugin.cpp
--- kdeconnect-1.2.1/plugins/mousepad/mousepadplugin.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/mousepad/mousepadplugin.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -118,11 +118,11 @@
#endif
}
-bool MousepadPlugin::receivePackage(const NetworkPackage& np)
+bool MousepadPlugin::receivePacket(const NetworkPacket& np)
{
#if HAVE_X11
if (m_x11) {
- return handlePackageX11(np);
+ return handlePacketX11(np);
}
#endif
#if HAVE_WAYLAND
@@ -131,7 +131,7 @@
m_waylandInput->authenticate(i18n("KDE Connect"), i18n("Use your phone as a touchpad and keyboard"));
m_waylandAuthenticationRequested = true;
}
- handPackageWayland(np);
+ handPacketWayland(np);
}
#endif
return false;
@@ -153,7 +153,7 @@
#endif
#if HAVE_X11
-bool MousepadPlugin::handlePackageX11(const NetworkPackage& np)
+bool MousepadPlugin::handlePacketX11(const NetworkPacket& np)
{
//qDebug() << np.serialize();
@@ -289,7 +289,7 @@
registry->setup();
}
-bool MousepadPlugin::handPackageWayland(const NetworkPackage& np)
+bool MousepadPlugin::handPacketWayland(const NetworkPacket& np)
{
const float dx = np.get(QStringLiteral("dx"), 0);
const float dy = np.get(QStringLiteral("dy"), 0);
diff -Nru kdeconnect-1.2.1/plugins/mousepad/mousepadplugin.h kdeconnect-1.3.0/plugins/mousepad/mousepadplugin.h
--- kdeconnect-1.2.1/plugins/mousepad/mousepadplugin.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/mousepad/mousepadplugin.h 2018-04-08 14:35:04.000000000 +0000
@@ -46,16 +46,16 @@
explicit MousepadPlugin(QObject* parent, const QVariantList& args);
~MousepadPlugin() override;
- bool receivePackage(const NetworkPackage& np) override;
+ bool receivePacket(const NetworkPacket& np) override;
void connected() override { }
private:
#if HAVE_X11
- bool handlePackageX11(const NetworkPackage& np);
+ bool handlePacketX11(const NetworkPacket& np);
#endif
#if HAVE_WAYLAND
void setupWaylandIntegration();
- bool handPackageWayland(const NetworkPackage& np);
+ bool handPacketWayland(const NetworkPacket& np);
#endif
#if HAVE_X11
diff -Nru kdeconnect-1.2.1/plugins/mousepad_windows/kdeconnect_mousepad.json kdeconnect-1.3.0/plugins/mousepad_windows/kdeconnect_mousepad.json
--- kdeconnect-1.2.1/plugins/mousepad_windows/kdeconnect_mousepad.json 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/mousepad_windows/kdeconnect_mousepad.json 2018-04-08 14:35:04.000000000 +0000
@@ -1,5 +1,4 @@
{
- "Encoding": "UTF-8",
"KPlugin": {
"Authors": [
{
@@ -90,8 +89,8 @@
],
"Version": "0.1"
},
- "X-KdeConnect-OutgoingPackageType": [],
- "X-KdeConnect-SupportedPackageType": [
+ "X-KdeConnect-OutgoingPacketType": [],
+ "X-KdeConnect-SupportedPacketType": [
"kdeconnect.mousepad.request"
]
}
diff -Nru kdeconnect-1.2.1/plugins/mousepad_windows/mousepadplugin_windows.cpp kdeconnect-1.3.0/plugins/mousepad_windows/mousepadplugin_windows.cpp
--- kdeconnect-1.2.1/plugins/mousepad_windows/mousepadplugin_windows.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/mousepad_windows/mousepadplugin_windows.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -39,7 +39,7 @@
{
}
-bool MousepadPlugin::receivePackage(const NetworkPackage& np)
+bool MousepadPlugin::receivePacket(const NetworkPacket& np)
{
float dx = np.get(QStringLiteral("dx"), 0);
float dy = np.get(QStringLiteral("dy"), 0);
diff -Nru kdeconnect-1.2.1/plugins/mousepad_windows/mousepadplugin_windows.h kdeconnect-1.3.0/plugins/mousepad_windows/mousepadplugin_windows.h
--- kdeconnect-1.2.1/plugins/mousepad_windows/mousepadplugin_windows.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/mousepad_windows/mousepadplugin_windows.h 2018-04-08 14:35:04.000000000 +0000
@@ -35,7 +35,7 @@
explicit MousepadPlugin(QObject* parent, const QVariantList &args);
~MousepadPlugin() override;
- bool receivePackage(const NetworkPackage& np) override;
+ bool receivePacket(const NetworkPacket& np) override;
void connected() override { }
};
diff -Nru kdeconnect-1.2.1/plugins/mpriscontrol/kdeconnect_mpriscontrol.json kdeconnect-1.3.0/plugins/mpriscontrol/kdeconnect_mpriscontrol.json
--- kdeconnect-1.2.1/plugins/mpriscontrol/kdeconnect_mpriscontrol.json 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/mpriscontrol/kdeconnect_mpriscontrol.json 2018-04-08 14:35:04.000000000 +0000
@@ -1,5 +1,4 @@
{
- "Encoding": "UTF-8",
"KPlugin": {
"Authors": [
{
@@ -90,10 +89,10 @@
"Version": "0.1",
"Website": "http://albertvaka.wordpress.com"
},
- "X-KdeConnect-OutgoingPackageType": [
+ "X-KdeConnect-OutgoingPacketType": [
"kdeconnect.mpris"
],
- "X-KdeConnect-SupportedPackageType": [
+ "X-KdeConnect-SupportedPacketType": [
"kdeconnect.mpris.request"
]
}
diff -Nru kdeconnect-1.2.1/plugins/mpriscontrol/mpriscontrolplugin.cpp kdeconnect-1.3.0/plugins/mpriscontrol/mpriscontrolplugin.cpp
--- kdeconnect-1.2.1/plugins/mpriscontrol/mpriscontrolplugin.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/mpriscontrol/mpriscontrolplugin.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -38,6 +38,16 @@
Q_LOGGING_CATEGORY(KDECONNECT_PLUGIN_MPRIS, "kdeconnect.plugin.mpris")
+
+MprisPlayer::MprisPlayer(const QString& serviceName, const QString& dbusObjectPath, const QDBusConnection& busConnection)
+ : m_serviceName(serviceName)
+ , m_propertiesInterface(new OrgFreedesktopDBusPropertiesInterface(serviceName, dbusObjectPath, busConnection))
+ , m_mediaPlayer2PlayerInterface(new OrgMprisMediaPlayer2PlayerInterface(serviceName, dbusObjectPath, busConnection))
+{
+ m_mediaPlayer2PlayerInterface->setTimeout(500);
+}
+
+
MprisControlPlugin::MprisControlPlugin(QObject* parent, const QVariantList& args)
: KdeConnectPlugin(parent, args)
, prevVolume(-1)
@@ -75,7 +85,10 @@
void MprisControlPlugin::addPlayer(const QString& service)
{
- QDBusInterface mprisInterface(service, QStringLiteral("/org/mpris/MediaPlayer2"), QStringLiteral("org.mpris.MediaPlayer2"));
+ const QString mediaPlayerObjectPath = QStringLiteral("/org/mpris/MediaPlayer2");
+
+ // estimate identifier string
+ QDBusInterface mprisInterface(service, mediaPlayerObjectPath, QStringLiteral("org.mpris.MediaPlayer2"));
//FIXME: This call hangs and returns an empty string if KDED is still starting!
QString identity = mprisInterface.property("Identity").toString();
if (identity.isEmpty()) {
@@ -83,39 +96,62 @@
}
QString uniqueName = identity;
- for (int i = 1 ; !playerList[uniqueName].isEmpty() ; i++) {
- uniqueName = identity + " [" + i + "]";
+ for (int i = 2; playerList.contains(uniqueName); ++i) {
+ uniqueName = identity + QLatin1String(" [") + QString::number(i) + QLatin1Char(']');
}
- playerList[uniqueName] = service;
- qCDebug(KDECONNECT_PLUGIN_MPRIS) << "Mpris addPlayer" << service << "->" << uniqueName;
- sendPlayerList();
+ MprisPlayer player(service, mediaPlayerObjectPath, QDBusConnection::sessionBus());
+
+ playerList.insert(uniqueName, player);
- OrgFreedesktopDBusPropertiesInterface* freedesktopInterface = new OrgFreedesktopDBusPropertiesInterface(service, QStringLiteral("/org/mpris/MediaPlayer2"), QDBusConnection::sessionBus(), this);
- connect(freedesktopInterface, &OrgFreedesktopDBusPropertiesInterface::PropertiesChanged, this, &MprisControlPlugin::propertiesChanged);
+ connect(player.propertiesInterface(), &OrgFreedesktopDBusPropertiesInterface::PropertiesChanged,
+ this, &MprisControlPlugin::propertiesChanged);
+ connect(player.mediaPlayer2PlayerInterface(), &OrgMprisMediaPlayer2PlayerInterface::Seeked,
+ this, &MprisControlPlugin::seeked);
- OrgMprisMediaPlayer2PlayerInterface* mprisInterface0 = new OrgMprisMediaPlayer2PlayerInterface(service, QStringLiteral("/org/mpris/MediaPlayer2"), QDBusConnection::sessionBus());
- connect(mprisInterface0, &OrgMprisMediaPlayer2PlayerInterface::Seeked, this, &MprisControlPlugin::seeked);
+ qCDebug(KDECONNECT_PLUGIN_MPRIS) << "Mpris addPlayer" << service << "->" << uniqueName;
+ sendPlayerList();
}
void MprisControlPlugin::seeked(qlonglong position){
//qCDebug(KDECONNECT_PLUGIN_MPRIS) << "Seeked in player";
- OrgFreedesktopDBusPropertiesInterface* interface = (OrgFreedesktopDBusPropertiesInterface*)sender();
- const QString& service = interface->service();
- const QString& player = playerList.key(service);
+ OrgMprisMediaPlayer2PlayerInterface* mediaPlayer2PlayerInterface = (OrgMprisMediaPlayer2PlayerInterface*)sender();
+ const auto end = playerList.constEnd();
+ const auto it = std::find_if(playerList.constBegin(), end, [mediaPlayer2PlayerInterface](const MprisPlayer& player) {
+ return (player.mediaPlayer2PlayerInterface() == mediaPlayer2PlayerInterface);
+ });
+ if (it == end) {
+ qCWarning(KDECONNECT_PLUGIN_MPRIS) << "Seeked signal received for no longer tracked service" << mediaPlayer2PlayerInterface->service();
+ return;
+ }
+
+ const QString& playerName = it.key();
- NetworkPackage np(PACKAGE_TYPE_MPRIS, {
+ NetworkPacket np(PACKET_TYPE_MPRIS, {
{"pos", position/1000}, //Send milis instead of nanos
- {"player", player}
+ {"player", playerName}
});
- sendPackage(np);
+ sendPacket(np);
}
void MprisControlPlugin::propertiesChanged(const QString& propertyInterface, const QVariantMap& properties)
{
Q_UNUSED(propertyInterface);
- NetworkPackage np(PACKAGE_TYPE_MPRIS);
+ OrgFreedesktopDBusPropertiesInterface* propertiesInterface = (OrgFreedesktopDBusPropertiesInterface*)sender();
+ const auto end = playerList.constEnd();
+ const auto it = std::find_if(playerList.constBegin(), end, [propertiesInterface](const MprisPlayer& player) {
+ return (player.propertiesInterface() == propertiesInterface);
+ });
+ if (it == end) {
+ qCWarning(KDECONNECT_PLUGIN_MPRIS) << "PropertiesChanged signal received for no longer tracked service" << propertiesInterface->service();
+ return;
+ }
+
+ OrgMprisMediaPlayer2PlayerInterface* const mediaPlayer2PlayerInterface = it.value().mediaPlayer2PlayerInterface();
+ const QString& playerName = it.key();
+
+ NetworkPacket np(PACKET_TYPE_MPRIS);
bool somethingToSend = false;
if (properties.contains(QStringLiteral("Volume"))) {
int volume = (int) (properties[QStringLiteral("Volume")].toDouble()*100);
@@ -130,7 +166,7 @@
QVariantMap nowPlayingMap;
bullshit >> nowPlayingMap;
- mprisPlayerMetadataToNetworkPackage(np, nowPlayingMap);
+ mprisPlayerMetadataToNetworkPacket(np, nowPlayingMap);
somethingToSend = true;
}
if (properties.contains(QStringLiteral("PlaybackStatus"))) {
@@ -160,37 +196,87 @@
}
if (somethingToSend) {
- OrgFreedesktopDBusPropertiesInterface* interface = (OrgFreedesktopDBusPropertiesInterface*)sender();
- const QString& service = interface->service();
- const QString& player = playerList.key(service);
- np.set(QStringLiteral("player"), player);
+ np.set(QStringLiteral("player"), playerName);
// Always also update the position
- OrgMprisMediaPlayer2PlayerInterface mprisInterface(service, QStringLiteral("/org/mpris/MediaPlayer2"), QDBusConnection::sessionBus());
- if (mprisInterface.canSeek()) {
- long long pos = mprisInterface.position();
+ if (mediaPlayer2PlayerInterface->canSeek()) {
+ long long pos = mediaPlayer2PlayerInterface->position();
np.set(QStringLiteral("pos"), pos/1000); //Send milis instead of nanos
}
- sendPackage(np);
+ sendPacket(np);
}
}
-void MprisControlPlugin::removePlayer(const QString& ifaceName)
+void MprisControlPlugin::removePlayer(const QString& serviceName)
{
- const QString identity = playerList.key(ifaceName);
- qCDebug(KDECONNECT_PLUGIN_MPRIS) << "Mpris removePlayer" << ifaceName << "->" << identity;
- playerList.remove(identity);
+ const auto end = playerList.end();
+ const auto it = std::find_if(playerList.begin(), end, [serviceName](const MprisPlayer& player) {
+ return (player.serviceName() == serviceName);
+ });
+ if (it == end) {
+ qCWarning(KDECONNECT_PLUGIN_MPRIS) << "Could not find player for serviceName" << serviceName;
+ return;
+ }
+
+ const QString& playerName = it.key();
+ qCDebug(KDECONNECT_PLUGIN_MPRIS) << "Mpris removePlayer" << serviceName << "->" << playerName;
+
+ playerList.erase(it);
+
sendPlayerList();
}
-bool MprisControlPlugin::receivePackage (const NetworkPackage& np)
+bool MprisControlPlugin::sendAlbumArt(const NetworkPacket& np)
+{
+ const QString player = np.get(QStringLiteral("player"));
+ auto it = playerList.find(player);
+ bool valid_player = (it != playerList.end());
+ if (!valid_player) {
+ return false;
+ }
+
+ //Get mpris information
+ auto& mprisInterface = *it.value().mediaPlayer2PlayerInterface();
+ QVariantMap nowPlayingMap = mprisInterface.metadata();
+
+ //Check if the supplied album art url indeed belongs to this mpris player
+ QUrl playerAlbumArtUrl{nowPlayingMap[QStringLiteral("mpris:artUrl")].toString()};
+ QString requestedAlbumArtUrl = np.get(QStringLiteral("albumArtUrl"));
+ if (!playerAlbumArtUrl.isValid() || playerAlbumArtUrl != QUrl(requestedAlbumArtUrl)) {
+ return false;
+ }
+
+ //Only support sending local files
+ if (playerAlbumArtUrl.scheme() != "file") {
+ return false;
+ }
+
+ //Open the file to send
+ QSharedPointer art{new QFile(playerAlbumArtUrl.toLocalFile())};
+
+ //Send the album art as payload
+ NetworkPacket answer(PACKET_TYPE_MPRIS);
+ answer.set(QStringLiteral("transferringAlbumArt"), true);
+ answer.set(QStringLiteral("player"), player);
+ answer.set(QStringLiteral("albumArtUrl"), requestedAlbumArtUrl);
+ answer.setPayload(art, art->size());
+ sendPacket(answer);
+ return true;
+}
+
+bool MprisControlPlugin::receivePacket (const NetworkPacket& np)
{
if (np.has(QStringLiteral("playerList"))) {
return false; //Whoever sent this is an mpris client and not an mpris control!
}
+ if (np.has(QStringLiteral("albumArtUrl"))) {
+ return sendAlbumArt(np);
+ }
+
//Send the player list
const QString player = np.get(QStringLiteral("player"));
- bool valid_player = playerList.contains(player);
+ auto it = playerList.find(player);
+ bool valid_player = (it != playerList.end());
if (!valid_player || np.get(QStringLiteral("requestPlayerList"))) {
sendPlayerList();
if (!valid_player) {
@@ -199,38 +285,40 @@
}
//Do something to the mpris interface
- OrgMprisMediaPlayer2PlayerInterface mprisInterface(playerList[player], QStringLiteral("/org/mpris/MediaPlayer2"), QDBusConnection::sessionBus());
- mprisInterface.setTimeout(500);
+ const QString& serviceName = it.value().serviceName();
+ // turn from pointer to reference to keep the patch diff small,
+ // actual patch would change all "mprisInterface." into "mprisInterface->"
+ auto& mprisInterface = *it.value().mediaPlayer2PlayerInterface();
if (np.has(QStringLiteral("action"))) {
const QString& action = np.get(QStringLiteral("action"));
- //qCDebug(KDECONNECT_PLUGIN_MPRIS) << "Calling action" << action << "in" << playerList[player];
+ //qCDebug(KDECONNECT_PLUGIN_MPRIS) << "Calling action" << action << "in" << serviceName;
//TODO: Check for valid actions, currently we trust anything the other end sends us
mprisInterface.call(action);
}
if (np.has(QStringLiteral("setVolume"))) {
double volume = np.get(QStringLiteral("setVolume"))/100.f;
- qCDebug(KDECONNECT_PLUGIN_MPRIS) << "Setting volume" << volume << "to" << playerList[player];
+ qCDebug(KDECONNECT_PLUGIN_MPRIS) << "Setting volume" << volume << "to" << serviceName;
mprisInterface.setVolume(volume);
}
if (np.has(QStringLiteral("Seek"))) {
int offset = np.get(QStringLiteral("Seek"));
- //qCDebug(KDECONNECT_PLUGIN_MPRIS) << "Seeking" << offset << "to" << playerList[player];
+ //qCDebug(KDECONNECT_PLUGIN_MPRIS) << "Seeking" << offset << "to" << serviceName;
mprisInterface.Seek(offset);
}
if (np.has(QStringLiteral("SetPosition"))){
qlonglong position = np.get(QStringLiteral("SetPosition"),0)*1000;
qlonglong seek = position - mprisInterface.position();
- //qCDebug(KDECONNECT_PLUGIN_MPRIS) << "Setting position by seeking" << seek << "to" << playerList[player];
+ //qCDebug(KDECONNECT_PLUGIN_MPRIS) << "Setting position by seeking" << seek << "to" << serviceName;
mprisInterface.Seek(seek);
}
//Send something read from the mpris interface
- NetworkPackage answer(PACKAGE_TYPE_MPRIS);
+ NetworkPacket answer(PACKET_TYPE_MPRIS);
bool somethingToSend = false;
if (np.get(QStringLiteral("requestNowPlaying"))) {
QVariantMap nowPlayingMap = mprisInterface.metadata();
- mprisPlayerMetadataToNetworkPackage(answer, nowPlayingMap);
+ mprisPlayerMetadataToNetworkPacket(answer, nowPlayingMap);
qlonglong pos = mprisInterface.position();
answer.set(QStringLiteral("pos"), pos/1000);
@@ -251,9 +339,10 @@
answer.set(QStringLiteral("volume"),volume);
somethingToSend = true;
}
+
if (somethingToSend) {
answer.set(QStringLiteral("player"), player);
- sendPackage(answer);
+ sendPacket(answer);
}
return true;
@@ -261,12 +350,13 @@
void MprisControlPlugin::sendPlayerList()
{
- NetworkPackage np(PACKAGE_TYPE_MPRIS);
+ NetworkPacket np(PACKET_TYPE_MPRIS);
np.set(QStringLiteral("playerList"),playerList.keys());
- sendPackage(np);
+ np.set(QStringLiteral("supportAlbumArtPayload"), true);
+ sendPacket(np);
}
-void MprisControlPlugin::mprisPlayerMetadataToNetworkPackage(NetworkPackage& np, const QVariantMap& nowPlayingMap) const {
+void MprisControlPlugin::mprisPlayerMetadataToNetworkPacket(NetworkPacket& np, const QVariantMap& nowPlayingMap) const {
QString title = nowPlayingMap[QStringLiteral("xesam:title")].toString();
QString artist = nowPlayingMap[QStringLiteral("xesam:artist")].toString();
QString album = nowPlayingMap[QStringLiteral("xesam:album")].toString();
diff -Nru kdeconnect-1.2.1/plugins/mpriscontrol/mpriscontrolplugin.h kdeconnect-1.3.0/plugins/mpriscontrol/mpriscontrolplugin.h
--- kdeconnect-1.2.1/plugins/mpriscontrol/mpriscontrolplugin.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/mpriscontrol/mpriscontrolplugin.h 2018-04-08 14:35:04.000000000 +0000
@@ -25,10 +25,33 @@
#include
#include
#include
+#include
#include
-#define PACKAGE_TYPE_MPRIS QStringLiteral("kdeconnect.mpris")
+
+class OrgFreedesktopDBusPropertiesInterface;
+class OrgMprisMediaPlayer2PlayerInterface;
+
+class MprisPlayer
+{
+public:
+ MprisPlayer(const QString& serviceName, const QString& dbusObjectPath, const QDBusConnection& busConnection);
+ MprisPlayer() = delete;
+
+public:
+ const QString& serviceName() const { return m_serviceName; }
+ OrgFreedesktopDBusPropertiesInterface* propertiesInterface() const { return m_propertiesInterface.data(); }
+ OrgMprisMediaPlayer2PlayerInterface* mediaPlayer2PlayerInterface() const { return m_mediaPlayer2PlayerInterface.data(); }
+
+private:
+ QString m_serviceName;
+ QSharedPointer m_propertiesInterface;
+ QSharedPointer m_mediaPlayer2PlayerInterface;
+};
+
+
+#define PACKET_TYPE_MPRIS QStringLiteral("kdeconnect.mpris")
Q_DECLARE_LOGGING_CATEGORY(KDECONNECT_PLUGIN_MPRIS)
@@ -40,7 +63,7 @@
public:
explicit MprisControlPlugin(QObject* parent, const QVariantList& args);
- bool receivePackage(const NetworkPackage& np) override;
+ bool receivePacket(const NetworkPacket& np) override;
void connected() override { }
private Q_SLOTS:
@@ -49,12 +72,13 @@
private:
void serviceOwnerChanged(const QString& serviceName, const QString& oldOwner, const QString& newOwner);
- void addPlayer(const QString& ifaceName);
- void removePlayer(const QString& ifaceName);
+ void addPlayer(const QString& serviceName);
+ void removePlayer(const QString& serviceName);
void sendPlayerList();
- void mprisPlayerMetadataToNetworkPackage(NetworkPackage& np, const QVariantMap& nowPlayingMap) const;
+ void mprisPlayerMetadataToNetworkPacket(NetworkPacket& np, const QVariantMap& nowPlayingMap) const;
+ bool sendAlbumArt(const NetworkPacket& np);
- QHash playerList;
+ QHash playerList;
int prevVolume;
QDBusServiceWatcher* m_watcher;
diff -Nru kdeconnect-1.2.1/plugins/mprisremote/kdeconnect_mprisremote.json kdeconnect-1.3.0/plugins/mprisremote/kdeconnect_mprisremote.json
--- kdeconnect-1.2.1/plugins/mprisremote/kdeconnect_mprisremote.json 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/mprisremote/kdeconnect_mprisremote.json 2018-04-08 14:35:04.000000000 +0000
@@ -1,5 +1,4 @@
{
- "Encoding": "UTF-8",
"KPlugin": {
"Authors": [
{
@@ -70,10 +69,10 @@
"Version": "0.1",
"Website": "https://kde.org"
},
- "X-KdeConnect-OutgoingPackageType": [
+ "X-KdeConnect-OutgoingPacketType": [
"kdeconnect.mpris.request"
],
- "X-KdeConnect-SupportedPackageType": [
+ "X-KdeConnect-SupportedPacketType": [
"kdeconnect.mpris"
]
}
diff -Nru kdeconnect-1.2.1/plugins/mprisremote/mprisremoteplugin.cpp kdeconnect-1.3.0/plugins/mprisremote/mprisremoteplugin.cpp
--- kdeconnect-1.2.1/plugins/mprisremote/mprisremoteplugin.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/mprisremote/mprisremoteplugin.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -50,9 +50,9 @@
{
}
-bool MprisRemotePlugin::receivePackage(const NetworkPackage& np)
+bool MprisRemotePlugin::receivePacket(const NetworkPacket& np)
{
- if (np.type() != PACKAGE_TYPE_MPRIS)
+ if (np.type() != PACKET_TYPE_MPRIS)
return false;
if (np.has(QStringLiteral("nowPlaying")) || np.has(QStringLiteral("volume")) || np.has(QStringLiteral("isPlaying")) || np.has(QStringLiteral("length")) || np.has(QStringLiteral("pos"))) {
@@ -92,53 +92,53 @@
void MprisRemotePlugin::requestPlayerStatus()
{
- NetworkPackage np(PACKAGE_TYPE_MPRIS_REQUEST, {
+ NetworkPacket np(PACKET_TYPE_MPRIS_REQUEST, {
{"player", m_player},
{"requestNowPlaying", true},
{"requestVolume", true}}
);
- sendPackage(np);
+ sendPacket(np);
}
void MprisRemotePlugin::requestPlayerList()
{
- NetworkPackage np(PACKAGE_TYPE_MPRIS_REQUEST, {{"requestPlayerList", true}});
- sendPackage(np);
+ NetworkPacket np(PACKET_TYPE_MPRIS_REQUEST, {{"requestPlayerList", true}});
+ sendPacket(np);
}
void MprisRemotePlugin::sendAction(const QString& action)
{
- NetworkPackage np(PACKAGE_TYPE_MPRIS_REQUEST, {
+ NetworkPacket np(PACKET_TYPE_MPRIS_REQUEST, {
{"player", m_player},
{"action", action}
});
- sendPackage(np);
+ sendPacket(np);
}
void MprisRemotePlugin::seek(int offset) const
{
- NetworkPackage np(PACKAGE_TYPE_MPRIS_REQUEST, {
+ NetworkPacket np(PACKET_TYPE_MPRIS_REQUEST, {
{"player", m_player},
{"Seek", offset}});
- sendPackage(np);
+ sendPacket(np);
}
void MprisRemotePlugin::setVolume(int volume)
{
- NetworkPackage np(PACKAGE_TYPE_MPRIS_REQUEST, {
+ NetworkPacket np(PACKET_TYPE_MPRIS_REQUEST, {
{"player", m_player},
{"setVolume",volume}
});
- sendPackage(np);
+ sendPacket(np);
}
void MprisRemotePlugin::setPosition(int position)
{
- NetworkPackage np(PACKAGE_TYPE_MPRIS_REQUEST, {
+ NetworkPacket np(PACKET_TYPE_MPRIS_REQUEST, {
{"player", m_player},
{"SetPosition", position}
});
- sendPackage(np);
+ sendPacket(np);
m_lastPosition = position;
m_lastPositionTime = QDateTime::currentMSecsSinceEpoch();
diff -Nru kdeconnect-1.2.1/plugins/mprisremote/mprisremoteplugin.h kdeconnect-1.3.0/plugins/mprisremote/mprisremoteplugin.h
--- kdeconnect-1.2.1/plugins/mprisremote/mprisremoteplugin.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/mprisremote/mprisremoteplugin.h 2018-04-08 14:35:04.000000000 +0000
@@ -25,8 +25,8 @@
#include
-#define PACKAGE_TYPE_MPRIS_REQUEST QStringLiteral("kdeconnect.mpris.request")
-#define PACKAGE_TYPE_MPRIS QStringLiteral("kdeconnect.mpris")
+#define PACKET_TYPE_MPRIS_REQUEST QStringLiteral("kdeconnect.mpris.request")
+#define PACKET_TYPE_MPRIS QStringLiteral("kdeconnect.mpris")
class Q_DECL_EXPORT MprisRemotePlugin
: public KdeConnectPlugin
@@ -57,7 +57,7 @@
void setPosition(int position);
void setPlayer(const QString& player);
- bool receivePackage(const NetworkPackage& np) override;
+ bool receivePacket(const NetworkPacket& np) override;
void connected() override {}
QString dbusPath() const override;
diff -Nru kdeconnect-1.2.1/plugins/notifications/CMakeLists.txt kdeconnect-1.3.0/plugins/notifications/CMakeLists.txt
--- kdeconnect-1.2.1/plugins/notifications/CMakeLists.txt 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/notifications/CMakeLists.txt 2018-04-08 14:35:04.000000000 +0000
@@ -1,5 +1,3 @@
-find_package(KF5 REQUIRED COMPONENTS Notifications KCMUtils I18n IconThemes Config)
-
set(kdeconnect_notifications_SRCS
notification.cpp
notificationsplugin.cpp
@@ -16,5 +14,4 @@
Qt5::DBus
KF5::Notifications
KF5::I18n
- KF5::IconThemes
)
diff -Nru kdeconnect-1.2.1/plugins/notifications/kdeconnect_notifications.json kdeconnect-1.3.0/plugins/notifications/kdeconnect_notifications.json
--- kdeconnect-1.2.1/plugins/notifications/kdeconnect_notifications.json 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/notifications/kdeconnect_notifications.json 2018-04-08 14:35:04.000000000 +0000
@@ -1,5 +1,4 @@
{
- "Encoding": "UTF-8",
"KPlugin": {
"Authors": [
{
@@ -88,11 +87,11 @@
"Version": "0.1",
"Website": "http://albertvaka.wordpress.com"
},
- "X-KdeConnect-OutgoingPackageType": [
+ "X-KdeConnect-OutgoingPacketType": [
"kdeconnect.notification.request",
"kdeconnect.notification.reply"
],
- "X-KdeConnect-SupportedPackageType": [
+ "X-KdeConnect-SupportedPacketType": [
"kdeconnect.notification"
]
}
diff -Nru kdeconnect-1.2.1/plugins/notifications/notification.cpp kdeconnect-1.3.0/plugins/notifications/notification.cpp
--- kdeconnect-1.2.1/plugins/notifications/notification.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/notifications/notification.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -31,8 +31,9 @@
#include
+QMap Notification::s_downloadsInProgress;
-Notification::Notification(const NetworkPackage& np, QObject* parent)
+Notification::Notification(const NetworkPacket& np, QObject* parent)
: QObject(parent)
{
//Make a own directory for each user so noone can see each others icons
@@ -49,7 +50,7 @@
m_closed = false;
m_ready = false;
- parseNetworkPackage(np);
+ parseNetworkPacket(np);
createKNotification(false, np);
}
@@ -74,13 +75,13 @@
}
}
-void Notification::update(const NetworkPackage& np)
+void Notification::update(const NetworkPacket& np)
{
- parseNetworkPackage(np);
+ parseNetworkPacket(np);
createKNotification(!m_closed, np);
}
-KNotification* Notification::createKNotification(bool update, const NetworkPackage& np)
+KNotification* Notification::createKNotification(bool update, const NetworkPacket& np)
{
if (!update) {
m_notification = new KNotification(QStringLiteral("notification"), KNotification::CloseOnTimeout, this);
@@ -111,15 +112,8 @@
applyNoIcon();
show();
} else {
-
m_iconPath = m_imagesDir.absoluteFilePath(m_payloadHash);
-
- if (!QFile::exists(m_iconPath)) {
- loadIcon(np);
- } else {
- applyIcon();
- show();
- }
+ loadIcon(np);
}
if (!m_requestReplyId.isEmpty()) {
@@ -132,22 +126,32 @@
return m_notification;
}
-void Notification::loadIcon(const NetworkPackage& np)
+void Notification::loadIcon(const NetworkPacket& np)
{
m_ready = false;
- FileTransferJob* job = np.createPayloadTransferJob(QUrl::fromLocalFile(m_iconPath));
- job->start();
-
- connect(job, &FileTransferJob::result, this, [this, job]{
- if (job->error()) {
- qCDebug(KDECONNECT_PLUGIN_NOTIFICATION) << "Error in FileTransferJob: " << job->errorString();
- applyNoIcon();
- } else {
- applyIcon();
- }
+ if (QFileInfo::exists(m_iconPath)) {
+ applyIcon();
show();
- });
+ } else {
+ FileTransferJob* fileTransferJob = s_downloadsInProgress.value(m_iconPath);
+ if (!fileTransferJob) {
+ fileTransferJob = np.createPayloadTransferJob(QUrl::fromLocalFile(m_iconPath));
+ fileTransferJob->start();
+ s_downloadsInProgress[m_iconPath] = fileTransferJob;
+ }
+
+ connect(fileTransferJob, &FileTransferJob::result, this, [this, fileTransferJob]{
+ s_downloadsInProgress.remove(m_iconPath);
+ if (fileTransferJob->error()) {
+ qCDebug(KDECONNECT_PLUGIN_NOTIFICATION) << "Error in FileTransferJob: " << fileTransferJob->errorString();
+ applyNoIcon();
+ } else {
+ applyIcon();
+ }
+ show();
+ });
+ }
}
void Notification::applyIcon()
@@ -172,7 +176,7 @@
m_closed = true;
}
-void Notification::parseNetworkPackage(const NetworkPackage& np)
+void Notification::parseNetworkPacket(const NetworkPacket& np)
{
m_internalId = np.get(QStringLiteral("id"));
m_appName = np.get(QStringLiteral("appName"));
diff -Nru kdeconnect-1.2.1/plugins/notifications/notification.h kdeconnect-1.3.0/plugins/notifications/notification.h
--- kdeconnect-1.2.1/plugins/notifications/notification.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/notifications/notification.h 2018-04-08 14:35:04.000000000 +0000
@@ -25,8 +25,9 @@
#include
#include
#include
+#include
-#include
+#include
class Notification
: public QObject
@@ -45,7 +46,7 @@
Q_PROPERTY(QString replyId READ replyId)
public:
- Notification(const NetworkPackage& np, QObject* parent);
+ Notification(const NetworkPacket& np, QObject* parent);
~Notification() override;
QString internalId() const { return m_internalId; }
@@ -59,9 +60,9 @@
bool hasIcon() const { return m_hasIcon; }
void show();
bool silent() const { return m_silent; }
- void update(const NetworkPackage& np);
+ void update(const NetworkPacket& np);
bool isReady() const { return m_ready; }
- KNotification* createKNotification(bool update, const NetworkPackage& np);
+ KNotification* createKNotification(bool update, const NetworkPacket& np);
public Q_SLOTS:
Q_SCRIPTABLE void dismiss();
@@ -90,10 +91,12 @@
QString m_payloadHash;
bool m_ready;
- void parseNetworkPackage(const NetworkPackage& np);
- void loadIcon(const NetworkPackage& np);
+ void parseNetworkPacket(const NetworkPacket& np);
+ void loadIcon(const NetworkPacket& np);
void applyIcon();
void applyNoIcon();
+
+ static QMap s_downloadsInProgress;
};
#endif
diff -Nru kdeconnect-1.2.1/plugins/notifications/notificationsdbusinterface.cpp kdeconnect-1.3.0/plugins/notifications/notificationsdbusinterface.cpp
--- kdeconnect-1.2.1/plugins/notifications/notificationsdbusinterface.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/notifications/notificationsdbusinterface.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -56,7 +56,14 @@
return m_notifications.keys();
}
-void NotificationsDbusInterface::processPackage(const NetworkPackage& np)
+void NotificationsDbusInterface::notificationReady()
+{
+ Notification* noti = static_cast(sender());
+ disconnect(noti, &Notification::ready, this, &NotificationsDbusInterface::notificationReady);
+ addNotification(noti);
+}
+
+void NotificationsDbusInterface::processPacket(const NetworkPacket& np)
{
if (np.get(QStringLiteral("isCancel"))) {
QString id = np.get(QStringLiteral("id"));
@@ -64,19 +71,6 @@
if (id.startsWith(QLatin1String("org.kde.kdeconnect_tp::")))
id = id.mid(id.indexOf(QLatin1String("::")) + 2);
removeNotification(id);
- } else if (np.get(QStringLiteral("isRequest"))) {
- for (const auto& n : qAsConst(m_notifications)) {
- NetworkPackage np(PACKAGE_TYPE_NOTIFICATION_REQUEST, {
- {"id", n->internalId()},
- {"appName", n->appName()},
- {"ticker", n->ticker()},
- {"isClearable", n->dismissable()},
- {"requestAnswer", true}
- });
- m_plugin->sendPackage(np);
- }
- } else if(np.get(QStringLiteral("requestAnswer"), false)) {
-
} else {
QString id = np.get(QStringLiteral("id"));
@@ -86,13 +80,14 @@
if (noti->isReady()) {
addNotification(noti);
} else {
- connect(noti, &Notification::ready, this, [this, noti]{
- addNotification(noti);
- });
+ connect(noti, &Notification::ready, this, &NotificationsDbusInterface::notificationReady);
}
} else {
- QString pubId = m_internalIdToPublicId[id];
- Notification* noti = m_notifications[pubId];
+ QString pubId = m_internalIdToPublicId.value(id);
+ Notification* noti = m_notifications.value(pubId);
+ if (!noti)
+ return;
+
noti->update(np);
if (noti->isReady()) {
@@ -158,9 +153,9 @@
void NotificationsDbusInterface::dismissRequested(const QString& internalId)
{
- NetworkPackage np(PACKAGE_TYPE_NOTIFICATION_REQUEST);
+ NetworkPacket np(PACKET_TYPE_NOTIFICATION_REQUEST);
np.set(QStringLiteral("cancel"), internalId);
- m_plugin->sendPackage(np);
+ m_plugin->sendPacket(np);
//Workaround: we erase notifications without waiting a repsonse from the
//phone because we won't receive a response if we are out of sync and this
@@ -182,10 +177,10 @@
void NotificationsDbusInterface::sendReply(const QString& replyId, const QString& message)
{
- NetworkPackage np(PACKAGE_TYPE_NOTIFICATION_REPLY);
+ NetworkPacket np(PACKET_TYPE_NOTIFICATION_REPLY);
np.set(QStringLiteral("requestReplyId"), replyId);
np.set(QStringLiteral("message"), message);
- m_plugin->sendPackage(np);
+ m_plugin->sendPacket(np);
}
QString NotificationsDbusInterface::newId()
diff -Nru kdeconnect-1.2.1/plugins/notifications/notificationsdbusinterface.h kdeconnect-1.3.0/plugins/notifications/notificationsdbusinterface.h
--- kdeconnect-1.2.1/plugins/notifications/notificationsdbusinterface.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/notifications/notificationsdbusinterface.h 2018-04-08 14:35:04.000000000 +0000
@@ -43,7 +43,7 @@
explicit NotificationsDbusInterface(KdeConnectPlugin* plugin);
~NotificationsDbusInterface() override;
- void processPackage(const NetworkPackage& np);
+ void processPacket(const NetworkPacket& np);
void clearNotifications();
void dismissRequested(const QString& notification);
void replyRequested(Notification* noti);
@@ -62,6 +62,7 @@
private /*methods*/:
void removeNotification(const QString& internalId);
QString newId(); //Generates successive identifitiers to use as public ids
+ void notificationReady();
private /*attributes*/:
const Device* m_device;
diff -Nru kdeconnect-1.2.1/plugins/notifications/notificationsplugin.cpp kdeconnect-1.3.0/plugins/notifications/notificationsplugin.cpp
--- kdeconnect-1.2.1/plugins/notifications/notificationsplugin.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/notifications/notificationsplugin.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -37,8 +37,8 @@
void NotificationsPlugin::connected()
{
- NetworkPackage np(PACKAGE_TYPE_NOTIFICATION_REQUEST, {{"request", true}});
- sendPackage(np);
+ NetworkPacket np(PACKET_TYPE_NOTIFICATION_REQUEST, {{"request", true}});
+ sendPacket(np);
}
NotificationsPlugin::~NotificationsPlugin()
@@ -52,11 +52,11 @@
notificationsDbusInterface->clearNotifications();
}
-bool NotificationsPlugin::receivePackage(const NetworkPackage& np)
+bool NotificationsPlugin::receivePacket(const NetworkPacket& np)
{
if (np.get(QStringLiteral("request"))) return false;
- notificationsDbusInterface->processPackage(np);
+ notificationsDbusInterface->processPacket(np);
return true;
}
diff -Nru kdeconnect-1.2.1/plugins/notifications/notificationsplugin.h kdeconnect-1.3.0/plugins/notifications/notificationsplugin.h
--- kdeconnect-1.2.1/plugins/notifications/notificationsplugin.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/notifications/notificationsplugin.h 2018-04-08 14:35:04.000000000 +0000
@@ -21,12 +21,10 @@
#ifndef NOTIFICATIONSPLUGIN_H
#define NOTIFICATIONSPLUGIN_H
-#include
-
#include
-#define PACKAGE_TYPE_NOTIFICATION_REQUEST QStringLiteral("kdeconnect.notification.request")
-#define PACKAGE_TYPE_NOTIFICATION_REPLY QStringLiteral("kdeconnect.notification.reply")
+#define PACKET_TYPE_NOTIFICATION_REQUEST QStringLiteral("kdeconnect.notification.request")
+#define PACKET_TYPE_NOTIFICATION_REPLY QStringLiteral("kdeconnect.notification.reply")
/*
* This class is just a proxy for NotificationsDbusInterface
@@ -44,8 +42,8 @@
public:
explicit NotificationsPlugin(QObject* parent, const QVariantList& args);
~NotificationsPlugin() override;
-
- bool receivePackage(const NetworkPackage& np) override;
+
+ bool receivePacket(const NetworkPacket& np) override;
void connected() override;
protected:
diff -Nru kdeconnect-1.2.1/plugins/pausemusic/CMakeLists.txt kdeconnect-1.3.0/plugins/pausemusic/CMakeLists.txt
--- kdeconnect-1.2.1/plugins/pausemusic/CMakeLists.txt 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/pausemusic/CMakeLists.txt 2018-04-08 14:35:04.000000000 +0000
@@ -1,4 +1,3 @@
-find_package(KF5 REQUIRED COMPONENTS KCMUtils)
find_program(PACTL pactl)
kdeconnect_add_plugin(kdeconnect_pausemusic JSON kdeconnect_pausemusic.json SOURCES pausemusicplugin.cpp)
diff -Nru kdeconnect-1.2.1/plugins/pausemusic/kdeconnect_pausemusic_config.desktop kdeconnect-1.3.0/plugins/pausemusic/kdeconnect_pausemusic_config.desktop
--- kdeconnect-1.2.1/plugins/pausemusic/kdeconnect_pausemusic_config.desktop 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/pausemusic/kdeconnect_pausemusic_config.desktop 2018-04-08 14:35:04.000000000 +0000
@@ -28,7 +28,7 @@
Name[it]=Impostazioni estensione Sospendi musica
Name[ko]=음악 일시 정지 플러그인 설정
Name[nl]=Plug-in-instellingen voor muziek pauzeren
-Name[nn]=Innstillingar for tillegg for pausing av musikk
+Name[nn]=Innstillingar for pausing av musikk
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
diff -Nru kdeconnect-1.2.1/plugins/pausemusic/kdeconnect_pausemusic.json kdeconnect-1.3.0/plugins/pausemusic/kdeconnect_pausemusic.json
--- kdeconnect-1.2.1/plugins/pausemusic/kdeconnect_pausemusic.json 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/pausemusic/kdeconnect_pausemusic.json 2018-04-08 14:35:04.000000000 +0000
@@ -1,5 +1,4 @@
{
- "Encoding": "UTF-8",
"KPlugin": {
"Authors": [
{
@@ -90,7 +89,7 @@
"Version": "0.1",
"Website": "http://albertvaka.wordpress.com"
},
- "X-KdeConnect-SupportedPackageType": [
+ "X-KdeConnect-SupportedPacketType": [
"kdeconnect.telephony"
]
}
diff -Nru kdeconnect-1.2.1/plugins/pausemusic/pausemusicplugin.cpp kdeconnect-1.3.0/plugins/pausemusic/pausemusicplugin.cpp
--- kdeconnect-1.2.1/plugins/pausemusic/pausemusicplugin.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/pausemusic/pausemusicplugin.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -39,7 +39,7 @@
, muted(false)
{}
-bool PauseMusicPlugin::receivePackage(const NetworkPackage& np)
+bool PauseMusicPlugin::receivePacket(const NetworkPacket& np)
{
bool pauseOnlyWhenTalking = config()->get(QStringLiteral("conditionTalking"), false);
diff -Nru kdeconnect-1.2.1/plugins/pausemusic/pausemusicplugin.h kdeconnect-1.3.0/plugins/pausemusic/pausemusicplugin.h
--- kdeconnect-1.2.1/plugins/pausemusic/pausemusicplugin.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/pausemusic/pausemusicplugin.h 2018-04-08 14:35:04.000000000 +0000
@@ -39,7 +39,7 @@
public:
explicit PauseMusicPlugin(QObject* parent, const QVariantList& args);
- bool receivePackage(const NetworkPackage& np) override;
+ bool receivePacket(const NetworkPacket& np) override;
void connected() override { }
private:
diff -Nru kdeconnect-1.2.1/plugins/ping/CMakeLists.txt kdeconnect-1.3.0/plugins/ping/CMakeLists.txt
--- kdeconnect-1.2.1/plugins/ping/CMakeLists.txt 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/ping/CMakeLists.txt 2018-04-08 14:35:04.000000000 +0000
@@ -1,5 +1,3 @@
-find_package(KF5 REQUIRED COMPONENTS Notifications)
-
set(kdeconnect_ping_SRCS
pingplugin.cpp
)
@@ -10,5 +8,4 @@
kdeconnectcore
Qt5::DBus
KF5::I18n
- KF5::Notifications
)
diff -Nru kdeconnect-1.2.1/plugins/ping/kdeconnect_ping.json kdeconnect-1.3.0/plugins/ping/kdeconnect_ping.json
--- kdeconnect-1.2.1/plugins/ping/kdeconnect_ping.json 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/ping/kdeconnect_ping.json 2018-04-08 14:35:04.000000000 +0000
@@ -1,5 +1,4 @@
{
- "Encoding": "UTF-8",
"KPlugin": {
"Authors": [
{
@@ -69,10 +68,10 @@
"Version": "0.1",
"Website": "http://albertvaka.wordpress.com"
},
- "X-KdeConnect-OutgoingPackageType": [
+ "X-KdeConnect-OutgoingPacketType": [
"kdeconnect.ping"
],
- "X-KdeConnect-SupportedPackageType": [
+ "X-KdeConnect-SupportedPacketType": [
"kdeconnect.ping"
]
}
diff -Nru kdeconnect-1.2.1/plugins/ping/pingplugin.cpp kdeconnect-1.3.0/plugins/ping/pingplugin.cpp
--- kdeconnect-1.2.1/plugins/ping/pingplugin.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/ping/pingplugin.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -20,7 +20,6 @@
#include "pingplugin.h"
-#include
#include
#include
@@ -29,6 +28,7 @@
#include
#include
+#include
K_PLUGIN_FACTORY_WITH_JSON( KdeConnectPluginFactory, "kdeconnect_ping.json", registerPlugin< PingPlugin >(); )
@@ -45,32 +45,27 @@
// qCDebug(KDECONNECT_PLUGIN_PING) << "Ping plugin destructor for device" << device()->name();
}
-bool PingPlugin::receivePackage(const NetworkPackage& np)
+bool PingPlugin::receivePacket(const NetworkPacket& np)
{
- KNotification* notification = new KNotification(QStringLiteral("pingReceived")); //KNotification::Persistent
- notification->setIconName(QStringLiteral("dialog-ok"));
- notification->setComponentName(QStringLiteral("kdeconnect"));
- notification->setTitle(device()->name());
- notification->setText(np.get(QStringLiteral("message"),i18n("Ping!"))); //This can be a source of spam
- notification->sendEvent();
+ Daemon::instance()->sendSimpleNotification(QStringLiteral("pingReceived"), device()->name(), np.get(QStringLiteral("message"),i18n("Ping!")), QStringLiteral("dialog-ok"));
return true;
}
void PingPlugin::sendPing()
{
- NetworkPackage np(PACKAGE_TYPE_PING);
- bool success = sendPackage(np);
+ NetworkPacket np(PACKET_TYPE_PING);
+ bool success = sendPacket(np);
qCDebug(KDECONNECT_PLUGIN_PING) << "sendPing:" << success;
}
void PingPlugin::sendPing(const QString& customMessage)
{
- NetworkPackage np(PACKAGE_TYPE_PING);
+ NetworkPacket np(PACKET_TYPE_PING);
if (!customMessage.isEmpty()) {
np.set(QStringLiteral("message"), customMessage);
}
- bool success = sendPackage(np);
+ bool success = sendPacket(np);
qCDebug(KDECONNECT_PLUGIN_PING) << "sendPing:" << success;
}
diff -Nru kdeconnect-1.2.1/plugins/ping/pingplugin.h kdeconnect-1.3.0/plugins/ping/pingplugin.h
--- kdeconnect-1.2.1/plugins/ping/pingplugin.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/ping/pingplugin.h 2018-04-08 14:35:04.000000000 +0000
@@ -25,7 +25,7 @@
#include
-#define PACKAGE_TYPE_PING QStringLiteral("kdeconnect.ping")
+#define PACKET_TYPE_PING QStringLiteral("kdeconnect.ping")
class Q_DECL_EXPORT PingPlugin
: public KdeConnectPlugin
@@ -40,7 +40,7 @@
Q_SCRIPTABLE void sendPing();
Q_SCRIPTABLE void sendPing(const QString& customMessage);
- bool receivePackage(const NetworkPackage& np) override;
+ bool receivePacket(const NetworkPacket& np) override;
void connected() override {}
QString dbusPath() const override;
diff -Nru kdeconnect-1.2.1/plugins/README.txt kdeconnect-1.3.0/plugins/README.txt
--- kdeconnect-1.2.1/plugins/README.txt 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/README.txt 2018-04-08 14:35:04.000000000 +0000
@@ -1,4 +1,4 @@
-Writting a plugin for KDE Connect
+Writting a plugin for KDE Connect
=================================
For the desktop client (this project):
@@ -18,9 +18,9 @@
A. Replace "ping" with "findmyphone".
B. Change name, description, icon, author, email, version, website, license info.
C. Remove all the translations
- D. Set X-KDEConnect-SupportedPackageType and X-KDEConnect-OutgoingPackageType to the package type your plugin will receive
+ D. Set X-KDEConnect-SupportedPacketType and X-KDEConnect-OutgoingPacketType to the packet type your plugin will receive
and send, respectively. In this example this is "kdeconnect.findmyphone". Make sure that this matches what is defined in
- the findmyplugin.h file (in the line "#define PACKAGE_TYPE_..."), and also in Android.
+ the findmyplugin.h file (in the line "#define PACKET_TYPE_..."), and also in Android.
10. Now you have an empty skeleton to implement your new plugin logic.
For Android (project kdeconnect-android):
@@ -37,6 +37,6 @@
7. Open src/org/kde/kdeconnect/Plugins/PluginFactory.java.
A. Copy "import … PingPlugin" line with replacing "PingPlugin" with "FindMyPhonePlugin".
B. Copy "PluginFactory.registerPlugin(PingPlugin.class);" line with replacing "PingPlugin" with "FindMyPhonePlugin".
-8. Open src/org/kde/kdeconnect/NetworkPackage.java. Copy a "public final static String PACKAGE_TYPE_PING = …" line
- replacing "PING" with the package type you will be using (should match the desktop client).
+8. Open src/org/kde/kdeconnect/NetworkPacket.java. Copy a "public final static String PACKET_TYPE_PING = …" line
+ replacing "PING" with the packet type you will be using (should match the desktop client).
9. Now you have an empty skeleton to implement your new plugin logic.
diff -Nru kdeconnect-1.2.1/plugins/remotecommands/kdeconnect_remotecommands.json kdeconnect-1.3.0/plugins/remotecommands/kdeconnect_remotecommands.json
--- kdeconnect-1.2.1/plugins/remotecommands/kdeconnect_remotecommands.json 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/remotecommands/kdeconnect_remotecommands.json 2018-04-08 14:35:04.000000000 +0000
@@ -1,5 +1,4 @@
{
- "Encoding": "UTF-8",
"KPlugin": {
"Authors": [
{
@@ -14,7 +13,7 @@
],
"Description": "Trigger commands predefined on the remote device",
"Description[ar]": "نفّذ أوامر معرّفة مسبقًا في الجهاز البعيد",
- "Description[ca@valencia]": "Activa ordes predefinides en el dispositiu remot",
+ "Description[ca@valencia]": "Activa ordres predefinides en el dispositiu remot",
"Description[ca]": "Activa ordres predefinides en el dispositiu remot",
"Description[cs]": "Spouštět příkazy předpřipravené na vzdáleném zařízení",
"Description[da]": "Udløs kommandoer som er prædefinerede på den eksterne enhed",
@@ -51,7 +50,7 @@
"License": "GPL",
"Name": "Host remote commands",
"Name[ar]": "استضف الأوامر البعيدة",
- "Name[ca@valencia]": "Allotja ordes remotes",
+ "Name[ca@valencia]": "Allotja ordres remotes",
"Name[ca]": "Allotja ordres remotes",
"Name[cs]": "Přijímat vzdálené příkazy",
"Name[da]": "Vært for eksterne kommandoer",
@@ -85,10 +84,10 @@
],
"Version": "0.1"
},
- "X-KdeConnect-OutgoingPackageType": [
+ "X-KdeConnect-OutgoingPacketType": [
"kdeconnect.runcommand.request"
],
- "X-KdeConnect-SupportedPackageType": [
+ "X-KdeConnect-SupportedPacketType": [
"kdeconnect.runcommand"
]
}
diff -Nru kdeconnect-1.2.1/plugins/remotecommands/remotecommandsplugin.cpp kdeconnect-1.3.0/plugins/remotecommands/remotecommandsplugin.cpp
--- kdeconnect-1.2.1/plugins/remotecommands/remotecommandsplugin.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/remotecommands/remotecommandsplugin.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -30,10 +30,10 @@
#include
#include
-#include
+#include
#include
-#define PACKAGE_TYPE_RUNCOMMAND_REQUEST QLatin1String("kdeconnect.runcommand.request")
+#define PACKET_TYPE_RUNCOMMAND_REQUEST QLatin1String("kdeconnect.runcommand.request")
K_PLUGIN_FACTORY_WITH_JSON( KdeConnectPluginFactory, "kdeconnect_remotecommands.json", registerPlugin< RemoteCommandsPlugin >(); )
@@ -47,7 +47,7 @@
RemoteCommandsPlugin::~RemoteCommandsPlugin() = default;
-bool RemoteCommandsPlugin::receivePackage(const NetworkPackage& np)
+bool RemoteCommandsPlugin::receivePacket(const NetworkPacket& np)
{
if (np.has(QStringLiteral("commandList"))) {
setCommands(np.get(QStringLiteral("commandList")));
@@ -59,8 +59,8 @@
void RemoteCommandsPlugin::connected()
{
- NetworkPackage np(PACKAGE_TYPE_RUNCOMMAND_REQUEST, {{"requestCommandList", true}});
- sendPackage(np);
+ NetworkPacket np(PACKET_TYPE_RUNCOMMAND_REQUEST, {{"requestCommandList", true}});
+ sendPacket(np);
}
QString RemoteCommandsPlugin::dbusPath() const
@@ -78,8 +78,8 @@
void RemoteCommandsPlugin::triggerCommand(const QString& key)
{
- NetworkPackage np(PACKAGE_TYPE_RUNCOMMAND_REQUEST, {{ "key", key }});
- sendPackage(np);
+ NetworkPacket np(PACKET_TYPE_RUNCOMMAND_REQUEST, {{ "key", key }});
+ sendPacket(np);
}
#include "remotecommandsplugin.moc"
diff -Nru kdeconnect-1.2.1/plugins/remotecommands/remotecommandsplugin.h kdeconnect-1.3.0/plugins/remotecommands/remotecommandsplugin.h
--- kdeconnect-1.2.1/plugins/remotecommands/remotecommandsplugin.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/remotecommands/remotecommandsplugin.h 2018-04-08 14:35:04.000000000 +0000
@@ -44,7 +44,7 @@
Q_SCRIPTABLE void triggerCommand(const QString& key);
QByteArray commands() const { return m_commands; }
- bool receivePackage(const NetworkPackage& np) override;
+ bool receivePacket(const NetworkPacket& np) override;
void connected() override;
QString dbusPath() const override;
diff -Nru kdeconnect-1.2.1/plugins/remotecontrol/kdeconnect_remotecontrol.json kdeconnect-1.3.0/plugins/remotecontrol/kdeconnect_remotecontrol.json
--- kdeconnect-1.2.1/plugins/remotecontrol/kdeconnect_remotecontrol.json 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/remotecontrol/kdeconnect_remotecontrol.json 2018-04-08 14:35:04.000000000 +0000
@@ -1,5 +1,4 @@
{
- "Encoding": "UTF-8",
"KPlugin": {
"Authors": [
{
@@ -85,8 +84,8 @@
"Version": "0.1",
"Website": "https://kde.org"
},
- "X-KdeConnect-OutgoingPackageType": [
+ "X-KdeConnect-OutgoingPacketType": [
"kdeconnect.mousepad.request"
],
- "X-KdeConnect-SupportedPackageType": []
+ "X-KdeConnect-SupportedPacketType": []
}
diff -Nru kdeconnect-1.2.1/plugins/remotecontrol/remotecontrolplugin.cpp kdeconnect-1.3.0/plugins/remotecontrol/remotecontrolplugin.cpp
--- kdeconnect-1.2.1/plugins/remotecontrol/remotecontrolplugin.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/remotecontrol/remotecontrolplugin.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -44,17 +44,17 @@
void RemoteControlPlugin::moveCursor(const QPoint &p)
{
- NetworkPackage np(PACKAGE_TYPE_MOUSEPAD_REQUEST, {
+ NetworkPacket np(PACKET_TYPE_MOUSEPAD_REQUEST, {
{"dx", p.x()},
{"dy", p.y()}
});
- sendPackage(np);
+ sendPacket(np);
}
void RemoteControlPlugin::sendCommand(const QString &name, bool val)
{
- NetworkPackage np(PACKAGE_TYPE_MOUSEPAD_REQUEST, {{name, val}});
- sendPackage(np);
+ NetworkPacket np(PACKET_TYPE_MOUSEPAD_REQUEST, {{name, val}});
+ sendPacket(np);
}
QString RemoteControlPlugin::dbusPath() const
diff -Nru kdeconnect-1.2.1/plugins/remotecontrol/remotecontrolplugin.h kdeconnect-1.3.0/plugins/remotecontrol/remotecontrolplugin.h
--- kdeconnect-1.2.1/plugins/remotecontrol/remotecontrolplugin.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/remotecontrol/remotecontrolplugin.h 2018-04-08 14:35:04.000000000 +0000
@@ -25,7 +25,7 @@
#include
-#define PACKAGE_TYPE_MOUSEPAD_REQUEST QStringLiteral("kdeconnect.mousepad.request")
+#define PACKET_TYPE_MOUSEPAD_REQUEST QStringLiteral("kdeconnect.mousepad.request")
class Q_DECL_EXPORT RemoteControlPlugin
: public KdeConnectPlugin
@@ -37,7 +37,7 @@
explicit RemoteControlPlugin(QObject* parent, const QVariantList &args);
~RemoteControlPlugin() override;
- bool receivePackage(const NetworkPackage& /*np*/) override { return false; }
+ bool receivePacket(const NetworkPacket& /*np*/) override { return false; }
void connected() override {}
QString dbusPath() const override;
diff -Nru kdeconnect-1.2.1/plugins/remotekeyboard/kdeconnect_remotekeyboard.json kdeconnect-1.3.0/plugins/remotekeyboard/kdeconnect_remotekeyboard.json
--- kdeconnect-1.2.1/plugins/remotekeyboard/kdeconnect_remotekeyboard.json 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/remotekeyboard/kdeconnect_remotekeyboard.json 2018-04-08 14:35:04.000000000 +0000
@@ -1,5 +1,4 @@
{
- "Encoding": "UTF-8",
"KPlugin": {
"Authors": [
{
@@ -75,10 +74,10 @@
],
"Version": "0.1"
},
- "X-KdeConnect-OutgoingPackageType": [
+ "X-KdeConnect-OutgoingPacketType": [
"kdeconnect.mousepad.request"
],
- "X-KdeConnect-SupportedPackageType": [
+ "X-KdeConnect-SupportedPacketType": [
"kdeconnect.mousepad.echo",
"kdeconnect.mousepad.keyboardstate"
]
diff -Nru kdeconnect-1.2.1/plugins/remotekeyboard/remotekeyboardplugin.cpp kdeconnect-1.3.0/plugins/remotekeyboard/remotekeyboardplugin.cpp
--- kdeconnect-1.2.1/plugins/remotekeyboard/remotekeyboardplugin.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/remotekeyboard/remotekeyboardplugin.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -77,12 +77,12 @@
{
}
-bool RemoteKeyboardPlugin::receivePackage(const NetworkPackage& np)
+bool RemoteKeyboardPlugin::receivePacket(const NetworkPacket& np)
{
- if (np.type() == PACKAGE_TYPE_MOUSEPAD_ECHO) {
+ if (np.type() == PACKET_TYPE_MOUSEPAD_ECHO) {
if (!np.has("isAck") || !np.has("key")) {
qCWarning(KDECONNECT_PLUGIN_REMOTEKEYBOARD) << "Invalid packet of type"
- << PACKAGE_TYPE_MOUSEPAD_ECHO;
+ << PACKET_TYPE_MOUSEPAD_ECHO;
return false;
}
// qCWarning(KDECONNECT_PLUGIN_REMOTEKEYBOARD) << "Received keypress" << np;
@@ -92,7 +92,7 @@
np.get("ctrl", false),
np.get("alt", false));
return true;
- } else if (np.type() == PACKAGE_TYPE_MOUSEPAD_KEYBOARDSTATE) {
+ } else if (np.type() == PACKET_TYPE_MOUSEPAD_KEYBOARDSTATE) {
// qCWarning(KDECONNECT_PLUGIN_REMOTEKEYBOARD) << "Received keyboardstate" << np;
if (m_remoteState != np.get("state")) {
m_remoteState = np.get("state");
@@ -107,7 +107,7 @@
bool shift, bool ctrl,
bool alt, bool sendAck) const
{
- NetworkPackage np(PACKAGE_TYPE_MOUSEPAD_REQUEST, {
+ NetworkPacket np(PACKET_TYPE_MOUSEPAD_REQUEST, {
{"key", key},
{"specialKey", specialKey},
{"shift", shift},
@@ -115,7 +115,7 @@
{"alt", alt},
{"sendAck", sendAck}
});
- sendPackage(np);
+ sendPacket(np);
}
void RemoteKeyboardPlugin::sendQKeyEvent(const QVariantMap& keyEvent, bool sendAck) const
diff -Nru kdeconnect-1.2.1/plugins/remotekeyboard/remotekeyboardplugin.h kdeconnect-1.3.0/plugins/remotekeyboard/remotekeyboardplugin.h
--- kdeconnect-1.2.1/plugins/remotekeyboard/remotekeyboardplugin.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/remotekeyboard/remotekeyboardplugin.h 2018-04-08 14:35:04.000000000 +0000
@@ -30,9 +30,9 @@
Q_DECLARE_LOGGING_CATEGORY(KDECONNECT_PLUGIN_REMOTEKEYBOARD);
-#define PACKAGE_TYPE_MOUSEPAD_REQUEST QLatin1String("kdeconnect.mousepad.request")
-#define PACKAGE_TYPE_MOUSEPAD_ECHO QLatin1String("kdeconnect.mousepad.echo")
-#define PACKAGE_TYPE_MOUSEPAD_KEYBOARDSTATE QLatin1String("kdeconnect.mousepad.keyboardstate")
+#define PACKET_TYPE_MOUSEPAD_REQUEST QLatin1String("kdeconnect.mousepad.request")
+#define PACKET_TYPE_MOUSEPAD_ECHO QLatin1String("kdeconnect.mousepad.echo")
+#define PACKET_TYPE_MOUSEPAD_KEYBOARDSTATE QLatin1String("kdeconnect.mousepad.keyboardstate")
class RemoteKeyboardPlugin
: public KdeConnectPlugin
@@ -48,7 +48,7 @@
explicit RemoteKeyboardPlugin(QObject* parent, const QVariantList& args);
~RemoteKeyboardPlugin() override;
- bool receivePackage(const NetworkPackage& np) override;
+ bool receivePacket(const NetworkPacket& np) override;
QString dbusPath() const override;
void connected() override;
diff -Nru kdeconnect-1.2.1/plugins/runcommand/kdeconnect_runcommand_config.desktop kdeconnect-1.3.0/plugins/runcommand/kdeconnect_runcommand_config.desktop
--- kdeconnect-1.2.1/plugins/runcommand/kdeconnect_runcommand_config.desktop 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/runcommand/kdeconnect_runcommand_config.desktop 2018-04-08 14:35:04.000000000 +0000
@@ -9,7 +9,7 @@
Name[ar]=إعدادات ملحقة تشغيل الأوامر
Name[ast]=Axustes del complementu d'execución de comandos
Name[ca]=Ajustaments del connector Executa ordres
-Name[ca@valencia]=Ajustaments del connector Executa ordes
+Name[ca@valencia]=Ajustaments del connector Executa ordres
Name[cs]=Nastavení modulu Spustit příkaz
Name[da]=Indstilling af kør kommando-plugin
Name[de]=Modul-Einstellungen für Befehlsausführung
diff -Nru kdeconnect-1.2.1/plugins/runcommand/kdeconnect_runcommand.json kdeconnect-1.3.0/plugins/runcommand/kdeconnect_runcommand.json
--- kdeconnect-1.2.1/plugins/runcommand/kdeconnect_runcommand.json 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/runcommand/kdeconnect_runcommand.json 2018-04-08 14:35:04.000000000 +0000
@@ -1,5 +1,4 @@
{
- "Encoding": "UTF-8",
"KPlugin": {
"Authors": [
{
@@ -23,7 +22,7 @@
],
"Description": "Execute console commands remotely",
"Description[ar]": "نفّذ أوامر طرفيّة عن بعد",
- "Description[ca@valencia]": "Executa ordes de la consola de forma remota",
+ "Description[ca@valencia]": "Executa ordres de la consola de forma remota",
"Description[ca]": "Executa ordres de la consola de forma remota",
"Description[cs]": "Spouštět konzolové příkazy vzdáleně",
"Description[da]": "Kør konsolkommandoer udefra",
@@ -60,7 +59,7 @@
"License": "GPL",
"Name": "Run commands",
"Name[ar]": "شغّل أوامر",
- "Name[ca@valencia]": "Executa ordes",
+ "Name[ca@valencia]": "Executa ordres",
"Name[ca]": "Executa ordres",
"Name[cs]": "Spustit příkazy",
"Name[da]": "Kør kommandoer",
@@ -98,10 +97,10 @@
"Version": "0.1",
"Website": "http://albertvaka.wordpress.com"
},
- "X-KdeConnect-OutgoingPackageType": [
+ "X-KdeConnect-OutgoingPacketType": [
"kdeconnect.runcommand"
],
- "X-KdeConnect-SupportedPackageType": [
+ "X-KdeConnect-SupportedPacketType": [
"kdeconnect.runcommand.request"
]
}
diff -Nru kdeconnect-1.2.1/plugins/runcommand/runcommand_config.cpp kdeconnect-1.3.0/plugins/runcommand/runcommand_config.cpp
--- kdeconnect-1.2.1/plugins/runcommand/runcommand_config.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/runcommand/runcommand_config.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -24,6 +24,8 @@
#include
#include
#include
+#include
+#include
#include
#include
#include
@@ -35,14 +37,23 @@
K_PLUGIN_FACTORY(ShareConfigFactory, registerPlugin();)
+
RunCommandConfig::RunCommandConfig(QWidget* parent, const QVariantList& args)
: KdeConnectPluginKcm(parent, args, QStringLiteral("kdeconnect_runcommand_config"))
{
+ QMenu* defaultMenu = new QMenu(this);
+ addSuggestedCommand(defaultMenu, i18n("Suspend"), QStringLiteral("systemctl suspend"));
+ addSuggestedCommand(defaultMenu, i18n("Maximum Brightness"), QStringLiteral("qdbus org.kde.Solid.PowerManagement /org/kde/Solid/PowerManagement/Actions/BrightnessControl org.kde.Solid.PowerManagement.Actions.BrightnessControl.setBrightness `qdbus org.kde.Solid.PowerManagement /org/kde/Solid/PowerManagement/Actions/BrightnessControl org.kde.Solid.PowerManagement.Actions.BrightnessControl.brightnessMax`"));
+
QTableView* table = new QTableView(this);
table->horizontalHeader()->setStretchLastSection(true);
table->verticalHeader()->setVisible(false);
QVBoxLayout* layout = new QVBoxLayout(this);
layout->addWidget(table);
+ QPushButton* button = new QPushButton(QIcon::fromTheme(QStringLiteral("list-add")), i18n("Sample commands"), this);
+ button->setMenu(defaultMenu);
+ layout->addWidget(button);
+
setLayout(layout);
m_entriesModel = new QStandardItemModel(this);
@@ -56,6 +67,16 @@
{
}
+void RunCommandConfig::addSuggestedCommand(QMenu* menu, const QString &name, const QString &command)
+{
+ auto action = new QAction(name);
+ connect(action, &QAction::triggered, action, [this, name, command]() {
+ insertRow(0, name, command);
+ Q_EMIT changed(true);
+ });
+ menu->addAction(action);
+}
+
void RunCommandConfig::defaults()
{
KCModule::defaults();
@@ -124,12 +145,17 @@
void RunCommandConfig::insertEmptyRow()
{
- QStandardItem* newName = new QStandardItem;
+ insertRow(m_entriesModel->rowCount(), {}, {});
+}
+
+void RunCommandConfig::insertRow(int i, const QString& name, const QString& command)
+{
+ QStandardItem* newName = new QStandardItem(name);
newName->setEditable(true);
- QStandardItem* newCommand = new QStandardItem;
+ QStandardItem* newCommand = new QStandardItem(command);
newName->setEditable(true);
- m_entriesModel->appendRow(QList() << newName << newCommand);
+ m_entriesModel->insertRow(i, QList() << newName << newCommand);
}
void RunCommandConfig::onDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight)
diff -Nru kdeconnect-1.2.1/plugins/runcommand/runcommand_config.h kdeconnect-1.3.0/plugins/runcommand/runcommand_config.h
--- kdeconnect-1.2.1/plugins/runcommand/runcommand_config.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/runcommand/runcommand_config.h 2018-04-08 14:35:04.000000000 +0000
@@ -23,6 +23,7 @@
#include "kcmplugin/kdeconnectpluginkcm.h"
+class QMenu;
class QStandardItemModel;
class RunCommandConfig
@@ -41,6 +42,8 @@
private Q_SLOTS:
void onDataChanged(const QModelIndex& topLeft, const QModelIndex& bottomRight);
private:
+ void addSuggestedCommand(QMenu* menu, const QString &name, const QString &command);
+ void insertRow(int i, const QString &name, const QString &command);
void insertEmptyRow();
QStandardItemModel* m_entriesModel;
diff -Nru kdeconnect-1.2.1/plugins/runcommand/runcommandplugin.cpp kdeconnect-1.3.0/plugins/runcommand/runcommandplugin.cpp
--- kdeconnect-1.2.1/plugins/runcommand/runcommandplugin.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/runcommand/runcommandplugin.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -30,10 +30,10 @@
#include
#include
-#include
+#include
#include
-#define PACKAGE_TYPE_RUNCOMMAND QStringLiteral("kdeconnect.runcommand")
+#define PACKET_TYPE_RUNCOMMAND QStringLiteral("kdeconnect.runcommand")
K_PLUGIN_FACTORY_WITH_JSON( KdeConnectPluginFactory, "kdeconnect_runcommand.json", registerPlugin< RunCommandPlugin >(); )
@@ -49,7 +49,7 @@
{
}
-bool RunCommandPlugin::receivePackage(const NetworkPackage& np)
+bool RunCommandPlugin::receivePacket(const NetworkPacket& np)
{
if (np.get(QStringLiteral("requestCommandList"), false)) {
sendConfig();
@@ -82,8 +82,8 @@
void RunCommandPlugin::sendConfig()
{
QString commands = config()->get(QStringLiteral("commands"),QStringLiteral("{}"));
- NetworkPackage np(PACKAGE_TYPE_RUNCOMMAND, {{"commandList", commands}});
- sendPackage(np);
+ NetworkPacket np(PACKET_TYPE_RUNCOMMAND, {{"commandList", commands}});
+ sendPacket(np);
}
void RunCommandPlugin::configChanged() {
diff -Nru kdeconnect-1.2.1/plugins/runcommand/runcommandplugin.h kdeconnect-1.3.0/plugins/runcommand/runcommandplugin.h
--- kdeconnect-1.2.1/plugins/runcommand/runcommandplugin.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/runcommand/runcommandplugin.h 2018-04-08 14:35:04.000000000 +0000
@@ -39,7 +39,7 @@
explicit RunCommandPlugin(QObject* parent, const QVariantList& args);
~RunCommandPlugin() override;
- bool receivePackage(const NetworkPackage& np) override;
+ bool receivePacket(const NetworkPacket& np) override;
void connected() override;
private Q_SLOTS:
diff -Nru kdeconnect-1.2.1/plugins/screensaver-inhibit/CMakeLists.txt kdeconnect-1.3.0/plugins/screensaver-inhibit/CMakeLists.txt
--- kdeconnect-1.2.1/plugins/screensaver-inhibit/CMakeLists.txt 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/screensaver-inhibit/CMakeLists.txt 2018-04-08 14:35:04.000000000 +0000
@@ -1,5 +1,3 @@
-find_package(KF5 REQUIRED COMPONENTS Notifications)
-
set(kdeconnect_screensaver_inhibit_SRCS
screensaverinhibitplugin.cpp
)
diff -Nru kdeconnect-1.2.1/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json kdeconnect-1.3.0/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json
--- kdeconnect-1.2.1/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/screensaver-inhibit/kdeconnect_screensaver_inhibit.json 2018-04-08 14:35:04.000000000 +0000
@@ -1,5 +1,4 @@
{
- "Encoding": "UTF-8",
"KPlugin": {
"Authors": [
{
diff -Nru kdeconnect-1.2.1/plugins/screensaver-inhibit/screensaverinhibitplugin.cpp kdeconnect-1.3.0/plugins/screensaver-inhibit/screensaverinhibitplugin.cpp
--- kdeconnect-1.2.1/plugins/screensaver-inhibit/screensaverinhibitplugin.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/screensaver-inhibit/screensaverinhibitplugin.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -76,7 +76,7 @@
}
-bool ScreensaverInhibitPlugin::receivePackage(const NetworkPackage& np)
+bool ScreensaverInhibitPlugin::receivePacket(const NetworkPacket& np)
{
Q_UNUSED(np);
return false;
diff -Nru kdeconnect-1.2.1/plugins/screensaver-inhibit/screensaverinhibitplugin.h kdeconnect-1.3.0/plugins/screensaver-inhibit/screensaverinhibitplugin.h
--- kdeconnect-1.2.1/plugins/screensaver-inhibit/screensaverinhibitplugin.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/screensaver-inhibit/screensaverinhibitplugin.h 2018-04-08 14:35:04.000000000 +0000
@@ -34,7 +34,7 @@
explicit ScreensaverInhibitPlugin(QObject* parent, const QVariantList& args);
~ScreensaverInhibitPlugin() override;
- bool receivePackage(const NetworkPackage& np) override;
+ bool receivePacket(const NetworkPacket& np) override;
void connected() override;
private:
diff -Nru kdeconnect-1.2.1/plugins/sendnotifications/CMakeLists.txt kdeconnect-1.3.0/plugins/sendnotifications/CMakeLists.txt
--- kdeconnect-1.2.1/plugins/sendnotifications/CMakeLists.txt 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/sendnotifications/CMakeLists.txt 2018-04-08 14:35:04.000000000 +0000
@@ -1,5 +1,3 @@
-find_package(KF5 REQUIRED COMPONENTS Notifications KCMUtils I18n IconThemes)
-
set(kdeconnect_sendnotifications_SRCS
sendnotificationsplugin.cpp
notificationslistener.cpp
diff -Nru kdeconnect-1.2.1/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop kdeconnect-1.3.0/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop
--- kdeconnect-1.2.1/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/sendnotifications/kdeconnect_sendnotifications_config.desktop 2018-04-08 14:35:04.000000000 +0000
@@ -25,7 +25,7 @@
Name[it]=Impostazioni dell'estensione di sincronizzazione delle notifiche
Name[ko]=알림 동기화 플러그인 설정
Name[nl]=Instellingen van plug-in voor synchronisatie van meldingen
-Name[nn]=Innstillingar for tillegg for synkronisering av varslingar
+Name[nn]=Innstillingar for synkronisering av varslingar
Name[pl]=Ustawienia wtyczki synchronizującej powiadomienia
Name[pt]=Configuração do 'plugin' de sincronização das notificações
Name[pt_BR]=Configuração do plugin de sincronização das notificações
diff -Nru kdeconnect-1.2.1/plugins/sendnotifications/kdeconnect_sendnotifications.json kdeconnect-1.3.0/plugins/sendnotifications/kdeconnect_sendnotifications.json
--- kdeconnect-1.2.1/plugins/sendnotifications/kdeconnect_sendnotifications.json 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/sendnotifications/kdeconnect_sendnotifications.json 2018-04-08 14:35:04.000000000 +0000
@@ -1,5 +1,4 @@
{
- "Encoding": "UTF-8",
"KPlugin": {
"Authors": [
{
@@ -14,7 +13,7 @@
],
"Description": "Broadcast this computer's notifications, so they can be shown on other devices.",
"Description[ar]": "بُثّ إخطارات هذا الحاسوب، لتظهر على الأجهزة الأخرى.",
- "Description[ca@valencia]": "Transmet les notificacions d'este ordinador, perquè puguen mostrar-se en altres dispositius.",
+ "Description[ca@valencia]": "Transmet les notificacions d'aquest ordinador, perquè puguen mostrar-se en altres dispositius.",
"Description[ca]": "Transmet les notificacions d'aquest ordinador, perquè puguin mostrar-se en altres dispositius.",
"Description[cs]": "Posílat upozornění tohoto počítače, takže mohou být zobrazena na jiných zařízeních.",
"Description[da]": "Udsend denne computers bekendtgørelser, så de kan vises på andre enheder.",
@@ -87,10 +86,10 @@
"Version": "0.1",
"Website": "http://albertvaka.wordpress.com"
},
- "X-KdeConnect-OutgoingPackageType": [
+ "X-KdeConnect-OutgoingPacketType": [
"kdeconnect.notification"
],
- "X-KdeConnect-SupportedPackageType": [
+ "X-KdeConnect-SupportedPacketType": [
"kdeconnect.notification.request"
]
}
diff -Nru kdeconnect-1.2.1/plugins/sendnotifications/notificationslistener.cpp kdeconnect-1.3.0/plugins/sendnotifications/notificationslistener.cpp
--- kdeconnect-1.2.1/plugins/sendnotifications/notificationslistener.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/sendnotifications/notificationslistener.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -237,7 +237,7 @@
return 0;
//qCDebug(KDECONNECT_PLUGIN_SENDNOTIFICATION) << "Sending notification from" << appName << ":" < 0 ? replacesId : ++id)},
{"appName", appName},
{"ticker", ticker},
@@ -268,7 +268,7 @@
np.setPayload(iconSource, iconSource->size());
}
- m_plugin->sendPackage(np);
+ m_plugin->sendPacket(np);
return (replacesId > 0 ? replacesId : id);
}
diff -Nru kdeconnect-1.2.1/plugins/sendnotifications/sendnotificationsplugin.cpp kdeconnect-1.3.0/plugins/sendnotifications/sendnotificationsplugin.cpp
--- kdeconnect-1.2.1/plugins/sendnotifications/sendnotificationsplugin.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/sendnotifications/sendnotificationsplugin.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -40,7 +40,7 @@
delete notificationsListener;
}
-bool SendNotificationsPlugin::receivePackage(const NetworkPackage& np)
+bool SendNotificationsPlugin::receivePacket(const NetworkPacket& np)
{
Q_UNUSED(np);
return true;
diff -Nru kdeconnect-1.2.1/plugins/sendnotifications/sendnotificationsplugin.h kdeconnect-1.3.0/plugins/sendnotifications/sendnotificationsplugin.h
--- kdeconnect-1.2.1/plugins/sendnotifications/sendnotificationsplugin.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/sendnotifications/sendnotificationsplugin.h 2018-04-08 14:35:04.000000000 +0000
@@ -23,7 +23,7 @@
#include "core/kdeconnectplugin.h"
-#define PACKAGE_TYPE_NOTIFICATION QStringLiteral("kdeconnect.notification")
+#define PACKET_TYPE_NOTIFICATION QStringLiteral("kdeconnect.notification")
/*
* This class is just a proxy for NotificationsDbusInterface
@@ -42,7 +42,7 @@
explicit SendNotificationsPlugin(QObject* parent, const QVariantList& args);
~SendNotificationsPlugin() override;
- bool receivePackage(const NetworkPackage& np) override;
+ bool receivePacket(const NetworkPacket& np) override;
void connected() override;
protected:
diff -Nru kdeconnect-1.2.1/plugins/sftp/CMakeLists.txt kdeconnect-1.3.0/plugins/sftp/CMakeLists.txt
--- kdeconnect-1.2.1/plugins/sftp/CMakeLists.txt 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/sftp/CMakeLists.txt 2018-04-08 14:35:04.000000000 +0000
@@ -2,8 +2,6 @@
find_program(HAVE_FUSERMOUNT fusermount)
configure_file(config-sftp.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-sftp.h )
-find_package(KF5 REQUIRED COMPONENTS Notifications KIO)
-
set(kdeconnect_sftp_SRCS
mounter.cpp
mountloop.cpp
diff -Nru kdeconnect-1.2.1/plugins/sftp/kdeconnect_sftp.json kdeconnect-1.3.0/plugins/sftp/kdeconnect_sftp.json
--- kdeconnect-1.2.1/plugins/sftp/kdeconnect_sftp.json 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/sftp/kdeconnect_sftp.json 2018-04-08 14:35:04.000000000 +0000
@@ -1,5 +1,4 @@
{
- "Encoding": "UTF-8",
"KPlugin": {
"Authors": [
{
@@ -92,10 +91,10 @@
"Version": "0.1",
"Website": "http://albertvaka.wordpress.com"
},
- "X-KdeConnect-OutgoingPackageType": [
+ "X-KdeConnect-OutgoingPacketType": [
"kdeconnect.sftp.request"
],
- "X-KdeConnect-SupportedPackageType": [
+ "X-KdeConnect-SupportedPacketType": [
"kdeconnect.sftp"
]
}
diff -Nru kdeconnect-1.2.1/plugins/sftp/mounter.cpp kdeconnect-1.3.0/plugins/sftp/mounter.cpp
--- kdeconnect-1.2.1/plugins/sftp/mounter.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/sftp/mounter.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -39,7 +39,7 @@
, m_started(false)
{
- connect(m_sftp, &SftpPlugin::packageReceived, this, &Mounter::onPakcageReceived);
+ connect(m_sftp, &SftpPlugin::packetReceived, this, &Mounter::onPakcageReceived);
connect(&m_connectTimer, &QTimer::timeout, this, &Mounter::onMountTimeout);
@@ -74,7 +74,7 @@
return loop.exec();
}
-void Mounter::onPakcageReceived(const NetworkPackage& np)
+void Mounter::onPakcageReceived(const NetworkPacket& np)
{
if (np.get(QStringLiteral("stop"), false))
{
@@ -204,8 +204,8 @@
void Mounter::start()
{
- NetworkPackage np(PACKAGE_TYPE_SFTP_REQUEST, {{"startBrowsing", true}});
- m_sftp->sendPackage(np);
+ NetworkPacket np(PACKET_TYPE_SFTP_REQUEST, {{"startBrowsing", true}});
+ m_sftp->sendPacket(np);
m_connectTimer.start();
}
diff -Nru kdeconnect-1.2.1/plugins/sftp/mounter.h kdeconnect-1.3.0/plugins/sftp/mounter.h
--- kdeconnect-1.2.1/plugins/sftp/mounter.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/sftp/mounter.h 2018-04-08 14:35:04.000000000 +0000
@@ -46,7 +46,7 @@
void failed(const QString& message);
private Q_SLOTS:
- void onPakcageReceived(const NetworkPackage& np);
+ void onPakcageReceived(const NetworkPacket& np);
void onStarted();
void onError(QProcess::ProcessError error);
void onFinished(int exitCode, QProcess::ExitStatus exitStatus);
diff -Nru kdeconnect-1.2.1/plugins/sftp/sftpplugin.cpp kdeconnect-1.3.0/plugins/sftp/sftpplugin.cpp
--- kdeconnect-1.2.1/plugins/sftp/sftpplugin.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/sftp/sftpplugin.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -125,14 +125,14 @@
return false;
}
-bool SftpPlugin::receivePackage(const NetworkPackage& np)
+bool SftpPlugin::receivePacket(const NetworkPacket& np)
{
if (!(fields_c - np.body().keys().toSet()).isEmpty()) {
- // package is invalid
+ // packet is invalid
return false;
}
- Q_EMIT packageReceived(np);
+ Q_EMIT packetReceived(np);
remoteDirectories.clear();
if (np.has(QStringLiteral("multiPaths"))) {
diff -Nru kdeconnect-1.2.1/plugins/sftp/sftpplugin.h kdeconnect-1.3.0/plugins/sftp/sftpplugin.h
--- kdeconnect-1.2.1/plugins/sftp/sftpplugin.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/sftp/sftpplugin.h 2018-04-08 14:35:04.000000000 +0000
@@ -24,26 +24,24 @@
#include
#include
-#define PACKAGE_TYPE_SFTP_REQUEST QStringLiteral("kdeconnect.sftp.request")
-
-class KNotification;
+#define PACKET_TYPE_SFTP_REQUEST QStringLiteral("kdeconnect.sftp.request")
class SftpPlugin
: public KdeConnectPlugin
{
Q_OBJECT
Q_CLASSINFO("D-Bus Interface", "org.kde.kdeconnect.device.sftp")
-
+
public:
explicit SftpPlugin(QObject* parent, const QVariantList& args);
~SftpPlugin() override;
- bool receivePackage(const NetworkPackage& np) override;
+ bool receivePacket(const NetworkPacket& np) override;
void connected() override {}
QString dbusPath() const override { return "/modules/kdeconnect/devices/" + deviceId + "/sftp"; }
Q_SIGNALS:
- void packageReceived(const NetworkPackage& np);
+ void packetReceived(const NetworkPacket& np);
Q_SCRIPTABLE void mounted();
Q_SCRIPTABLE void unmounted();
@@ -61,12 +59,12 @@
void onMounted();
void onUnmounted();
void onFailed(const QString& message);
-
+
private:
void knotify(int type, const QString& text, const QPixmap& icon) const;
void addToDolphin();
void removeFromDolphin();
-
+
private:
struct Pimpl;
QScopedPointer d;
diff -Nru kdeconnect-1.2.1/plugins/share/CMakeLists.txt kdeconnect-1.3.0/plugins/share/CMakeLists.txt
--- kdeconnect-1.2.1/plugins/share/CMakeLists.txt 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/share/CMakeLists.txt 2018-04-08 14:35:04.000000000 +0000
@@ -1,5 +1,3 @@
-find_package(KF5 REQUIRED COMPONENTS Notifications KIO)
-
set(kdeconnect_share_SRCS
shareplugin.cpp
)
diff -Nru kdeconnect-1.2.1/plugins/share/kdeconnect_share_config.desktop kdeconnect-1.3.0/plugins/share/kdeconnect_share_config.desktop
--- kdeconnect-1.2.1/plugins/share/kdeconnect_share_config.desktop 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/share/kdeconnect_share_config.desktop 2018-04-08 14:35:04.000000000 +0000
@@ -28,7 +28,7 @@
Name[it]=Impostazioni estensione Condivisione
Name[ko]=공유 플러그인 설정
Name[nl]=Plug-in-instellingen van delen
-Name[nn]=Innstillingar for tillegg for deling
+Name[nn]=Innstillingar for deling
Name[pl]=Ustawienia wtyczki udostępniania
Name[pt]=Configuração do 'plugin' de partilha
Name[pt_BR]=Compartilhar as configurações do plugin
diff -Nru kdeconnect-1.2.1/plugins/share/kdeconnect_share.json kdeconnect-1.3.0/plugins/share/kdeconnect_share.json
--- kdeconnect-1.2.1/plugins/share/kdeconnect_share.json 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/share/kdeconnect_share.json 2018-04-08 14:35:04.000000000 +0000
@@ -1,5 +1,4 @@
{
- "Encoding": "UTF-8",
"KPlugin": {
"Authors": [
{
@@ -90,10 +89,10 @@
"Version": "0.1",
"Website": "http://albertvaka.wordpress.com"
},
- "X-KdeConnect-OutgoingPackageType": [
+ "X-KdeConnect-OutgoingPacketType": [
"kdeconnect.share.request"
],
- "X-KdeConnect-SupportedPackageType": [
+ "X-KdeConnect-SupportedPacketType": [
"kdeconnect.share.request"
]
}
diff -Nru kdeconnect-1.2.1/plugins/share/shareplugin.cpp kdeconnect-1.3.0/plugins/share/shareplugin.cpp
--- kdeconnect-1.2.1/plugins/share/shareplugin.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/share/shareplugin.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -69,21 +69,21 @@
return idx>=0 ? filename.mid(idx + 1) : filename;
}
-bool SharePlugin::receivePackage(const NetworkPackage& np)
+bool SharePlugin::receivePacket(const NetworkPacket& np)
{
/*
//TODO: Write a test like this
- if (np.type() == PACKAGE_TYPE_PING) {
+ if (np.type() == PACKET_TYPE_PING) {
qCDebug(KDECONNECT_PLUGIN_SHARE) << "sending file" << (QDesktopServices::storageLocation(QDesktopServices::HomeLocation) + "/.bashrc");
- NetworkPackage out(PACKAGE_TYPE_SHARE_REQUEST);
+ NetworkPacket out(PACKET_TYPE_SHARE_REQUEST);
out.set("filename", mDestinationDir + "itworks.txt");
AutoClosingQFile* file = new AutoClosingQFile(QDesktopServices::storageLocation(QDesktopServices::HomeLocation) + "/.bashrc"); //Test file to transfer
out.setPayload(file, file->size());
- device()->sendPackage(out);
+ device()->sendPacket(out);
return true;
@@ -155,15 +155,15 @@
void SharePlugin::shareUrl(const QUrl& url)
{
- NetworkPackage package(PACKAGE_TYPE_SHARE_REQUEST);
+ NetworkPacket packet(PACKET_TYPE_SHARE_REQUEST);
if(url.isLocalFile()) {
QSharedPointer ioFile(new QFile(url.toLocalFile()));
- package.setPayload(ioFile, ioFile->size());
- package.set(QStringLiteral("filename"), QUrl(url).fileName());
+ packet.setPayload(ioFile, ioFile->size());
+ packet.set(QStringLiteral("filename"), QUrl(url).fileName());
} else {
- package.set(QStringLiteral("url"), url.toString());
+ packet.set(QStringLiteral("url"), url.toString());
}
- sendPackage(package);
+ sendPacket(packet);
}
QString SharePlugin::dbusPath() const
diff -Nru kdeconnect-1.2.1/plugins/share/shareplugin.h kdeconnect-1.3.0/plugins/share/shareplugin.h
--- kdeconnect-1.2.1/plugins/share/shareplugin.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/share/shareplugin.h 2018-04-08 14:35:04.000000000 +0000
@@ -21,12 +21,11 @@
#ifndef SHAREPLUGIN_H
#define SHAREPLUGIN_H
-#include
#include
#include
-#define PACKAGE_TYPE_SHARE_REQUEST QStringLiteral("kdeconnect.share.request")
+#define PACKET_TYPE_SHARE_REQUEST QStringLiteral("kdeconnect.share.request")
class SharePlugin
: public KdeConnectPlugin
@@ -40,7 +39,7 @@
///Helper method, QDBus won't recognize QUrl
Q_SCRIPTABLE void shareUrl(const QString& url) { shareUrl(QUrl(url)); }
- bool receivePackage(const NetworkPackage& np) override;
+ bool receivePacket(const NetworkPacket& np) override;
void connected() override {}
QString dbusPath() const override;
diff -Nru kdeconnect-1.2.1/plugins/telephony/CMakeLists.txt kdeconnect-1.3.0/plugins/telephony/CMakeLists.txt
--- kdeconnect-1.2.1/plugins/telephony/CMakeLists.txt 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/telephony/CMakeLists.txt 2018-04-08 14:35:04.000000000 +0000
@@ -1,5 +1,3 @@
-find_package(KF5 REQUIRED COMPONENTS Notifications)
-
include_directories(${CMAKE_BINARY_DIR})
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../notifications/) # needed for the sendreplydialog
diff -Nru kdeconnect-1.2.1/plugins/telephony/kdeconnect_telephony.json kdeconnect-1.3.0/plugins/telephony/kdeconnect_telephony.json
--- kdeconnect-1.2.1/plugins/telephony/kdeconnect_telephony.json 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/telephony/kdeconnect_telephony.json 2018-04-08 14:35:04.000000000 +0000
@@ -1,5 +1,4 @@
{
- "Encoding": "UTF-8",
"KPlugin": {
"Authors": [
{
@@ -88,11 +87,11 @@
"Version": "0.1",
"Website": "http://albertvaka.wordpress.com"
},
- "X-KdeConnect-OutgoingPackageType": [
+ "X-KdeConnect-OutgoingPacketType": [
"kdeconnect.telephony.request",
"kdeconnect.sms.request"
],
- "X-KdeConnect-SupportedPackageType": [
+ "X-KdeConnect-SupportedPacketType": [
"kdeconnect.telephony"
]
}
diff -Nru kdeconnect-1.2.1/plugins/telephony/telephonyplugin.cpp kdeconnect-1.3.0/plugins/telephony/telephonyplugin.cpp
--- kdeconnect-1.2.1/plugins/telephony/telephonyplugin.cpp 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/telephony/telephonyplugin.cpp 2018-04-08 14:35:04.000000000 +0000
@@ -39,7 +39,7 @@
{
}
-KNotification* TelephonyPlugin::createNotification(const NetworkPackage& np)
+KNotification* TelephonyPlugin::createNotification(const NetworkPacket& np)
{
const QString event = np.get(QStringLiteral("event"));
const QString phoneNumber = np.get(QStringLiteral("phoneNumber"), i18n("unknown number"));
@@ -107,7 +107,7 @@
if (event == QLatin1String("ringing")) {
notification->setActions( QStringList(i18n("Mute Call")) );
- connect(notification, &KNotification::action1Activated, this, &TelephonyPlugin::sendMutePackage);
+ connect(notification, &KNotification::action1Activated, this, &TelephonyPlugin::sendMutePacket);
} else if (event == QLatin1String("sms")) {
const QString messageBody = np.get(QStringLiteral("messageBody"),QLatin1String(""));
notification->setActions( QStringList(i18n("Reply")) );
@@ -121,7 +121,7 @@
}
-bool TelephonyPlugin::receivePackage(const NetworkPackage& np)
+bool TelephonyPlugin::receivePacket(const NetworkPacket& np)
{
if (np.get(QStringLiteral("isCancel"))) {
@@ -135,20 +135,20 @@
return true;
}
-void TelephonyPlugin::sendMutePackage()
+void TelephonyPlugin::sendMutePacket()
{
- NetworkPackage package(PACKAGE_TYPE_TELEPHONY_REQUEST, {{"action", "mute"}});
- sendPackage(package);
+ NetworkPacket packet(PACKET_TYPE_TELEPHONY_REQUEST, {{"action", "mute"}});
+ sendPacket(packet);
}
void TelephonyPlugin::sendSms(const QString& phoneNumber, const QString& messageBody)
{
- NetworkPackage np(PACKAGE_TYPE_SMS_REQUEST, {
+ NetworkPacket np(PACKET_TYPE_SMS_REQUEST, {
{"sendSms", true},
{"phoneNumber", phoneNumber},
{"messageBody", messageBody}
});
- sendPackage(np);
+ sendPacket(np);
}
void TelephonyPlugin::showSendSmsDialog()
diff -Nru kdeconnect-1.2.1/plugins/telephony/telephonyplugin.h kdeconnect-1.3.0/plugins/telephony/telephonyplugin.h
--- kdeconnect-1.2.1/plugins/telephony/telephonyplugin.h 2018-01-16 22:45:57.000000000 +0000
+++ kdeconnect-1.3.0/plugins/telephony/telephonyplugin.h 2018-04-08 14:35:04.000000000 +0000
@@ -28,8 +28,8 @@
#include
-#define PACKAGE_TYPE_TELEPHONY_REQUEST QStringLiteral("kdeconnect.telephony.request")
-#define PACKAGE_TYPE_SMS_REQUEST QStringLiteral("kdeconnect.sms.request")
+#define PACKET_TYPE_TELEPHONY_REQUEST QStringLiteral("kdeconnect.telephony.request")
+#define PACKET_TYPE_SMS_REQUEST QStringLiteral("kdeconnect.sms.request")
Q_DECLARE_LOGGING_CATEGORY(KDECONNECT_PLUGIN_TELEPHONY)
@@ -42,7 +42,7 @@
public:
explicit TelephonyPlugin(QObject* parent, const QVariantList& args);
- bool receivePackage(const NetworkPackage& np) override;
+ bool receivePacket(const NetworkPacket& np) override;
void connected() override {}
QString dbusPath() const override;
@@ -50,11 +50,11 @@
Q_SCRIPTABLE void sendSms(const QString& phoneNumber, const QString& messageBody);
private Q_SLOTS:
- void sendMutePackage();
+ void sendMutePacket();
void showSendSmsDialog();
private:
- KNotification* createNotification(const NetworkPackage& np);
+ KNotification* createNotification(const NetworkPacket& np);
QDBusInterface m_telepathyInterface;
};
diff -Nru kdeconnect-1.2.1/po/ar/kdeconnect-cli.po kdeconnect-1.3.0/po/ar/kdeconnect-cli.po
--- kdeconnect-1.2.1/po/ar/kdeconnect-cli.po 2018-01-16 22:46:11.000000000 +0000
+++ kdeconnect-1.3.0/po/ar/kdeconnect-cli.po 2018-04-08 14:35:16.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-06-10 02:58+0200\n"
+"POT-Creation-Date: 2018-02-28 03:17+0100\n"
"PO-Revision-Date: ٢٠١٦-٠٩-١٦ ١٧:٤٩+0300\n"
"Last-Translator: Safa Alfulaij \n"
"Language-Team: Arabic \n"
@@ -68,122 +68,146 @@
"السّكربتة"
#: kdeconnect-cli.cpp:54
+#, fuzzy, kde-format
+#| msgid ""
+#| "Make --list-devices or --list-available print only the devices id, to "
+#| "ease scripting"
+msgid ""
+"Make --list-devices or --list-available print only the devices name, to ease "
+"scripting"
+msgstr ""
+"اجعل --list-devices أو --list-available تطبع فقط معرّفات الأجهزة، لتسهيل "
+"السّكربتة"
+
+#: kdeconnect-cli.cpp:55
+#, fuzzy, kde-format
+#| msgid ""
+#| "Make --list-devices or --list-available print only the devices id, to "
+#| "ease scripting"
+msgid ""
+"Make --list-devices or --list-available print only the devices id and name, "
+"to ease scripting"
+msgstr ""
+"اجعل --list-devices أو --list-available تطبع فقط معرّفات الأجهزة، لتسهيل "
+"السّكربتة"
+
+#: kdeconnect-cli.cpp:56
#, kde-format
msgid "Search for devices in the network and re-establish connections"
msgstr "ابحث عن الأجهزة في الشّبكة وأعد إنشاء الاتّصالات"
-#: kdeconnect-cli.cpp:55
+#: kdeconnect-cli.cpp:57
#, kde-format
msgid "Request pairing to a said device"
msgstr "اطلب الاقتران بالجهاز"
-#: kdeconnect-cli.cpp:56
+#: kdeconnect-cli.cpp:58
#, kde-format
msgid "Find the said device by ringing it."
msgstr "جِد الجهاز برنّه."
-#: kdeconnect-cli.cpp:57
+#: kdeconnect-cli.cpp:59
#, kde-format
msgid "Stop pairing to a said device"
msgstr "ألغِ الاقتران بالجهاز"
-#: kdeconnect-cli.cpp:58
+#: kdeconnect-cli.cpp:60
#, kde-format
msgid "Sends a ping to said device"
msgstr "أرسل وخزة إلى الجهاز"
-#: kdeconnect-cli.cpp:59
+#: kdeconnect-cli.cpp:61
#, kde-format
msgid "Same as ping but you can set the message to display"
msgstr "نفس ping لكنّك تستطيع تخصيص الرّسالة الظّاهرة"
-#: kdeconnect-cli.cpp:59 kdeconnect-cli.cpp:63
+#: kdeconnect-cli.cpp:61 kdeconnect-cli.cpp:65
#, kde-format
msgid "message"
msgstr "الرّسالة"
-#: kdeconnect-cli.cpp:60
+#: kdeconnect-cli.cpp:62
#, kde-format
msgid "Share a file to a said device"
msgstr "شارك ملفًّا مع الجهاز"
-#: kdeconnect-cli.cpp:61
+#: kdeconnect-cli.cpp:63
#, kde-format
msgid "Display the notifications on a said device"
msgstr "اعرض الإخطارات في الجهاز"
-#: kdeconnect-cli.cpp:62
+#: kdeconnect-cli.cpp:64
#, kde-format
msgid "Lock the specified device"
msgstr "أوصد الجهاز المحدّد"
-#: kdeconnect-cli.cpp:63
+#: kdeconnect-cli.cpp:65
#, kde-format
msgid "Sends an SMS. Requires destination"
msgstr ""
-#: kdeconnect-cli.cpp:64
+#: kdeconnect-cli.cpp:66
#, kde-format
msgid "Phone number to send the message"
msgstr ""
-#: kdeconnect-cli.cpp:64
+#: kdeconnect-cli.cpp:66
#, kde-format
msgid "phone number"
msgstr ""
-#: kdeconnect-cli.cpp:65
+#: kdeconnect-cli.cpp:67
#, kde-format
msgid "Device ID"
msgstr "معرّف الجهاز"
-#: kdeconnect-cli.cpp:66
+#: kdeconnect-cli.cpp:68
#, kde-format
msgid "Device Name"
msgstr "اسم الجهاز"
-#: kdeconnect-cli.cpp:67
+#: kdeconnect-cli.cpp:69
#, kde-format
msgid "Get encryption info about said device"
msgstr "اجلب معلومات التّعمية للجهاز"
-#: kdeconnect-cli.cpp:68
+#: kdeconnect-cli.cpp:70
#, kde-format
msgid "Lists remote commands and their ids"
msgstr "اسرد الأوامر البعيدة ومعرّفاتها"
-#: kdeconnect-cli.cpp:69
+#: kdeconnect-cli.cpp:71
#, kde-format
msgid "Executes a remote command by id"
msgstr "نفّذ أمرًا بعيدًا بمعرّفه"
-#: kdeconnect-cli.cpp:70
+#: kdeconnect-cli.cpp:72
#, fuzzy, kde-format
#| msgid "Sends a ping to said device"
msgid "Sends keys to a said device"
msgstr "أرسل وخزة إلى الجهاز"
-#: kdeconnect-cli.cpp:71
+#: kdeconnect-cli.cpp:73
#, kde-format
msgid "Display this device's id and exit"
msgstr ""
-#: kdeconnect-cli.cpp:102
+#: kdeconnect-cli.cpp:114
#, kde-format
msgid "(paired and reachable)"
msgstr "(مُقترن به ويمكن الوصول إليه)"
-#: kdeconnect-cli.cpp:104
+#: kdeconnect-cli.cpp:116
#, kde-format
msgid "(reachable)"
msgstr "(يمكن الوصول إليه)"
-#: kdeconnect-cli.cpp:106
+#: kdeconnect-cli.cpp:118
#, kde-format
msgid "(paired)"
msgstr "(مُقترن به)"
-#: kdeconnect-cli.cpp:113
+#: kdeconnect-cli.cpp:125
#, kde-format
msgid "1 device found"
msgid_plural "%1 devices found"
@@ -194,64 +218,69 @@
msgstr[4] "وُجد %1 جهازًا"
msgstr[5] "وُجد %1 جهاز"
-#: kdeconnect-cli.cpp:115
+#: kdeconnect-cli.cpp:127
#, kde-format
msgid "No devices found"
msgstr "لا أجهزة"
-#: kdeconnect-cli.cpp:133
+#: kdeconnect-cli.cpp:145
#, kde-format
msgid "No device specified"
msgstr "لا جهاز محدّد"
-#: kdeconnect-cli.cpp:145
+#: kdeconnect-cli.cpp:158
+#, kde-format
+msgid "Can't find the file: %1"
+msgstr ""
+
+#: kdeconnect-cli.cpp:169
#, kde-format
-msgid "Couldn't share %1"
-msgstr "تعذّرت مشاركة %1"
+msgid "Sent %1"
+msgstr ""
-#: kdeconnect-cli.cpp:152
+#: kdeconnect-cli.cpp:176
#, kde-format
msgid "waiting for device..."
msgstr "ينتظر الجهاز..."
-#: kdeconnect-cli.cpp:166
+#: kdeconnect-cli.cpp:190
#, kde-format
msgid "Device not found"
msgstr "لم يوجد الجهاز"
-#: kdeconnect-cli.cpp:168
+#: kdeconnect-cli.cpp:192
#, kde-format
msgid "Already paired"
msgstr "مُقترن به فعلًا"
-#: kdeconnect-cli.cpp:170
+#: kdeconnect-cli.cpp:194
#, kde-format
msgid "Pair requested"
msgstr "طُلب الاقتران"
-#: kdeconnect-cli.cpp:177
+#: kdeconnect-cli.cpp:201
#, kde-format
msgid "Device does not exist"
msgstr "الجهاز غير موجود"
-#: kdeconnect-cli.cpp:179
+#: kdeconnect-cli.cpp:203
#, kde-format
msgid "Already not paired"
msgstr "ليس مُقترنًا به فعلًا"
-#: kdeconnect-cli.cpp:181
+#: kdeconnect-cli.cpp:205
#, kde-format
msgid "Unpaired"
msgstr "ليس مُقترنًا به"
-#: kdeconnect-cli.cpp:197
+#: kdeconnect-cli.cpp:221
#, kde-format
msgid ""
"error: should specify the SMS's recipient by passing --destination "
msgstr ""
-#: kdeconnect-cli.cpp:244
+#: kdeconnect-cli.cpp:268
#, kde-format
msgid "Nothing to be done"
msgstr "لا شيء للقيام به"
\ No newline at end of file
diff -Nru kdeconnect-1.2.1/po/ar/kdeconnect-core.po kdeconnect-1.3.0/po/ar/kdeconnect-core.po
--- kdeconnect-1.2.1/po/ar/kdeconnect-core.po 2018-01-16 22:46:11.000000000 +0000
+++ kdeconnect-1.3.0/po/ar/kdeconnect-core.po 2018-04-08 14:35:16.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-09-19 03:23+0200\n"
+"POT-Creation-Date: 2018-03-06 03:17+0100\n"
"PO-Revision-Date: ٢٠١٦-٠٩-١٦ ١٧:٥٣+0300\n"
"Last-Translator: Safa Alfulaij \n"
"Language-Team: Arabic \n"
@@ -53,22 +53,22 @@
msgid "Couldn't find an available port"
msgstr "تعّّر إيجاد منفذ متوفّر"
-#: device.cpp:160
+#: device.cpp:156
#, kde-format
msgid "Already paired"
msgstr "مُقترن به فعلًا"
-#: device.cpp:165
+#: device.cpp:161
#, kde-format
msgid "Device not reachable"
msgstr "لا يمكن الوصول إلى الجهاز"
-#: device.cpp:477
+#: device.cpp:473
#, kde-format
msgid "SHA1 fingerprint of your device certificate is: %1\n"
msgstr "بصمة SHA1 لشهادة جهازك هي: %1\n"
-#: device.cpp:485
+#: device.cpp:481
#, kde-format
msgid "SHA1 fingerprint of remote device certificate is: %1\n"
msgstr "بصمة SHA1 لشهادة الجهاز البعيد هي: %1\n"
@@ -106,11 +106,15 @@
msgstr "فشل بدء «كدي المتّصل»"
#: kdeconnectconfig.cpp:70
-#, kde-format
+#, fuzzy, kde-format
+#| msgid ""
+#| "Could not find support for RSA in your QCA installation. If your "
+#| "distribution provides separate packages for QCA-ossl and QCA-gnupg, make "
+#| "sure you have them installed and try again."
msgid ""
"Could not find support for RSA in your QCA installation. If your "
-"distribution provides separate packages for QCA-ossl and QCA-gnupg, make "
-"sure you have them installed and try again."
+"distribution provides separate packets for QCA-ossl and QCA-gnupg, make sure "
+"you have them installed and try again."
msgstr ""
"تعذّر إيجاد دعم RSA في تثبيت QCA لديك. إن كانت توفّر التّوزيعة حزمًا منفصلة لQCA-"
"ossl و QCA-gnupg، تأكّد من تثبيتها وجرّب مجدّدًا."
diff -Nru kdeconnect-1.2.1/po/ar/kdeconnect-kcm.po kdeconnect-1.3.0/po/ar/kdeconnect-kcm.po
--- kdeconnect-1.2.1/po/ar/kdeconnect-kcm.po 2018-01-16 22:46:11.000000000 +0000
+++ kdeconnect-1.3.0/po/ar/kdeconnect-kcm.po 2018-04-08 14:35:16.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-07-14 03:06+0200\n"
+"POT-Creation-Date: 2018-02-18 03:11+0100\n"
"PO-Revision-Date: 2017-01-23 11:11+0300\n"
"Last-Translator: Safa Alfulaij \n"
"Language-Team: Arabic \n"
@@ -85,88 +85,92 @@
msgid "KDE Connect"
msgstr "كدي المتّصل"
+#. i18n: ectx: property (text), widget (QToolButton, renameShow_button)
+#: kcm.ui:70
+#, kde-format
+msgid "Edit"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QToolButton, renameDone_button)
+#: kcm.ui:92
+#, kde-format
+msgid "Save"
+msgstr ""
+
#. i18n: ectx: property (text), widget (QPushButton, refresh_button)
-#: kcm.ui:110
+#: kcm.ui:108
#, kde-format
msgid "Refresh"
msgstr "أنعش"
#. i18n: ectx: property (text), widget (QLabel, name_label)
-#: kcm.ui:157
+#: kcm.ui:155
#, kde-format
msgid "Device"
msgstr "الجهاز"
#. i18n: ectx: property (text), widget (QLabel, status_label)
-#: kcm.ui:173
+#: kcm.ui:171
#, kde-format
msgid "(status)"
msgstr "(الحالة)"
#. i18n: ectx: property (text), widget (QPushButton, accept_button)
-#: kcm.ui:212
+#: kcm.ui:210
#, kde-format
msgid "Accept"
msgstr ""
#. i18n: ectx: property (text), widget (QPushButton, reject_button)
-#: kcm.ui:219
+#: kcm.ui:217
#, kde-format
msgid "Reject"
msgstr ""
#. i18n: ectx: property (text), widget (QPushButton, pair_button)
-#: kcm.ui:232
+#: kcm.ui:230
#, kde-format
msgid "Request pair"
msgstr "اطلب الاقتران"
#. i18n: ectx: property (text), widget (QPushButton, unpair_button)
-#: kcm.ui:245
+#: kcm.ui:243
#, kde-format
msgid "Unpair"
msgstr "أزل الاقتران"
#. i18n: ectx: property (text), widget (QPushButton, ping_button)
-#: kcm.ui:258
+#: kcm.ui:256
#, kde-format
msgid "Send ping"
msgstr "أرسل وخزة"
-#. i18n: ectx: property (text), widget (QLabel, noDeviceLabel)
-#: kcm.ui:303
-#, kde-format
-msgid "No device selected."
-msgstr "لم يحدّد جهاز."
-
#. i18n: ectx: property (text), widget (QLabel, noDeviceLinks)
-#: kcm.ui:319
-#, kde-format
+#: kcm.ui:294
+#, fuzzy, kde-format
+#| msgid ""
+#| "If you own an Android device, make sure to install "
+#| "the KDE Connect "
+#| "Android app (also available from F-Droid) and it should appear "
+#| "in the list.
"
msgid ""
-"If you own an Android device, make sure to install the "
-"KDE Connect Android app"
-"span> (also available from F-Droid) and it should appear in the list.
"
-"html>"
+"No device selected.
If you own an Android "
+"device, make sure to install the KDE Connect Android app (also "
+"available from F-Droid) and it should appear in the list.
If you "
+"are having problems, visit the KDE Connect "
+"Community wiki for help.
"
msgstr ""
"إن كنت تملك جهاز أندرويد، تأكّد من تثبيت تطبيق «كدي المتّصل» لأندويد"
"span> (متوفّر أيضًا في F-Droid) وسيظهر الجهاز في القائمة.
"
-
-#. i18n: ectx: property (text), widget (QLabel, noDeviceTroubleshoot)
-#: kcm.ui:350
-#, kde-format
-msgid ""
-"If you are having problems, visit the KDE Connect Community wiki for help.
"
-"html>"
-msgstr ""
-"إن واجهتك مشاكل زُر ويكي مجتمع «كدي "
-"المتّصل» للمساعدة.
"
\ No newline at end of file
+"\">في F-Droid) وسيظهر الجهاز في القائمة."
\ No newline at end of file
diff -Nru kdeconnect-1.2.1/po/ar/kdeconnect-plugins.po kdeconnect-1.3.0/po/ar/kdeconnect-plugins.po
--- kdeconnect-1.2.1/po/ar/kdeconnect-plugins.po 2018-01-16 22:46:11.000000000 +0000
+++ kdeconnect-1.3.0/po/ar/kdeconnect-plugins.po 2018-04-08 14:35:16.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-12-30 03:03+0100\n"
+"POT-Creation-Date: 2018-04-05 03:28+0200\n"
"PO-Revision-Date: ٢٠١٦-٠٩-١٦ ١٧:٤٣+0300\n"
"Last-Translator: Safa Alfulaij \n"
"Language-Team: Arabic \n"
@@ -18,28 +18,28 @@
"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
"X-Generator: Lokalize 2.0\n"
-#: battery/batteryplugin.cpp:77
+#: battery/batteryplugin.cpp:75
#, kde-format
msgctxt "device name: low battery"
msgid "%1: Low Battery"
msgstr "%1: البطّاريّة ضعيفة"
-#: battery/batteryplugin.cpp:78
+#: battery/batteryplugin.cpp:75
#, kde-format
msgid "Battery at %1%"
msgstr "البطّاريّة عند %1%"
-#: mousepad/mousepadplugin.cpp:131
+#: mousepad/waylandremoteinput.cpp:59
#, kde-format
msgid "KDE Connect"
msgstr "كدي المتّصل"
-#: mousepad/mousepadplugin.cpp:131
+#: mousepad/waylandremoteinput.cpp:59
#, kde-format
msgid "Use your phone as a touchpad and keyboard"
msgstr "استخدم هاتفك كلوحتي لمس ومفاتيح"
-#: notifications/notification.cpp:127 telephony/telephonyplugin.cpp:113
+#: notifications/notification.cpp:120 telephony/telephonyplugin.cpp:113
#, kde-format
msgid "Reply"
msgstr "رُدّ"
@@ -97,18 +97,33 @@
msgid "Mute system sound"
msgstr "اكتم صوت النّظام"
-#: ping/pingplugin.cpp:54
+#: ping/pingplugin.cpp:50
#, kde-format
msgid "Ping!"
msgstr "وخزة!"
-#: runcommand/runcommand_config.cpp:51
+#: runcommand/runcommand_config.cpp:45
+#, kde-format
+msgid "Suspend"
+msgstr ""
+
+#: runcommand/runcommand_config.cpp:46
+#, kde-format
+msgid "Maximum Brightness"
+msgstr ""
+
+#: runcommand/runcommand_config.cpp:53
+#, kde-format
+msgid "Sample commands"
+msgstr ""
+
+#: runcommand/runcommand_config.cpp:62
#: sendnotifications/notifyingapplicationmodel.cpp:208
#, kde-format
msgid "Name"
msgstr "الاسم"
-#: runcommand/runcommand_config.cpp:51
+#: runcommand/runcommand_config.cpp:62
#, kde-format
msgid "Command"
msgstr "الأمر"
diff -Nru kdeconnect-1.2.1/po/ar/plasma_applet_org.kde.kdeconnect.po kdeconnect-1.3.0/po/ar/plasma_applet_org.kde.kdeconnect.po
--- kdeconnect-1.2.1/po/ar/plasma_applet_org.kde.kdeconnect.po 2018-01-16 22:46:11.000000000 +0000
+++ kdeconnect-1.3.0/po/ar/plasma_applet_org.kde.kdeconnect.po 2018-04-08 14:35:16.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-01-10 04:36+0100\n"
+"POT-Creation-Date: 2018-03-25 04:16+0200\n"
"PO-Revision-Date: ٢٠١٦-٠٩-١٦ ١٧:٤١+0300\n"
"Last-Translator: Safa Alfulaij \n"
"Language-Team: Arabic \n"
@@ -52,10 +52,24 @@
msgid "Notifications:"
msgstr "الإخطارات"
+#: package/contents/ui/DeviceDelegate.qml:209
+#, fuzzy
+#| msgid "Notifications"
+msgid "Dismiss all notifications"
+msgstr "الإخطارات"
+
+#: package/contents/ui/DeviceDelegate.qml:245
+msgid "Reply"
+msgstr ""
+
+#: package/contents/ui/DeviceDelegate.qml:254
+msgid "Dismiss"
+msgstr ""
+
#: package/contents/ui/FullRepresentation.qml:35
msgid "No paired devices available"
msgstr "لا أجهزة مقترنة متوفّرة"
-#: package/contents/ui/main.qml:60
+#: package/contents/ui/main.qml:59
msgid "KDE Connect Settings..."
msgstr "إعدادات «كدي المتّصل»..."
\ No newline at end of file
diff -Nru kdeconnect-1.2.1/po/ast/kdeconnect-cli.po kdeconnect-1.3.0/po/ast/kdeconnect-cli.po
--- kdeconnect-1.2.1/po/ast/kdeconnect-cli.po 2018-01-16 22:46:11.000000000 +0000
+++ kdeconnect-1.3.0/po/ast/kdeconnect-cli.po 2018-04-08 14:35:16.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-06-10 02:58+0200\n"
+"POT-Creation-Date: 2018-02-28 03:17+0100\n"
"PO-Revision-Date: 2017-01-05 16:22+0100\n"
"Last-Translator: enolp \n"
"Language-Team: Asturian \n"
@@ -66,184 +66,203 @@
#: kdeconnect-cli.cpp:54
#, kde-format
-msgid "Search for devices in the network and re-establish connections"
+msgid ""
+"Make --list-devices or --list-available print only the devices name, to ease "
+"scripting"
msgstr ""
#: kdeconnect-cli.cpp:55
#, kde-format
-msgid "Request pairing to a said device"
+msgid ""
+"Make --list-devices or --list-available print only the devices id and name, "
+"to ease scripting"
msgstr ""
#: kdeconnect-cli.cpp:56
#, kde-format
-msgid "Find the said device by ringing it."
+msgid "Search for devices in the network and re-establish connections"
msgstr ""
#: kdeconnect-cli.cpp:57
#, kde-format
-msgid "Stop pairing to a said device"
+msgid "Request pairing to a said device"
msgstr ""
#: kdeconnect-cli.cpp:58
#, kde-format
-msgid "Sends a ping to said device"
+msgid "Find the said device by ringing it."
msgstr ""
#: kdeconnect-cli.cpp:59
#, kde-format
+msgid "Stop pairing to a said device"
+msgstr ""
+
+#: kdeconnect-cli.cpp:60
+#, kde-format
+msgid "Sends a ping to said device"
+msgstr ""
+
+#: kdeconnect-cli.cpp:61
+#, kde-format
msgid "Same as ping but you can set the message to display"
msgstr ""
-#: kdeconnect-cli.cpp:59 kdeconnect-cli.cpp:63
+#: kdeconnect-cli.cpp:61 kdeconnect-cli.cpp:65
#, kde-format
msgid "message"
msgstr "mensaxe"
-#: kdeconnect-cli.cpp:60
+#: kdeconnect-cli.cpp:62
#, kde-format
msgid "Share a file to a said device"
msgstr ""
-#: kdeconnect-cli.cpp:61
+#: kdeconnect-cli.cpp:63
#, kde-format
msgid "Display the notifications on a said device"
msgstr ""
-#: kdeconnect-cli.cpp:62
+#: kdeconnect-cli.cpp:64
#, kde-format
msgid "Lock the specified device"
msgstr ""
-#: kdeconnect-cli.cpp:63
+#: kdeconnect-cli.cpp:65
#, kde-format
msgid "Sends an SMS. Requires destination"
msgstr "Unvia un SMS. Rique un destinatariu"
-#: kdeconnect-cli.cpp:64
+#: kdeconnect-cli.cpp:66
#, kde-format
msgid "Phone number to send the message"
msgstr ""
-#: kdeconnect-cli.cpp:64
+#: kdeconnect-cli.cpp:66
#, kde-format
msgid "phone number"
msgstr "númberu de teléfonu"
-#: kdeconnect-cli.cpp:65
+#: kdeconnect-cli.cpp:67
#, kde-format
msgid "Device ID"
msgstr "ID del preséu"
-#: kdeconnect-cli.cpp:66
+#: kdeconnect-cli.cpp:68
#, kde-format
msgid "Device Name"
msgstr "Nome del preséu"
-#: kdeconnect-cli.cpp:67
+#: kdeconnect-cli.cpp:69
#, kde-format
msgid "Get encryption info about said device"
msgstr ""
-#: kdeconnect-cli.cpp:68
+#: kdeconnect-cli.cpp:70
#, kde-format
msgid "Lists remote commands and their ids"
msgstr ""
-#: kdeconnect-cli.cpp:69
+#: kdeconnect-cli.cpp:71
#, kde-format
msgid "Executes a remote command by id"
msgstr ""
-#: kdeconnect-cli.cpp:70
+#: kdeconnect-cli.cpp:72
#, kde-format
msgid "Sends keys to a said device"
msgstr ""
-#: kdeconnect-cli.cpp:71
+#: kdeconnect-cli.cpp:73
#, kde-format
msgid "Display this device's id and exit"
msgstr ""
-#: kdeconnect-cli.cpp:102
+#: kdeconnect-cli.cpp:114
#, kde-format
msgid "(paired and reachable)"
msgstr ""
-#: kdeconnect-cli.cpp:104
+#: kdeconnect-cli.cpp:116
#, kde-format
msgid "(reachable)"
msgstr ""
-#: kdeconnect-cli.cpp:106
+#: kdeconnect-cli.cpp:118
#, kde-format
msgid "(paired)"
msgstr ""
-#: kdeconnect-cli.cpp:113
+#: kdeconnect-cli.cpp:125
#, kde-format
msgid "1 device found"
msgid_plural "%1 devices found"
msgstr[0] ""
msgstr[1] ""
-#: kdeconnect-cli.cpp:115
+#: kdeconnect-cli.cpp:127
#, kde-format
msgid "No devices found"
msgstr "Nun s'alcontraron preseos"
-#: kdeconnect-cli.cpp:133
+#: kdeconnect-cli.cpp:145
#, kde-format
msgid "No device specified"
msgstr "Nun s'especificaron preseos"
-#: kdeconnect-cli.cpp:145
+#: kdeconnect-cli.cpp:158
+#, kde-format
+msgid "Can't find the file: %1"
+msgstr ""
+
+#: kdeconnect-cli.cpp:169
#, kde-format
-msgid "Couldn't share %1"
-msgstr "Nun pudo compartise %1"
+msgid "Sent %1"
+msgstr ""
-#: kdeconnect-cli.cpp:152
+#: kdeconnect-cli.cpp:176
#, kde-format
msgid "waiting for device..."
msgstr "esperando pol preséu..."
-#: kdeconnect-cli.cpp:166
+#: kdeconnect-cli.cpp:190
#, kde-format
msgid "Device not found"
msgstr "Nun s'alcontró'l preséu"
-#: kdeconnect-cli.cpp:168
+#: kdeconnect-cli.cpp:192
#, kde-format
msgid "Already paired"
msgstr "Yá s'empareyó"
-#: kdeconnect-cli.cpp:170
+#: kdeconnect-cli.cpp:194
#, kde-format
msgid "Pair requested"
msgstr ""
-#: kdeconnect-cli.cpp:177
+#: kdeconnect-cli.cpp:201
#, kde-format
msgid "Device does not exist"
msgstr "Nun esiste'l preséu"
-#: kdeconnect-cli.cpp:179
+#: kdeconnect-cli.cpp:203
#, kde-format
msgid "Already not paired"
msgstr ""
-#: kdeconnect-cli.cpp:181
+#: kdeconnect-cli.cpp:205
#, kde-format
msgid "Unpaired"
msgstr ""
-#: kdeconnect-cli.cpp:197
+#: kdeconnect-cli.cpp:221
#, kde-format
msgid ""
"error: should specify the SMS's recipient by passing --destination "
msgstr ""
-#: kdeconnect-cli.cpp:244
+#: kdeconnect-cli.cpp:268
#, kde-format
msgid "Nothing to be done"
msgstr "Nada pa facer"
\ No newline at end of file
diff -Nru kdeconnect-1.2.1/po/ast/kdeconnect-core.po kdeconnect-1.3.0/po/ast/kdeconnect-core.po
--- kdeconnect-1.2.1/po/ast/kdeconnect-core.po 2018-01-16 22:46:11.000000000 +0000
+++ kdeconnect-1.3.0/po/ast/kdeconnect-core.po 2018-04-08 14:35:16.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-09-19 03:23+0200\n"
+"POT-Creation-Date: 2018-03-06 03:17+0100\n"
"PO-Revision-Date: 2017-02-01 18:25+0100\n"
"Last-Translator: enolp \n"
"Language-Team: Asturian \n"
@@ -54,22 +54,22 @@
msgid "Couldn't find an available port"
msgstr "Nun pudo alcontrase un puertu válidu"
-#: device.cpp:160
+#: device.cpp:156
#, kde-format
msgid "Already paired"
msgstr "Yá s'empareyó"
-#: device.cpp:165
+#: device.cpp:161
#, kde-format
msgid "Device not reachable"
msgstr "Preséu non algamable"
-#: device.cpp:477
+#: device.cpp:473
#, kde-format
msgid "SHA1 fingerprint of your device certificate is: %1\n"
msgstr ""
-#: device.cpp:485
+#: device.cpp:481
#, kde-format
msgid "SHA1 fingerprint of remote device certificate is: %1\n"
msgstr ""
@@ -110,8 +110,8 @@
#, kde-format
msgid ""
"Could not find support for RSA in your QCA installation. If your "
-"distribution provides separate packages for QCA-ossl and QCA-gnupg, make "
-"sure you have them installed and try again."
+"distribution provides separate packets for QCA-ossl and QCA-gnupg, make sure "
+"you have them installed and try again."
msgstr ""
#: kdeconnectconfig.cpp:96
diff -Nru kdeconnect-1.2.1/po/ast/kdeconnect-kcm.po kdeconnect-1.3.0/po/ast/kdeconnect-kcm.po
--- kdeconnect-1.2.1/po/ast/kdeconnect-kcm.po 2018-01-16 22:46:11.000000000 +0000
+++ kdeconnect-1.3.0/po/ast/kdeconnect-kcm.po 2018-04-08 14:35:16.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-07-14 03:06+0200\n"
+"POT-Creation-Date: 2018-02-18 03:11+0100\n"
"PO-Revision-Date: 2017-01-05 16:12+0100\n"
"Last-Translator: enolp \n"
"Language-Team: Asturian \n"
@@ -85,71 +85,88 @@
msgid "KDE Connect"
msgstr "KDE Connect"
+#. i18n: ectx: property (text), widget (QToolButton, renameShow_button)
+#: kcm.ui:70
+#, kde-format
+msgid "Edit"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QToolButton, renameDone_button)
+#: kcm.ui:92
+#, kde-format
+msgid "Save"
+msgstr ""
+
#. i18n: ectx: property (text), widget (QPushButton, refresh_button)
-#: kcm.ui:110
+#: kcm.ui:108
#, kde-format
msgid "Refresh"
msgstr "Refrescar"
#. i18n: ectx: property (text), widget (QLabel, name_label)
-#: kcm.ui:157
+#: kcm.ui:155
#, kde-format
msgid "Device"
msgstr "Preséu"
#. i18n: ectx: property (text), widget (QLabel, status_label)
-#: kcm.ui:173
+#: kcm.ui:171
#, kde-format
msgid "(status)"
msgstr "(estáu)"
#. i18n: ectx: property (text), widget (QPushButton, accept_button)
-#: kcm.ui:212
+#: kcm.ui:210
#, kde-format
msgid "Accept"
msgstr ""
#. i18n: ectx: property (text), widget (QPushButton, reject_button)
-#: kcm.ui:219
+#: kcm.ui:217
#, kde-format
msgid "Reject"
msgstr ""
#. i18n: ectx: property (text), widget (QPushButton, pair_button)
-#: kcm.ui:232
+#: kcm.ui:230
#, kde-format
msgid "Request pair"
msgstr "Solicitar empareyamientu"
#. i18n: ectx: property (text), widget (QPushButton, unpair_button)
-#: kcm.ui:245
+#: kcm.ui:243
#, kde-format
msgid "Unpair"
msgstr "Desempareyar"
#. i18n: ectx: property (text), widget (QPushButton, ping_button)
-#: kcm.ui:258
+#: kcm.ui:256
#, kde-format
msgid "Send ping"
msgstr "Unviar ping"
-#. i18n: ectx: property (text), widget (QLabel, noDeviceLabel)
-#: kcm.ui:303
-#, kde-format
-msgid "No device selected."
-msgstr "Nun s'esbilló preséu dalu."
-
#. i18n: ectx: property (text), widget (QLabel, noDeviceLinks)
-#: kcm.ui:319
-#, kde-format
+#: kcm.ui:294
+#, fuzzy, kde-format
+#| msgid ""
+#| "If you own an Android device, make sure to install "
+#| "the KDE Connect "
+#| "Android app (also available from F-Droid) and it should appear "
+#| "in the list.
"
msgid ""
-"If you own an Android device, make sure to install the "
-"KDE Connect Android app"
-"span> (also available from F-Droid) and it should appear in the list.
"
-"html>"
+"No device selected.
If you own an Android "
+"device, make sure to install the KDE Connect Android app (also "
+"available from F-Droid) and it should appear in the list.
If you "
+"are having problems, visit the KDE Connect "
+"Community wiki for help.
"
msgstr ""
"Si tienes un preséu Android, asegúrate d'instalar (tamién disponible en F-Droid) y debería apaecer nel llistáu.
"
-"body>"
-
-#. i18n: ectx: property (text), widget (QLabel, noDeviceTroubleshoot)
-#: kcm.ui:350
-#, kde-format
-msgid ""
-"If you are having problems, visit the KDE Connect Community wiki for help.
"
-"html>"
-msgstr ""
-"Si tas teniendo problemes, visita la wiki de la comunidá KDE Connect p'ayuda.
"
\ No newline at end of file
+"body>"
\ No newline at end of file
diff -Nru kdeconnect-1.2.1/po/ast/kdeconnect-plugins.po kdeconnect-1.3.0/po/ast/kdeconnect-plugins.po
--- kdeconnect-1.2.1/po/ast/kdeconnect-plugins.po 2018-01-16 22:46:11.000000000 +0000
+++ kdeconnect-1.3.0/po/ast/kdeconnect-plugins.po 2018-04-08 14:35:16.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-12-30 03:03+0100\n"
+"POT-Creation-Date: 2018-04-05 03:28+0200\n"
"PO-Revision-Date: 2016-12-19 01:58+0100\n"
"Last-Translator: enolp \n"
"Language-Team: Asturian \n"
@@ -17,28 +17,28 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Lokalize 2.0\n"
-#: battery/batteryplugin.cpp:77
+#: battery/batteryplugin.cpp:75
#, kde-format
msgctxt "device name: low battery"
msgid "%1: Low Battery"
msgstr ""
-#: battery/batteryplugin.cpp:78
+#: battery/batteryplugin.cpp:75
#, kde-format
msgid "Battery at %1%"
msgstr ""
-#: mousepad/mousepadplugin.cpp:131
+#: mousepad/waylandremoteinput.cpp:59
#, kde-format
msgid "KDE Connect"
msgstr "KDE Connect"
-#: mousepad/mousepadplugin.cpp:131
+#: mousepad/waylandremoteinput.cpp:59
#, kde-format
msgid "Use your phone as a touchpad and keyboard"
msgstr ""
-#: notifications/notification.cpp:127 telephony/telephonyplugin.cpp:113
+#: notifications/notification.cpp:120 telephony/telephonyplugin.cpp:113
#, kde-format
msgid "Reply"
msgstr ""
@@ -96,18 +96,33 @@
msgid "Mute system sound"
msgstr ""
-#: ping/pingplugin.cpp:54
+#: ping/pingplugin.cpp:50
#, kde-format
msgid "Ping!"
msgstr ""
-#: runcommand/runcommand_config.cpp:51
+#: runcommand/runcommand_config.cpp:45
+#, kde-format
+msgid "Suspend"
+msgstr ""
+
+#: runcommand/runcommand_config.cpp:46
+#, kde-format
+msgid "Maximum Brightness"
+msgstr ""
+
+#: runcommand/runcommand_config.cpp:53
+#, kde-format
+msgid "Sample commands"
+msgstr ""
+
+#: runcommand/runcommand_config.cpp:62
#: sendnotifications/notifyingapplicationmodel.cpp:208
#, kde-format
msgid "Name"
msgstr ""
-#: runcommand/runcommand_config.cpp:51
+#: runcommand/runcommand_config.cpp:62
#, kde-format
msgid "Command"
msgstr ""
diff -Nru kdeconnect-1.2.1/po/ast/kdeconnect-urlhandler.po kdeconnect-1.3.0/po/ast/kdeconnect-urlhandler.po
--- kdeconnect-1.2.1/po/ast/kdeconnect-urlhandler.po 2018-01-16 22:46:11.000000000 +0000
+++ kdeconnect-1.3.0/po/ast/kdeconnect-urlhandler.po 2018-04-08 14:35:16.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-06-10 02:58+0200\n"
+"POT-Creation-Date: 2018-01-26 03:14+0100\n"
"PO-Revision-Date: 2017-06-30 05:56+0100\n"
"Last-Translator: enolp \n"
"Language-Team: Asturian \n"
@@ -42,7 +42,12 @@
msgid "URL to share"
msgstr ""
-#: kdeconnect-handler.cpp:104
+#: kdeconnect-handler.cpp:94
+#, kde-format
+msgid "Device to call this phone number with:"
+msgstr ""
+
+#: kdeconnect-handler.cpp:111
#, kde-format
msgid "Couldn't share %1"
msgstr ""
\ No newline at end of file
diff -Nru kdeconnect-1.2.1/po/ast/plasma_applet_org.kde.kdeconnect.po kdeconnect-1.3.0/po/ast/plasma_applet_org.kde.kdeconnect.po
--- kdeconnect-1.2.1/po/ast/plasma_applet_org.kde.kdeconnect.po 2018-01-16 22:46:11.000000000 +0000
+++ kdeconnect-1.3.0/po/ast/plasma_applet_org.kde.kdeconnect.po 2018-04-08 14:35:16.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-01-10 04:36+0100\n"
+"POT-Creation-Date: 2018-03-25 04:16+0200\n"
"PO-Revision-Date: 2017-01-05 16:11+0100\n"
"Last-Translator: enolp \n"
"Language-Team: Asturian \n"
@@ -51,10 +51,24 @@
msgid "Notifications:"
msgstr "Avisos"
+#: package/contents/ui/DeviceDelegate.qml:209
+#, fuzzy
+#| msgid "Notifications"
+msgid "Dismiss all notifications"
+msgstr "Avisos"
+
+#: package/contents/ui/DeviceDelegate.qml:245
+msgid "Reply"
+msgstr ""
+
+#: package/contents/ui/DeviceDelegate.qml:254
+msgid "Dismiss"
+msgstr ""
+
#: package/contents/ui/FullRepresentation.qml:35
msgid "No paired devices available"
msgstr "Nun hai preseos empareyaos disponibles"
-#: package/contents/ui/main.qml:60
+#: package/contents/ui/main.qml:59
msgid "KDE Connect Settings..."
msgstr "Axustes de KDE Connect..."
\ No newline at end of file
diff -Nru kdeconnect-1.2.1/po/bg/kdeconnect-kcm.po kdeconnect-1.3.0/po/bg/kdeconnect-kcm.po
--- kdeconnect-1.2.1/po/bg/kdeconnect-kcm.po 2018-01-16 22:46:11.000000000 +0000
+++ kdeconnect-1.3.0/po/bg/kdeconnect-kcm.po 2018-04-08 14:35:17.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: kdeconnect-kcm\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-07-14 03:06+0200\n"
+"POT-Creation-Date: 2018-02-18 03:11+0100\n"
"PO-Revision-Date: 2014-05-19 00:20+0200\n"
"Last-Translator: Svetoslav Stefanov \n"
"Language-Team: BULGARIAN \n"
@@ -85,79 +85,78 @@
msgid "KDE Connect"
msgstr ""
+#. i18n: ectx: property (text), widget (QToolButton, renameShow_button)
+#: kcm.ui:70
+#, kde-format
+msgid "Edit"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QToolButton, renameDone_button)
+#: kcm.ui:92
+#, kde-format
+msgid "Save"
+msgstr ""
+
#. i18n: ectx: property (text), widget (QPushButton, refresh_button)
-#: kcm.ui:110
+#: kcm.ui:108
#, kde-format
msgid "Refresh"
msgstr ""
#. i18n: ectx: property (text), widget (QLabel, name_label)
-#: kcm.ui:157
+#: kcm.ui:155
#, kde-format
msgid "Device"
msgstr "Устройства"
#. i18n: ectx: property (text), widget (QLabel, status_label)
-#: kcm.ui:173
+#: kcm.ui:171
#, kde-format
msgid "(status)"
msgstr "(състояние)"
#. i18n: ectx: property (text), widget (QPushButton, accept_button)
-#: kcm.ui:212
+#: kcm.ui:210
#, kde-format
msgid "Accept"
msgstr ""
#. i18n: ectx: property (text), widget (QPushButton, reject_button)
-#: kcm.ui:219
+#: kcm.ui:217
#, kde-format
msgid "Reject"
msgstr ""
#. i18n: ectx: property (text), widget (QPushButton, pair_button)
-#: kcm.ui:232
+#: kcm.ui:230
#, kde-format
msgid "Request pair"
msgstr "Заявка за сдвояване"
#. i18n: ectx: property (text), widget (QPushButton, unpair_button)
-#: kcm.ui:245
+#: kcm.ui:243
#, kde-format
msgid "Unpair"
msgstr "Разкачване"
#. i18n: ectx: property (text), widget (QPushButton, ping_button)
-#: kcm.ui:258
+#: kcm.ui:256
#, kde-format
msgid "Send ping"
msgstr "Изпращане на пинг"
-#. i18n: ectx: property (text), widget (QLabel, noDeviceLabel)
-#: kcm.ui:303
-#, kde-format
-msgid "No device selected."
-msgstr ""
-
#. i18n: ectx: property (text), widget (QLabel, noDeviceLinks)
-#: kcm.ui:319
-#, kde-format
-msgid ""
-"If you own an Android device, make sure to install the "
-"KDE Connect Android app"
-"span> (also available from F-Droid) and it should appear in the list.
"
-"html>"
-msgstr ""
-
-#. i18n: ectx: property (text), widget (QLabel, noDeviceTroubleshoot)
-#: kcm.ui:350
+#: kcm.ui:294
#, kde-format
msgid ""
-"If you are having problems, visit the KDE Connect Community wiki for help.
"
-"html>"
+"No device selected.
If you own an Android "
+"device, make sure to install the KDE Connect Android app (also "
+"available from F-Droid) and it should appear in the list.
If you "
+"are having problems, visit the KDE Connect "
+"Community wiki for help.
"
msgstr ""
\ No newline at end of file
diff -Nru kdeconnect-1.2.1/po/bs/kdeconnect-cli.po kdeconnect-1.3.0/po/bs/kdeconnect-cli.po
--- kdeconnect-1.2.1/po/bs/kdeconnect-cli.po 2018-01-16 22:46:13.000000000 +0000
+++ kdeconnect-1.3.0/po/bs/kdeconnect-cli.po 2018-04-08 14:35:18.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: bosnianuniversetranslation\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-06-10 02:58+0200\n"
+"POT-Creation-Date: 2018-02-28 03:17+0100\n"
"PO-Revision-Date: 2015-02-24 23:44+0100\n"
"Last-Translator: Samir Ribić \n"
"Language-Team: Bosnian \n"
@@ -70,132 +70,146 @@
msgstr ""
#: kdeconnect-cli.cpp:54
+#, kde-format
+msgid ""
+"Make --list-devices or --list-available print only the devices name, to ease "
+"scripting"
+msgstr ""
+
+#: kdeconnect-cli.cpp:55
+#, kde-format
+msgid ""
+"Make --list-devices or --list-available print only the devices id and name, "
+"to ease scripting"
+msgstr ""
+
+#: kdeconnect-cli.cpp:56
#, fuzzy, kde-format
#| msgid "Search for devices in the network and re-establish connections."
msgid "Search for devices in the network and re-establish connections"
msgstr "Potraži uređaje na mreži i ponovo uspostavi konekciju."
-#: kdeconnect-cli.cpp:55
+#: kdeconnect-cli.cpp:57
#, fuzzy, kde-format
#| msgid "Request pairing to a said device."
msgid "Request pairing to a said device"
msgstr "Zatraži uparivanje sa navedenim uređajem."
-#: kdeconnect-cli.cpp:56
+#: kdeconnect-cli.cpp:58
#, kde-format
msgid "Find the said device by ringing it."
msgstr ""
-#: kdeconnect-cli.cpp:57
+#: kdeconnect-cli.cpp:59
#, fuzzy, kde-format
#| msgid "Stop pairing to a said device."
msgid "Stop pairing to a said device"
msgstr "Zaustavi uparivanje sa navedenim uređajem."
-#: kdeconnect-cli.cpp:58
+#: kdeconnect-cli.cpp:60
#, fuzzy, kde-format
#| msgid "Send a ping to said device."
msgid "Sends a ping to said device"
msgstr "Pošalji ping navedenom uređaju."
-#: kdeconnect-cli.cpp:59
+#: kdeconnect-cli.cpp:61
#, fuzzy, kde-format
#| msgid "Same as ping but you can customize the message shown."
msgid "Same as ping but you can set the message to display"
msgstr "Isto kao i ping ali možete podesiti poruku koja se prikazuje."
-#: kdeconnect-cli.cpp:59 kdeconnect-cli.cpp:63
+#: kdeconnect-cli.cpp:61 kdeconnect-cli.cpp:65
#, kde-format
msgid "message"
msgstr ""
-#: kdeconnect-cli.cpp:60
+#: kdeconnect-cli.cpp:62
#, fuzzy, kde-format
#| msgid "Share a file to a said device."
msgid "Share a file to a said device"
msgstr "Podijeli datoteku na navedeni uređaj."
-#: kdeconnect-cli.cpp:61
+#: kdeconnect-cli.cpp:63
#, fuzzy, kde-format
#| msgid "Display the notifications on a said device."
msgid "Display the notifications on a said device"
msgstr "Prikaži notifikaciju na navedenom uređaju."
-#: kdeconnect-cli.cpp:62
+#: kdeconnect-cli.cpp:64
#, kde-format
msgid "Lock the specified device"
msgstr ""
-#: kdeconnect-cli.cpp:63
+#: kdeconnect-cli.cpp:65
#, kde-format
msgid "Sends an SMS. Requires destination"
msgstr ""
-#: kdeconnect-cli.cpp:64
+#: kdeconnect-cli.cpp:66
#, kde-format
msgid "Phone number to send the message"
msgstr ""
-#: kdeconnect-cli.cpp:64
+#: kdeconnect-cli.cpp:66
#, kde-format
msgid "phone number"
msgstr ""
-#: kdeconnect-cli.cpp:65
+#: kdeconnect-cli.cpp:67
#, fuzzy, kde-format
#| msgid "Device ID."
msgid "Device ID"
msgstr "Identifikacijski Broj Uređaja."
-#: kdeconnect-cli.cpp:66
+#: kdeconnect-cli.cpp:68
#, fuzzy, kde-format
#| msgid "Device ID."
msgid "Device Name"
msgstr "Identifikacijski Broj Uređaja."
-#: kdeconnect-cli.cpp:67
+#: kdeconnect-cli.cpp:69
#, fuzzy, kde-format
#| msgid "Request pairing to a said device."
msgid "Get encryption info about said device"
msgstr "Zatraži uparivanje sa navedenim uređajem."
-#: kdeconnect-cli.cpp:68
+#: kdeconnect-cli.cpp:70
#, kde-format
msgid "Lists remote commands and their ids"
msgstr ""
-#: kdeconnect-cli.cpp:69
+#: kdeconnect-cli.cpp:71
#, kde-format
msgid "Executes a remote command by id"
msgstr ""
-#: kdeconnect-cli.cpp:70
+#: kdeconnect-cli.cpp:72
#, fuzzy, kde-format
#| msgid "Send a ping to said device."
msgid "Sends keys to a said device"
msgstr "Pošalji ping navedenom uređaju."
-#: kdeconnect-cli.cpp:71
+#: kdeconnect-cli.cpp:73
#, kde-format
msgid "Display this device's id and exit"
msgstr ""
-#: kdeconnect-cli.cpp:102
+#: kdeconnect-cli.cpp:114
#, kde-format
msgid "(paired and reachable)"
msgstr ""
-#: kdeconnect-cli.cpp:104
+#: kdeconnect-cli.cpp:116
#, kde-format
msgid "(reachable)"
msgstr ""
-#: kdeconnect-cli.cpp:106
+#: kdeconnect-cli.cpp:118
#, kde-format
msgid "(paired)"
msgstr ""
-#: kdeconnect-cli.cpp:113
+#: kdeconnect-cli.cpp:125
#, fuzzy, kde-format
#| msgid "No device specified"
msgid "1 device found"
@@ -203,66 +217,71 @@
msgstr[0] "Nije određen uređaj"
msgstr[1] "Nije određen uređaj"
-#: kdeconnect-cli.cpp:115
+#: kdeconnect-cli.cpp:127
#, fuzzy, kde-format
#| msgid "No device specified"
msgid "No devices found"
msgstr "Nije određen uređaj"
-#: kdeconnect-cli.cpp:133
+#: kdeconnect-cli.cpp:145
#, kde-format
msgid "No device specified"
msgstr "Nije određen uređaj"
-#: kdeconnect-cli.cpp:145
+#: kdeconnect-cli.cpp:158
+#, kde-format
+msgid "Can't find the file: %1"
+msgstr ""
+
+#: kdeconnect-cli.cpp:169
#, kde-format
-msgid "Couldn't share %1"
-msgstr "Nije moguće dijeljenje %1"
+msgid "Sent %1"
+msgstr ""
-#: kdeconnect-cli.cpp:152
+#: kdeconnect-cli.cpp:176
#, kde-format
msgid "waiting for device..."
msgstr ""
-#: kdeconnect-cli.cpp:166
+#: kdeconnect-cli.cpp:190
#, fuzzy, kde-format
#| msgid "No device specified"
msgid "Device not found"
msgstr "Nije određen uređaj"
-#: kdeconnect-cli.cpp:168
+#: kdeconnect-cli.cpp:192
#, kde-format
msgid "Already paired"
msgstr ""
-#: kdeconnect-cli.cpp:170
+#: kdeconnect-cli.cpp:194
#, kde-format
msgid "Pair requested"
msgstr ""
-#: kdeconnect-cli.cpp:177
+#: kdeconnect-cli.cpp:201
#, kde-format
msgid "Device does not exist"
msgstr ""
-#: kdeconnect-cli.cpp:179
+#: kdeconnect-cli.cpp:203
#, kde-format
msgid "Already not paired"
msgstr ""
-#: kdeconnect-cli.cpp:181
+#: kdeconnect-cli.cpp:205
#, kde-format
msgid "Unpaired"
msgstr ""
-#: kdeconnect-cli.cpp:197
+#: kdeconnect-cli.cpp:221
#, kde-format
msgid ""
"error: should specify the SMS's recipient by passing --destination "
msgstr ""
-#: kdeconnect-cli.cpp:244
+#: kdeconnect-cli.cpp:268
#, fuzzy, kde-format
#| msgid "Nothing to be done with the device"
msgid "Nothing to be done"
diff -Nru kdeconnect-1.2.1/po/bs/kdeconnect-core.po kdeconnect-1.3.0/po/bs/kdeconnect-core.po
--- kdeconnect-1.2.1/po/bs/kdeconnect-core.po 2018-01-16 22:46:13.000000000 +0000
+++ kdeconnect-1.3.0/po/bs/kdeconnect-core.po 2018-04-08 14:35:18.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: bosnianuniversetranslation\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-09-19 03:23+0200\n"
+"POT-Creation-Date: 2018-03-06 03:17+0100\n"
"PO-Revision-Date: 2014-12-19 00:46+0000\n"
"Last-Translator: Samir Ribić \n"
"Language-Team: Bosnian \n"
@@ -57,22 +57,22 @@
msgid "Couldn't find an available port"
msgstr ""
-#: device.cpp:160
+#: device.cpp:156
#, kde-format
msgid "Already paired"
msgstr "Već uparen"
-#: device.cpp:165
+#: device.cpp:161
#, kde-format
msgid "Device not reachable"
msgstr "Uređaj nije dostupan"
-#: device.cpp:477
+#: device.cpp:473
#, kde-format
msgid "SHA1 fingerprint of your device certificate is: %1\n"
msgstr ""
-#: device.cpp:485
+#: device.cpp:481
#, kde-format
msgid "SHA1 fingerprint of remote device certificate is: %1\n"
msgstr ""
@@ -115,8 +115,8 @@
#, kde-format
msgid ""
"Could not find support for RSA in your QCA installation. If your "
-"distribution provides separate packages for QCA-ossl and QCA-gnupg, make "
-"sure you have them installed and try again."
+"distribution provides separate packets for QCA-ossl and QCA-gnupg, make sure "
+"you have them installed and try again."
msgstr ""
#: kdeconnectconfig.cpp:96
diff -Nru kdeconnect-1.2.1/po/bs/kdeconnect-kcm.po kdeconnect-1.3.0/po/bs/kdeconnect-kcm.po
--- kdeconnect-1.2.1/po/bs/kdeconnect-kcm.po 2018-01-16 22:46:13.000000000 +0000
+++ kdeconnect-1.3.0/po/bs/kdeconnect-kcm.po 2018-04-08 14:35:18.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: bosnianuniversetranslation\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-07-14 03:06+0200\n"
+"POT-Creation-Date: 2018-02-18 03:11+0100\n"
"PO-Revision-Date: 2015-02-04 15:16+0000\n"
"Last-Translator: Samir Ribić \n"
"Language-Team: Bosnian \n"
@@ -87,79 +87,78 @@
msgid "KDE Connect"
msgstr ""
+#. i18n: ectx: property (text), widget (QToolButton, renameShow_button)
+#: kcm.ui:70
+#, kde-format
+msgid "Edit"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QToolButton, renameDone_button)
+#: kcm.ui:92
+#, kde-format
+msgid "Save"
+msgstr ""
+
#. i18n: ectx: property (text), widget (QPushButton, refresh_button)
-#: kcm.ui:110
+#: kcm.ui:108
#, kde-format
msgid "Refresh"
msgstr "Osvježi"
#. i18n: ectx: property (text), widget (QLabel, name_label)
-#: kcm.ui:157
+#: kcm.ui:155
#, kde-format
msgid "Device"
msgstr "Uređaj"
#. i18n: ectx: property (text), widget (QLabel, status_label)
-#: kcm.ui:173
+#: kcm.ui:171
#, kde-format
msgid "(status)"
msgstr "(status)"
#. i18n: ectx: property (text), widget (QPushButton, accept_button)
-#: kcm.ui:212
+#: kcm.ui:210
#, kde-format
msgid "Accept"
msgstr ""
#. i18n: ectx: property (text), widget (QPushButton, reject_button)
-#: kcm.ui:219
+#: kcm.ui:217
#, kde-format
msgid "Reject"
msgstr ""
#. i18n: ectx: property (text), widget (QPushButton, pair_button)
-#: kcm.ui:232
+#: kcm.ui:230
#, kde-format
msgid "Request pair"
msgstr "Zatraži par"
#. i18n: ectx: property (text), widget (QPushButton, unpair_button)
-#: kcm.ui:245
+#: kcm.ui:243
#, kde-format
msgid "Unpair"
msgstr "Razdvoji"
#. i18n: ectx: property (text), widget (QPushButton, ping_button)
-#: kcm.ui:258
+#: kcm.ui:256
#, kde-format
msgid "Send ping"
msgstr "Pošalji ping"
-#. i18n: ectx: property (text), widget (QLabel, noDeviceLabel)
-#: kcm.ui:303
-#, kde-format
-msgid "No device selected."
-msgstr ""
-
#. i18n: ectx: property (text), widget (QLabel, noDeviceLinks)
-#: kcm.ui:319
-#, kde-format
-msgid ""
-"If you own an Android device, make sure to install the "
-"KDE Connect Android app"
-"span> (also available from F-Droid) and it should appear in the list.
"
-"html>"
-msgstr ""
-
-#. i18n: ectx: property (text), widget (QLabel, noDeviceTroubleshoot)
-#: kcm.ui:350
+#: kcm.ui:294
#, kde-format
msgid ""
-"If you are having problems, visit the KDE Connect Community wiki for help.
"
-"html>"
+"No device selected.
If you own an Android "
+"device, make sure to install the KDE Connect Android app (also "
+"available from F-Droid) and it should appear in the list.
If you "
+"are having problems, visit the KDE Connect "
+"Community wiki for help.
"
msgstr ""
\ No newline at end of file
diff -Nru kdeconnect-1.2.1/po/bs/kdeconnect-plugins.po kdeconnect-1.3.0/po/bs/kdeconnect-plugins.po
--- kdeconnect-1.2.1/po/bs/kdeconnect-plugins.po 2018-01-16 22:46:13.000000000 +0000
+++ kdeconnect-1.3.0/po/bs/kdeconnect-plugins.po 2018-04-08 14:35:18.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: bosnianuniversetranslation\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-12-30 03:03+0100\n"
+"POT-Creation-Date: 2018-04-05 03:28+0200\n"
"PO-Revision-Date: 2015-02-22 23:17+0100\n"
"Last-Translator: Samir Ribić \n"
"Language-Team: Bosnian \n"
@@ -20,7 +20,7 @@
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: battery/batteryplugin.cpp:77
+#: battery/batteryplugin.cpp:75
#, fuzzy, kde-format
#| msgctxt "device name: low battery"
#| msgid "%1: low battery"
@@ -28,22 +28,22 @@
msgid "%1: Low Battery"
msgstr "%1: baterija prazna"
-#: battery/batteryplugin.cpp:78
+#: battery/batteryplugin.cpp:75
#, kde-format
msgid "Battery at %1%"
msgstr "Baterija na %1%"
-#: mousepad/mousepadplugin.cpp:131
+#: mousepad/waylandremoteinput.cpp:59
#, kde-format
msgid "KDE Connect"
msgstr ""
-#: mousepad/mousepadplugin.cpp:131
+#: mousepad/waylandremoteinput.cpp:59
#, kde-format
msgid "Use your phone as a touchpad and keyboard"
msgstr ""
-#: notifications/notification.cpp:127 telephony/telephonyplugin.cpp:113
+#: notifications/notification.cpp:120 telephony/telephonyplugin.cpp:113
#, kde-format
msgid "Reply"
msgstr ""
@@ -101,18 +101,33 @@
msgid "Mute system sound"
msgstr "Ukini ton sistemskog zvuka"
-#: ping/pingplugin.cpp:54
+#: ping/pingplugin.cpp:50
#, kde-format
msgid "Ping!"
msgstr "Ping!"
-#: runcommand/runcommand_config.cpp:51
+#: runcommand/runcommand_config.cpp:45
+#, kde-format
+msgid "Suspend"
+msgstr ""
+
+#: runcommand/runcommand_config.cpp:46
+#, kde-format
+msgid "Maximum Brightness"
+msgstr ""
+
+#: runcommand/runcommand_config.cpp:53
+#, kde-format
+msgid "Sample commands"
+msgstr ""
+
+#: runcommand/runcommand_config.cpp:62
#: sendnotifications/notifyingapplicationmodel.cpp:208
#, kde-format
msgid "Name"
msgstr ""
-#: runcommand/runcommand_config.cpp:51
+#: runcommand/runcommand_config.cpp:62
#, kde-format
msgid "Command"
msgstr ""
diff -Nru kdeconnect-1.2.1/po/bs/plasma_applet_org.kde.kdeconnect.po kdeconnect-1.3.0/po/bs/plasma_applet_org.kde.kdeconnect.po
--- kdeconnect-1.2.1/po/bs/plasma_applet_org.kde.kdeconnect.po 2018-01-16 22:46:13.000000000 +0000
+++ kdeconnect-1.3.0/po/bs/plasma_applet_org.kde.kdeconnect.po 2018-04-08 14:35:18.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: $2\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-01-10 04:36+0100\n"
+"POT-Creation-Date: 2018-03-25 04:16+0200\n"
"PO-Revision-Date: 2015-02-16 11:58+0000\n"
"Last-Translator: Samir Ribić \n"
"Language-Team: none\n"
@@ -55,13 +55,27 @@
msgid "Notifications:"
msgstr "Napomene"
+#: package/contents/ui/DeviceDelegate.qml:209
+#, fuzzy
+#| msgid "Notifications"
+msgid "Dismiss all notifications"
+msgstr "Napomene"
+
+#: package/contents/ui/DeviceDelegate.qml:245
+msgid "Reply"
+msgstr ""
+
+#: package/contents/ui/DeviceDelegate.qml:254
+msgid "Dismiss"
+msgstr ""
+
#: package/contents/ui/FullRepresentation.qml:35
#, fuzzy
#| msgid "No paired devices available"
msgid "No paired devices available"
msgstr "Nema uparenih dostupnih uređaja"
-#: package/contents/ui/main.qml:60
+#: package/contents/ui/main.qml:59
#, fuzzy
#| msgid "KDE Connect device notifications"
msgid "KDE Connect Settings..."
diff -Nru kdeconnect-1.2.1/po/ca/kdeconnect-cli.po kdeconnect-1.3.0/po/ca/kdeconnect-cli.po
--- kdeconnect-1.2.1/po/ca/kdeconnect-cli.po 2018-01-16 22:46:13.000000000 +0000
+++ kdeconnect-1.3.0/po/ca/kdeconnect-cli.po 2018-04-08 14:35:19.000000000 +0000
@@ -1,17 +1,17 @@
# Translation of kdeconnect-cli.po to Catalan
-# Copyright (C) 2014-2017 This_file_is_part_of_KDE
+# Copyright (C) 2014-2018 This_file_is_part_of_KDE
# This file is distributed under the license LGPL version 2.1 or
# version 3 or later versions approved by the membership of KDE e.V.
#
-# Antoni Bella Pérez , 2014, 2015, 2016, 2017.
-# Josep Ma. Ferrer , 2015, 2016, 2017.
+# Antoni Bella Pérez , 2014, 2015, 2016, 2017, 2018.
+# Josep Ma. Ferrer , 2015, 2016, 2017, 2018.
msgid ""
msgstr ""
"Project-Id-Version: kdeconnect-cli\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-06-10 02:58+0200\n"
-"PO-Revision-Date: 2017-02-25 18:11+0100\n"
-"Last-Translator: Josep Ma. Ferrer \n"
+"POT-Creation-Date: 2018-02-28 03:17+0100\n"
+"PO-Revision-Date: 2018-02-28 09:30+0100\n"
+"Last-Translator: Antoni Bella Pérez \n"
"Language-Team: Catalan \n"
"Language: ca\n"
"MIME-Version: 1.0\n"
@@ -72,177 +72,200 @@
#: kdeconnect-cli.cpp:54
#, kde-format
+msgid ""
+"Make --list-devices or --list-available print only the devices name, to ease "
+"scripting"
+msgstr ""
+"Fa que --list-devices o --list-available imprimeixi només els noms dels "
+"dispositius, per a facilitar la creació de scripts"
+
+#: kdeconnect-cli.cpp:55
+#, kde-format
+msgid ""
+"Make --list-devices or --list-available print only the devices id and name, "
+"to ease scripting"
+msgstr ""
+"Fa que --list-devices o --list-available imprimeixi només els ID i els noms "
+"dels dispositius, per a facilitar la creació de scripts"
+
+#: kdeconnect-cli.cpp:56
+#, kde-format
msgid "Search for devices in the network and re-establish connections"
msgstr "Cerca dispositius a la xarxa i torna a establir les connexions"
-#: kdeconnect-cli.cpp:55
+#: kdeconnect-cli.cpp:57
#, kde-format
msgid "Request pairing to a said device"
msgstr "Demana aparellar amb un dispositiu indicat"
-#: kdeconnect-cli.cpp:56
+#: kdeconnect-cli.cpp:58
#, kde-format
msgid "Find the said device by ringing it."
msgstr "Troba el dispositiu indicat trucant-lo."
-#: kdeconnect-cli.cpp:57
+#: kdeconnect-cli.cpp:59
#, kde-format
msgid "Stop pairing to a said device"
msgstr "Atura l'aparellament amb un dispositiu indicat"
-#: kdeconnect-cli.cpp:58
+#: kdeconnect-cli.cpp:60
#, kde-format
msgid "Sends a ping to said device"
msgstr "Envia un ping a un dispositiu indicat"
-#: kdeconnect-cli.cpp:59
+#: kdeconnect-cli.cpp:61
#, kde-format
msgid "Same as ping but you can set the message to display"
msgstr "Igual que el ping però es pot definir el missatge que es mostrarà"
-#: kdeconnect-cli.cpp:59 kdeconnect-cli.cpp:63
+#: kdeconnect-cli.cpp:61 kdeconnect-cli.cpp:65
#, kde-format
msgid "message"
msgstr "missatge"
-#: kdeconnect-cli.cpp:60
+#: kdeconnect-cli.cpp:62
#, kde-format
msgid "Share a file to a said device"
msgstr "Comparteix un fitxer amb un dispositiu indicat"
-#: kdeconnect-cli.cpp:61
+#: kdeconnect-cli.cpp:63
#, kde-format
msgid "Display the notifications on a said device"
msgstr "Mostra les notificacions a un dispositiu indicat"
-#: kdeconnect-cli.cpp:62
+#: kdeconnect-cli.cpp:64
#, kde-format
msgid "Lock the specified device"
msgstr "Bloqueja el dispositiu especificat"
-#: kdeconnect-cli.cpp:63
+#: kdeconnect-cli.cpp:65
#, kde-format
msgid "Sends an SMS. Requires destination"
msgstr "Envia un SMS. Requereix una destinació"
-#: kdeconnect-cli.cpp:64
+#: kdeconnect-cli.cpp:66
#, kde-format
msgid "Phone number to send the message"
msgstr "Número de telèfon a on enviar el missatge"
-#: kdeconnect-cli.cpp:64
+#: kdeconnect-cli.cpp:66
#, kde-format
msgid "phone number"
msgstr "número de telèfon"
-#: kdeconnect-cli.cpp:65
+#: kdeconnect-cli.cpp:67
#, kde-format
msgid "Device ID"
msgstr "ID del dispositiu"
-#: kdeconnect-cli.cpp:66
+#: kdeconnect-cli.cpp:68
#, kde-format
msgid "Device Name"
msgstr "Nom del dispositiu"
-#: kdeconnect-cli.cpp:67
+#: kdeconnect-cli.cpp:69
#, kde-format
msgid "Get encryption info about said device"
msgstr "Obtén la informació d'encriptatge del dispositiu indicat"
-#: kdeconnect-cli.cpp:68
+#: kdeconnect-cli.cpp:70
#, kde-format
msgid "Lists remote commands and their ids"
msgstr "Llista les ordres remotes i les seves ID"
-#: kdeconnect-cli.cpp:69
+#: kdeconnect-cli.cpp:71
#, kde-format
msgid "Executes a remote command by id"
msgstr "Executa una ordre remota pel seu ID"
-#: kdeconnect-cli.cpp:70
+#: kdeconnect-cli.cpp:72
#, kde-format
msgid "Sends keys to a said device"
msgstr "Envia les tecles a un dispositiu indicat"
-#: kdeconnect-cli.cpp:71
+#: kdeconnect-cli.cpp:73
#, kde-format
msgid "Display this device's id and exit"
msgstr "Mostra l'ID d'aquest dispositiu i surt"
-#: kdeconnect-cli.cpp:102
+#: kdeconnect-cli.cpp:114
#, kde-format
msgid "(paired and reachable)"
msgstr "(aparellat i accessible)"
-#: kdeconnect-cli.cpp:104
+#: kdeconnect-cli.cpp:116
#, kde-format
msgid "(reachable)"
msgstr "(accessible)"
-#: kdeconnect-cli.cpp:106
+#: kdeconnect-cli.cpp:118
#, kde-format
msgid "(paired)"
msgstr "(aparellat)"
-#: kdeconnect-cli.cpp:113
+#: kdeconnect-cli.cpp:125
#, kde-format
msgid "1 device found"
msgid_plural "%1 devices found"
msgstr[0] "S'ha trobat 1 dispositiu"
msgstr[1] "S'han trobat %1 dispositius"
-#: kdeconnect-cli.cpp:115
+#: kdeconnect-cli.cpp:127
#, kde-format
msgid "No devices found"
msgstr "No s'ha trobat cap dispositiu"
-#: kdeconnect-cli.cpp:133
+#: kdeconnect-cli.cpp:145
#, kde-format
msgid "No device specified"
msgstr "No s'ha especificat cap dispositiu"
-#: kdeconnect-cli.cpp:145
+#: kdeconnect-cli.cpp:158
+#, kde-format
+msgid "Can't find the file: %1"
+msgstr "No s'ha pogut trobar el fitxer: %1"
+
+#: kdeconnect-cli.cpp:169
#, kde-format
-msgid "Couldn't share %1"
-msgstr "No s'ha pogut compartir %1"
+msgid "Sent %1"
+msgstr "Enviat %1"
-#: kdeconnect-cli.cpp:152
+#: kdeconnect-cli.cpp:176
#, kde-format
msgid "waiting for device..."
msgstr "s'està esperant per un dispositiu..."
-#: kdeconnect-cli.cpp:166
+#: kdeconnect-cli.cpp:190
#, kde-format
msgid "Device not found"
msgstr "No s'ha trobat cap dispositiu"
-#: kdeconnect-cli.cpp:168
+#: kdeconnect-cli.cpp:192
#, kde-format
msgid "Already paired"
msgstr "Ja està aparellat"
-#: kdeconnect-cli.cpp:170
+#: kdeconnect-cli.cpp:194
#, kde-format
msgid "Pair requested"
msgstr "Sol·licitud per aparellar"
-#: kdeconnect-cli.cpp:177
+#: kdeconnect-cli.cpp:201
#, kde-format
msgid "Device does not exist"
msgstr "Aquest dispositiu no existeix"
-#: kdeconnect-cli.cpp:179
+#: kdeconnect-cli.cpp:203
#, kde-format
msgid "Already not paired"
msgstr "Ja no està aparellat"
-#: kdeconnect-cli.cpp:181
+#: kdeconnect-cli.cpp:205
#, kde-format
msgid "Unpaired"
msgstr "Sense aparellar"
-#: kdeconnect-cli.cpp:197
+#: kdeconnect-cli.cpp:221
#, kde-format
msgid ""
"error: should specify the SMS's recipient by passing --destination "
-#: kdeconnect-cli.cpp:244
+#: kdeconnect-cli.cpp:268
#, kde-format
msgid "Nothing to be done"
msgstr "No es fa res"
\ No newline at end of file
diff -Nru kdeconnect-1.2.1/po/ca/kdeconnect-core.po kdeconnect-1.3.0/po/ca/kdeconnect-core.po
--- kdeconnect-1.2.1/po/ca/kdeconnect-core.po 2018-01-16 22:46:13.000000000 +0000
+++ kdeconnect-1.3.0/po/ca/kdeconnect-core.po 2018-04-08 14:35:19.000000000 +0000
@@ -1,17 +1,17 @@
# Translation of kdeconnect-core.po to Catalan
-# Copyright (C) 2014-2016 This_file_is_part_of_KDE
+# Copyright (C) 2014-2018 This_file_is_part_of_KDE
# This file is distributed under the license LGPL version 2.1 or
# version 3 or later versions approved by the membership of KDE e.V.
#
-# Antoni Bella Pérez , 2014, 2015, 2016.
+# Antoni Bella Pérez , 2014, 2015, 2016, 2018.
# Josep Ma. Ferrer , 2015, 2016.
msgid ""
msgstr ""
"Project-Id-Version: kdeconnect-core\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-09-19 03:23+0200\n"
-"PO-Revision-Date: 2016-07-07 20:35+0200\n"
-"Last-Translator: Josep Ma. Ferrer \n"
+"POT-Creation-Date: 2018-03-06 03:17+0100\n"
+"PO-Revision-Date: 2018-03-06 15:46+0100\n"
+"Last-Translator: Antoni Bella Pérez \n"
"Language-Team: Catalan \n"
"Language: ca\n"
"MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Accelerator-Marker: &\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
#: backends/bluetooth/bluetoothpairinghandler.cpp:70
#: backends/lan/lanpairinghandler.cpp:66
@@ -58,22 +58,22 @@
msgid "Couldn't find an available port"
msgstr "No s'ha pogut trobar un port disponible"
-#: device.cpp:160
+#: device.cpp:156
#, kde-format
msgid "Already paired"
msgstr "Ja està aparellat"
-#: device.cpp:165
+#: device.cpp:161
#, kde-format
msgid "Device not reachable"
msgstr "No es pot accedir al dispositiu"
-#: device.cpp:477
+#: device.cpp:473
#, kde-format
msgid "SHA1 fingerprint of your device certificate is: %1\n"
msgstr "L'empremta digital SHA1 del certificat del vostre dispositiu és: %1\n"
-#: device.cpp:485
+#: device.cpp:481
#, kde-format
msgid "SHA1 fingerprint of remote device certificate is: %1\n"
msgstr "L'empremta digital SHA1 del certificat del dispositiu remot és: %1\n"
@@ -114,8 +114,8 @@
#, kde-format
msgid ""
"Could not find support for RSA in your QCA installation. If your "
-"distribution provides separate packages for QCA-ossl and QCA-gnupg, make "
-"sure you have them installed and try again."
+"distribution provides separate packets for QCA-ossl and QCA-gnupg, make sure "
+"you have them installed and try again."
msgstr ""
"No s'ha pogut trobar la implementació RSA en la vostra instal·lació del QCA. "
"Si la vostra distribució ofereix paquets separats per a QCA-ossl i QCA-"
diff -Nru kdeconnect-1.2.1/po/ca/kdeconnect-kcm.po kdeconnect-1.3.0/po/ca/kdeconnect-kcm.po
--- kdeconnect-1.2.1/po/ca/kdeconnect-kcm.po 2018-01-16 22:46:13.000000000 +0000
+++ kdeconnect-1.3.0/po/ca/kdeconnect-kcm.po 2018-04-08 14:35:19.000000000 +0000
@@ -3,14 +3,14 @@
# This file is distributed under the license LGPL version 2.1 or
# version 3 or later versions approved by the membership of KDE e.V.
#
-# Antoni Bella Pérez , 2014, 2015, 2016, 2017.
+# Antoni Bella Pérez , 2014, 2015, 2016, 2017, 2018.
# Josep Ma. Ferrer , 2015, 2016, 2018.
msgid ""
msgstr ""
"Project-Id-Version: kdeconnect-kcm\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-07-14 03:06+0200\n"
-"PO-Revision-Date: 2018-01-01 19:38+0100\n"
+"POT-Creation-Date: 2018-02-18 03:11+0100\n"
+"PO-Revision-Date: 2018-02-18 12:11+0100\n"
"Last-Translator: Josep Ma. Ferrer \n"
"Language-Team: Catalan \n"
"Language: ca\n"
@@ -87,90 +87,89 @@
msgid "KDE Connect"
msgstr "KDE Connect"
+#. i18n: ectx: property (text), widget (QToolButton, renameShow_button)
+#: kcm.ui:70
+#, kde-format
+msgid "Edit"
+msgstr "Edita"
+
+#. i18n: ectx: property (text), widget (QToolButton, renameDone_button)
+#: kcm.ui:92
+#, kde-format
+msgid "Save"
+msgstr "Desa"
+
#. i18n: ectx: property (text), widget (QPushButton, refresh_button)
-#: kcm.ui:110
+#: kcm.ui:108
#, kde-format
msgid "Refresh"
msgstr "Refresca"
#. i18n: ectx: property (text), widget (QLabel, name_label)
-#: kcm.ui:157
+#: kcm.ui:155
#, kde-format
msgid "Device"
msgstr "Dispositiu"
#. i18n: ectx: property (text), widget (QLabel, status_label)
-#: kcm.ui:173
+#: kcm.ui:171
#, kde-format
msgid "(status)"
msgstr "(estat)"
#. i18n: ectx: property (text), widget (QPushButton, accept_button)
-#: kcm.ui:212
+#: kcm.ui:210
#, kde-format
msgid "Accept"
msgstr "Accepta"
#. i18n: ectx: property (text), widget (QPushButton, reject_button)
-#: kcm.ui:219
+#: kcm.ui:217
#, kde-format
msgid "Reject"
msgstr "Rebutja"
#. i18n: ectx: property (text), widget (QPushButton, pair_button)
-#: kcm.ui:232
+#: kcm.ui:230
#, kde-format
msgid "Request pair"
msgstr "Demana aparellar"
#. i18n: ectx: property (text), widget (QPushButton, unpair_button)
-#: kcm.ui:245
+#: kcm.ui:243
#, kde-format
msgid "Unpair"
msgstr "Desparella"
#. i18n: ectx: property (text), widget (QPushButton, ping_button)
-#: kcm.ui:258
+#: kcm.ui:256
#, kde-format
msgid "Send ping"
msgstr "Envia un ping"
-#. i18n: ectx: property (text), widget (QLabel, noDeviceLabel)
-#: kcm.ui:303
-#, kde-format
-msgid "No device selected."
-msgstr "No s'ha seleccionat cap dispositiu."
-
#. i18n: ectx: property (text), widget (QLabel, noDeviceLinks)
-#: kcm.ui:319
+#: kcm.ui:294
#, kde-format
msgid ""
-"If you own an Android device, make sure to install the "
-"KDE Connect Android app"
-"span> (also available from F-Droid) and it should appear in the list.
"
-"html>"
-msgstr ""
-"Si teniu un dispositiu amb Android, assegureu-vos "
-"d'instal·lar l'app KDE "
-"Connect per a Android (també disponible des de F-Droid) i hauria d'aparèixer a "
-"la llista.
"
-
-#. i18n: ectx: property (text), widget (QLabel, noDeviceTroubleshoot)
-#: kcm.ui:350
-#, kde-format
-msgid ""
-"If you are having problems, visit the KDE Connect Community wiki for help.
"
-"html>"
+"No device selected.
If you own an Android "
+"device, make sure to install the KDE Connect Android app (also "
+"available from F-Droid) and it should appear in the list.
If you "
+"are having problems, visit the KDE Connect "
+"Community wiki for help.
"
msgstr ""
-"Si teniu cap problema, visiteu el wiki de la comunitat del KDE Connect per a trobar l'ajuda "
-"necessària.
"
\ No newline at end of file
+"No hi ha cap dispositiu seleccionat.
Si teniu "
+"un dispositiu amb Android, assegureu-vos d'instal·lar l'app KDE Connect per a Android "
+"(també disponible des de F-Droid) i hauria d'aparèixer a la llista.
Si "
+"teniu problemes, visiteu el wiki de KDE Connect Community per obtenir ajuda."
+"
"
\ No newline at end of file
diff -Nru kdeconnect-1.2.1/po/ca/kdeconnect-plugins.po kdeconnect-1.3.0/po/ca/kdeconnect-plugins.po
--- kdeconnect-1.2.1/po/ca/kdeconnect-plugins.po 2018-01-16 22:46:13.000000000 +0000
+++ kdeconnect-1.3.0/po/ca/kdeconnect-plugins.po 2018-04-08 14:35:19.000000000 +0000
@@ -1,17 +1,17 @@
# Translation of kdeconnect-plugins.po to Catalan
-# Copyright (C) 2014-2017 This_file_is_part_of_KDE
+# Copyright (C) 2014-2018 This_file_is_part_of_KDE
# This file is distributed under the license LGPL version 2.1 or
# version 3 or later versions approved by the membership of KDE e.V.
#
-# Antoni Bella Pérez , 2014, 2015, 2016.
+# Antoni Bella Pérez , 2014, 2015, 2016, 2018.
# Josep Ma. Ferrer , 2015, 2017.
msgid ""
msgstr ""
"Project-Id-Version: kdeconnect-plugins\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-12-30 03:03+0100\n"
-"PO-Revision-Date: 2017-09-19 20:20+0100\n"
-"Last-Translator: Josep Ma. Ferrer \n"
+"POT-Creation-Date: 2018-04-05 03:28+0200\n"
+"PO-Revision-Date: 2018-03-25 10:36+0100\n"
+"Last-Translator: Antoni Bella Pérez \n"
"Language-Team: Catalan \n"
"Language: ca\n"
"MIME-Version: 1.0\n"
@@ -21,28 +21,28 @@
"X-Accelerator-Marker: &\n"
"X-Generator: Lokalize 2.0\n"
-#: battery/batteryplugin.cpp:77
+#: battery/batteryplugin.cpp:75
#, kde-format
msgctxt "device name: low battery"
msgid "%1: Low Battery"
msgstr "%1: Bateria baixa"
-#: battery/batteryplugin.cpp:78
+#: battery/batteryplugin.cpp:75
#, kde-format
msgid "Battery at %1%"
msgstr "Bateria al %1%"
-#: mousepad/mousepadplugin.cpp:131
+#: mousepad/waylandremoteinput.cpp:59
#, kde-format
msgid "KDE Connect"
msgstr "KDE Connect"
-#: mousepad/mousepadplugin.cpp:131
+#: mousepad/waylandremoteinput.cpp:59
#, kde-format
msgid "Use your phone as a touchpad and keyboard"
msgstr "Empra el telèfon com un ratolí tàctil i teclat"
-#: notifications/notification.cpp:127 telephony/telephonyplugin.cpp:113
+#: notifications/notification.cpp:120 telephony/telephonyplugin.cpp:113
#, kde-format
msgid "Reply"
msgstr "Respon"
@@ -100,18 +100,33 @@
msgid "Mute system sound"
msgstr "Silencia el so del sistema"
-#: ping/pingplugin.cpp:54
+#: ping/pingplugin.cpp:50
#, kde-format
msgid "Ping!"
msgstr "Ping!"
-#: runcommand/runcommand_config.cpp:51
+#: runcommand/runcommand_config.cpp:45
+#, kde-format
+msgid "Suspend"
+msgstr "Suspèn"
+
+#: runcommand/runcommand_config.cpp:46
+#, kde-format
+msgid "Maximum Brightness"
+msgstr "Lluminositat màxima"
+
+#: runcommand/runcommand_config.cpp:53
+#, kde-format
+msgid "Sample commands"
+msgstr "Ordres de mostra"
+
+#: runcommand/runcommand_config.cpp:62
#: sendnotifications/notifyingapplicationmodel.cpp:208
#, kde-format
msgid "Name"
msgstr "Nom"
-#: runcommand/runcommand_config.cpp:51
+#: runcommand/runcommand_config.cpp:62
#, kde-format
msgid "Command"
msgstr "Ordre"
diff -Nru kdeconnect-1.2.1/po/ca/kdeconnect-urlhandler.po kdeconnect-1.3.0/po/ca/kdeconnect-urlhandler.po
--- kdeconnect-1.2.1/po/ca/kdeconnect-urlhandler.po 2018-01-16 22:46:13.000000000 +0000
+++ kdeconnect-1.3.0/po/ca/kdeconnect-urlhandler.po 2018-04-08 14:35:19.000000000 +0000
@@ -1,15 +1,15 @@
# Translation of kdeconnect-urlhandler.po to Catalan
-# Copyright (C) 2017 This_file_is_part_of_KDE
+# Copyright (C) 2017-2018 This_file_is_part_of_KDE
# This file is distributed under the license LGPL version 2.1 or
# version 3 or later versions approved by the membership of KDE e.V.
#
-# Josep Ma. Ferrer , 2017.
+# Josep Ma. Ferrer , 2017, 2018.
msgid ""
msgstr ""
"Project-Id-Version: kdeconnect-urlhandler\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-06-10 02:58+0200\n"
-"PO-Revision-Date: 2017-06-10 11:21+0100\n"
+"POT-Creation-Date: 2018-01-26 03:14+0100\n"
+"PO-Revision-Date: 2018-01-26 17:08+0100\n"
"Last-Translator: Josep Ma. Ferrer \n"
"Language-Team: Catalan \n"
"Language: ca\n"
@@ -45,7 +45,12 @@
msgid "URL to share"
msgstr "URL a compartir"
-#: kdeconnect-handler.cpp:104
+#: kdeconnect-handler.cpp:94
+#, kde-format
+msgid "Device to call this phone number with:"
+msgstr "Dispositiu amb el que trucar aquest número de telèfon:"
+
+#: kdeconnect-handler.cpp:111
#, kde-format
msgid "Couldn't share %1"
msgstr "No s'ha pogut compartir %1"
\ No newline at end of file
diff -Nru kdeconnect-1.2.1/po/ca/plasma_applet_org.kde.kdeconnect.po kdeconnect-1.3.0/po/ca/plasma_applet_org.kde.kdeconnect.po
--- kdeconnect-1.2.1/po/ca/plasma_applet_org.kde.kdeconnect.po 2018-01-16 22:46:13.000000000 +0000
+++ kdeconnect-1.3.0/po/ca/plasma_applet_org.kde.kdeconnect.po 2018-04-08 14:35:19.000000000 +0000
@@ -1,15 +1,16 @@
# Translation of plasma_applet_org.kde.kdeconnect.po to Catalan
-# Copyright (C) 2014-2017 This_file_is_part_of_KDE
+# Copyright (C) 2014-2018 This_file_is_part_of_KDE
# This file is distributed under the license LGPL version 2.1 or
# version 3 or later versions approved by the membership of KDE e.V.
#
-# Antoni Bella Pérez , 2014, 2015, 2016, 2017.
+# Antoni Bella Pérez , 2014, 2015, 2016, 2017, 2018.
+# Josep Ma. Ferrer , 2018.
msgid ""
msgstr ""
"Project-Id-Version: plasma_applet_org.kde.kdeconnect\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-01-10 04:36+0100\n"
-"PO-Revision-Date: 2017-07-28 10:55+0100\n"
+"POT-Creation-Date: 2018-03-25 04:16+0200\n"
+"PO-Revision-Date: 2018-03-25 10:40+0100\n"
"Last-Translator: Antoni Bella Pérez \n"
"Language-Team: Catalan \n"
"Language: ca\n"
@@ -52,10 +53,22 @@
msgid "Notifications:"
msgstr "Notificacions:"
+#: package/contents/ui/DeviceDelegate.qml:209
+msgid "Dismiss all notifications"
+msgstr "Descarta totes les notificacions"
+
+#: package/contents/ui/DeviceDelegate.qml:245
+msgid "Reply"
+msgstr "Respon"
+
+#: package/contents/ui/DeviceDelegate.qml:254
+msgid "Dismiss"
+msgstr "Refusa"
+
#: package/contents/ui/FullRepresentation.qml:35
msgid "No paired devices available"
-msgstr "No hi ha dispositius aparellats disponibles"
+msgstr "No hi ha disponible cap dispositiu aparellat"
-#: package/contents/ui/main.qml:60
+#: package/contents/ui/main.qml:59
msgid "KDE Connect Settings..."
msgstr "Arranjament del KDE Connect..."
\ No newline at end of file
diff -Nru kdeconnect-1.2.1/po/ca@valencia/kdeconnect-cli.po kdeconnect-1.3.0/po/ca@valencia/kdeconnect-cli.po
--- kdeconnect-1.2.1/po/ca@valencia/kdeconnect-cli.po 2018-01-16 22:46:13.000000000 +0000
+++ kdeconnect-1.3.0/po/ca@valencia/kdeconnect-cli.po 2018-04-08 14:35:19.000000000 +0000
@@ -1,17 +1,17 @@
# Translation of kdeconnect-cli.po to Catalan (Valencian)
-# Copyright (C) 2014-2017 This_file_is_part_of_KDE
+# Copyright (C) 2014-2018 This_file_is_part_of_KDE
# This file is distributed under the license LGPL version 2.1 or
# version 3 or later versions approved by the membership of KDE e.V.
#
-# Antoni Bella Pérez , 2014, 2015, 2016, 2017.
-# Josep Ma. Ferrer , 2015, 2016, 2017.
+# Antoni Bella Pérez , 2014, 2015, 2016, 2017, 2018.
+# Josep Ma. Ferrer , 2015, 2016, 2017, 2018.
msgid ""
msgstr ""
"Project-Id-Version: kdeconnect-cli\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-06-10 02:58+0200\n"
-"PO-Revision-Date: 2017-02-25 18:11+0100\n"
-"Last-Translator: Josep Ma. Ferrer \n"
+"POT-Creation-Date: 2018-02-28 03:17+0100\n"
+"PO-Revision-Date: 2018-02-28 09:30+0100\n"
+"Last-Translator: Antoni Bella Pérez \n"
"Language-Team: Catalan \n"
"Language: ca@valencia\n"
"MIME-Version: 1.0\n"
@@ -72,177 +72,200 @@
#: kdeconnect-cli.cpp:54
#, kde-format
-msgid "Search for devices in the network and re-establish connections"
-msgstr "Busca dispositius a la xarxa i torna a establir les connexions"
+msgid ""
+"Make --list-devices or --list-available print only the devices name, to ease "
+"scripting"
+msgstr ""
+"Fa que --list-devices o --list-available imprimisca només els noms dels "
+"dispositius, per a facilitar la creació de scripts"
#: kdeconnect-cli.cpp:55
#, kde-format
+msgid ""
+"Make --list-devices or --list-available print only the devices id and name, "
+"to ease scripting"
+msgstr ""
+"Fa que --list-devices o --list-available imprimisca només els ID i els noms "
+"dels dispositius, per a facilitar la creació de scripts"
+
+#: kdeconnect-cli.cpp:56
+#, kde-format
+msgid "Search for devices in the network and re-establish connections"
+msgstr "Cerca dispositius a la xarxa i torna a establir les connexions"
+
+#: kdeconnect-cli.cpp:57
+#, kde-format
msgid "Request pairing to a said device"
msgstr "Demana aparellar amb un dispositiu indicat"
-#: kdeconnect-cli.cpp:56
+#: kdeconnect-cli.cpp:58
#, kde-format
msgid "Find the said device by ringing it."
msgstr "Troba el dispositiu indicat trucant-lo."
-#: kdeconnect-cli.cpp:57
+#: kdeconnect-cli.cpp:59
#, kde-format
msgid "Stop pairing to a said device"
msgstr "Atura l'aparellament amb un dispositiu indicat"
-#: kdeconnect-cli.cpp:58
+#: kdeconnect-cli.cpp:60
#, kde-format
msgid "Sends a ping to said device"
msgstr "Envia un ping a un dispositiu indicat"
-#: kdeconnect-cli.cpp:59
+#: kdeconnect-cli.cpp:61
#, kde-format
msgid "Same as ping but you can set the message to display"
msgstr "Igual que el ping però es pot definir el missatge que es mostrarà"
-#: kdeconnect-cli.cpp:59 kdeconnect-cli.cpp:63
+#: kdeconnect-cli.cpp:61 kdeconnect-cli.cpp:65
#, kde-format
msgid "message"
msgstr "missatge"
-#: kdeconnect-cli.cpp:60
+#: kdeconnect-cli.cpp:62
#, kde-format
msgid "Share a file to a said device"
msgstr "Comparteix un fitxer amb un dispositiu indicat"
-#: kdeconnect-cli.cpp:61
+#: kdeconnect-cli.cpp:63
#, kde-format
msgid "Display the notifications on a said device"
msgstr "Mostra les notificacions a un dispositiu indicat"
-#: kdeconnect-cli.cpp:62
+#: kdeconnect-cli.cpp:64
#, kde-format
msgid "Lock the specified device"
msgstr "Bloqueja el dispositiu especificat"
-#: kdeconnect-cli.cpp:63
+#: kdeconnect-cli.cpp:65
#, kde-format
msgid "Sends an SMS. Requires destination"
msgstr "Envia un SMS. Requereix una destinació"
-#: kdeconnect-cli.cpp:64
+#: kdeconnect-cli.cpp:66
#, kde-format
msgid "Phone number to send the message"
msgstr "Número de telèfon a on enviar el missatge"
-#: kdeconnect-cli.cpp:64
+#: kdeconnect-cli.cpp:66
#, kde-format
msgid "phone number"
msgstr "número de telèfon"
-#: kdeconnect-cli.cpp:65
+#: kdeconnect-cli.cpp:67
#, kde-format
msgid "Device ID"
msgstr "ID del dispositiu"
-#: kdeconnect-cli.cpp:66
+#: kdeconnect-cli.cpp:68
#, kde-format
msgid "Device Name"
msgstr "Nom del dispositiu"
-#: kdeconnect-cli.cpp:67
+#: kdeconnect-cli.cpp:69
#, kde-format
msgid "Get encryption info about said device"
msgstr "Obtén la informació d'encriptatge del dispositiu indicat"
-#: kdeconnect-cli.cpp:68
+#: kdeconnect-cli.cpp:70
#, kde-format
msgid "Lists remote commands and their ids"
-msgstr "Llista les ordes remotes i les seues ID"
+msgstr "Llista les ordres remotes i les seues ID"
-#: kdeconnect-cli.cpp:69
+#: kdeconnect-cli.cpp:71
#, kde-format
msgid "Executes a remote command by id"
-msgstr "Executa una orde remota pel seu ID"
+msgstr "Executa una ordre remota pel seu ID"
-#: kdeconnect-cli.cpp:70
+#: kdeconnect-cli.cpp:72
#, kde-format
msgid "Sends keys to a said device"
msgstr "Envia les tecles a un dispositiu indicat"
-#: kdeconnect-cli.cpp:71
+#: kdeconnect-cli.cpp:73
#, kde-format
msgid "Display this device's id and exit"
-msgstr "Mostra l'ID d'este dispositiu i ix"
+msgstr "Mostra l'ID d'aquest dispositiu i ix"
-#: kdeconnect-cli.cpp:102
+#: kdeconnect-cli.cpp:114
#, kde-format
msgid "(paired and reachable)"
msgstr "(aparellat i accessible)"
-#: kdeconnect-cli.cpp:104
+#: kdeconnect-cli.cpp:116
#, kde-format
msgid "(reachable)"
msgstr "(accessible)"
-#: kdeconnect-cli.cpp:106
+#: kdeconnect-cli.cpp:118
#, kde-format
msgid "(paired)"
msgstr "(aparellat)"
-#: kdeconnect-cli.cpp:113
+#: kdeconnect-cli.cpp:125
#, kde-format
msgid "1 device found"
msgid_plural "%1 devices found"
msgstr[0] "S'ha trobat 1 dispositiu"
msgstr[1] "S'han trobat %1 dispositius"
-#: kdeconnect-cli.cpp:115
+#: kdeconnect-cli.cpp:127
#, kde-format
msgid "No devices found"
msgstr "No s'ha trobat cap dispositiu"
-#: kdeconnect-cli.cpp:133
+#: kdeconnect-cli.cpp:145
#, kde-format
msgid "No device specified"
msgstr "No s'ha especificat cap dispositiu"
-#: kdeconnect-cli.cpp:145
+#: kdeconnect-cli.cpp:158
+#, kde-format
+msgid "Can't find the file: %1"
+msgstr "No s'ha pogut trobar el fitxer: %1"
+
+#: kdeconnect-cli.cpp:169
#, kde-format
-msgid "Couldn't share %1"
-msgstr "No s'ha pogut compartir %1"
+msgid "Sent %1"
+msgstr "Enviat %1"
-#: kdeconnect-cli.cpp:152
+#: kdeconnect-cli.cpp:176
#, kde-format
msgid "waiting for device..."
msgstr "s'està esperant per un dispositiu..."
-#: kdeconnect-cli.cpp:166
+#: kdeconnect-cli.cpp:190
#, kde-format
msgid "Device not found"
msgstr "No s'ha trobat cap dispositiu"
-#: kdeconnect-cli.cpp:168
+#: kdeconnect-cli.cpp:192
#, kde-format
msgid "Already paired"
msgstr "Ja està aparellat"
-#: kdeconnect-cli.cpp:170
+#: kdeconnect-cli.cpp:194
#, kde-format
msgid "Pair requested"
msgstr "Sol·licitud per aparellar"
-#: kdeconnect-cli.cpp:177
+#: kdeconnect-cli.cpp:201
#, kde-format
msgid "Device does not exist"
-msgstr "Este dispositiu no existeix"
+msgstr "Aquest dispositiu no existeix"
-#: kdeconnect-cli.cpp:179
+#: kdeconnect-cli.cpp:203
#, kde-format
msgid "Already not paired"
msgstr "Ja no està aparellat"
-#: kdeconnect-cli.cpp:181
+#: kdeconnect-cli.cpp:205
#, kde-format
msgid "Unpaired"
msgstr "Sense aparellar"
-#: kdeconnect-cli.cpp:197
+#: kdeconnect-cli.cpp:221
#, kde-format
msgid ""
"error: should specify the SMS's recipient by passing --destination "
-#: kdeconnect-cli.cpp:244
+#: kdeconnect-cli.cpp:268
#, kde-format
msgid "Nothing to be done"
msgstr "No es fa res"
\ No newline at end of file
diff -Nru kdeconnect-1.2.1/po/ca@valencia/kdeconnect-core.po kdeconnect-1.3.0/po/ca@valencia/kdeconnect-core.po
--- kdeconnect-1.2.1/po/ca@valencia/kdeconnect-core.po 2018-01-16 22:46:13.000000000 +0000
+++ kdeconnect-1.3.0/po/ca@valencia/kdeconnect-core.po 2018-04-08 14:35:19.000000000 +0000
@@ -1,17 +1,17 @@
# Translation of kdeconnect-core.po to Catalan (Valencian)
-# Copyright (C) 2014-2016 This_file_is_part_of_KDE
+# Copyright (C) 2014-2018 This_file_is_part_of_KDE
# This file is distributed under the license LGPL version 2.1 or
# version 3 or later versions approved by the membership of KDE e.V.
#
-# Antoni Bella Pérez , 2014, 2015, 2016.
+# Antoni Bella Pérez , 2014, 2015, 2016, 2018.
# Josep Ma. Ferrer , 2015, 2016.
msgid ""
msgstr ""
"Project-Id-Version: kdeconnect-core\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-09-19 03:23+0200\n"
-"PO-Revision-Date: 2016-07-07 20:35+0200\n"
-"Last-Translator: Josep Ma. Ferrer \n"
+"POT-Creation-Date: 2018-03-06 03:17+0100\n"
+"PO-Revision-Date: 2018-03-06 15:46+0100\n"
+"Last-Translator: Antoni Bella Pérez \n"
"Language-Team: Catalan \n"
"Language: ca@valencia\n"
"MIME-Version: 1.0\n"
@@ -19,7 +19,7 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Accelerator-Marker: &\n"
-"X-Generator: Lokalize 1.5\n"
+"X-Generator: Lokalize 2.0\n"
#: backends/bluetooth/bluetoothpairinghandler.cpp:70
#: backends/lan/lanpairinghandler.cpp:66
@@ -50,30 +50,30 @@
"This device cannot be paired because it is running an old version of KDE "
"Connect."
msgstr ""
-"Este dispositiu no es pot aparellar perquè està executant una versió antiga "
-"del KDE Connect."
+"Aquest dispositiu no es pot aparellar perquè està executant una versió "
+"antiga del KDE Connect."
#: backends/lan/uploadjob.cpp:50
#, kde-format
msgid "Couldn't find an available port"
msgstr "No s'ha pogut trobar un port disponible"
-#: device.cpp:160
+#: device.cpp:156
#, kde-format
msgid "Already paired"
msgstr "Ja està aparellat"
-#: device.cpp:165
+#: device.cpp:161
#, kde-format
msgid "Device not reachable"
msgstr "No es pot accedir al dispositiu"
-#: device.cpp:477
+#: device.cpp:473
#, kde-format
msgid "SHA1 fingerprint of your device certificate is: %1\n"
msgstr "L'empremta digital SHA1 del certificat del vostre dispositiu és: %1\n"
-#: device.cpp:485
+#: device.cpp:481
#, kde-format
msgid "SHA1 fingerprint of remote device certificate is: %1\n"
msgstr "L'empremta digital SHA1 del certificat del dispositiu remot és: %1\n"
@@ -114,8 +114,8 @@
#, kde-format
msgid ""
"Could not find support for RSA in your QCA installation. If your "
-"distribution provides separate packages for QCA-ossl and QCA-gnupg, make "
-"sure you have them installed and try again."
+"distribution provides separate packets for QCA-ossl and QCA-gnupg, make sure "
+"you have them installed and try again."
msgstr ""
"No s'ha pogut trobar la implementació RSA en la vostra instal·lació del QCA. "
"Si la vostra distribució ofereix paquets separats per a QCA-ossl i QCA-"
diff -Nru kdeconnect-1.2.1/po/ca@valencia/kdeconnect-kcm.po kdeconnect-1.3.0/po/ca@valencia/kdeconnect-kcm.po
--- kdeconnect-1.2.1/po/ca@valencia/kdeconnect-kcm.po 2018-01-16 22:46:13.000000000 +0000
+++ kdeconnect-1.3.0/po/ca@valencia/kdeconnect-kcm.po 2018-04-08 14:35:19.000000000 +0000
@@ -3,14 +3,14 @@
# This file is distributed under the license LGPL version 2.1 or
# version 3 or later versions approved by the membership of KDE e.V.
#
-# Antoni Bella Pérez , 2014, 2015, 2016, 2017.
+# Antoni Bella Pérez , 2014, 2015, 2016, 2017, 2018.
# Josep Ma. Ferrer , 2015, 2016, 2018.
msgid ""
msgstr ""
"Project-Id-Version: kdeconnect-kcm\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-07-14 03:06+0200\n"
-"PO-Revision-Date: 2018-01-01 19:38+0100\n"
+"POT-Creation-Date: 2018-02-18 03:11+0100\n"
+"PO-Revision-Date: 2018-02-18 12:11+0100\n"
"Last-Translator: Josep Ma. Ferrer \n"
"Language-Team: Catalan \n"
"Language: ca@valencia\n"
@@ -87,90 +87,89 @@
msgid "KDE Connect"
msgstr "KDE Connect"
+#. i18n: ectx: property (text), widget (QToolButton, renameShow_button)
+#: kcm.ui:70
+#, kde-format
+msgid "Edit"
+msgstr "Edita"
+
+#. i18n: ectx: property (text), widget (QToolButton, renameDone_button)
+#: kcm.ui:92
+#, kde-format
+msgid "Save"
+msgstr "Guarda"
+
#. i18n: ectx: property (text), widget (QPushButton, refresh_button)
-#: kcm.ui:110
+#: kcm.ui:108
#, kde-format
msgid "Refresh"
msgstr "Refresca"
#. i18n: ectx: property (text), widget (QLabel, name_label)
-#: kcm.ui:157
+#: kcm.ui:155
#, kde-format
msgid "Device"
msgstr "Dispositiu"
#. i18n: ectx: property (text), widget (QLabel, status_label)
-#: kcm.ui:173
+#: kcm.ui:171
#, kde-format
msgid "(status)"
msgstr "(estat)"
#. i18n: ectx: property (text), widget (QPushButton, accept_button)
-#: kcm.ui:212
+#: kcm.ui:210
#, kde-format
msgid "Accept"
msgstr "Accepta"
#. i18n: ectx: property (text), widget (QPushButton, reject_button)
-#: kcm.ui:219
+#: kcm.ui:217
#, kde-format
msgid "Reject"
msgstr "Rebutja"
#. i18n: ectx: property (text), widget (QPushButton, pair_button)
-#: kcm.ui:232
+#: kcm.ui:230
#, kde-format
msgid "Request pair"
msgstr "Demana aparellar"
#. i18n: ectx: property (text), widget (QPushButton, unpair_button)
-#: kcm.ui:245
+#: kcm.ui:243
#, kde-format
msgid "Unpair"
msgstr "Desparella"
#. i18n: ectx: property (text), widget (QPushButton, ping_button)
-#: kcm.ui:258
+#: kcm.ui:256
#, kde-format
msgid "Send ping"
msgstr "Envia un ping"
-#. i18n: ectx: property (text), widget (QLabel, noDeviceLabel)
-#: kcm.ui:303
-#, kde-format
-msgid "No device selected."
-msgstr "No s'ha seleccionat cap dispositiu."
-
#. i18n: ectx: property (text), widget (QLabel, noDeviceLinks)
-#: kcm.ui:319
+#: kcm.ui:294
#, kde-format
msgid ""
-"If you own an Android device, make sure to install the "
-"KDE Connect Android app"
-"span> (also available from F-Droid) and it should appear in the list.
"
-"html>"
-msgstr ""
-"Si teniu un dispositiu amb Android, assegureu-vos "
-"d'instal·lar l'app KDE "
-"Connect per a Android (també disponible des de F-Droid) i hauria d'aparèixer a "
-"la llista.
"
-
-#. i18n: ectx: property (text), widget (QLabel, noDeviceTroubleshoot)
-#: kcm.ui:350
-#, kde-format
-msgid ""
-"If you are having problems, visit the KDE Connect Community wiki for help.
"
-"html>"
+"No device selected.
If you own an Android "
+"device, make sure to install the KDE Connect Android app (also "
+"available from F-Droid) and it should appear in the list.
If you "
+"are having problems, visit the KDE Connect "
+"Community wiki for help.
"
msgstr ""
-"Si teniu cap problema, visiteu el wiki de la comunitat del KDE Connect per a trobar l'ajuda "
-"necessària.
"
\ No newline at end of file
+"No hi ha cap dispositiu seleccionat.
Si teniu "
+"un dispositiu amb Android, assegureu-vos d'instal·lar l'app KDE Connect per a Android "
+"(també disponible des de F-Droid) i hauria d'aparèixer a la llista.
Si "
+"teniu problemes, visiteu el wiki de KDE Connect Community per obtindre ajuda."
+"
"
\ No newline at end of file
diff -Nru kdeconnect-1.2.1/po/ca@valencia/kdeconnect-plugins.po kdeconnect-1.3.0/po/ca@valencia/kdeconnect-plugins.po
--- kdeconnect-1.2.1/po/ca@valencia/kdeconnect-plugins.po 2018-01-16 22:46:13.000000000 +0000
+++ kdeconnect-1.3.0/po/ca@valencia/kdeconnect-plugins.po 2018-04-08 14:35:19.000000000 +0000
@@ -1,17 +1,17 @@
# Translation of kdeconnect-plugins.po to Catalan (Valencian)
-# Copyright (C) 2014-2017 This_file_is_part_of_KDE
+# Copyright (C) 2014-2018 This_file_is_part_of_KDE
# This file is distributed under the license LGPL version 2.1 or
# version 3 or later versions approved by the membership of KDE e.V.
#
-# Antoni Bella Pérez , 2014, 2015, 2016.
+# Antoni Bella Pérez , 2014, 2015, 2016, 2018.
# Josep Ma. Ferrer , 2015, 2017.
msgid ""
msgstr ""
"Project-Id-Version: kdeconnect-plugins\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-12-30 03:03+0100\n"
-"PO-Revision-Date: 2017-09-19 20:20+0100\n"
-"Last-Translator: Josep Ma. Ferrer \n"
+"POT-Creation-Date: 2018-04-05 03:28+0200\n"
+"PO-Revision-Date: 2018-03-25 10:36+0100\n"
+"Last-Translator: Antoni Bella Pérez \n"
"Language-Team: Catalan \n"
"Language: ca@valencia\n"
"MIME-Version: 1.0\n"
@@ -21,28 +21,28 @@
"X-Accelerator-Marker: &\n"
"X-Generator: Lokalize 2.0\n"
-#: battery/batteryplugin.cpp:77
+#: battery/batteryplugin.cpp:75
#, kde-format
msgctxt "device name: low battery"
msgid "%1: Low Battery"
msgstr "%1: Bateria baixa"
-#: battery/batteryplugin.cpp:78
+#: battery/batteryplugin.cpp:75
#, kde-format
msgid "Battery at %1%"
msgstr "Bateria al %1%"
-#: mousepad/mousepadplugin.cpp:131
+#: mousepad/waylandremoteinput.cpp:59
#, kde-format
msgid "KDE Connect"
msgstr "KDE Connect"
-#: mousepad/mousepadplugin.cpp:131
+#: mousepad/waylandremoteinput.cpp:59
#, kde-format
msgid "Use your phone as a touchpad and keyboard"
msgstr "Empra el telèfon com un ratolí tàctil i teclat"
-#: notifications/notification.cpp:127 telephony/telephonyplugin.cpp:113
+#: notifications/notification.cpp:120 telephony/telephonyplugin.cpp:113
#, kde-format
msgid "Reply"
msgstr "Respon"
@@ -100,21 +100,36 @@
msgid "Mute system sound"
msgstr "Silencia el so del sistema"
-#: ping/pingplugin.cpp:54
+#: ping/pingplugin.cpp:50
#, kde-format
msgid "Ping!"
msgstr "Ping!"
-#: runcommand/runcommand_config.cpp:51
+#: runcommand/runcommand_config.cpp:45
+#, kde-format
+msgid "Suspend"
+msgstr "Suspèn"
+
+#: runcommand/runcommand_config.cpp:46
+#, kde-format
+msgid "Maximum Brightness"
+msgstr "Lluminositat màxima"
+
+#: runcommand/runcommand_config.cpp:53
+#, kde-format
+msgid "Sample commands"
+msgstr "Ordres de mostra"
+
+#: runcommand/runcommand_config.cpp:62
#: sendnotifications/notifyingapplicationmodel.cpp:208
#, kde-format
msgid "Name"
msgstr "Nom"
-#: runcommand/runcommand_config.cpp:51
+#: runcommand/runcommand_config.cpp:62
#, kde-format
msgid "Command"
-msgstr "Orde"
+msgstr "Ordre"
#: sendnotifications/notifyingapplicationmodel.cpp:212
#, kde-format
@@ -139,7 +154,7 @@
"notifications."
msgstr ""
"Expressió regular que defineix les notificacions que no s'han d'enviar.\n"
-"Este patró s'aplica al resum, i si s'ha seleccionat a dalt, al cos de les "
+"Aquest patró s'aplica al resum, i si s'ha seleccionat a dalt, al cos de les "
"notificacions."
#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
diff -Nru kdeconnect-1.2.1/po/ca@valencia/kdeconnect-urlhandler.po kdeconnect-1.3.0/po/ca@valencia/kdeconnect-urlhandler.po
--- kdeconnect-1.2.1/po/ca@valencia/kdeconnect-urlhandler.po 2018-01-16 22:46:13.000000000 +0000
+++ kdeconnect-1.3.0/po/ca@valencia/kdeconnect-urlhandler.po 2018-04-08 14:35:19.000000000 +0000
@@ -1,15 +1,15 @@
# Translation of kdeconnect-urlhandler.po to Catalan (Valencian)
-# Copyright (C) 2017 This_file_is_part_of_KDE
+# Copyright (C) 2017-2018 This_file_is_part_of_KDE
# This file is distributed under the license LGPL version 2.1 or
# version 3 or later versions approved by the membership of KDE e.V.
#
-# Josep Ma. Ferrer , 2017.
+# Josep Ma. Ferrer , 2017, 2018.
msgid ""
msgstr ""
"Project-Id-Version: kdeconnect-urlhandler\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-06-10 02:58+0200\n"
-"PO-Revision-Date: 2017-06-10 11:21+0100\n"
+"POT-Creation-Date: 2018-01-26 03:14+0100\n"
+"PO-Revision-Date: 2018-01-26 17:08+0100\n"
"Last-Translator: Josep Ma. Ferrer \n"
"Language-Team: Catalan \n"
"Language: ca@valencia\n"
@@ -45,7 +45,12 @@
msgid "URL to share"
msgstr "URL a compartir"
-#: kdeconnect-handler.cpp:104
+#: kdeconnect-handler.cpp:94
+#, kde-format
+msgid "Device to call this phone number with:"
+msgstr "Dispositiu amb el que trucar aquest número de telèfon:"
+
+#: kdeconnect-handler.cpp:111
#, kde-format
msgid "Couldn't share %1"
msgstr "No s'ha pogut compartir %1"
\ No newline at end of file
diff -Nru kdeconnect-1.2.1/po/ca@valencia/plasma_applet_org.kde.kdeconnect.po kdeconnect-1.3.0/po/ca@valencia/plasma_applet_org.kde.kdeconnect.po
--- kdeconnect-1.2.1/po/ca@valencia/plasma_applet_org.kde.kdeconnect.po 2018-01-16 22:46:13.000000000 +0000
+++ kdeconnect-1.3.0/po/ca@valencia/plasma_applet_org.kde.kdeconnect.po 2018-04-08 14:35:19.000000000 +0000
@@ -1,15 +1,16 @@
# Translation of plasma_applet_org.kde.kdeconnect.po to Catalan (Valencian)
-# Copyright (C) 2014-2017 This_file_is_part_of_KDE
+# Copyright (C) 2014-2018 This_file_is_part_of_KDE
# This file is distributed under the license LGPL version 2.1 or
# version 3 or later versions approved by the membership of KDE e.V.
#
-# Antoni Bella Pérez , 2014, 2015, 2016, 2017.
+# Antoni Bella Pérez , 2014, 2015, 2016, 2017, 2018.
+# Josep Ma. Ferrer , 2018.
msgid ""
msgstr ""
"Project-Id-Version: plasma_applet_org.kde.kdeconnect\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-01-10 04:36+0100\n"
-"PO-Revision-Date: 2017-07-28 10:55+0100\n"
+"POT-Creation-Date: 2018-03-25 04:16+0200\n"
+"PO-Revision-Date: 2018-03-25 10:40+0100\n"
"Last-Translator: Antoni Bella Pérez \n"
"Language-Team: Catalan \n"
"Language: ca@valencia\n"
@@ -42,7 +43,7 @@
#: package/contents/ui/DeviceDelegate.qml:142
msgid "Browse this device"
-msgstr "Navega per este dispositiu"
+msgstr "Navega per aquest dispositiu"
#: package/contents/ui/DeviceDelegate.qml:164
msgid "Remote Keyboard"
@@ -52,10 +53,22 @@
msgid "Notifications:"
msgstr "Notificacions:"
+#: package/contents/ui/DeviceDelegate.qml:209
+msgid "Dismiss all notifications"
+msgstr "Descarta totes les notificacions"
+
+#: package/contents/ui/DeviceDelegate.qml:245
+msgid "Reply"
+msgstr "Respon"
+
+#: package/contents/ui/DeviceDelegate.qml:254
+msgid "Dismiss"
+msgstr "Refusa"
+
#: package/contents/ui/FullRepresentation.qml:35
msgid "No paired devices available"
-msgstr "No hi ha dispositius aparellats disponibles"
+msgstr "No hi ha disponible cap dispositiu aparellat"
-#: package/contents/ui/main.qml:60
+#: package/contents/ui/main.qml:59
msgid "KDE Connect Settings..."
msgstr "Arranjament del KDE Connect..."
\ No newline at end of file
diff -Nru kdeconnect-1.2.1/po/cs/kdeconnect-cli.po kdeconnect-1.3.0/po/cs/kdeconnect-cli.po
--- kdeconnect-1.2.1/po/cs/kdeconnect-cli.po 2018-01-16 22:46:14.000000000 +0000
+++ kdeconnect-1.3.0/po/cs/kdeconnect-cli.po 2018-04-08 14:35:20.000000000 +0000
@@ -1,14 +1,14 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
-# Vít Pelčák , 2014, 2015, 2016, 2017.
+# Vít Pelčák , 2014, 2015, 2016, 2017, 2018.
#
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-06-10 02:58+0200\n"
-"PO-Revision-Date: 2017-02-27 09:06+0100\n"
-"Last-Translator: Vít Pelčák \n"
+"POT-Creation-Date: 2018-02-28 03:17+0100\n"
+"PO-Revision-Date: 2018-03-01 16:50+0100\n"
+"Last-Translator: Vit Pelcak \n"
"Language-Team: Czech \n"
"Language: cs\n"
"MIME-Version: 1.0\n"
@@ -68,120 +68,138 @@
#: kdeconnect-cli.cpp:54
#, kde-format
+msgid ""
+"Make --list-devices or --list-available print only the devices name, to ease "
+"scripting"
+msgstr ""
+"Pro zjednodušení skriptování zapnout aby --list-devices nebo --list-"
+"available vypsal pouze název zařízení"
+
+#: kdeconnect-cli.cpp:55
+#, kde-format
+msgid ""
+"Make --list-devices or --list-available print only the devices id and name, "
+"to ease scripting"
+msgstr ""
+"Pro zjednodušení skriptování zapnout aby --list-devices nebo --list-"
+"available vypsal pouze id a název zařízení"
+
+#: kdeconnect-cli.cpp:56
+#, kde-format
msgid "Search for devices in the network and re-establish connections"
msgstr "Hledat zařízení v síti a znovu navázat spojení"
-#: kdeconnect-cli.cpp:55
+#: kdeconnect-cli.cpp:57
#, kde-format
msgid "Request pairing to a said device"
msgstr "Vyžádat párování s daným zařízením"
-#: kdeconnect-cli.cpp:56
+#: kdeconnect-cli.cpp:58
#, kde-format
msgid "Find the said device by ringing it."
msgstr "Najít požadované zařízení prozvoněním."
-#: kdeconnect-cli.cpp:57
+#: kdeconnect-cli.cpp:59
#, kde-format
msgid "Stop pairing to a said device"
msgstr "Zastavit párování s daným zařízením"
-#: kdeconnect-cli.cpp:58
+#: kdeconnect-cli.cpp:60
#, kde-format
msgid "Sends a ping to said device"
msgstr "Pošle na dané zařízení ping"
-#: kdeconnect-cli.cpp:59
+#: kdeconnect-cli.cpp:61
#, kde-format
msgid "Same as ping but you can set the message to display"
msgstr "Stejné jako ping, ale můžete nastavit zobrazenou zprávu."
-#: kdeconnect-cli.cpp:59 kdeconnect-cli.cpp:63
+#: kdeconnect-cli.cpp:61 kdeconnect-cli.cpp:65
#, kde-format
msgid "message"
msgstr "zpráva"
-#: kdeconnect-cli.cpp:60
+#: kdeconnect-cli.cpp:62
#, kde-format
msgid "Share a file to a said device"
msgstr "Sdílet soubor s daným zařízením"
-#: kdeconnect-cli.cpp:61
+#: kdeconnect-cli.cpp:63
#, kde-format
msgid "Display the notifications on a said device"
msgstr "Zobrazit upozornění na daném zařízení"
-#: kdeconnect-cli.cpp:62
+#: kdeconnect-cli.cpp:64
#, kde-format
msgid "Lock the specified device"
msgstr "Uzamknout zadané zařízení"
-#: kdeconnect-cli.cpp:63
+#: kdeconnect-cli.cpp:65
#, kde-format
msgid "Sends an SMS. Requires destination"
msgstr "Pošle SMS. Požaduje cíl"
-#: kdeconnect-cli.cpp:64
+#: kdeconnect-cli.cpp:66
#, kde-format
msgid "Phone number to send the message"
msgstr "Telefonní číslo pro poslání zprávy"
-#: kdeconnect-cli.cpp:64
+#: kdeconnect-cli.cpp:66
#, kde-format
msgid "phone number"
msgstr "telefonní číslo"
-#: kdeconnect-cli.cpp:65
+#: kdeconnect-cli.cpp:67
#, kde-format
msgid "Device ID"
msgstr "ID zařízení"
-#: kdeconnect-cli.cpp:66
+#: kdeconnect-cli.cpp:68
#, kde-format
msgid "Device Name"
msgstr "Název zařízení"
-#: kdeconnect-cli.cpp:67
+#: kdeconnect-cli.cpp:69
#, kde-format
msgid "Get encryption info about said device"
msgstr "Vyžádat informace o šifrování daného zařízení"
-#: kdeconnect-cli.cpp:68
+#: kdeconnect-cli.cpp:70
#, kde-format
msgid "Lists remote commands and their ids"
msgstr "Vypíše vzdálené příkazy a jejich id"
-#: kdeconnect-cli.cpp:69
+#: kdeconnect-cli.cpp:71
#, kde-format
msgid "Executes a remote command by id"
msgstr "Spustit vzdálený příkaz podle id"
-#: kdeconnect-cli.cpp:70
+#: kdeconnect-cli.cpp:72
#, kde-format
msgid "Sends keys to a said device"
msgstr "Pošle na dané zařízení stisky kláves"
-#: kdeconnect-cli.cpp:71
+#: kdeconnect-cli.cpp:73
#, kde-format
msgid "Display this device's id and exit"
msgstr "Zobrazit id tohoto zařízení a ukončit"
-#: kdeconnect-cli.cpp:102
+#: kdeconnect-cli.cpp:114
#, kde-format
msgid "(paired and reachable)"
msgstr "(spárovaná a dosažitelná)"
-#: kdeconnect-cli.cpp:104
+#: kdeconnect-cli.cpp:116
#, kde-format
msgid "(reachable)"
msgstr "(nedostupná)"
-#: kdeconnect-cli.cpp:106
+#: kdeconnect-cli.cpp:118
#, kde-format
msgid "(paired)"
msgstr "(spárovaná)"
-#: kdeconnect-cli.cpp:113
+#: kdeconnect-cli.cpp:125
#, kde-format
msgid "1 device found"
msgid_plural "%1 devices found"
@@ -189,57 +207,62 @@
msgstr[1] "Nalezena %1 zařízení"
msgstr[2] "Nalezeno %1 zařízení"
-#: kdeconnect-cli.cpp:115
+#: kdeconnect-cli.cpp:127
#, kde-format
msgid "No devices found"
msgstr "Nenalezena žádná zařízení"
-#: kdeconnect-cli.cpp:133
+#: kdeconnect-cli.cpp:145
#, kde-format
msgid "No device specified"
msgstr "Nebylo zadáno žádné zařízení"
-#: kdeconnect-cli.cpp:145
+#: kdeconnect-cli.cpp:158
+#, kde-format
+msgid "Can't find the file: %1"
+msgstr "Nelze najít soubor: %1"
+
+#: kdeconnect-cli.cpp:169
#, kde-format
-msgid "Couldn't share %1"
-msgstr "Nelze sdílet %1"
+msgid "Sent %1"
+msgstr "Posláno %1"
-#: kdeconnect-cli.cpp:152
+#: kdeconnect-cli.cpp:176
#, kde-format
msgid "waiting for device..."
msgstr "čeká se na zařízení..."
-#: kdeconnect-cli.cpp:166
+#: kdeconnect-cli.cpp:190
#, kde-format
msgid "Device not found"
msgstr "Zařízení nenalezeno"
-#: kdeconnect-cli.cpp:168
+#: kdeconnect-cli.cpp:192
#, kde-format
msgid "Already paired"
msgstr "Již spárované"
-#: kdeconnect-cli.cpp:170
+#: kdeconnect-cli.cpp:194
#, kde-format
msgid "Pair requested"
msgstr "Bylo vyžádáno párování"
-#: kdeconnect-cli.cpp:177
+#: kdeconnect-cli.cpp:201
#, kde-format
msgid "Device does not exist"
msgstr "Zařízení neexistuje."
-#: kdeconnect-cli.cpp:179
+#: kdeconnect-cli.cpp:203
#, kde-format
msgid "Already not paired"
msgstr "Již nespárované"
-#: kdeconnect-cli.cpp:181
+#: kdeconnect-cli.cpp:205
#, kde-format
msgid "Unpaired"
msgstr "Nespárované"
-#: kdeconnect-cli.cpp:197
+#: kdeconnect-cli.cpp:221
#, kde-format
msgid ""
"error: should specify the SMS's recipient by passing --destination "
-#: kdeconnect-cli.cpp:244
+#: kdeconnect-cli.cpp:268
#, kde-format
msgid "Nothing to be done"
msgstr "Nebude nic provedeno"
\ No newline at end of file
diff -Nru kdeconnect-1.2.1/po/cs/kdeconnect-core.po kdeconnect-1.3.0/po/cs/kdeconnect-core.po
--- kdeconnect-1.2.1/po/cs/kdeconnect-core.po 2018-01-16 22:46:14.000000000 +0000
+++ kdeconnect-1.3.0/po/cs/kdeconnect-core.po 2018-04-08 14:35:20.000000000 +0000
@@ -1,14 +1,14 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
-# Vít Pelčák , 2014, 2015, 2016.
+# Vít Pelčák , 2014, 2015, 2016, 2018.
#
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-09-19 03:23+0200\n"
-"PO-Revision-Date: 2016-07-14 11:12+0100\n"
-"Last-Translator: Vít Pelčák \n"
+"POT-Creation-Date: 2018-03-06 03:17+0100\n"
+"PO-Revision-Date: 2018-03-28 09:24+0100\n"
+"Last-Translator: Vit Pelcak \n"
"Language-Team: Czech \n"
"Language: cs\n"
"MIME-Version: 1.0\n"
@@ -53,22 +53,22 @@
msgid "Couldn't find an available port"
msgstr "Nelze najít žádný dostupný port"
-#: device.cpp:160
+#: device.cpp:156
#, kde-format
msgid "Already paired"
msgstr "Již spárováno"
-#: device.cpp:165
+#: device.cpp:161
#, kde-format
msgid "Device not reachable"
msgstr "Zařízení je nedostupné"
-#: device.cpp:477
+#: device.cpp:473
#, kde-format
msgid "SHA1 fingerprint of your device certificate is: %1\n"
msgstr "Otisk SHA1 certifikátu vašeho zařízení je: %1\n"
-#: device.cpp:485
+#: device.cpp:481
#, kde-format
msgid "SHA1 fingerprint of remote device certificate is: %1\n"
msgstr "Otisk SHA1 certifikátu vzdáleného zařízení je: %1\n"
@@ -109,12 +109,12 @@
#, kde-format
msgid ""
"Could not find support for RSA in your QCA installation. If your "
-"distribution provides separate packages for QCA-ossl and QCA-gnupg, make "
-"sure you have them installed and try again."
+"distribution provides separate packets for QCA-ossl and QCA-gnupg, make sure "
+"you have them installed and try again."
msgstr ""
-"Ve vaší instalaci QCA nebylo nalezeno RSA. Pokud vaše distribuce poskytuje "
-"QCA-ossl a QCA-gnupg ujistěte se, že máte nainstalované obě a zkuste to "
-"znovu."
+"Ve vaší instalaci QCA nebyla nalezena podpora RSA. Pokud vaše distribuce "
+"poskytuje QCA-ossl a QCA-gnupg ujistěte se, že máte nainstalované obě a "
+"zkuste to znovu."
#: kdeconnectconfig.cpp:96
#, kde-format
diff -Nru kdeconnect-1.2.1/po/cs/kdeconnect-kcm.po kdeconnect-1.3.0/po/cs/kdeconnect-kcm.po
--- kdeconnect-1.2.1/po/cs/kdeconnect-kcm.po 2018-01-16 22:46:14.000000000 +0000
+++ kdeconnect-1.3.0/po/cs/kdeconnect-kcm.po 2018-04-08 14:35:20.000000000 +0000
@@ -1,14 +1,14 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
-# Vít Pelčák , 2013, 2014, 2015, 2016, 2017.
+# Vít Pelčák , 2013, 2014, 2015, 2016, 2017, 2018.
#
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-07-14 03:06+0200\n"
-"PO-Revision-Date: 2017-02-23 09:07+0100\n"
-"Last-Translator: Vít Pelčák \n"
+"POT-Creation-Date: 2018-02-18 03:11+0100\n"
+"PO-Revision-Date: 2018-02-06 14:26+0100\n"
+"Last-Translator: Vit Pelcak \n"
"Language-Team: Czech \n"
"Language: cs\n"
"MIME-Version: 1.0\n"
@@ -83,89 +83,89 @@
msgid "KDE Connect"
msgstr "KDE Connect"
+#. i18n: ectx: property (text), widget (QToolButton, renameShow_button)
+#: kcm.ui:70
+#, kde-format
+msgid "Edit"
+msgstr "Upravit"
+
+#. i18n: ectx: property (text), widget (QToolButton, renameDone_button)
+#: kcm.ui:92
+#, kde-format
+msgid "Save"
+msgstr "Uložit"
+
#. i18n: ectx: property (text), widget (QPushButton, refresh_button)
-#: kcm.ui:110
+#: kcm.ui:108
#, kde-format
msgid "Refresh"
msgstr "Obnovit"
#. i18n: ectx: property (text), widget (QLabel, name_label)
-#: kcm.ui:157
+#: kcm.ui:155
#, kde-format
msgid "Device"
msgstr "Zařízení"
#. i18n: ectx: property (text), widget (QLabel, status_label)
-#: kcm.ui:173
+#: kcm.ui:171
#, kde-format
msgid "(status)"
msgstr "(stav)"
#. i18n: ectx: property (text), widget (QPushButton, accept_button)
-#: kcm.ui:212
+#: kcm.ui:210
#, kde-format
msgid "Accept"
msgstr "Přijmout"
#. i18n: ectx: property (text), widget (QPushButton, reject_button)
-#: kcm.ui:219
+#: kcm.ui:217
#, kde-format
msgid "Reject"
msgstr "Odmítnout"
#. i18n: ectx: property (text), widget (QPushButton, pair_button)
-#: kcm.ui:232
+#: kcm.ui:230
#, kde-format
msgid "Request pair"
msgstr "Vyžádat párování"
#. i18n: ectx: property (text), widget (QPushButton, unpair_button)
-#: kcm.ui:245
+#: kcm.ui:243
#, kde-format
msgid "Unpair"
msgstr "Zrušit párování"
#. i18n: ectx: property (text), widget (QPushButton, ping_button)
-#: kcm.ui:258
+#: kcm.ui:256
#, kde-format
msgid "Send ping"
msgstr "Poslat ping"
-#. i18n: ectx: property (text), widget (QLabel, noDeviceLabel)
-#: kcm.ui:303
-#, kde-format
-msgid "No device selected."
-msgstr "Žádné zařízení nebylo vybráno."
-
#. i18n: ectx: property (text), widget (QLabel, noDeviceLinks)
-#: kcm.ui:319
+#: kcm.ui:294
#, kde-format
msgid ""
-"If you own an Android device, make sure to install the "
-"KDE Connect Android app"
-"span> (also available from F-Droid) and it should appear in the list.
"
-"html>"
-msgstr ""
-"Pokud máte zařízení s Androidem, ujistěte se, že máte "
-"nainstalovánuAplikaci KDE "
-"Connect Android (rovněž dostupná z F-Droidu) a měla by se objevit v "
-"seznamu.
"
-
-#. i18n: ectx: property (text), widget (QLabel, noDeviceTroubleshoot)
-#: kcm.ui:350
-#, kde-format
-msgid ""
-"If you are having problems, visit the KDE Connect Community wiki for help.
"
-"html>"
+"No device selected.
If you own an Android "
+"device, make sure to install the KDE Connect Android app (also "
+"available from F-Droid) and it should appear in the list.
If you "
+"are having problems, visit the KDE Connect "
+"Community wiki for help.
"
msgstr ""
-"Pokud máte problémy, hledejte pomoc na Wiki komunity KDE Connect.
"
\ No newline at end of file
+"Nebylo vybráno zařízení.
Pokud máte zařízení s "
+"Androidem, ujistěte se, že máte nainstalovánu aplikaci KDE Connect Android"
+"a> (rovněž dostupná z F-Droidu) a měla by se objevit v seznamu.
"
+"
V případě problémů, navštivte Komunitní Wiki pro KDE Connect kde můžete hledat pomoc.
"
+"body>"
\ No newline at end of file
diff -Nru kdeconnect-1.2.1/po/cs/kdeconnect-plugins.po kdeconnect-1.3.0/po/cs/kdeconnect-plugins.po
--- kdeconnect-1.2.1/po/cs/kdeconnect-plugins.po 2018-01-16 22:46:14.000000000 +0000
+++ kdeconnect-1.3.0/po/cs/kdeconnect-plugins.po 2018-04-08 14:35:20.000000000 +0000
@@ -1,14 +1,14 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
-# Vít Pelčák , 2014, 2015, 2016.
+# Vít Pelčák , 2014, 2015, 2016, 2018.
#
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-12-30 03:03+0100\n"
-"PO-Revision-Date: 2016-01-22 15:09+0100\n"
-"Last-Translator: Vít Pelčák \n"
+"POT-Creation-Date: 2018-04-05 03:28+0200\n"
+"PO-Revision-Date: 2018-03-28 09:24+0100\n"
+"Last-Translator: Vit Pelcak \n"
"Language-Team: Czech \n"
"Language: cs\n"
"MIME-Version: 1.0\n"
@@ -17,28 +17,28 @@
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
"X-Generator: Lokalize 2.0\n"
-#: battery/batteryplugin.cpp:77
+#: battery/batteryplugin.cpp:75
#, kde-format
msgctxt "device name: low battery"
msgid "%1: Low Battery"
msgstr "%1: Nízká úroveň baterie"
-#: battery/batteryplugin.cpp:78
+#: battery/batteryplugin.cpp:75
#, kde-format
msgid "Battery at %1%"
msgstr "Baterie je na %1%"
-#: mousepad/mousepadplugin.cpp:131
+#: mousepad/waylandremoteinput.cpp:59
#, kde-format
msgid "KDE Connect"
msgstr "KDE Connect"
-#: mousepad/mousepadplugin.cpp:131
+#: mousepad/waylandremoteinput.cpp:59
#, kde-format
msgid "Use your phone as a touchpad and keyboard"
msgstr "Používejte svůj telefon jako touchpad a klávesnici"
-#: notifications/notification.cpp:127 telephony/telephonyplugin.cpp:113
+#: notifications/notification.cpp:120 telephony/telephonyplugin.cpp:113
#, kde-format
msgid "Reply"
msgstr "Odpovědět"
@@ -96,18 +96,33 @@
msgid "Mute system sound"
msgstr "Ztlumit zvuk systému"
-#: ping/pingplugin.cpp:54
+#: ping/pingplugin.cpp:50
#, kde-format
msgid "Ping!"
msgstr "Ping."
-#: runcommand/runcommand_config.cpp:51
+#: runcommand/runcommand_config.cpp:45
+#, kde-format
+msgid "Suspend"
+msgstr "Uspat"
+
+#: runcommand/runcommand_config.cpp:46
+#, kde-format
+msgid "Maximum Brightness"
+msgstr "Maximální jas"
+
+#: runcommand/runcommand_config.cpp:53
+#, kde-format
+msgid "Sample commands"
+msgstr "Ukázkové příkazy"
+
+#: runcommand/runcommand_config.cpp:62
#: sendnotifications/notifyingapplicationmodel.cpp:208
#, kde-format
msgid "Name"
msgstr "Název"
-#: runcommand/runcommand_config.cpp:51
+#: runcommand/runcommand_config.cpp:62
#, kde-format
msgid "Command"
msgstr "Příkaz"
diff -Nru kdeconnect-1.2.1/po/cs/kdeconnect-urlhandler.po kdeconnect-1.3.0/po/cs/kdeconnect-urlhandler.po
--- kdeconnect-1.2.1/po/cs/kdeconnect-urlhandler.po 2018-01-16 22:46:14.000000000 +0000
+++ kdeconnect-1.3.0/po/cs/kdeconnect-urlhandler.po 2018-04-08 14:35:20.000000000 +0000
@@ -1,14 +1,14 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
-# Vít Pelčák , 2017.
+# Vít Pelčák , 2017, 2018.
#
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-06-10 02:58+0200\n"
-"PO-Revision-Date: 2017-06-29 16:46+0100\n"
-"Last-Translator: Vít Pelčák \n"
+"POT-Creation-Date: 2018-01-26 03:14+0100\n"
+"PO-Revision-Date: 2018-01-30 17:50+0100\n"
+"Last-Translator: Vit Pelcak \n"
"Language-Team: Czech \n"
"Language: cs\n"
"MIME-Version: 1.0\n"
@@ -42,7 +42,12 @@
msgid "URL to share"
msgstr "URL ke sdílení"
-#: kdeconnect-handler.cpp:104
+#: kdeconnect-handler.cpp:94
+#, kde-format
+msgid "Device to call this phone number with:"
+msgstr "Zařízení se kterým volat na toto telefonní číslo:"
+
+#: kdeconnect-handler.cpp:111
#, kde-format
msgid "Couldn't share %1"
msgstr "Nelze sdílet %1"
\ No newline at end of file
diff -Nru kdeconnect-1.2.1/po/cs/plasma_applet_org.kde.kdeconnect.po kdeconnect-1.3.0/po/cs/plasma_applet_org.kde.kdeconnect.po
--- kdeconnect-1.2.1/po/cs/plasma_applet_org.kde.kdeconnect.po 2018-01-16 22:46:14.000000000 +0000
+++ kdeconnect-1.3.0/po/cs/plasma_applet_org.kde.kdeconnect.po 2018-04-08 14:35:20.000000000 +0000
@@ -1,14 +1,14 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
-# Vít Pelčák , 2015, 2016, 2017.
+# Vít Pelčák , 2015, 2016, 2017, 2018.
#
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-01-10 04:36+0100\n"
-"PO-Revision-Date: 2017-07-28 13:05+0100\n"
-"Last-Translator: Vít Pelčák \n"
+"POT-Creation-Date: 2018-03-25 04:16+0200\n"
+"PO-Revision-Date: 2018-03-28 09:25+0100\n"
+"Last-Translator: Vit Pelcak \n"
"Language-Team: Czech \n"
"Language: cs\n"
"MIME-Version: 1.0\n"
@@ -49,10 +49,22 @@
msgid "Notifications:"
msgstr "Oznamování:"
+#: package/contents/ui/DeviceDelegate.qml:209
+msgid "Dismiss all notifications"
+msgstr "Zahodit všechna oznámení"
+
+#: package/contents/ui/DeviceDelegate.qml:245
+msgid "Reply"
+msgstr "Odpovědět"
+
+#: package/contents/ui/DeviceDelegate.qml:254
+msgid "Dismiss"
+msgstr "Zahodit"
+
#: package/contents/ui/FullRepresentation.qml:35
msgid "No paired devices available"
msgstr "Žádná dostupná spárovaná zařízení"
-#: package/contents/ui/main.qml:60
+#: package/contents/ui/main.qml:59
msgid "KDE Connect Settings..."
msgstr "Nastavení KDE Connect..."
\ No newline at end of file
diff -Nru kdeconnect-1.2.1/po/da/kdeconnect-cli.po kdeconnect-1.3.0/po/da/kdeconnect-cli.po
--- kdeconnect-1.2.1/po/da/kdeconnect-cli.po 2018-01-16 22:46:15.000000000 +0000
+++ kdeconnect-1.3.0/po/da/kdeconnect-cli.po 2018-04-08 14:35:21.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-06-10 02:58+0200\n"
+"POT-Creation-Date: 2018-02-28 03:17+0100\n"
"PO-Revision-Date: 2017-03-04 14:29+0100\n"
"Last-Translator: Martin Schlander \n"
"Language-Team: Danish \n"
@@ -67,178 +67,207 @@
"gøre scripting lettere"
#: kdeconnect-cli.cpp:54
+#, fuzzy, kde-format
+#| msgid ""
+#| "Make --list-devices or --list-available print only the devices id, to "
+#| "ease scripting"
+msgid ""
+"Make --list-devices or --list-available print only the devices name, to ease "
+"scripting"
+msgstr ""
+"Make --list-devices eller --list-available skriver kun enhedens id, for at "
+"gøre scripting lettere"
+
+#: kdeconnect-cli.cpp:55
+#, fuzzy, kde-format
+#| msgid ""
+#| "Make --list-devices or --list-available print only the devices id, to "
+#| "ease scripting"
+msgid ""
+"Make --list-devices or --list-available print only the devices id and name, "
+"to ease scripting"
+msgstr ""
+"Make --list-devices eller --list-available skriver kun enhedens id, for at "
+"gøre scripting lettere"
+
+#: kdeconnect-cli.cpp:56
#, kde-format
msgid "Search for devices in the network and re-establish connections"
msgstr "Søg efter enheder i netværket og genopret forbindelser"
-#: kdeconnect-cli.cpp:55
+#: kdeconnect-cli.cpp:57
#, kde-format
msgid "Request pairing to a said device"
msgstr "Anmod om parring med en given enhed"
-#: kdeconnect-cli.cpp:56
+#: kdeconnect-cli.cpp:58
#, kde-format
msgid "Find the said device by ringing it."
msgstr "Find den pågældende enhed ved at ringe til den."
-#: kdeconnect-cli.cpp:57
+#: kdeconnect-cli.cpp:59
#, kde-format
msgid "Stop pairing to a said device"
msgstr "Stop parring med en given enhed"
-#: kdeconnect-cli.cpp:58
+#: kdeconnect-cli.cpp:60
#, kde-format
msgid "Sends a ping to said device"
msgstr "Send et ping til given enhed"
-#: kdeconnect-cli.cpp:59
+#: kdeconnect-cli.cpp:61
#, kde-format
msgid "Same as ping but you can set the message to display"
msgstr "Samme som ping, men du kan angive den besked som vises"
-#: kdeconnect-cli.cpp:59 kdeconnect-cli.cpp:63
+#: kdeconnect-cli.cpp:61 kdeconnect-cli.cpp:65
#, kde-format
msgid "message"
msgstr "besked"
-#: kdeconnect-cli.cpp:60
+#: kdeconnect-cli.cpp:62
#, kde-format
msgid "Share a file to a said device"
msgstr "Del en fil til en given enhed"
-#: kdeconnect-cli.cpp:61
+#: kdeconnect-cli.cpp:63
#, kde-format
msgid "Display the notifications on a said device"
msgstr "Vis bekendtgørelser på en given enhed"
-#: kdeconnect-cli.cpp:62
+#: kdeconnect-cli.cpp:64
#, kde-format
msgid "Lock the specified device"
msgstr "Lås den angivne enhed"
-#: kdeconnect-cli.cpp:63
+#: kdeconnect-cli.cpp:65
#, kde-format
msgid "Sends an SMS. Requires destination"
msgstr "Sender en sms. Kræver destination"
-#: kdeconnect-cli.cpp:64
+#: kdeconnect-cli.cpp:66
#, kde-format
msgid "Phone number to send the message"
msgstr "Telefonnummer beskeden skal sendes til"
-#: kdeconnect-cli.cpp:64
+#: kdeconnect-cli.cpp:66
#, kde-format
msgid "phone number"
msgstr "telefonnummer"
-#: kdeconnect-cli.cpp:65
+#: kdeconnect-cli.cpp:67
#, kde-format
msgid "Device ID"
msgstr "Enheds-id"
-#: kdeconnect-cli.cpp:66
+#: kdeconnect-cli.cpp:68
#, kde-format
msgid "Device Name"
msgstr "Enhedsnavn"
-#: kdeconnect-cli.cpp:67
+#: kdeconnect-cli.cpp:69
#, kde-format
msgid "Get encryption info about said device"
msgstr "Få krypteringsinfo om den pågældende enhed"
-#: kdeconnect-cli.cpp:68
+#: kdeconnect-cli.cpp:70
#, kde-format
msgid "Lists remote commands and their ids"
msgstr "Oplister eksterne kommandoer og deres id'er"
-#: kdeconnect-cli.cpp:69
+#: kdeconnect-cli.cpp:71
#, kde-format
msgid "Executes a remote command by id"
msgstr "Kører en ekstern kommando via id'et"
-#: kdeconnect-cli.cpp:70
+#: kdeconnect-cli.cpp:72
#, kde-format
msgid "Sends keys to a said device"
msgstr "Sender tastetryk til en given enhed"
-#: kdeconnect-cli.cpp:71
+#: kdeconnect-cli.cpp:73
#, kde-format
msgid "Display this device's id and exit"
msgstr "Vis enhedens id og afslut"
-#: kdeconnect-cli.cpp:102
+#: kdeconnect-cli.cpp:114
#, kde-format
msgid "(paired and reachable)"
msgstr "(parret og kan nås)"
-#: kdeconnect-cli.cpp:104
+#: kdeconnect-cli.cpp:116
#, kde-format
msgid "(reachable)"
msgstr "(kan nås)"
-#: kdeconnect-cli.cpp:106
+#: kdeconnect-cli.cpp:118
#, kde-format
msgid "(paired)"
msgstr "(parret)"
-#: kdeconnect-cli.cpp:113
+#: kdeconnect-cli.cpp:125
#, kde-format
msgid "1 device found"
msgid_plural "%1 devices found"
msgstr[0] "1 enhed fundet"
msgstr[1] "%1 enheder fundet"
-#: kdeconnect-cli.cpp:115
+#: kdeconnect-cli.cpp:127
#, kde-format
msgid "No devices found"
msgstr "Ingen enheder fundet"
-#: kdeconnect-cli.cpp:133
+#: kdeconnect-cli.cpp:145
#, kde-format
msgid "No device specified"
msgstr "Ingen enhed angivet"
-#: kdeconnect-cli.cpp:145
+#: kdeconnect-cli.cpp:158
+#, kde-format
+msgid "Can't find the file: %1"
+msgstr ""
+
+#: kdeconnect-cli.cpp:169
#, kde-format
-msgid "Couldn't share %1"
-msgstr "Kunne ikke dele %1"
+msgid "Sent %1"
+msgstr ""
-#: kdeconnect-cli.cpp:152
+#: kdeconnect-cli.cpp:176
#, kde-format
msgid "waiting for device..."
msgstr "venter på enheden..."
-#: kdeconnect-cli.cpp:166
+#: kdeconnect-cli.cpp:190
#, kde-format
msgid "Device not found"
msgstr "Enhed ikke fundet"
-#: kdeconnect-cli.cpp:168
+#: kdeconnect-cli.cpp:192
#, kde-format
msgid "Already paired"
msgstr "Allerede parret"
-#: kdeconnect-cli.cpp:170
+#: kdeconnect-cli.cpp:194
#, kde-format
msgid "Pair requested"
msgstr "Anmodet om parring"
-#: kdeconnect-cli.cpp:177
+#: kdeconnect-cli.cpp:201
#, kde-format
msgid "Device does not exist"
msgstr "Enheden findes ikke"
-#: kdeconnect-cli.cpp:179
+#: kdeconnect-cli.cpp:203
#, kde-format
msgid "Already not paired"
msgstr "Parring allerede fjernet"
-#: kdeconnect-cli.cpp:181
+#: kdeconnect-cli.cpp:205
#, kde-format
msgid "Unpaired"
msgstr "Ikke parret"
-#: kdeconnect-cli.cpp:197
+#: kdeconnect-cli.cpp:221
#, kde-format
msgid ""
"error: should specify the SMS's recipient by passing --destination "
-#: kdeconnect-cli.cpp:244
+#: kdeconnect-cli.cpp:268
#, kde-format
msgid "Nothing to be done"
msgstr "Intet at gøre"
\ No newline at end of file
diff -Nru kdeconnect-1.2.1/po/da/kdeconnect-core.po kdeconnect-1.3.0/po/da/kdeconnect-core.po
--- kdeconnect-1.2.1/po/da/kdeconnect-core.po 2018-01-16 22:46:15.000000000 +0000
+++ kdeconnect-1.3.0/po/da/kdeconnect-core.po 2018-04-08 14:35:21.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-09-19 03:23+0200\n"
+"POT-Creation-Date: 2018-03-06 03:17+0100\n"
"PO-Revision-Date: 2016-08-07 14:03+0100\n"
"Last-Translator: Martin Schlander \n"
"Language-Team: Danish \n"
@@ -53,22 +53,22 @@
msgid "Couldn't find an available port"
msgstr "Kunne ikke finde en tilgængelig port"
-#: device.cpp:160
+#: device.cpp:156
#, kde-format
msgid "Already paired"
msgstr "Allerede parret"
-#: device.cpp:165
+#: device.cpp:161
#, kde-format
msgid "Device not reachable"
msgstr "Enheden kan ikke nås"
-#: device.cpp:477
+#: device.cpp:473
#, kde-format
msgid "SHA1 fingerprint of your device certificate is: %1\n"
msgstr "SHA1-fingeraftrykket for dit enhedscertifikat er: %1\n"
-#: device.cpp:485
+#: device.cpp:481
#, kde-format
msgid "SHA1 fingerprint of remote device certificate is: %1\n"
msgstr "SHA1-fingeraftrykket for det eksterne enhedscertifikat er: %1\n"
@@ -106,11 +106,15 @@
msgstr "KDE Connect kunne ikke starte"
#: kdeconnectconfig.cpp:70
-#, kde-format
+#, fuzzy, kde-format
+#| msgid ""
+#| "Could not find support for RSA in your QCA installation. If your "
+#| "distribution provides separate packages for QCA-ossl and QCA-gnupg, make "
+#| "sure you have them installed and try again."
msgid ""
"Could not find support for RSA in your QCA installation. If your "
-"distribution provides separate packages for QCA-ossl and QCA-gnupg, make "
-"sure you have them installed and try again."
+"distribution provides separate packets for QCA-ossl and QCA-gnupg, make sure "
+"you have them installed and try again."
msgstr ""
"Kunne ikke finde understøttelse af RSA i din QCA-installation. Hvis din "
"distribution leverer separate pakker til QCA-ossl og QCA-gnupg, så sørg for "
diff -Nru kdeconnect-1.2.1/po/da/kdeconnect-kcm.po kdeconnect-1.3.0/po/da/kdeconnect-kcm.po
--- kdeconnect-1.2.1/po/da/kdeconnect-kcm.po 2018-01-16 22:46:15.000000000 +0000
+++ kdeconnect-1.3.0/po/da/kdeconnect-kcm.po 2018-04-08 14:35:21.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-07-14 03:06+0200\n"
+"POT-Creation-Date: 2018-02-18 03:11+0100\n"
"PO-Revision-Date: 2017-03-04 14:31+0100\n"
"Last-Translator: Martin Schlander \n"
"Language-Team: Danish \n"
@@ -83,71 +83,88 @@
msgid "KDE Connect"
msgstr "KDE Connect"
+#. i18n: ectx: property (text), widget (QToolButton, renameShow_button)
+#: kcm.ui:70
+#, kde-format
+msgid "Edit"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QToolButton, renameDone_button)
+#: kcm.ui:92
+#, kde-format
+msgid "Save"
+msgstr ""
+
#. i18n: ectx: property (text), widget (QPushButton, refresh_button)
-#: kcm.ui:110
+#: kcm.ui:108
#, kde-format
msgid "Refresh"
msgstr "Genopfrisk"
#. i18n: ectx: property (text), widget (QLabel, name_label)
-#: kcm.ui:157
+#: kcm.ui:155
#, kde-format
msgid "Device"
msgstr "Enhed"
#. i18n: ectx: property (text), widget (QLabel, status_label)
-#: kcm.ui:173
+#: kcm.ui:171
#, kde-format
msgid "(status)"
msgstr "(status)"
#. i18n: ectx: property (text), widget (QPushButton, accept_button)
-#: kcm.ui:212
+#: kcm.ui:210
#, kde-format
msgid "Accept"
msgstr "Acceptér"
#. i18n: ectx: property (text), widget (QPushButton, reject_button)
-#: kcm.ui:219
+#: kcm.ui:217
#, kde-format
msgid "Reject"
msgstr "Afvis"
#. i18n: ectx: property (text), widget (QPushButton, pair_button)
-#: kcm.ui:232
+#: kcm.ui:230
#, kde-format
msgid "Request pair"
msgstr "Anmod om parring"
#. i18n: ectx: property (text), widget (QPushButton, unpair_button)
-#: kcm.ui:245
+#: kcm.ui:243
#, kde-format
msgid "Unpair"
msgstr "Fjern parring"
#. i18n: ectx: property (text), widget (QPushButton, ping_button)
-#: kcm.ui:258
+#: kcm.ui:256
#, kde-format
msgid "Send ping"
msgstr "Send ping"
-#. i18n: ectx: property (text), widget (QLabel, noDeviceLabel)
-#: kcm.ui:303
-#, kde-format
-msgid "No device selected."
-msgstr "Ingen enhed valgt."
-
#. i18n: ectx: property (text), widget (QLabel, noDeviceLinks)
-#: kcm.ui:319
-#, kde-format
+#: kcm.ui:294
+#, fuzzy, kde-format
+#| msgid ""
+#| "If you own an Android device, make sure to install "
+#| "the KDE Connect "
+#| "Android app (also available from F-Droid) and it should appear "
+#| "in the list.
"
msgid ""
-"If you own an Android device, make sure to install the "
-"KDE Connect Android app"
-"span> (also available from F-Droid) and it should appear in the list.
"
-"html>"
+"No device selected.
If you own an Android "
+"device, make sure to install the KDE Connect Android app (also "
+"available from F-Droid) and it should appear in the list.
If you "
+"are having problems, visit the KDE Connect "
+"Community wiki for help.
"
msgstr ""
"Hvis du ejer en Android-enhed, så sørg for at "
"installere (også tilgængelig fra F-Droid) og enheden bør så dukke op "
-"i listen.
"
-
-#. i18n: ectx: property (text), widget (QLabel, noDeviceTroubleshoot)
-#: kcm.ui:350
-#, kde-format
-msgid ""
-"If you are having problems, visit the KDE Connect Community wiki for help.
"
-"html>"
-msgstr ""
-"Hvis du har problemer, så besøg KDE Connects community wiki for hjælp.
"
\ No newline at end of file
+"i listen."
\ No newline at end of file
diff -Nru kdeconnect-1.2.1/po/da/kdeconnect-plugins.po kdeconnect-1.3.0/po/da/kdeconnect-plugins.po
--- kdeconnect-1.2.1/po/da/kdeconnect-plugins.po 2018-01-16 22:46:15.000000000 +0000
+++ kdeconnect-1.3.0/po/da/kdeconnect-plugins.po 2018-04-08 14:35:21.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: kdeconnect-plugins\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-12-30 03:03+0100\n"
+"POT-Creation-Date: 2018-04-05 03:28+0200\n"
"PO-Revision-Date: 2017-11-06 15:11+0200\n"
"Last-Translator: scootergrisen\n"
"Language-Team: Danish\n"
@@ -16,28 +16,28 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: battery/batteryplugin.cpp:77
+#: battery/batteryplugin.cpp:75
#, kde-format
msgctxt "device name: low battery"
msgid "%1: Low Battery"
msgstr "%1: Lavt batteri"
-#: battery/batteryplugin.cpp:78
+#: battery/batteryplugin.cpp:75
#, kde-format
msgid "Battery at %1%"
msgstr "Batteri på %1%"
-#: mousepad/mousepadplugin.cpp:131
+#: mousepad/waylandremoteinput.cpp:59
#, kde-format
msgid "KDE Connect"
msgstr "KDE Connect"
-#: mousepad/mousepadplugin.cpp:131
+#: mousepad/waylandremoteinput.cpp:59
#, kde-format
msgid "Use your phone as a touchpad and keyboard"
msgstr "Brug din telefon som touchpad og tastatur"
-#: notifications/notification.cpp:127 telephony/telephonyplugin.cpp:113
+#: notifications/notification.cpp:120 telephony/telephonyplugin.cpp:113
#, kde-format
msgid "Reply"
msgstr "Svar"
@@ -95,18 +95,33 @@
msgid "Mute system sound"
msgstr "Sæt systemlyde på lydløs"
-#: ping/pingplugin.cpp:54
+#: ping/pingplugin.cpp:50
#, kde-format
msgid "Ping!"
msgstr "Ping!"
-#: runcommand/runcommand_config.cpp:51
+#: runcommand/runcommand_config.cpp:45
+#, kde-format
+msgid "Suspend"
+msgstr ""
+
+#: runcommand/runcommand_config.cpp:46
+#, kde-format
+msgid "Maximum Brightness"
+msgstr ""
+
+#: runcommand/runcommand_config.cpp:53
+#, kde-format
+msgid "Sample commands"
+msgstr ""
+
+#: runcommand/runcommand_config.cpp:62
#: sendnotifications/notifyingapplicationmodel.cpp:208
#, kde-format
msgid "Name"
msgstr "Navn"
-#: runcommand/runcommand_config.cpp:51
+#: runcommand/runcommand_config.cpp:62
#, kde-format
msgid "Command"
msgstr "Kommando"
diff -Nru kdeconnect-1.2.1/po/da/kdeconnect-urlhandler.po kdeconnect-1.3.0/po/da/kdeconnect-urlhandler.po
--- kdeconnect-1.2.1/po/da/kdeconnect-urlhandler.po 2018-01-16 22:46:15.000000000 +0000
+++ kdeconnect-1.3.0/po/da/kdeconnect-urlhandler.po 2018-04-08 14:35:21.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-06-10 02:58+0200\n"
+"POT-Creation-Date: 2018-01-26 03:14+0100\n"
"PO-Revision-Date: 2017-07-23 12:52+0100\n"
"Last-Translator: Martin Schlander \n"
"Language-Team: Danish \n"
@@ -42,7 +42,12 @@
msgid "URL to share"
msgstr "URL der skal deles"
-#: kdeconnect-handler.cpp:104
+#: kdeconnect-handler.cpp:94
+#, kde-format
+msgid "Device to call this phone number with:"
+msgstr ""
+
+#: kdeconnect-handler.cpp:111
#, kde-format
msgid "Couldn't share %1"
msgstr "Kunne ikke dele %1"
\ No newline at end of file
diff -Nru kdeconnect-1.2.1/po/da/plasma_applet_org.kde.kdeconnect.po kdeconnect-1.3.0/po/da/plasma_applet_org.kde.kdeconnect.po
--- kdeconnect-1.2.1/po/da/plasma_applet_org.kde.kdeconnect.po 2018-01-16 22:46:15.000000000 +0000
+++ kdeconnect-1.3.0/po/da/plasma_applet_org.kde.kdeconnect.po 2018-04-08 14:35:21.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: plasma_applet_org.kde.kdeconnect\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-01-10 04:36+0100\n"
+"POT-Creation-Date: 2018-03-25 04:16+0200\n"
"PO-Revision-Date: 2017-11-06 15:19+0200\n"
"Last-Translator: scootergrisen\n"
"Language-Team: Danish\n"
@@ -48,10 +48,24 @@
msgid "Notifications:"
msgstr "Bekendtgørelser:"
+#: package/contents/ui/DeviceDelegate.qml:209
+#, fuzzy
+#| msgid "Notifications:"
+msgid "Dismiss all notifications"
+msgstr "Bekendtgørelser:"
+
+#: package/contents/ui/DeviceDelegate.qml:245
+msgid "Reply"
+msgstr ""
+
+#: package/contents/ui/DeviceDelegate.qml:254
+msgid "Dismiss"
+msgstr ""
+
#: package/contents/ui/FullRepresentation.qml:35
msgid "No paired devices available"
msgstr "Ingen parrede enheder tilgængelige"
-#: package/contents/ui/main.qml:60
+#: package/contents/ui/main.qml:59
msgid "KDE Connect Settings..."
msgstr "Indstilling af KDE Connect..."
\ No newline at end of file
diff -Nru kdeconnect-1.2.1/po/de/kdeconnect-cli.po kdeconnect-1.3.0/po/de/kdeconnect-cli.po
--- kdeconnect-1.2.1/po/de/kdeconnect-cli.po 2018-01-16 22:46:15.000000000 +0000
+++ kdeconnect-1.3.0/po/de/kdeconnect-cli.po 2018-04-08 14:35:21.000000000 +0000
@@ -1,12 +1,12 @@
# Frederik Schwarzer , 2014, 2016.
-# Burkhard Lück , 2014, 2015, 2016, 2017.
+# Burkhard Lück , 2014, 2015, 2016, 2017, 2018.
# hkaelber , 2016.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-06-10 02:58+0200\n"
-"PO-Revision-Date: 2017-10-31 21:08+0100\n"
+"POT-Creation-Date: 2018-02-28 03:17+0100\n"
+"PO-Revision-Date: 2018-03-05 09:48+0100\n"
"Last-Translator: Burkhard Lück \n"
"Language-Team: German \n"
"Language: de\n"
@@ -67,177 +67,200 @@
#: kdeconnect-cli.cpp:54
#, kde-format
+msgid ""
+"Make --list-devices or --list-available print only the devices name, to ease "
+"scripting"
+msgstr ""
+"Die Optionen --list-devices oder --list-available geben nur Namen der Geräte "
+"aus, das erleichtert die Verarbeitung durch Skripte."
+
+#: kdeconnect-cli.cpp:55
+#, kde-format
+msgid ""
+"Make --list-devices or --list-available print only the devices id and name, "
+"to ease scripting"
+msgstr ""
+"Die Optionen --list-devices oder --list-available geben nur die Kennung und "
+"Namen der Geräte aus, das erleichtert die Verarbeitung durch Skripte."
+
+#: kdeconnect-cli.cpp:56
+#, kde-format
msgid "Search for devices in the network and re-establish connections"
msgstr "Nach Geräten im Netzwerk suchen und Verbindungen wiederherstellen"
-#: kdeconnect-cli.cpp:55
+#: kdeconnect-cli.cpp:57
#, kde-format
msgid "Request pairing to a said device"
msgstr "Verbindung für ein genanntes Gerät anfordern"
-#: kdeconnect-cli.cpp:56
+#: kdeconnect-cli.cpp:58
#, kde-format
msgid "Find the said device by ringing it."
msgstr "Das angegebene Gerät klingeln lassen, um es zu finden."
-#: kdeconnect-cli.cpp:57
+#: kdeconnect-cli.cpp:59
#, kde-format
msgid "Stop pairing to a said device"
msgstr "Verbindung für ein genanntes Gerät trennen"
-#: kdeconnect-cli.cpp:58
+#: kdeconnect-cli.cpp:60
#, kde-format
msgid "Sends a ping to said device"
msgstr "Ping an ein genanntes Gerät senden"
-#: kdeconnect-cli.cpp:59
+#: kdeconnect-cli.cpp:61
#, kde-format
msgid "Same as ping but you can set the message to display"
msgstr "Wie beim Ping, aber Sie können die angezeigte Nachricht anpassen"
-#: kdeconnect-cli.cpp:59 kdeconnect-cli.cpp:63
+#: kdeconnect-cli.cpp:61 kdeconnect-cli.cpp:65
#, kde-format
msgid "message"
msgstr "Nachricht"
-#: kdeconnect-cli.cpp:60
+#: kdeconnect-cli.cpp:62
#, kde-format
msgid "Share a file to a said device"
msgstr "Eine Datei für ein genanntes Gerät freigeben"
-#: kdeconnect-cli.cpp:61
+#: kdeconnect-cli.cpp:63
#, kde-format
msgid "Display the notifications on a said device"
msgstr "Benachrichtigungen auf einem genannten Gerät anzeigen"
-#: kdeconnect-cli.cpp:62
+#: kdeconnect-cli.cpp:64
#, kde-format
msgid "Lock the specified device"
msgstr "Sperrt das angegebene Gerät"
-#: kdeconnect-cli.cpp:63
+#: kdeconnect-cli.cpp:65
#, kde-format
msgid "Sends an SMS. Requires destination"
msgstr "Sendet eine SMS. Erfordert ein Ziel"
-#: kdeconnect-cli.cpp:64
+#: kdeconnect-cli.cpp:66
#, kde-format
msgid "Phone number to send the message"
msgstr "Telefonnummer, an die die Nachricht gesendet werden soll"
-#: kdeconnect-cli.cpp:64
+#: kdeconnect-cli.cpp:66
#, kde-format
msgid "phone number"
msgstr "Telefonnummer"
-#: kdeconnect-cli.cpp:65
+#: kdeconnect-cli.cpp:67
#, kde-format
msgid "Device ID"
msgstr "Geräte-Kennung"
-#: kdeconnect-cli.cpp:66
+#: kdeconnect-cli.cpp:68
#, kde-format
msgid "Device Name"
msgstr "Gerätename"
-#: kdeconnect-cli.cpp:67
+#: kdeconnect-cli.cpp:69
#, kde-format
msgid "Get encryption info about said device"
msgstr "Verschlüsselungsinformationen für genanntes Gerät anfordern"
-#: kdeconnect-cli.cpp:68
+#: kdeconnect-cli.cpp:70
#, kde-format
msgid "Lists remote commands and their ids"
msgstr "Zeigt entfernte Befehle und ihre Kennungen an"
-#: kdeconnect-cli.cpp:69
+#: kdeconnect-cli.cpp:71
#, kde-format
msgid "Executes a remote command by id"
msgstr "Führt einen entfernten Befehl nach Kennung aus"
-#: kdeconnect-cli.cpp:70
+#: kdeconnect-cli.cpp:72
#, kde-format
msgid "Sends keys to a said device"
msgstr "Tastendrücke an ein genanntes Gerät senden"
-#: kdeconnect-cli.cpp:71
+#: kdeconnect-cli.cpp:73
#, kde-format
msgid "Display this device's id and exit"
msgstr "Kennung diese Geräts anzeigen und beenden"
-#: kdeconnect-cli.cpp:102
+#: kdeconnect-cli.cpp:114
#, kde-format
msgid "(paired and reachable)"
msgstr "(Verbunden und Erreichbar)"
-#: kdeconnect-cli.cpp:104
+#: kdeconnect-cli.cpp:116
#, kde-format
msgid "(reachable)"
msgstr "(Erreichbar)"
-#: kdeconnect-cli.cpp:106
+#: kdeconnect-cli.cpp:118
#, kde-format
msgid "(paired)"
msgstr "(Verbunden)"
-#: kdeconnect-cli.cpp:113
+#: kdeconnect-cli.cpp:125
#, kde-format
msgid "1 device found"
msgid_plural "%1 devices found"
msgstr[0] "1 Gerät gefunden"
msgstr[1] "%1 Gerät gefunden"
-#: kdeconnect-cli.cpp:115
+#: kdeconnect-cli.cpp:127
#, kde-format
msgid "No devices found"
msgstr "Keine Geräte gefunden"
-#: kdeconnect-cli.cpp:133
+#: kdeconnect-cli.cpp:145
#, kde-format
msgid "No device specified"
msgstr "Kein Gerät angegeben"
-#: kdeconnect-cli.cpp:145
+#: kdeconnect-cli.cpp:158
+#, kde-format
+msgid "Can't find the file: %1"
+msgstr "Die Datei „%1“ wurde nicht gefunden"
+
+#: kdeconnect-cli.cpp:169
#, kde-format
-msgid "Couldn't share %1"
-msgstr "%1 kann nicht freigegeben werden"
+msgid "Sent %1"
+msgstr "%1 versendet"
-#: kdeconnect-cli.cpp:152
+#: kdeconnect-cli.cpp:176
#, kde-format
msgid "waiting for device..."
msgstr "Warten auf Gerät ..."
-#: kdeconnect-cli.cpp:166
+#: kdeconnect-cli.cpp:190
#, kde-format
msgid "Device not found"
msgstr "Gerät nicht gefunden"
-#: kdeconnect-cli.cpp:168
+#: kdeconnect-cli.cpp:192
#, kde-format
msgid "Already paired"
msgstr "Bereits verbunden"
-#: kdeconnect-cli.cpp:170
+#: kdeconnect-cli.cpp:194
#, kde-format
msgid "Pair requested"
msgstr "Verbindung angefordert"
-#: kdeconnect-cli.cpp:177
+#: kdeconnect-cli.cpp:201
#, kde-format
msgid "Device does not exist"
msgstr "Das Gerät existiert nicht"
-#: kdeconnect-cli.cpp:179
+#: kdeconnect-cli.cpp:203
#, kde-format
msgid "Already not paired"
msgstr "Noch nicht verbunden"
-#: kdeconnect-cli.cpp:181
+#: kdeconnect-cli.cpp:205
#, kde-format
msgid "Unpaired"
msgstr "Nicht verbunden"
-#: kdeconnect-cli.cpp:197
+#: kdeconnect-cli.cpp:221
#, kde-format
msgid ""
"error: should specify the SMS's recipient by passing --destination "
"angegeben werden"
-#: kdeconnect-cli.cpp:244
+#: kdeconnect-cli.cpp:268
#, kde-format
msgid "Nothing to be done"
msgstr "Es gibt nichts zu tun"
\ No newline at end of file
diff -Nru kdeconnect-1.2.1/po/de/kdeconnect-core.po kdeconnect-1.3.0/po/de/kdeconnect-core.po
--- kdeconnect-1.2.1/po/de/kdeconnect-core.po 2018-01-16 22:46:15.000000000 +0000
+++ kdeconnect-1.3.0/po/de/kdeconnect-core.po 2018-04-08 14:35:21.000000000 +0000
@@ -1,12 +1,12 @@
-# Frederik Schwarzer , 2014, 2016.
+# Frederik Schwarzer , 2014, 2016, 2018.
# Burkhard Lück , 2014, 2015, 2016.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-09-19 03:23+0200\n"
-"PO-Revision-Date: 2016-08-04 14:26+0100\n"
-"Last-Translator: Burkhard Lück \n"
+"POT-Creation-Date: 2018-03-06 03:17+0100\n"
+"PO-Revision-Date: 2018-03-11 13:42+0100\n"
+"Last-Translator: Frederik Schwarzer \n"
"Language-Team: German \n"
"Language: de\n"
"MIME-Version: 1.0\n"
@@ -52,22 +52,22 @@
msgid "Couldn't find an available port"
msgstr "Es ist kein Port verfügbar"
-#: device.cpp:160
+#: device.cpp:156
#, kde-format
msgid "Already paired"
msgstr "Bereits verbunden"
-#: device.cpp:165
+#: device.cpp:161
#, kde-format
msgid "Device not reachable"
msgstr "Das Gerät ist nicht erreichbar"
-#: device.cpp:477
+#: device.cpp:473
#, kde-format
msgid "SHA1 fingerprint of your device certificate is: %1\n"
msgstr "Der SHA1-Fingerabdruck Ihres Gerätezertifikats lautet: %1\n"
-#: device.cpp:485
+#: device.cpp:481
#, kde-format
msgid "SHA1 fingerprint of remote device certificate is: %1\n"
msgstr ""
@@ -109,12 +109,12 @@
#, kde-format
msgid ""
"Could not find support for RSA in your QCA installation. If your "
-"distribution provides separate packages for QCA-ossl and QCA-gnupg, make "
-"sure you have them installed and try again."
+"distribution provides separate packets for QCA-ossl and QCA-gnupg, make sure "
+"you have them installed and try again."
msgstr ""
"Es wurde keine Unterstützung für RSA in Ihrer QCA-Installation gefunden. "
-"Wenn Ihre Distribution getrennte Pakete für QCA-ossl und QCA-gnupg hat, "
-"sollten Sie zu installieren und es erneut versuchen."
+"Wenn Ihre Distribution getrennte Pakete für QCA-ossl und QCA-gnupg bereit "
+"stellt, installieren Sie diese bitte und versuchen es erneut."
#: kdeconnectconfig.cpp:96
#, kde-format
diff -Nru kdeconnect-1.2.1/po/de/kdeconnect-kcm.po kdeconnect-1.3.0/po/de/kdeconnect-kcm.po
--- kdeconnect-1.2.1/po/de/kdeconnect-kcm.po 2018-01-16 22:46:15.000000000 +0000
+++ kdeconnect-1.3.0/po/de/kdeconnect-kcm.po 2018-04-08 14:35:21.000000000 +0000
@@ -1,11 +1,11 @@
-# Burkhard Lück , 2013, 2014, 2015, 2016, 2017.
+# Burkhard Lück , 2013, 2014, 2015, 2016, 2017, 2018.
# Frederik Schwarzer , 2015, 2016.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-07-14 03:06+0200\n"
-"PO-Revision-Date: 2017-03-14 13:54+0100\n"
+"POT-Creation-Date: 2018-02-18 03:11+0100\n"
+"PO-Revision-Date: 2018-03-05 09:52+0100\n"
"Last-Translator: Burkhard Lück \n"
"Language-Team: German \n"
"Language: de\n"
@@ -81,89 +81,88 @@
msgid "KDE Connect"
msgstr "KDE-Connect"
+#. i18n: ectx: property (text), widget (QToolButton, renameShow_button)
+#: kcm.ui:70
+#, kde-format
+msgid "Edit"
+msgstr "Bearbeiten"
+
+#. i18n: ectx: property (text), widget (QToolButton, renameDone_button)
+#: kcm.ui:92
+#, kde-format
+msgid "Save"
+msgstr "Speichern"
+
#. i18n: ectx: property (text), widget (QPushButton, refresh_button)
-#: kcm.ui:110
+#: kcm.ui:108
#, kde-format
msgid "Refresh"
msgstr "Aktualisieren"
#. i18n: ectx: property (text), widget (QLabel, name_label)
-#: kcm.ui:157
+#: kcm.ui:155
#, kde-format
msgid "Device"
msgstr "Gerät"
#. i18n: ectx: property (text), widget (QLabel, status_label)
-#: kcm.ui:173
+#: kcm.ui:171
#, kde-format
msgid "(status)"
msgstr "(Status)"
#. i18n: ectx: property (text), widget (QPushButton, accept_button)
-#: kcm.ui:212
+#: kcm.ui:210
#, kde-format
msgid "Accept"
msgstr "Annehmen"
#. i18n: ectx: property (text), widget (QPushButton, reject_button)
-#: kcm.ui:219
+#: kcm.ui:217
#, kde-format
msgid "Reject"
msgstr "Ablehnen"
#. i18n: ectx: property (text), widget (QPushButton, pair_button)
-#: kcm.ui:232
+#: kcm.ui:230
#, kde-format
msgid "Request pair"
msgstr "Verbindung anfragen"
#. i18n: ectx: property (text), widget (QPushButton, unpair_button)
-#: kcm.ui:245
+#: kcm.ui:243
#, kde-format
msgid "Unpair"
msgstr "Verbindung trennen"
#. i18n: ectx: property (text), widget (QPushButton, ping_button)
-#: kcm.ui:258
+#: kcm.ui:256
#, kde-format
msgid "Send ping"
msgstr "Ping senden"
-#. i18n: ectx: property (text), widget (QLabel, noDeviceLabel)
-#: kcm.ui:303
-#, kde-format
-msgid "No device selected."
-msgstr "Kein Gerät ausgewählt."
-
#. i18n: ectx: property (text), widget (QLabel, noDeviceLinks)
-#: kcm.ui:319
-#, kde-format
-msgid ""
-"If you own an Android device, make sure to install the "
-"KDE Connect Android app"
-"span> (also available from F-Droid) and it should appear in the list.
"
-"html>"
-msgstr ""
-"Haben Sie ein Android-Gerät, installieren Sie die "
-"Android-Anwendung KDE "
-"Connect (auch vonF-"
-"Droid verfügbar) und sie sollte in der Liste erscheinen.
"
-"body>"
-
-#. i18n: ectx: property (text), widget (QLabel, noDeviceTroubleshoot)
-#: kcm.ui:350
+#: kcm.ui:294
#, kde-format
msgid ""
-"If you are having problems, visit the KDE Connect Community wiki for help.
"
-"html>"
+"No device selected.
If you own an Android "
+"device, make sure to install the KDE Connect Android app (also "
+"available from F-Droid) and it should appear in the list.
If you "
+"are having problems, visit the KDE Connect "
+"Community wiki for help.
"
msgstr ""
-"Bei Problemen, besuchen Sie bitte das Wiki der KDE-Connect-Gemeinschaft.
"
\ No newline at end of file
+"Kein Gerät ausgewählt.
Haben Sie ein Android-"
+"Gerät, installieren Sie die Android-Anwendung KDE Connect (auch vonF-Droid"
+"span> verfügbar) und sie sollte in der Liste erscheinen.
Bei "
+"Problemen gehen Sie zur KDE Connect "
+"im Community Wiki.
"
\ No newline at end of file
diff -Nru kdeconnect-1.2.1/po/de/kdeconnect-plugins.po kdeconnect-1.3.0/po/de/kdeconnect-plugins.po
--- kdeconnect-1.2.1/po/de/kdeconnect-plugins.po 2018-01-16 22:46:15.000000000 +0000
+++ kdeconnect-1.3.0/po/de/kdeconnect-plugins.po 2018-04-08 14:35:21.000000000 +0000
@@ -1,13 +1,13 @@
-# Frederik Schwarzer , 2014, 2016.
+# Frederik Schwarzer , 2014, 2016, 2018.
# Burkhard Lück , 2014, 2015, 2017.
# hkaelber , 2016.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-12-30 03:03+0100\n"
-"PO-Revision-Date: 2017-09-25 14:56+0100\n"
-"Last-Translator: Burkhard Lück \n"
+"POT-Creation-Date: 2018-04-05 03:28+0200\n"
+"PO-Revision-Date: 2018-03-25 22:35+0100\n"
+"Last-Translator: Frederik Schwarzer \n"
"Language-Team: German \n"
"Language: de\n"
"MIME-Version: 1.0\n"
@@ -16,28 +16,28 @@
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Lokalize 2.0\n"
-#: battery/batteryplugin.cpp:77
+#: battery/batteryplugin.cpp:75
#, kde-format
msgctxt "device name: low battery"
msgid "%1: Low Battery"
msgstr "%1: Niedriger Ladestand"
-#: battery/batteryplugin.cpp:78
+#: battery/batteryplugin.cpp:75
#, kde-format
msgid "Battery at %1%"
msgstr "Akku bei %1 %"
-#: mousepad/mousepadplugin.cpp:131
+#: mousepad/waylandremoteinput.cpp:59
#, kde-format
msgid "KDE Connect"
msgstr "KDE-Connect"
-#: mousepad/mousepadplugin.cpp:131
+#: mousepad/waylandremoteinput.cpp:59
#, kde-format
msgid "Use your phone as a touchpad and keyboard"
msgstr "Verwendet Ihr Handy als Touchpad und Tastatur"
-#: notifications/notification.cpp:127 telephony/telephonyplugin.cpp:113
+#: notifications/notification.cpp:120 telephony/telephonyplugin.cpp:113
#, kde-format
msgid "Reply"
msgstr "Antworten"
@@ -95,18 +95,33 @@
msgid "Mute system sound"
msgstr "Sound stummschalten"
-#: ping/pingplugin.cpp:54
+#: ping/pingplugin.cpp:50
#, kde-format
msgid "Ping!"
msgstr "Ping!"
-#: runcommand/runcommand_config.cpp:51
+#: runcommand/runcommand_config.cpp:45
+#, kde-format
+msgid "Suspend"
+msgstr ""
+
+#: runcommand/runcommand_config.cpp:46
+#, kde-format
+msgid "Maximum Brightness"
+msgstr "Maximale Helligkeit"
+
+#: runcommand/runcommand_config.cpp:53
+#, kde-format
+msgid "Sample commands"
+msgstr ""
+
+#: runcommand/runcommand_config.cpp:62
#: sendnotifications/notifyingapplicationmodel.cpp:208
#, kde-format
msgid "Name"
msgstr "Name"
-#: runcommand/runcommand_config.cpp:51
+#: runcommand/runcommand_config.cpp:62
#, kde-format
msgid "Command"
msgstr "Befehl"
diff -Nru kdeconnect-1.2.1/po/de/kdeconnect-urlhandler.po kdeconnect-1.3.0/po/de/kdeconnect-urlhandler.po
--- kdeconnect-1.2.1/po/de/kdeconnect-urlhandler.po 2018-01-16 22:46:15.000000000 +0000
+++ kdeconnect-1.3.0/po/de/kdeconnect-urlhandler.po 2018-04-08 14:35:21.000000000 +0000
@@ -1,13 +1,13 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
#
-# Burkhard Lück , 2017.
+# Burkhard Lück , 2017, 2018.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-06-10 02:58+0200\n"
-"PO-Revision-Date: 2017-11-27 09:22+0100\n"
+"POT-Creation-Date: 2018-01-26 03:14+0100\n"
+"PO-Revision-Date: 2018-03-21 20:18+0100\n"
"Last-Translator: Burkhard Lück \n"
"Language-Team: German \n"
"Language: de\n"
@@ -42,7 +42,12 @@
msgid "URL to share"
msgstr "URL (Adresse) zur Freigabe"
-#: kdeconnect-handler.cpp:104
+#: kdeconnect-handler.cpp:94
+#, kde-format
+msgid "Device to call this phone number with:"
+msgstr "Gerät mit dem diese Telefonnummer angerufen werden soll:"
+
+#: kdeconnect-handler.cpp:111
#, kde-format
msgid "Couldn't share %1"
msgstr "%1 kann nicht freigegeben werden"
\ No newline at end of file
diff -Nru kdeconnect-1.2.1/po/de/plasma_applet_org.kde.kdeconnect.po kdeconnect-1.3.0/po/de/plasma_applet_org.kde.kdeconnect.po
--- kdeconnect-1.2.1/po/de/plasma_applet_org.kde.kdeconnect.po 2018-01-16 22:46:15.000000000 +0000
+++ kdeconnect-1.3.0/po/de/plasma_applet_org.kde.kdeconnect.po 2018-04-08 14:35:21.000000000 +0000
@@ -1,12 +1,12 @@
-# Burkhard Lück , 2015, 2017.
-# Frederik Schwarzer , 2016.
+# Burkhard Lück , 2015, 2017, 2018.
+# Frederik Schwarzer , 2016, 2018.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2018-01-10 04:36+0100\n"
-"PO-Revision-Date: 2017-10-31 21:06+0100\n"
-"Last-Translator: Burkhard Lück \n"
+"POT-Creation-Date: 2018-03-25 04:16+0200\n"
+"PO-Revision-Date: 2018-03-25 22:35+0100\n"
+"Last-Translator: Frederik Schwarzer \n"
"Language-Team: German \n"
"Language: de\n"
"MIME-Version: 1.0\n"
@@ -47,10 +47,22 @@
msgid "Notifications:"
msgstr "Benachrichtigungen:"
+#: package/contents/ui/DeviceDelegate.qml:209
+msgid "Dismiss all notifications"
+msgstr "Alle Benachrichtigungen abweisen"
+
+#: package/contents/ui/DeviceDelegate.qml:245
+msgid "Reply"
+msgstr "Antworten"
+
+#: package/contents/ui/DeviceDelegate.qml:254
+msgid "Dismiss"
+msgstr "Abweisen"
+
#: package/contents/ui/FullRepresentation.qml:35
msgid "No paired devices available"
msgstr "Es sind keine angeschlossenen Geräte verfügbar"
-#: package/contents/ui/main.qml:60
+#: package/contents/ui/main.qml:59
msgid "KDE Connect Settings..."
msgstr "KDE-Connect-Einstellungen..."
\ No newline at end of file
diff -Nru kdeconnect-1.2.1/po/el/kdeconnect-cli.po kdeconnect-1.3.0/po/el/kdeconnect-cli.po
--- kdeconnect-1.2.1/po/el/kdeconnect-cli.po 2018-01-16 22:46:15.000000000 +0000
+++ kdeconnect-1.3.0/po/el/kdeconnect-cli.po 2018-04-08 14:35:21.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2017-06-10 02:58+0200\n"
+"POT-Creation-Date: 2018-02-28 03:17+0100\n"
"PO-Revision-Date: 2017-10-29 11:21+0200\n"
"Last-Translator: Stelios \n"
"Language-Team: Greek