diff -Nru kdeconnect-0.7.1/cli/kdeconnect-cli.cpp kdeconnect-0.7.3/cli/kdeconnect-cli.cpp --- kdeconnect-0.7.1/cli/kdeconnect-cli.cpp 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/cli/kdeconnect-cli.cpp 2014-10-11 17:03:59.000000000 +0000 @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -33,21 +34,24 @@ KAboutData about("kdeconnect-cli", "kdeconnect-cli", ki18n(("kdeconnect-cli")), "1.0", ki18n("KDE Connect CLI tool"), KAboutData::License_GPL, ki18n("(C) 2013 Aleix Pol Gonzalez")); about.addAuthor( ki18n("Aleix Pol Gonzalez"), KLocalizedString(), "aleixpol@kde.org" ); + about.addAuthor( ki18n("Albert Vaca Cintora"), KLocalizedString(), "albertvaka@gmail.com" ); KCmdLineArgs::init(argc, argv, &about); KCmdLineOptions options; options.add("l") - .add("list-devices", ki18n("List all devices")); - options.add("share ", ki18n("Share a file to a said device")); - options.add("pair", ki18n("Request pairing to a said device")); - options.add("unpair", ki18n("Stop pairing to a said device")); - options.add("ping", ki18n("Sends a ping to said device")); - options.add("device ", ki18n("Device ID")); + .add("list-devices", ki18n("List all devices.")); + options.add("refresh", ki18n("Search for devices in the network and re-establish connections.")); + options.add("pair", ki18n("Request pairing to a said device.")); + options.add("unpair", ki18n("Stop pairing to a said device.")); + options.add("ping", ki18n("Send a ping to said device.")); + options.add("ping-msg ", ki18n("Same as ping but you can customize the shown message.")); + options.add("share ", ki18n("Share a file to a said device.")); + options.add("list-notifications", ki18n("Display the notifications on a said device.")); + options.add("device ", ki18n("Device ID.")); KCmdLineArgs::addCmdLineOptions( options ); KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); KApplication app; if(args->isSet("l")) { DevicesModel devices; - devices.setDisplayFilter(DevicesModel::StatusUnknown); for(int i=0, rows=devices.rowCount(); iisSet("refresh")) { + QDBusMessage msg = QDBusMessage::createMethodCall("org.kde.kdeconnect", "/modules/kdeconnect", "org.kde.kdeconnect.daemon", "forceOnNetworkChange"); + QDBusConnection::sessionBus().call(msg); } else { QString device; if(!args->isSet("device")) { @@ -99,11 +105,24 @@ QDBusPendingReply req = dev.unpair(); req.waitForFinished(); } - } else if(args->isSet("ping")) { + } else if(args->isSet("ping") || args->isSet("ping-msg")) { QDBusMessage msg = QDBusMessage::createMethodCall("org.kde.kdeconnect", "/modules/kdeconnect/devices/"+device+"/ping", "org.kde.kdeconnect.device.ping", "sendPing"); + if (args->isSet("ping-msg")) { + QString message = args->getOption("ping-msg"); + msg.setArguments(QVariantList() << message); + } QDBusConnection::sessionBus().call(msg); - } else + } else if(args->isSet("list-notifications")) { + NotificationsModel notifications; + notifications.setDeviceId(device); + for(int i=0, rows=notifications.rowCount(); i +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# 3. The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + +find_package(PkgConfig QUIET REQUIRED) +pkg_check_modules(PC_LibFakeKey libfakekey) + +find_path(LibFakeKey_INCLUDE_DIRS + NAMES fakekey/fakekey.h + HINTS ${PC_LibFakeKey_LIBRARY_DIRS} +) + +find_library(LibFakeKey_LIBRARIES + NAMES fakekey + HINTS ${PC_LibFakeKey_LIBRARY_DIRS} +) + +set(LibFakeKey_VERSION ${PC_LibFakeKey_VERSION}) + +include(FindPackageHandleStandardArgs) + +find_package_handle_standard_args(LibFakeKey + FOUND_VAR LibFakeKey_FOUND + REQUIRED_VARS LibFakeKey_LIBRARIES LibFakeKey_INCLUDE_DIRS + VERSION_VAR LibFakeKey_VERSION +) + +mark_as_advanced(LibFakeKey_LIBRARIES LibFakeKey_INCLUDE_DIRS LibFakeKey_VERSION) diff -Nru kdeconnect-0.7.1/core/backends/devicelink.cpp kdeconnect-0.7.3/core/backends/devicelink.cpp --- kdeconnect-0.7.1/core/backends/devicelink.cpp 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/core/backends/devicelink.cpp 2014-10-11 17:03:59.000000000 +0000 @@ -29,6 +29,5 @@ Q_ASSERT(!deviceId.isEmpty()); setProperty("deviceId", deviceId); - //gcc complains if we don't add something to compile on a class with virtual functions } diff -Nru kdeconnect-0.7.1/core/backends/lan/landevicelink.cpp kdeconnect-0.7.3/core/backends/lan/landevicelink.cpp --- kdeconnect-0.7.1/core/backends/lan/landevicelink.cpp 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/core/backends/lan/landevicelink.cpp 2014-10-11 17:03:59.000000000 +0000 @@ -80,7 +80,7 @@ const QByteArray package = mSocketLineReader->readLine(); - //kDebug(kdeconnect_kded()) << "LanDeviceLink dataReceived" << package; + //kDebug(debugArea()) << "LanDeviceLink dataReceived" << package; NetworkPackage unserialized(QString::null); NetworkPackage::unserialize(package, &unserialized); @@ -90,7 +90,7 @@ unserialized.decrypt(mPrivateKey, &decrypted); if (decrypted.hasPayloadTransferInfo()) { - kDebug(kdeconnect_kded()) << "HasPayloadTransferInfo"; + kDebug(debugArea()) << "HasPayloadTransferInfo"; DownloadJob* job = new DownloadJob(mSocketLineReader->peerAddress(), decrypted.payloadTransferInfo()); job->start(); decrypted.setPayload(job->getPayload(), decrypted.payloadSize()); diff -Nru kdeconnect-0.7.1/core/backends/lan/lanlinkprovider.cpp kdeconnect-0.7.3/core/backends/lan/lanlinkprovider.cpp --- kdeconnect-0.7.1/core/backends/lan/lanlinkprovider.cpp 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/core/backends/lan/lanlinkprovider.cpp 2014-10-11 17:03:59.000000000 +0000 @@ -29,6 +29,9 @@ #include #include +#include +#include + #include "../../kdebugnamespace.h" #include "landevicelink.h" @@ -44,13 +47,17 @@ #endif #ifdef TCP_KEEPCNT - int count = 3; // send up to 3 keepalive packets out, then disconnect if no response - setsockopt(fd, getprotobyname("TCP")->p_proto, TCP_KEEPCNT, &count, sizeof(count)); + if (getprotobyname("TCP")) { + int count = 3; // send up to 3 keepalive packets out, then disconnect if no response + setsockopt(fd, getprotobyname("TCP")->p_proto, TCP_KEEPCNT, &count, sizeof(count)); + } #endif #ifdef TCP_KEEPINTVL - int interval = 5; // send a keepalive packet out every 2 seconds (after the 5 second idle period) - setsockopt(fd, getprotobyname("TCP")->p_proto, TCP_KEEPINTVL, &interval, sizeof(interval)); + if (getprotobyname("TCP")) { + int interval = 5; // send a keepalive packet out every 2 seconds (after the 5 second idle period) + setsockopt(fd, getprotobyname("TCP")->p_proto, TCP_KEEPINTVL, &interval, sizeof(interval)); + } #endif } @@ -98,6 +105,8 @@ NetworkPackage::createIdentityPackage(&np); np.set("tcpPort", mTcpPort); mUdpSocket.writeDatagram(np.serialize(), QHostAddress("255.255.255.255"), port); + + //TODO: Ping active connections to see if they are still reachable } //I'm the existing device, a new device is kindly introducing itself (I will create a TcpSocket) @@ -123,17 +132,17 @@ delete receivedPackage; } - NetworkPackage np2(""); - NetworkPackage::createIdentityPackage(&np2); + KSharedConfigPtr config = KSharedConfig::openConfig("kdeconnectrc"); + const QString myId = config->group("myself").readEntry("id",""); - if (receivedPackage->get("deviceId") == np2.get("deviceId")) { - //kDebug(kdeconnect_kded()) << "Ignoring my own broadcast"; + //kDebug(debugArea()) << "Ignoring my own broadcast"; + if (receivedPackage->get("deviceId") == myId) { return; } int tcpPort = receivedPackage->get("tcpPort", port); - //kDebug(kdeconnect_kded()) << "Received Udp presentation from" << sender << "asking for a tcp connection on port " << tcpPort; + //kDebug(debugArea()) << "Received Udp presentation from" << sender << "asking for a tcp connection on port " << tcpPort; QTcpSocket* socket = new QTcpSocket(this); receivedIdentityPackages[socket].np = receivedPackage; @@ -151,7 +160,7 @@ disconnect(socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(connectError())); disconnect(socket, SIGNAL(connected()), this, SLOT(connected())); - kDebug(kdeconnect_kded()) << "Fallback (1), try reverse connection"; + kDebug(debugArea()) << "Fallback (1), try reverse connection"; NetworkPackage np(""); NetworkPackage::createIdentityPackage(&np); np.set("tcpPort", mTcpPort); @@ -166,6 +175,8 @@ QTcpSocket* socket = qobject_cast(sender()); + if (!socket) return; + disconnect(socket, SIGNAL(connected()), this, SLOT(connected())); disconnect(socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(connectError())); @@ -173,7 +184,7 @@ NetworkPackage* receivedPackage = receivedIdentityPackages[socket].np; const QString& deviceId = receivedPackage->get("deviceId"); - //kDebug(kdeconnect_kded()) << "Connected" << socket->isWritable(); + //kDebug(debugArea()) << "Connected" << socket->isWritable(); LanDeviceLink* deviceLink = new LanDeviceLink(deviceId, this, socket); @@ -182,10 +193,9 @@ bool success = deviceLink->sendPackage(np2); - //TODO: Use reverse connection too to preffer connecting a unstable device (a phone) to a stable device (a computer) if (success) { - //kDebug(kdeconnect_kded()) << "Handshaking done (i'm the existing device)"; + //kDebug(debugArea()) << "Handshaking done (i'm the existing device)"; connect(deviceLink, SIGNAL(destroyed(QObject*)), this, SLOT(deviceLinkDestroyed(QObject*))); @@ -206,7 +216,7 @@ } else { //I think this will never happen - kDebug(kdeconnect_kded()) << "Fallback (2), try reverse connection"; + kDebug(debugArea()) << "Fallback (2), try reverse connection"; mUdpSocket.writeDatagram(np2.serialize(), receivedIdentityPackages[socket].sender, port); delete deviceLink; } @@ -220,7 +230,7 @@ //I'm the new device and this is the answer to my UDP introduction (no data received yet) void LanLinkProvider::newConnection() { - //kDebug(kdeconnect_kded()) << "LanLinkProvider newConnection"; + //kDebug(debugArea()) << "LanLinkProvider newConnection"; while(mTcpServer->hasPendingConnections()) { QTcpSocket* socket = mTcpServer->nextPendingConnection(); @@ -234,7 +244,7 @@ NetworkPackage::createIdentityPackage(&np); int written = socket->write(np.serialize()); - kDebug(kdeconnect_kded()) << "LanLinkProvider sent package." << written << " bytes written, waiting for reply"; + kDebug(debugArea()) << "LanLinkProvider sent package." << written << " bytes written, waiting for reply"; */ } @@ -246,20 +256,20 @@ const QByteArray data = socket->readLine(); - //kDebug(kdeconnect_kded()) << "LanLinkProvider received reply:" << data; + //kDebug(debugArea()) << "LanLinkProvider received reply:" << data; NetworkPackage np(""); bool success = NetworkPackage::unserialize(data, &np); if (!success || np.type() != PACKAGE_TYPE_IDENTITY) { - kDebug(kdeconnect_kded()) << "LanLinkProvider/newConnection: Not an identification package (wuh?)"; + kDebug(debugArea()) << "LanLinkProvider/newConnection: Not an identification package (wuh?)"; return; } const QString& deviceId = np.get("deviceId"); LanDeviceLink* deviceLink = new LanDeviceLink(deviceId, this, socket); - //kDebug(kdeconnect_kded()) << "Handshaking done (i'm the new device)"; + //kDebug(debugArea()) << "Handshaking done (i'm the new device)"; connect(deviceLink, SIGNAL(destroyed(QObject*)), this, SLOT(deviceLinkDestroyed(QObject*))); @@ -282,7 +292,7 @@ void LanLinkProvider::deviceLinkDestroyed(QObject* destroyedDeviceLink) { - //kDebug(kdeconnect_kded()) << "deviceLinkDestroyed"; + //kDebug(debugArea()) << "deviceLinkDestroyed"; const QString id = destroyedDeviceLink->property("deviceId").toString(); QMap< QString, DeviceLink* >::iterator oldLinkIterator = mLinks.find(id); if (oldLinkIterator != mLinks.end() && oldLinkIterator.value() == destroyedDeviceLink) { diff -Nru kdeconnect-0.7.1/core/backends/lan/uploadjob.cpp kdeconnect-0.7.3/core/backends/lan/uploadjob.cpp --- kdeconnect-0.7.1/core/backends/lan/uploadjob.cpp 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/core/backends/lan/uploadjob.cpp 2014-10-11 17:03:59.000000000 +0000 @@ -39,7 +39,7 @@ while(!mServer->listen(QHostAddress::Any, mPort)) { mPort++; if (mPort > 1764) { //No ports available? - kDebug(kdeconnect_kded()) << "Error opening a port in range 1739-1764 for file transfer"; + kDebug(debugArea()) << "Error opening a port in range 1739-1764 for file transfer"; mPort = 0; return; } diff -Nru kdeconnect-0.7.1/core/backends/linkprovider.h kdeconnect-0.7.3/core/backends/linkprovider.h --- kdeconnect-0.7.1/core/backends/linkprovider.h 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/core/backends/linkprovider.h 2014-10-11 17:03:59.000000000 +0000 @@ -36,7 +36,7 @@ public: - const static int PRIORITY_LOW = 0; //eg: 3g + const static int PRIORITY_LOW = 0; //eg: 3g internet const static int PRIORITY_MEDIUM = 50; //eg: internet const static int PRIORITY_HIGH = 100; //eg: lan diff -Nru kdeconnect-0.7.1/core/CMakeLists.txt kdeconnect-0.7.3/core/CMakeLists.txt --- kdeconnect-0.7.1/core/CMakeLists.txt 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/core/CMakeLists.txt 2014-10-11 17:03:59.000000000 +0000 @@ -1,7 +1,11 @@ project(KDEConnectCore) +set(KDECONNECT_VERSION_MAJOR 1) +set(KDECONNECT_VERSION_MINOR 0) +set(KDECONNECT_VERSION_PATCH 1) +set(KDECONNECT_VERSION "${KDECONNECT_VERSION_MAJOR}.${KDECONNECT_VERSION_MINOR}.${KDECONNECT_VERSION_PATCH}") + include_directories( - ${KDE4_KIO_LIBS} ${QJSON_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${QCA2_INCLUDE_DIR} @@ -19,14 +23,19 @@ kdeconnectplugin.cpp pluginloader.cpp + dbushelper.cpp networkpackage.cpp filetransferjob.cpp daemon.cpp device.cpp - kdebugnamespace.cpp ) kde4_add_library(kdeconnectcore SHARED ${kded_kdeconnect_SRCS}) +set_target_properties(kdeconnectcore PROPERTIES + VERSION ${KDECONNECT_VERSION} + SOVERSION ${KDECONNECT_VERSION_MAJOR} +) + target_link_libraries(kdeconnectcore LINK_PUBLIC ${KDE4_KDECORE_LIBS} diff -Nru kdeconnect-0.7.1/core/daemon.cpp kdeconnect-0.7.3/core/daemon.cpp --- kdeconnect-0.7.1/core/daemon.cpp 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/core/daemon.cpp 2014-10-11 17:03:59.000000000 +0000 @@ -27,11 +27,13 @@ #include #include #include +#include #include #include #include +#include "dbushelper.h" #include "kdebugnamespace.h" #include "networkpackage.h" #include "backends/lan/lanlinkprovider.h" @@ -61,22 +63,23 @@ : QObject(parent) , d(new DaemonPrivate) { + kDebug(debugArea()) << "KdeConnect daemon starting"; + KSharedConfigPtr config = KSharedConfig::openConfig("kdeconnectrc"); if (!config->group("myself").hasKey("id")) { QString uuid = QUuid::createUuid().toString(); - //uuids contain charcaters that are not exportable in dbus paths - uuid = uuid.mid(1, uuid.length() - 2).replace("-", "_"); + DbusHelper::filterNonExportableCharacters(uuid); config->group("myself").writeEntry("id", uuid); config->sync(); - kDebug(kdeconnect_kded()) << "My id:" << uuid; + kDebug(debugArea()) << "My id:" << uuid; } - //kDebug(kdeconnect_kded()) << "QCA supported capabilities:" << QCA::supportedFeatures().join(","); + //kDebug(debugArea()) << "QCA supported capabilities:" << QCA::supportedFeatures().join(","); if(!QCA::isSupported("rsa")) { - //TODO: Maybe display this in a more visible way? - kWarning(kdeconnect_kded()) << "Error: KDE Connect could not find support for RSA in your QCA installation, if your distribution provides" - << "separate packages for QCA-ossl and QCA-gnupg plugins, make sure you have them installed and try again"; + //TODO: Display this in a notification or another visible way + kWarning(debugArea()) << "Error: KDE Connect could not find support for RSA in your QCA installation, if your distribution provides" + << "separate packages for QCA-ossl and QCA-gnupg plugins, make sure you have them installed and try again."; return; } @@ -89,13 +92,13 @@ if (!privKey.open(QIODevice::ReadWrite | QIODevice::Truncate)) { - kWarning(kdeconnect_kded()) << "Error: KDE Connect could not create private keys file: " << privateKeyPath; + kWarning(debugArea()) << "Error: KDE Connect could not create private keys file: " << privateKeyPath; return; } if (!privKey.setPermissions(strict)) { - kWarning(kdeconnect_kded()) << "Error: KDE Connect could not set permissions for private file: " << privateKeyPath; + kWarning(debugArea()) << "Error: KDE Connect could not set permissions for private file: " << privateKeyPath; } //http://delta.affinix.com/docs/qca/rsatest_8cpp-example.html @@ -110,14 +113,14 @@ config->group("myself").writeEntry("privateKeyPath", privateKeyPath); config->sync(); } - if (QFile::permissions(config->group("myself").readEntry("privateKeyPath")) != strict) { - kWarning(kdeconnect_kded()) << "Error: KDE Connect detects wrong permissions for private file " << config->group("myself").readEntry("privateKeyPath"); + kWarning(debugArea()) << "Error: KDE Connect detects wrong permissions for private file " << config->group("myself").readEntry("privateKeyPath"); } - //Debugging - kDebug(kdeconnect_kded()) << "Starting KdeConnect daemon"; + //Register on DBus + QDBusConnection::sessionBus().registerService("org.kde.kdeconnect"); + QDBusConnection::sessionBus().registerObject("/modules/kdeconnect", this, QDBusConnection::ExportScriptableContents); //Load backends (hardcoded by now, should be plugins in a future) d->mLinkProviders.insert(new LanLinkProvider()); @@ -133,26 +136,29 @@ d->mDevices[id] = device; Q_EMIT deviceAdded(id); } - - //Listen to connectivity changes - QNetworkSession* network = new QNetworkSession(QNetworkConfigurationManager().defaultConfiguration()); + + //Listen to new devices Q_FOREACH (LinkProvider* a, d->mLinkProviders) { - connect(network, SIGNAL(stateChanged(QNetworkSession::State)), - a, SLOT(onNetworkChange(QNetworkSession::State))); connect(a, SIGNAL(onConnectionReceived(NetworkPackage, DeviceLink*)), this, SLOT(onNewDeviceLink(NetworkPackage, DeviceLink*))); } - - QDBusConnection::sessionBus().registerService("org.kde.kdeconnect"); - QDBusConnection::sessionBus().registerObject("/modules/kdeconnect", this, QDBusConnection::ExportScriptableContents); - setDiscoveryEnabled(true); + //Listen to connectivity changes + QNetworkConfigurationManager* manager = new QNetworkConfigurationManager(); + QNetworkSession* network = new QNetworkSession(manager->defaultConfiguration()); + connect(manager, SIGNAL(configurationAdded(QNetworkConfiguration)), + this, SLOT(forceOnNetworkChange())); + Q_FOREACH (LinkProvider* a, d->mLinkProviders) { + connect(network, SIGNAL(stateChanged(QNetworkSession::State)), + a, SLOT(onNetworkChange(QNetworkSession::State))); + } + + kDebug(debugArea()) << "KdeConnect daemon started"; } void Daemon::setDiscoveryEnabled(bool b) { - //Listen to incomming connections Q_FOREACH (LinkProvider* a, d->mLinkProviders) { if (b) a->onStart(); @@ -185,14 +191,14 @@ const QString& id = identityPackage.get("deviceId"); - //kDebug(kdeconnect_kded()) << "Device discovered" << id << "via" << dl->provider()->name(); + //kDebug(debugArea()) << "Device discovered" << id << "via" << dl->provider()->name(); if (d->mDevices.contains(id)) { - //kDebug(kdeconnect_kded()) << "It is a known device"; + //kDebug(debugArea()) << "It is a known device"; Device* device = d->mDevices[id]; device->addLink(identityPackage, dl); } else { - //kDebug(kdeconnect_kded()) << "It is a new device"; + //kDebug(debugArea()) << "It is a new device"; Device* device = new Device(this, identityPackage, dl); connect(device, SIGNAL(reachableStatusChanged()), this, SLOT(onDeviceReachableStatusChanged())); @@ -213,12 +219,12 @@ Q_EMIT deviceVisibilityChanged(id, device->isReachable()); - //kDebug(kdeconnect_kded()) << "Device" << device->name() << "reachable status changed:" << device->isReachable(); + //kDebug(debugArea()) << "Device" << device->name() << "reachable status changed:" << device->isReachable(); if (!device->isReachable()) { if (!device->isPaired()) { - kDebug(kdeconnect_kded()) << "Destroying device" << device->name(); + kDebug(debugArea()) << "Destroying device" << device->name(); Q_EMIT deviceRemoved(id); d->mDevices.remove(id); device->deleteLater(); diff -Nru kdeconnect-0.7.1/core/dbushelper.cpp kdeconnect-0.7.3/core/dbushelper.cpp --- kdeconnect-0.7.1/core/dbushelper.cpp 1970-01-01 00:00:00.000000000 +0000 +++ kdeconnect-0.7.3/core/dbushelper.cpp 2014-10-11 17:03:59.000000000 +0000 @@ -0,0 +1,33 @@ +/** + * Copyright 2014 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 "dbushelper.h" + +#include + +namespace DbusHelper { + +void filterNonExportableCharacters(QString& s) +{ + static QRegExp regexp("[^A-Za-z0-9_]", Qt::CaseSensitive, QRegExp::Wildcard); + s.replace(regexp,"_"); +} + +} \ No newline at end of file diff -Nru kdeconnect-0.7.1/core/dbushelper.h kdeconnect-0.7.3/core/dbushelper.h --- kdeconnect-0.7.1/core/dbushelper.h 1970-01-01 00:00:00.000000000 +0000 +++ kdeconnect-0.7.3/core/dbushelper.h 2014-10-11 17:03:59.000000000 +0000 @@ -0,0 +1,29 @@ +/** + * Copyright 2014 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 KDECONNECT_DBUSHELPER_H +#define KDECONNECT_DBUSHELPER_H +#include + +namespace DbusHelper { + void filterNonExportableCharacters(QString& s); +} + +#endif \ No newline at end of file diff -Nru kdeconnect-0.7.1/core/default_args.h kdeconnect-0.7.3/core/default_args.h --- kdeconnect-0.7.1/core/default_args.h 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/core/default_args.h 2014-10-11 17:03:59.000000000 +0000 @@ -40,14 +40,6 @@ static int get() { return -1; } }; -//Pointer types -> NULL (partial specialization) -//NOTE: Comented because it doesn't makeno sense to send a pointer over the network, but I just left it here for reference --albertvaka -/*template -struct default_arg { - static T* get() { NULL; } -}; -*/ - //QByteArray-> empty qbytearray template<> struct default_arg { diff -Nru kdeconnect-0.7.1/core/device.cpp kdeconnect-0.7.3/core/device.cpp --- kdeconnect-0.7.1/core/device.cpp 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/core/device.cpp 2014-10-11 17:03:59.000000000 +0000 @@ -70,6 +70,8 @@ , m_deviceType(str2type(identityPackage.get("deviceType"))) , m_pairStatus(Device::NotPaired) , m_protocolVersion(identityPackage.get("protocolVersion")) + , m_incomingCapabilities(identityPackage.get("SupportedIncomingInterfaces", QStringList()).toSet()) + , m_outgoingCapabilities(identityPackage.get("SupportedOutgoingInterfaces", QStringList()).toSet()) { initPrivateKey(); @@ -130,11 +132,27 @@ incomingInterfaces = m_pluginsByIncomingInterface.keys(plugin); outgoingInterfaces = m_pluginsByOutgoingInterface.keys(plugin); } else { - PluginData data = loader->instantiatePluginForDevice(pluginName, this); - plugin = data.plugin; - incomingInterfaces = data.incomingInterfaces; - outgoingInterfaces = data.outgoingInterfaces; + KService::Ptr service = loader->pluginService(pluginName); + incomingInterfaces = service->property("X-KdeConnect-SupportedPackageType", QVariant::StringList).toStringList(); + outgoingInterfaces = service->property("X-KdeConnect-OutgoingPackageType", QVariant::StringList).toStringList(); } + + //If we don't find intersection with the received on one end and the sent on the other, we don't + //let the plugin stay + //Also, if no capabilities are specified on the other end, we don't apply this optimizaton, as + //we asume that the other client doesn't know about capabilities. + if (!m_incomingCapabilities.isEmpty() && !m_outgoingCapabilities.isEmpty() + && m_incomingCapabilities.intersect(outgoingInterfaces.toSet()).isEmpty() + && m_outgoingCapabilities.intersect(incomingInterfaces.toSet()).isEmpty() + ) { + delete plugin; + continue; + } + + if (!plugin) { + plugin = loader->instantiatePluginForDevice(pluginName, this); + } + foreach(const QString& interface, incomingInterfaces) { newPluginsByIncomingInterface.insert(interface, plugin); } @@ -233,7 +251,7 @@ void Device::addLink(const NetworkPackage& identityPackage, DeviceLink* link) { - //kDebug(kdeconnect_kded()) << "Adding link to" << id() << "via" << link->provider(); + //kDebug(debugArea()) << "Adding link to" << id() << "via" << link->provider(); m_protocolVersion = identityPackage.get("protocolVersion"); if (m_protocolVersion != NetworkPackage::ProtocolVersion) { @@ -280,7 +298,7 @@ { m_deviceLinks.removeOne(link); - //kDebug(kdeconnect_kded()) << "RemoveLink" << m_deviceLinks.size() << "links remaining"; + //kDebug(debugArea()) << "RemoveLink" << m_deviceLinks.size() << "links remaining"; if (m_deviceLinks.isEmpty()) { reloadPlugins(); @@ -313,12 +331,12 @@ { if (np.type() == PACKAGE_TYPE_PAIR) { - //kDebug(kdeconnect_kded()) << "Pair package"; + //kDebug(debugArea()) << "Pair package"; bool wantsPair = np.get("pair"); if (wantsPair == isPaired()) { - kDebug(kdeconnect_kded()) << "Already" << (wantsPair? "paired":"unpaired"); + kDebug(debugArea()) << "Already" << (wantsPair? "paired":"unpaired"); if (m_pairStatus == Device::Requested) { m_pairStatus = Device::NotPaired; m_pairingTimeut.stop(); @@ -333,7 +351,7 @@ const QString& key = np.get("publicKey"); m_publicKey = QCA::RSAPublicKey::fromPEM(key); if (m_publicKey.isNull()) { - kDebug(kdeconnect_kded()) << "ERROR decoding key"; + kDebug(debugArea()) << "ERROR decoding key"; if (m_pairStatus == Device::Requested) { m_pairStatus = Device::NotPaired; m_pairingTimeut.stop(); @@ -344,12 +362,12 @@ if (m_pairStatus == Device::Requested) { //We started pairing - kDebug(kdeconnect_kded()) << "Pair answer"; + kDebug(debugArea()) << "Pair answer"; setAsPaired(); } else { - kDebug(kdeconnect_kded()) << "Pair request"; + kDebug(debugArea()) << "Pair request"; KNotification* notification = new KNotification("pingReceived"); //KNotification::Persistent notification->setPixmap(KIcon("dialog-information").pixmap(48, 48)); @@ -367,7 +385,7 @@ } else { - kDebug(kdeconnect_kded()) << "Unpair request"; + kDebug(debugArea()) << "Unpair request"; PairStatus prevPairStatus = m_pairStatus; m_pairStatus = Device::NotPaired; @@ -390,7 +408,7 @@ plugin->receivePackage(np); } } else { - kDebug(kdeconnect_kded()) << "device" << name() << "not paired, ignoring package" << np.type(); + kDebug(debugArea()) << "device" << name() << "not paired, ignoring package" << np.type(); unpair(); } @@ -408,7 +426,7 @@ void Device::rejectPairing() { - kDebug(kdeconnect_kded()) << "Rejected pairing"; + kDebug(debugArea()) << "Rejected pairing"; m_pairStatus = Device::NotPaired; @@ -424,7 +442,7 @@ { if (m_pairStatus != Device::RequestedByPeer) return; - kDebug(kdeconnect_kded()) << "Accepted pairing"; + kDebug(debugArea()) << "Accepted pairing"; bool success = sendOwnPublicKey(); diff -Nru kdeconnect-0.7.1/core/device.h kdeconnect-0.7.3/core/device.h --- kdeconnect-0.7.1/core/device.h 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/core/device.h 2014-10-11 17:03:59.000000000 +0000 @@ -135,6 +135,8 @@ QMultiMap m_pluginsByOutgoingInterface; QTimer m_pairingTimeut; + QSet m_incomingCapabilities; + QSet m_outgoingCapabilities; void setAsPaired(); void storeAsTrusted(); diff -Nru kdeconnect-0.7.1/core/filetransferjob.cpp kdeconnect-0.7.3/core/filetransferjob.cpp --- kdeconnect-0.7.1/core/filetransferjob.cpp 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/core/filetransferjob.cpp 2014-10-11 17:03:59.000000000 +0000 @@ -41,18 +41,18 @@ mDeviceName = i18nc("Device name that will appear on the jobs", "KDE-Connect"); setCapabilities(Killable); - kDebug(kdeconnect_kded()) << "FileTransferJob Downloading payload to" << destination; + kDebug(debugArea()) << "FileTransferJob Downloading payload to" << destination; } void FileTransferJob::openFinished(KJob* job) { - kDebug(kdeconnect_kded()) << job->errorString(); + kDebug(debugArea()) << job->errorString(); } void FileTransferJob::start() { QMetaObject::invokeMethod(this, "doStart", Qt::QueuedConnection); - //kDebug(kdeconnect_kded()) << "FileTransferJob start"; + //kDebug(debugArea()) << "FileTransferJob start"; } void FileTransferJob::doStart() @@ -136,10 +136,10 @@ { Q_UNUSED(job); - //kDebug(kdeconnect_kded()) << "FileTransferJob open"; + //kDebug(debugArea()) << "FileTransferJob open"; if (!mOrigin) { - kDebug(kdeconnect_kded()) << "FileTransferJob: Origin is null"; + kDebug(debugArea()) << "FileTransferJob: Origin is null"; return; } @@ -161,7 +161,7 @@ mWritten += data.size(); setProcessedAmount(Bytes, mWritten); - //kDebug(kdeconnect_kded()) << "readyRead" << mSize << mWritten << bytes; + //kDebug(debugArea()) << "readyRead" << mSize << mWritten << bytes; if (mSize > -1) { //If a least 1 second has passed since last update @@ -190,13 +190,13 @@ //Make sure we do not enter this function again disconnect(mOrigin.data(), SIGNAL(aboutToClose()),this, SLOT(sourceFinished())); - //TODO: MD5 check the file + //TODO: MD5-check the file if (mSize > -1 && mWritten != mSize) { - kDebug(kdeconnect_kded()) << "Received incomplete file (" << mWritten << " of " << mSize << " bytes)"; + kDebug(debugArea()) << "Received incomplete file (" << mWritten << " of " << mSize << " bytes)"; setError(1); setErrorText(i18n("Received incomplete file")); } else { - kDebug(kdeconnect_kded()) << "Finished transfer" << mDestinationJob->url(); + kDebug(debugArea()) << "Finished transfer" << mDestinationJob->url(); } mDestinationJob->close(); mDestinationJob->deleteLater(); diff -Nru kdeconnect-0.7.1/core/kdebugnamespace.cpp kdeconnect-0.7.3/core/kdebugnamespace.cpp --- kdeconnect-0.7.1/core/kdebugnamespace.cpp 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/core/kdebugnamespace.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,28 +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 "kdebugnamespace.h" - -int kdeconnect_kded() { - static int s_area = KDebug::registerArea("kdeconnect_kded", true); - return s_area; -} - - diff -Nru kdeconnect-0.7.1/core/kdebugnamespace.h kdeconnect-0.7.3/core/kdebugnamespace.h --- kdeconnect-0.7.1/core/kdebugnamespace.h 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/core/kdebugnamespace.h 2014-10-11 17:03:59.000000000 +0000 @@ -23,7 +23,11 @@ #include -KDE_EXPORT int kdeconnect_kded(); +inline int debugArea() +{ + static int theArea = KDebug::registerArea("kdeconnect"); + return theArea; +}; #endif diff -Nru kdeconnect-0.7.1/core/networkpackage.cpp kdeconnect-0.7.3/core/networkpackage.cpp --- kdeconnect-0.7.1/core/networkpackage.cpp 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/core/networkpackage.cpp 2014-10-11 17:03:59.000000000 +0000 @@ -32,7 +32,9 @@ #include #include +#include "dbushelper.h" #include "filetransferjob.h" +#include "pluginloader.h" const QCA::EncryptionAlgorithm NetworkPackage::EncryptionAlgorithm = QCA::EME_PKCS1v15; const int NetworkPackage::ProtocolVersion = 5; @@ -56,8 +58,10 @@ np->mPayloadSize = 0; np->set("deviceId", id); np->set("deviceName", qgetenv("USER") + "@" + QHostInfo::localHostName()); - np->set("protocolType", "desktop"); //TODO: Detect laptop, tablet, phone... + np->set("deviceType", "desktop"); //TODO: Detect laptop, tablet, phone... np->set("protocolVersion", NetworkPackage::ProtocolVersion); + np->set("SupportedIncomingInterfaces", PluginLoader::instance()->incomingInterfaces().join(",")); + np->set("SupportedOutgoingInterfaces", PluginLoader::instance()->outgoingInterfaces().join(",")); //kDebug(kdeconnect_kded()) << "createIdentityPackage" << np->serialize(); } @@ -82,10 +86,10 @@ QJson::Serializer serializer; QByteArray json = serializer.serialize(variant,&ok); if (!ok) { - kDebug(kdeconnect_kded()) << "Serialization error:" << serializer.errorMessage(); + kDebug(debugArea()) << "Serialization error:" << serializer.errorMessage(); } else { if (!isEncrypted()) { - //kDebug(kdeconnect_kded()) << "Serialized package:" << json; + //kDebug(kDebugArea) << "Serialized package:" << json; } json.append('\n'); } @@ -100,7 +104,7 @@ bool ok; QVariantMap variant = parser.parse(a, &ok).toMap(); if (!ok) { - kDebug(kdeconnect_kded()) << "Unserialization error:" << a; + kDebug(debugArea()) << "Unserialization error:" << a; return false; } @@ -108,7 +112,7 @@ QJson::QObjectHelper::qvariant2qobject(variant, np); if (!np->isEncrypted()) { - //kDebug(kdeconnect_kded()) << "Unserialized: " << a; + //kDebug(kDebugArea) << "Unserialized: " << a; } np->mPayloadSize = variant["payloadSize"].toInt(); //Will return 0 if was not present, which is ok @@ -117,6 +121,14 @@ } np->mPayloadTransferInfo = variant["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->mBody.contains("deviceId")) + { + QString deviceId = np->get("deviceId"); + DbusHelper::filterNonExportableCharacters(deviceId); + np->set("deviceId", deviceId); + } + return true; } diff -Nru kdeconnect-0.7.1/core/networkpackage.h kdeconnect-0.7.3/core/networkpackage.h --- kdeconnect-0.7.1/core/networkpackage.h 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/core/networkpackage.h 2014-10-11 17:03:59.000000000 +0000 @@ -95,7 +95,7 @@ QString mId; QString mType; QVariantMap mBody; - + QSharedPointer mPayload; int mPayloadSize; QVariantMap mPayloadTransferInfo; diff -Nru kdeconnect-0.7.1/core/pluginloader.cpp kdeconnect-0.7.3/core/pluginloader.cpp --- kdeconnect-0.7.1/core/pluginloader.cpp 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/core/pluginloader.cpp 2014-10-11 17:03:59.000000000 +0000 @@ -50,42 +50,62 @@ { KService::Ptr service = plugins[name]; if (!service) { - kDebug(kdeconnect_kded()) << "Plugin unknown" << name; + kDebug(debugArea()) << "Plugin unknown" << name; return KPluginInfo(); } return KPluginInfo(service); } -PluginData PluginLoader::instantiatePluginForDevice(const QString& name, Device* device) const +KdeConnectPlugin* PluginLoader::instantiatePluginForDevice(const QString& name, Device* device) const { - PluginData ret; + KdeConnectPlugin* ret = 0; KService::Ptr service = plugins[name]; if (!service) { - kDebug(kdeconnect_kded()) << "Plugin unknown" << name; + kDebug(debugArea()) << "Plugin unknown" << name; return ret; } KPluginFactory *factory = KPluginLoader(service->library()).factory(); if (!factory) { - kDebug(kdeconnect_kded()) << "KPluginFactory could not load the plugin:" << service->library(); + kDebug(debugArea()) << "KPluginFactory could not load the plugin:" << service->library(); return ret; } - ret.incomingInterfaces = service->property("X-KdeConnect-SupportedPackageType", QVariant::StringList).toStringList(); - ret.outgoingInterfaces = service->property("X-KdeConnect-OutgoingPackageType", QVariant::StringList).toStringList(); + QStringList outgoingInterfaces = service->property("X-KdeConnect-OutgoingPackageType", QVariant::StringList).toStringList(); QVariant deviceVariant = QVariant::fromValue(device); - //FIXME any reason to use QObject in template param instead KdeConnectPlugin? - ret.plugin = factory->create(device, QVariantList() << deviceVariant << ret.outgoingInterfaces); - if (!ret.plugin) { - kDebug(kdeconnect_kded()) << "Error loading plugin"; + ret = factory->create(device, QVariantList() << deviceVariant << outgoingInterfaces); + if (!ret) { + kDebug(debugArea()) << "Error loading plugin"; return ret; } - kDebug(kdeconnect_kded()) << "Loaded plugin:" << service->name(); + kDebug(debugArea()) << "Loaded plugin:" << service->name(); return ret; } +KService::Ptr PluginLoader::pluginService(const QString& pluginName) const +{ + return plugins[pluginName]; +} + +QStringList PluginLoader::incomingInterfaces() const +{ + QSet ret; + foreach(const KService::Ptr& service, plugins) { + ret += service->property("X-KdeConnect-SupportedPackageType", QVariant::StringList).toStringList().toSet(); + } + return ret.toList(); +} + +QStringList PluginLoader::outgoingInterfaces() const +{ + QSet ret; + foreach(const KService::Ptr& service, plugins) { + ret += service->property("X-KdeConnect-OutgoingPackageType", QVariant::StringList).toStringList().toSet(); + } + return ret.toList(); +} diff -Nru kdeconnect-0.7.1/core/pluginloader.h kdeconnect-0.7.3/core/pluginloader.h --- kdeconnect-0.7.1/core/pluginloader.h 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/core/pluginloader.h 2014-10-11 17:03:59.000000000 +0000 @@ -32,23 +32,18 @@ class Device; class KdeConnectPlugin; -struct PluginData -{ - PluginData() : plugin(0) {} - KdeConnectPlugin* plugin; - QStringList incomingInterfaces; - QStringList outgoingInterfaces; -}; - class PluginLoader { public: static PluginLoader* instance(); + QStringList incomingInterfaces() const; + QStringList outgoingInterfaces() const; QStringList getPluginList() const; KPluginInfo getPluginInfo(const QString& name) const; - PluginData instantiatePluginForDevice(const QString& name, Device* device) const; + KService::Ptr pluginService(const QString& pluginName) const; + KdeConnectPlugin* instantiatePluginForDevice(const QString& name, Device* device) const; private: PluginLoader(); diff -Nru kdeconnect-0.7.1/debian/changelog kdeconnect-0.7.3/debian/changelog --- kdeconnect-0.7.1/debian/changelog 2014-07-01 17:26:23.000000000 +0000 +++ kdeconnect-0.7.3/debian/changelog 2014-11-26 21:06:22.000000000 +0000 @@ -1,8 +1,15 @@ -kdeconnect (0.7.1-0ubuntu3~ubuntu14.04.1) trusty-backports; urgency=medium +kdeconnect (0.7.3-0ubuntu1~ubuntu14.04.1) trusty-backports; urgency=medium - * No-change backport to trusty (LP: #1335840) + * No-change backport to trusty (LP: #1394586) - -- Felix Geyer Tue, 01 Jul 2014 19:26:23 +0200 + -- Felix Geyer Wed, 26 Nov 2014 22:06:22 +0100 + +kdeconnect (0.7.3-0ubuntu1) vivid; urgency=medium + + * New upstream release + * Parallelize build + + -- Rohan Garg Tue, 18 Nov 2014 15:40:20 +0100 kdeconnect (0.7.1-0ubuntu3) utopic; urgency=medium diff -Nru kdeconnect-0.7.1/debian/control kdeconnect-0.7.3/debian/control --- kdeconnect-0.7.1/debian/control 2014-06-30 15:18:35.000000000 +0000 +++ kdeconnect-0.7.3/debian/control 2014-11-18 14:31:37.000000000 +0000 @@ -10,6 +10,8 @@ libqca2-plugin-ossl, libqjson-dev, libxtst-dev, + libfakekey-dev, + pkg-config, pkg-kde-tools Standards-Version: 3.9.5 Homepage: https://projects.kde.org/projects/playground/base/kdeconnect-kde diff -Nru kdeconnect-0.7.1/debian/rules kdeconnect-0.7.3/debian/rules --- kdeconnect-0.7.1/debian/rules 2014-06-30 14:04:01.000000000 +0000 +++ kdeconnect-0.7.3/debian/rules 2014-11-18 14:35:49.000000000 +0000 @@ -9,7 +9,7 @@ CXXFLAGS+=$(CPPFLAGS) %: - dh $@ --with kde + dh $@ --with kde --parallel override_dh_auto_install: dh_auto_install diff -Nru kdeconnect-0.7.1/fileitemactionplugin/kdeconnectsendfile.desktop kdeconnect-0.7.3/fileitemactionplugin/kdeconnectsendfile.desktop --- kdeconnect-0.7.1/fileitemactionplugin/kdeconnectsendfile.desktop 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/fileitemactionplugin/kdeconnectsendfile.desktop 2014-10-11 17:03:59.000000000 +0000 @@ -4,7 +4,9 @@ Name[ca]=Envia un fitxer a través del servei KDE Connect Name[cs]=Poslat soubor přes službu KDE Connect Name[da]=Send fil via KDE Connect-tjeneste +Name[de]=Datei mit KDE-Connect -Dienst versenden Name[es]=Enviar archivo usando el servicio KDE Connect +Name[fr]=Envoyer un fichier via le service KDE Connect Name[hu]=Fájl küldése a KDE csatlakozás szolgáltatáson keresztül Name[nl]=Bestand via de service KDE Connect versturen Name[pl]=Wyślij plik przez usługę KDE Connect @@ -19,7 +21,9 @@ X-KDE-Submenu[ca]=Connecta X-KDE-Submenu[cs]=Připojit X-KDE-Submenu[da]=Forbind +X-KDE-Submenu[de]=Verbinden X-KDE-Submenu[es]=Conectar +X-KDE-Submenu[fr]=Connecter X-KDE-Submenu[hu]=Csatlakozás X-KDE-Submenu[nl]=Verbinden X-KDE-Submenu[pl]=Połącz diff -Nru kdeconnect-0.7.1/interfaces/CMakeLists.txt kdeconnect-0.7.3/interfaces/CMakeLists.txt --- kdeconnect-0.7.1/interfaces/CMakeLists.txt 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/interfaces/CMakeLists.txt 2014-10-11 17:03:59.000000000 +0000 @@ -15,7 +15,6 @@ devicesmodel.cpp notificationsmodel.cpp modeltest.cpp - kdebugnamespace.cpp ) set(libkdeconnect_public_HEADERS @@ -70,9 +69,11 @@ ) target_link_libraries(kdeconnectinterfaces - ${KDE4_KDEUI_LIBS} +LINK_PUBLIC ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} +LINK_PRIVATE + ${KDE4_KDEUI_LIBS} ${KDE4_KDECORE_LIBS} ${QJSON_LIBRARIES} ) diff -Nru kdeconnect-0.7.1/interfaces/devicesmodel.cpp kdeconnect-0.7.3/interfaces/devicesmodel.cpp --- kdeconnect-0.7.1/interfaces/devicesmodel.cpp 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/interfaces/devicesmodel.cpp 2014-10-11 17:03:59.000000000 +0000 @@ -26,9 +26,10 @@ #include #include -#include "kdebugnamespace.h" +#include + +#include "dbusinterfaces.h" // #include "modeltest.h" -#include "interfaces/dbusinterfaces.h" DevicesModel::DevicesModel(QObject *parent) : QAbstractListModel(parent) @@ -85,19 +86,14 @@ refreshDeviceList(); } -DevicesModel::StatusFlags DevicesModel::displayFilter() const +int DevicesModel::displayFilter() const { return m_displayFilter; } void DevicesModel::setDisplayFilter(int flags) { - setDisplayFilter((StatusFlags)flags); -} - -void DevicesModel::setDisplayFilter(DevicesModel::StatusFlags flags) -{ - m_displayFilter = flags; + m_displayFilter = (StatusFlag)flags; refreshDeviceList(); } @@ -110,16 +106,19 @@ } if (!m_dbusInterface->isValid()) { + kDebug(debugArea()) << "dbus interface not valid"; return; } - bool onlyPaired = (m_displayFilter & StatusPaired); bool onlyReachable = (m_displayFilter & StatusReachable); QDBusPendingReply pendingDeviceIds = m_dbusInterface->devices(onlyReachable, onlyPaired); pendingDeviceIds.waitForFinished(); - if (pendingDeviceIds.isError()) return; + if (pendingDeviceIds.isError()) { + kDebug(debugArea()) << pendingDeviceIds.error(); + return; + } const QStringList& deviceIds = pendingDeviceIds.value(); Q_FOREACH(const QString& id, deviceIds) { diff -Nru kdeconnect-0.7.1/interfaces/devicesmodel.h kdeconnect-0.7.3/interfaces/devicesmodel.h --- kdeconnect-0.7.1/interfaces/devicesmodel.h 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/interfaces/devicesmodel.h 2014-10-11 17:03:59.000000000 +0000 @@ -35,7 +35,7 @@ : public QAbstractListModel { Q_OBJECT - Q_PROPERTY(StatusFlags displayFilter READ displayFilter WRITE setDisplayFilter) + Q_PROPERTY(int displayFilter READ displayFilter WRITE setDisplayFilter) Q_PROPERTY(int count READ rowCount NOTIFY rowsChanged) public: @@ -52,13 +52,14 @@ StatusReachable = 0x02 }; Q_DECLARE_FLAGS(StatusFlags, StatusFlag) + Q_FLAGS(StatusFlags) + Q_ENUMS(StatusFlag) DevicesModel(QObject *parent = 0); virtual ~DevicesModel(); - void setDisplayFilter(StatusFlags flags); void setDisplayFilter(int flags); - StatusFlags displayFilter() const; + int displayFilter() const; virtual QVariant data(const QModelIndex& index, int role) const; virtual int rowCount(const QModelIndex& parent = QModelIndex()) const; @@ -80,7 +81,8 @@ DaemonDbusInterface* m_dbusInterface; QList m_deviceList; StatusFlags m_displayFilter; - }; +//Q_DECLARE_OPERATORS_FOR_FLAGS(DevicesModel::StatusFlags) + #endif // DEVICESMODEL_H diff -Nru kdeconnect-0.7.1/interfaces/kdebugnamespace.cpp kdeconnect-0.7.3/interfaces/kdebugnamespace.cpp --- kdeconnect-0.7.1/interfaces/kdebugnamespace.cpp 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/interfaces/kdebugnamespace.cpp 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 . - */ - -#include "kdebugnamespace.h" - -int libkdeconnect() { - static int s_area = KDebug::registerArea("kdeconnect_libkdeconnect", true); - return s_area; -} - diff -Nru kdeconnect-0.7.1/interfaces/kdebugnamespace.h kdeconnect-0.7.3/interfaces/kdebugnamespace.h --- kdeconnect-0.7.1/interfaces/kdebugnamespace.h 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/interfaces/kdebugnamespace.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +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 KDEBUG_LIBKDECONNECT_H -#define KDEBUG_LIBKDECONNECT_H - -#include - -int libkdeconnect(); - -#endif - diff -Nru kdeconnect-0.7.1/interfaces/notificationsmodel.cpp kdeconnect-0.7.3/interfaces/notificationsmodel.cpp --- kdeconnect-0.7.1/interfaces/notificationsmodel.cpp 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/interfaces/notificationsmodel.cpp 2014-10-11 17:03:59.000000000 +0000 @@ -26,8 +26,10 @@ #include #include -#include "modeltest.h" -#include "kdebugnamespace.h" +#include + +//#include "modeltest.h" + NotificationsModel::NotificationsModel(QObject* parent) : QAbstractListModel(parent) @@ -110,12 +112,14 @@ } if (!m_dbusInterface->isValid()) { + kDebug(debugArea()) << "dbus interface not valid"; return; } QDBusPendingReply pendingNotificationIds = m_dbusInterface->activeNotifications(); pendingNotificationIds.waitForFinished(); if (pendingNotificationIds.isError()) { + kDebug(debugArea()) << pendingNotificationIds.error(); return; } const QStringList& notificationIds = pendingNotificationIds.value(); @@ -205,7 +209,6 @@ return false; } - void NotificationsModel::dismissAll() { Q_FOREACH (NotificationDbusInterface* notification, m_notificationList) { diff -Nru kdeconnect-0.7.1/kcm/CMakeLists.txt kdeconnect-0.7.3/kcm/CMakeLists.txt --- kdeconnect-0.7.1/kcm/CMakeLists.txt 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/kcm/CMakeLists.txt 2014-10-11 17:03:59.000000000 +0000 @@ -7,7 +7,6 @@ set(kcm_SRCS kcm.cpp devicessortproxymodel.cpp - kdebugnamespace.cpp ) kde4_add_ui_files(kcm_SRCS kcm.ui) diff -Nru kdeconnect-0.7.1/kcm/devicessortproxymodel.cpp kdeconnect-0.7.3/kcm/devicessortproxymodel.cpp --- kdeconnect-0.7.1/kcm/devicessortproxymodel.cpp 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/kcm/devicessortproxymodel.cpp 2014-10-11 17:03:59.000000000 +0000 @@ -20,10 +20,9 @@ #include "devicessortproxymodel.h" -#include "interfaces/dbusinterfaces.h" -#include "interfaces/devicesmodel.h" - -#include "kdebugnamespace.h" +#include +#include +#include DevicesSortProxyModel::DevicesSortProxyModel(DevicesModel* devicesModel) : QSortFilterProxyModel(devicesModel) diff -Nru kdeconnect-0.7.1/kcm/devicessortproxymodel.h kdeconnect-0.7.3/kcm/devicessortproxymodel.h --- kdeconnect-0.7.1/kcm/devicessortproxymodel.h 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/kcm/devicessortproxymodel.h 2014-10-11 17:03:59.000000000 +0000 @@ -33,7 +33,7 @@ virtual bool lessThan(const QModelIndex& left, const QModelIndex& right) const; virtual bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const; -public slots: +public Q_SLOTS: void sourceDataChanged(QModelIndex,QModelIndex); }; diff -Nru kdeconnect-0.7.1/kcm/kcm.cpp kdeconnect-0.7.3/kcm/kcm.cpp --- kdeconnect-0.7.1/kcm/kcm.cpp 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/kcm/kcm.cpp 2014-10-11 17:03:59.000000000 +0000 @@ -34,11 +34,12 @@ #include #include +#include + #include "ui_kcm.h" #include "interfaces/dbusinterfaces.h" #include "interfaces/devicesmodel.h" #include "devicessortproxymodel.h" -#include "kdebugnamespace.h" K_PLUGIN_FACTORY(KdeConnectKcmFactory, registerPlugin();) K_EXPORT_PLUGIN(KdeConnectKcmFactory("kdeconnect-kcm", "kdeconnect-kcm")) @@ -74,7 +75,8 @@ this, SLOT(unpair())); connect(kcmUi->ping_button, SIGNAL(pressed()), this, SLOT(sendPing())); - + connect(kcmUi->refresh_button,SIGNAL(pressed()), + this, SLOT(refresh())); } KdeConnectKcm::~KdeConnectKcm() @@ -82,6 +84,12 @@ } +void KdeConnectKcm::refresh() +{ + QDBusMessage msg = QDBusMessage::createMethodCall("org.kde.kdeconnect", "/modules/kdeconnect", "org.kde.kdeconnect.daemon", "forceOnNetworkChange"); + QDBusConnection::sessionBus().call(msg); +} + void KdeConnectKcm::resetSelection() { kcmUi->deviceList->selectionModel()->setCurrentIndex(sortProxyModel->mapFromSource(currentIndex), QItemSelectionModel::ClearAndSelect); diff -Nru kdeconnect-0.7.1/kcm/kcm.h kdeconnect-0.7.3/kcm/kcm.h --- kdeconnect-0.7.1/kcm/kcm.h 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/kcm/kcm.h 2014-10-11 17:03:59.000000000 +0000 @@ -61,6 +61,7 @@ void pairingSuccesful(); void pairingFailed(const QString& error); void unpaired(); + void refresh(); private: Ui::KdeConnectKcmUi* kcmUi; diff -Nru kdeconnect-0.7.1/kcm/kcm.ui kdeconnect-0.7.3/kcm/kcm.ui --- kdeconnect-0.7.1/kcm/kcm.ui 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/kcm/kcm.ui 2014-10-11 17:03:59.000000000 +0000 @@ -32,12 +32,16 @@ - - 0 - + + + + Refresh + + + diff -Nru kdeconnect-0.7.1/kcm/kdebugnamespace.cpp kdeconnect-0.7.3/kcm/kdebugnamespace.cpp --- kdeconnect-0.7.1/kcm/kdebugnamespace.cpp 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/kcm/kdebugnamespace.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +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 "kdebugnamespace.h" - -int kdeconnect_kcm() { - static int s_area = KDebug::registerArea("kdeconnect_kcm", true); - return s_area; -} diff -Nru kdeconnect-0.7.1/kcm/kdebugnamespace.h kdeconnect-0.7.3/kcm/kdebugnamespace.h --- kdeconnect-0.7.1/kcm/kdebugnamespace.h 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/kcm/kdebugnamespace.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +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 KDEBUG_KDECONNECT_KCM_H -#define KDEBUG_KDECONNECT_KCM_H - -#include - -int kdeconnect_kcm(); - -#endif - diff -Nru kdeconnect-0.7.1/kded/kded.cpp kdeconnect-0.7.3/kded/kded.cpp --- kdeconnect-0.7.1/kded/kded.cpp 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/kded/kded.cpp 2014-10-11 17:03:59.000000000 +0000 @@ -27,8 +27,6 @@ #include "core/kdebugnamespace.h" -int theArea = KDebug::registerArea("kdeconnect-kded"); - K_PLUGIN_FACTORY(KdeConnectFactory, registerPlugin();) K_EXPORT_PLUGIN(KdeConnectFactory("kdeconnect", "kdeconnect-kded")) @@ -37,13 +35,13 @@ , m_daemon(0) { QMetaObject::invokeMethod(this, "start", Qt::QueuedConnection); - kDebug(theArea) << "kded_kdeconnect started"; + kDebug(debugArea()) << "kded_kdeconnect started"; } Kded::~Kded() { stop(); - kDebug(theArea) << "kded_kdeconnect stopped"; + kDebug(debugArea()) << "kded_kdeconnect stopped"; } void Kded::start() @@ -53,7 +51,7 @@ } const QString daemon = KStandardDirs::locate("exe", "kdeconnectd"); - kDebug(theArea) << "Starting daemon " << daemon; + kDebug(debugArea()) << "Starting daemon " << daemon; m_daemon = new KProcess(this); connect(m_daemon, SIGNAL(started()), SLOT(daemonStarted())); connect(m_daemon, SIGNAL(error(QProcess::ProcessError)), this, SLOT(onError(QProcess::ProcessError))); @@ -85,24 +83,24 @@ void Kded::onError(QProcess::ProcessError errorCode) { - kError(theArea) << "Process error code=" << errorCode; + kError(debugArea()) << "Process error code=" << errorCode; } void Kded::daemonStarted() { - kDebug(theArea) << "Daemon successfuly started"; + kDebug(debugArea()) << "Daemon successfuly started"; Q_EMIT started(); } void Kded::onFinished(int exitCode, QProcess::ExitStatus status) { if (status == QProcess::CrashExit) { - kError(theArea) << "Process crashed with code=" << exitCode; - kError(theArea) << m_daemon->readAllStandardError(); - kWarning(theArea) << "Restarting in 5 sec..."; + kError(debugArea()) << "Process crashed with code=" << exitCode; + kError(debugArea()) << m_daemon->readAllStandardError(); + kWarning(debugArea()) << "Restarting in 5 sec..."; QTimer::singleShot(5000, this, SLOT(start())); } else { - kWarning(theArea) << "Process finished with code=" << exitCode; + kWarning(debugArea()) << "Process finished with code=" << exitCode; } Q_EMIT stopped(); @@ -116,5 +114,5 @@ } m_daemon->kill(); - kWarning(theArea) << "Daemon killed"; + kWarning(debugArea()) << "Daemon killed"; } diff -Nru kdeconnect-0.7.1/kio/CMakeLists.txt kdeconnect-0.7.3/kio/CMakeLists.txt --- kdeconnect-0.7.1/kio/CMakeLists.txt 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/kio/CMakeLists.txt 2014-10-11 17:03:59.000000000 +0000 @@ -2,7 +2,7 @@ set(kio_kdeconnect_PART_SRCS kiokdeconnect.cpp - kdebugnamespace.cpp) +) kde4_add_plugin(kio_kdeconnect ${kio_kdeconnect_PART_SRCS}) diff -Nru kdeconnect-0.7.1/kio/kdebugnamespace.cpp kdeconnect-0.7.3/kio/kdebugnamespace.cpp --- kdeconnect-0.7.1/kio/kdebugnamespace.cpp 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/kio/kdebugnamespace.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +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 "kdebugnamespace.h" - -int kdeconnect_kio() { - static int s_area = KDebug::registerArea("kdeconnect_kio", true); - return s_area; -} diff -Nru kdeconnect-0.7.1/kio/kdebugnamespace.h kdeconnect-0.7.3/kio/kdebugnamespace.h --- kdeconnect-0.7.1/kio/kdebugnamespace.h 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/kio/kdebugnamespace.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +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 KDEBUG_KDECONNECT_KCM_H -#define KDEBUG_KDECONNECT_KCM_H - -#include - -int kdeconnect_kio(); - -#endif - diff -Nru kdeconnect-0.7.1/kio/kiokdeconnect.cpp kdeconnect-0.7.3/kio/kiokdeconnect.cpp --- kdeconnect-0.7.1/kio/kiokdeconnect.cpp 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/kio/kiokdeconnect.cpp 2014-10-11 17:03:59.000000000 +0000 @@ -32,7 +32,7 @@ #include #include -#include "kdebugnamespace.h" +#include extern "C" int KDE_EXPORT kdemain(int argc, char **argv) { @@ -74,7 +74,7 @@ { if (!reply.isValid()) { - kDebug(kdeconnect_kio()) << "Error in DBus request:" << reply.error(); + kDebug(debugArea()) << "Error in DBus request:" << reply.error(); slave->error(toKioError(reply.error().type()),reply.error().message()); return true; } @@ -92,7 +92,8 @@ { infoMessage(i18n("Listing devices...")); - QStringList devices = m_dbusInterface->devices(true, true); //TODO: Change to all devices and show different icons for connected and disconnected? + //TODO: Change to all devices and show different icons for connected and disconnected? + QStringList devices = m_dbusInterface->devices(true, true); totalSize(devices.length()); @@ -129,50 +130,44 @@ { infoMessage(i18n("Accessing device...")); - kDebug(kdeconnect_kio()) << "ListDevice" << m_currentDevice; + kDebug(debugArea()) << "ListDevice" << m_currentDevice; SftpDbusInterface interface(m_currentDevice); QDBusReply mountreply = interface.mountAndWait(); - if (handleDBusError(mountreply, this)) - { + if (handleDBusError(mountreply, this)) { return; } - if (!mountreply.value()) - { + if (!mountreply.value()) { error(KIO::ERR_COULD_NOT_MOUNT, i18n("Could not mount device filesystem")); return; } - QDBusReply urlreply = interface.mountPoint(); + QDBusReply< QVariantMap > urlreply = interface.getDirectories(); - if (handleDBusError(urlreply, this)) - { + if (handleDBusError(urlreply, this)) { return; } - QString url = urlreply.value(); + QVariantMap urls = urlreply.value(); - KIO::UDSEntry entry; - entry.insert(KIO::UDSEntry::UDS_NAME, "files"); - entry.insert(KIO::UDSEntry::UDS_DISPLAY_NAME, i18n("Camera pictures")); - entry.insert(KIO::UDSEntry::UDS_ICON_NAME, "folder"); - entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR); - entry.insert(KIO::UDSEntry::UDS_ACCESS, S_IRUSR | S_IRGRP | S_IROTH); - entry.insert(KIO::UDSEntry::UDS_MIME_TYPE, ""); - entry.insert(KIO::UDSEntry::UDS_URL, url + "/DCIM/Camera"); - listEntry(entry, false); - - entry.insert(KIO::UDSEntry::UDS_NAME, "files"); - entry.insert(KIO::UDSEntry::UDS_DISPLAY_NAME, i18n("All files")); - entry.insert(KIO::UDSEntry::UDS_ICON_NAME, "folder"); - entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR); - entry.insert(KIO::UDSEntry::UDS_ACCESS, S_IRUSR | S_IRGRP | S_IROTH); - entry.insert(KIO::UDSEntry::UDS_MIME_TYPE, ""); - entry.insert(KIO::UDSEntry::UDS_URL, url); - listEntry(entry, false); + for (QVariantMap::iterator it = urls.begin(); it != urls.end(); it++) { + + QString path = it.key(); + QString name = it.value().toString(); + + KIO::UDSEntry entry; + entry.insert(KIO::UDSEntry::UDS_NAME, "files"); + entry.insert(KIO::UDSEntry::UDS_DISPLAY_NAME, name); + entry.insert(KIO::UDSEntry::UDS_ICON_NAME, "folder"); + entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR); + entry.insert(KIO::UDSEntry::UDS_ACCESS, S_IRUSR | S_IRGRP | S_IROTH); + entry.insert(KIO::UDSEntry::UDS_MIME_TYPE, ""); + entry.insert(KIO::UDSEntry::UDS_URL, path); + listEntry(entry, false); + } listEntry(KIO::UDSEntry(), true); infoMessage(""); @@ -184,7 +179,7 @@ void KioKdeconnect::listDir(const KUrl &url) { - kDebug(kdeconnect_kio()) << "Listing..." << url; + kDebug(debugArea()) << "Listing..." << url; /// Url is not used here becuase all we could care about the url is the host, and that's already /// handled in @p setHost @@ -206,7 +201,7 @@ void KioKdeconnect::stat(const KUrl &url) { - kDebug(kdeconnect_kio()) << "Stat: " << url; + kDebug(debugArea()) << "Stat: " << url; KIO::UDSEntry entry; entry.insert(KIO::UDSEntry::UDS_FILE_TYPE, S_IFDIR); @@ -217,7 +212,7 @@ void KioKdeconnect::get(const KUrl &url) { - kDebug(kdeconnect_kio()) << "Get: " << url; + kDebug(debugArea()) << "Get: " << url; mimeType(""); finished(); } @@ -227,7 +222,7 @@ //This is called before everything else to set the file we want to show - kDebug(kdeconnect_kio()) << "Setting host: " << hostName; + kDebug(debugArea()) << "Setting host: " << hostName; // In this kio only the hostname is used Q_UNUSED(port) diff -Nru kdeconnect-0.7.1/plasmoid/package/contents/ui/Battery.qml kdeconnect-0.7.3/plasmoid/package/contents/ui/Battery.qml --- kdeconnect-0.7.1/plasmoid/package/contents/ui/Battery.qml 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/plasmoid/package/contents/ui/Battery.qml 2014-10-11 17:03:59.000000000 +0000 @@ -53,8 +53,8 @@ if (available) { battery = DeviceBatteryDbusInterfaceFactory.create(deviceId) - battery.stateChanged.connect(function(charging) {root.charging = charging}) - battery.chargeChanged.connect(function(charge) {root.charge = charge}) + battery.stateChanged.connect(function(c) {charging = c}) + battery.chargeChanged.connect(function(c) {charge = c}) startupCheck1.setPendingCall(battery.isCharging()) startupCheck2.setPendingCall(battery.charge()) diff -Nru kdeconnect-0.7.1/plasmoid/package/contents/ui/kdeconnect.qml kdeconnect-0.7.3/plasmoid/package/contents/ui/kdeconnect.qml --- kdeconnect-0.7.1/plasmoid/package/contents/ui/kdeconnect.qml 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/plasmoid/package/contents/ui/kdeconnect.qml 2014-10-11 17:03:59.000000000 +0000 @@ -23,7 +23,7 @@ import org.kde.plasma.components 0.1 as PlasmaComponents import org.kde.plasma.extras 0.1 as PlasmaExtras import org.kde.plasma.graphicswidgets 0.1 as PlasmaWidgets -import org.kde.kdeconnect 1.0 as KdeConnect +import org.kde.kdeconnect 1.0 Item { id: kdeconnect @@ -66,9 +66,9 @@ flickableItem: ListView { id: devicesView anchors.fill: parent - model: KdeConnect.DevicesModel { + model: DevicesModel { id: connectDeviceModel - displayFilter: StatusPaired | StatusReachable + displayFilter: 3 } delegate: DeviceDelegate { } onCountChanged: shouldPlasmoidBeShown() diff -Nru kdeconnect-0.7.1/plugins/battery/batterydbusinterface.cpp kdeconnect-0.7.3/plugins/battery/batterydbusinterface.cpp --- kdeconnect-0.7.1/plugins/battery/batterydbusinterface.cpp 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/plugins/battery/batterydbusinterface.cpp 2014-10-11 17:03:59.000000000 +0000 @@ -20,16 +20,17 @@ #include "batterydbusinterface.h" +#include #include -BatteryDbusInterface::BatteryDbusInterface(QObject *parent) - : QDBusAbstractAdaptor(parent) +BatteryDbusInterface::BatteryDbusInterface(const Device *device) + : QDBusAbstractAdaptor(const_cast(device)) { } BatteryDbusInterface::~BatteryDbusInterface() { - kDebug(kdeconnect_kded()) << "Destroying BatteryDbusInterface"; + kDebug(debugArea()) << "Destroying BatteryDbusInterface"; } void BatteryDbusInterface::updateValues(bool isCharging, int currentCharge) diff -Nru kdeconnect-0.7.1/plugins/battery/batterydbusinterface.h kdeconnect-0.7.3/plugins/battery/batterydbusinterface.h --- kdeconnect-0.7.1/plugins/battery/batterydbusinterface.h 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/plugins/battery/batterydbusinterface.h 2014-10-11 17:03:59.000000000 +0000 @@ -23,6 +23,8 @@ #include +class Device; + class BatteryDbusInterface : public QDBusAbstractAdaptor { @@ -30,7 +32,7 @@ Q_CLASSINFO("D-Bus Interface", "org.kde.kdeconnect.device.battery") public: - explicit BatteryDbusInterface(QObject *parent); + explicit BatteryDbusInterface(const Device *device); virtual ~BatteryDbusInterface(); Q_SCRIPTABLE int charge() const { return mCharge; } diff -Nru kdeconnect-0.7.1/plugins/battery/batteryplugin.cpp kdeconnect-0.7.3/plugins/battery/batteryplugin.cpp --- kdeconnect-0.7.1/plugins/battery/batteryplugin.cpp 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/plugins/battery/batteryplugin.cpp 2014-10-11 17:03:59.000000000 +0000 @@ -32,7 +32,7 @@ BatteryPlugin::BatteryPlugin(QObject *parent, const QVariantList &args) : KdeConnectPlugin(parent, args) - , batteryDbusInterface(new BatteryDbusInterface(parent)) + , batteryDbusInterface(new BatteryDbusInterface(device())) { //TODO: Add battery reporting, could be based on: diff -Nru kdeconnect-0.7.1/plugins/battery/kdeconnect_battery.desktop kdeconnect-0.7.3/plugins/battery/kdeconnect_battery.desktop --- kdeconnect-0.7.1/plugins/battery/kdeconnect_battery.desktop 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/plugins/battery/kdeconnect_battery.desktop 2014-10-11 17:03:59.000000000 +0000 @@ -42,7 +42,7 @@ Comment[da]=Vis dit telefonbatteri ved siden af din computers batteri Comment[de]=Zeigt den Akku Ihres Telefons neben dem Akku des Rechners Comment[es]=Muestra la batería de su teléfono junto a la batería de su equipo -Comment[fr]=Affichez la batterie de votre téléphone près de la batterie de votre téléphone +Comment[fr]=Affichez la batterie de votre téléphone près de la batterie de votre ordinateur Comment[hu]=A telefon akkumulátorának megjelenítése a számítógép akkumulátora mellett Comment[it]=Mostra il livello batteria del tuo telefono accanto a quella del computer Comment[ko]=폰 배터리와 컴퓨터 배터리 동시 확인 diff -Nru kdeconnect-0.7.1/plugins/kdeconnect_plugin.desktop kdeconnect-0.7.3/plugins/kdeconnect_plugin.desktop --- kdeconnect-0.7.1/plugins/kdeconnect_plugin.desktop 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/plugins/kdeconnect_plugin.desktop 2014-10-11 17:03:59.000000000 +0000 @@ -5,7 +5,7 @@ Name=KDEConnect Plugin Name[bg]=Приставка на KDEConnect Name[bs]=Priključak za KDE konekciju -Name[ca]=Connector del KDEConnect +Name[ca]=Connector del KDE Connect Name[cs]=Modul KDEConnect Name[da]=KDEConnect-plugin Name[de]=KDEConnect-Modul diff -Nru kdeconnect-0.7.1/plugins/mousepad/CMakeLists.txt kdeconnect-0.7.3/plugins/mousepad/CMakeLists.txt --- kdeconnect-0.7.1/plugins/mousepad/CMakeLists.txt 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/plugins/mousepad/CMakeLists.txt 2014-10-11 17:03:59.000000000 +0000 @@ -4,12 +4,18 @@ find_package(XTest REQUIRED) find_package(X11 REQUIRED) +find_package(LibFakeKey REQUIRED) kde4_add_plugin(kdeconnect_mousepad ${kdeconnect_mousepad_SRCS}) -include_directories(${XTEST_INCLUDE_DIRS} ${X11_INCLUDE_DIR}) +include_directories(${XTEST_INCLUDE_DIRS} ${X11_INCLUDE_DIR} ${LibFakeKey_INCLUDE_DIRS}) -target_link_libraries(kdeconnect_mousepad kdeconnectcore ${QT_QTGUI_LIBRARY} ${X11_LIBRARIES} ${XTEST_LIBRARIES}) +target_link_libraries(kdeconnect_mousepad kdeconnectcore + ${QT_QTGUI_LIBRARY} + ${X11_LIBRARIES} + ${XTEST_LIBRARIES} + ${LibFakeKey_LIBRARIES} +) install(TARGETS kdeconnect_mousepad DESTINATION ${PLUGIN_INSTALL_DIR} ) install(FILES kdeconnect_mousepad.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) diff -Nru kdeconnect-0.7.1/plugins/mousepad/kdeconnect_mousepad.desktop kdeconnect-0.7.3/plugins/mousepad/kdeconnect_mousepad.desktop --- kdeconnect-0.7.1/plugins/mousepad/kdeconnect_mousepad.desktop 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/plugins/mousepad/kdeconnect_mousepad.desktop 2014-10-11 17:03:59.000000000 +0000 @@ -11,23 +11,37 @@ X-KDE-PluginInfo-EnabledByDefault=true Icon=input-mouse Name=Touchpad -Name[ca]=Catifa del ratolí -Name[da]=Museplade -Name[nl]=Muispad -Name[pt]=Painel de Rato -Name[pt_BR]=Mousepad -Name[sv]=Musplatta -Name[uk]=Килимок для миші -Name[x-test]=xxMousepadxx +Name[ca]=Plafó tàctil +Name[cs]=Touchpad +Name[da]=Touchpad +Name[de]=Touchpad +Name[es]=Cursor del ratón +Name[fr]=Pavé tactile +Name[hu]=Érintőtábla +Name[nl]=Touchpad +Name[pl]=Gładzik +Name[pt]=Rato por Toque +Name[pt_BR]=Touchpad +Name[sk]=Touchpad +Name[sv]=Tryckplatta +Name[uk]=Сенсорна панель +Name[x-test]=xxTouchpadxx Comment=Use your phone as a touchpad -Comment[ca]=Usa el vostre telèfon com una catifa del ratolí -Comment[da]=Brug din telefon som museplade -Comment[nl]=Uw telefoon gebruiken als muispad +Comment[ca]=Usa el vostre telèfon com un plafó tàctil +Comment[cs]=Používejte svůj telefon jako touchpad +Comment[da]=Brug din telefon som touchpad +Comment[de]=Verwendet Ihr Handy als Touchpad +Comment[es]=Usar su teléfono como cursor del ratón +Comment[fr]=Utilisez votre téléphone comme un pavé tactile +Comment[hu]=A telefon használata érintőtáblaként +Comment[nl]=Uw telefoon gebruiken als touchpad +Comment[pl]=Użyj swojego telefonu jako gładzika Comment[pt]=Usar o seu telemóvel como painel de rato -Comment[pt_BR]=Use seu celular como mousepad -Comment[sv]=Använd telefonen som en musplatta -Comment[uk]=Використання телефону як килимка для миші -Comment[x-test]=xxUse your phone as a mousepadxx +Comment[pt_BR]=Use seu celular como touchpad +Comment[sk]=Použiť váš mobil ako touchpad +Comment[sv]=Använd telefonen som en tryckplatta +Comment[uk]=Використання телефону як сенсорної панелі +Comment[x-test]=xxUse your phone as a touchpadxx X-KdeConnect-SupportedPackageType=kdeconnect.mousepad X-KdeConnect-OutgoingPackageType=kdeconnect.mousepad diff -Nru kdeconnect-0.7.1/plugins/mousepad/mousepadplugin.cpp kdeconnect-0.7.3/plugins/mousepad/mousepadplugin.cpp --- kdeconnect-0.7.1/plugins/mousepad/mousepadplugin.cpp 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/plugins/mousepad/mousepadplugin.cpp 2014-10-11 17:03:59.000000000 +0000 @@ -22,14 +22,44 @@ #include #include +#include +#include K_PLUGIN_FACTORY( KdeConnectPluginFactory, registerPlugin< MousepadPlugin >(); ) K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_mousepad", "kdeconnect-plugins") ) -// Source: http://bharathisubramanian.wordpress.com/2010/04/01/x11-fake-mouse-events-generation-using-xtest/ +enum MouseButtons { + LeftMouseButton = 1, + MiddleMouseButton = 2, + RightMouseButton = 3, + MouseWheelUp = 4, + MouseWheelDown = 5 +}; + +//Translation table to keep in sync within all the implementations +int SpecialKeysMap[] = { + 0, // Invalid + XK_BackSpace, // 1 + XK_Tab, // 2 + XK_Linefeed, // 3 + XK_Left, // 4 + XK_Up, // 5 + XK_Right, // 6 + XK_Down, // 7 + XK_Page_Up, // 8 + XK_Page_Down, // 9 + XK_Home, // 10 + XK_End, // 11 + XK_Return, // 12 + XK_Delete, // 13 + XK_Escape, // 14 +}; + +template +size_t arraySize(T(&arr)[N]) { (void)arr; return N; } MousepadPlugin::MousepadPlugin(QObject* parent, const QVariantList& args) - : KdeConnectPlugin(parent, args), m_display(0) + : KdeConnectPlugin(parent, args), m_display(0), m_fakekey(0) { } @@ -40,10 +70,16 @@ XCloseDisplay(m_display); m_display = 0; } + if (m_fakekey) { + free(m_fakekey); + m_fakekey = 0; + } } bool MousepadPlugin::receivePackage(const NetworkPackage& np) { + //TODO: Split mouse/keyboard in two different plugins to avoid big if statements + float dx = np.get("dx", 0); float dy = np.get("dy", 0); @@ -52,39 +88,74 @@ bool isMiddleClick = np.get("middleclick", false); bool isRightClick = np.get("rightclick", false); bool isScroll = np.get("scroll", false); + QString key = np.get("key", ""); + int specialKey = np.get("specialKey", 0); + + if (isSingleClick || isDoubleClick || isMiddleClick || isRightClick || isScroll || !key.isEmpty() || specialKey) { - if (isSingleClick || isDoubleClick || isMiddleClick || isRightClick || isScroll) { if(!m_display) { m_display = XOpenDisplay(NULL); + if(!m_display) { + kDebug(debugArea()) << "Failed to open X11 display"; + return false; + } } - if(m_display) { - if (isSingleClick) { - XTestFakeButtonEvent(m_display, LeftMouseButton, true, CurrentTime); - XTestFakeButtonEvent(m_display, LeftMouseButton, false, CurrentTime); - } else if (isDoubleClick) { - XTestFakeButtonEvent(m_display, LeftMouseButton, true, CurrentTime); - XTestFakeButtonEvent(m_display, LeftMouseButton, false, CurrentTime); - XTestFakeButtonEvent(m_display, LeftMouseButton, true, CurrentTime); - XTestFakeButtonEvent(m_display, LeftMouseButton, false, CurrentTime); - } else if (isMiddleClick) { - XTestFakeButtonEvent(m_display, MiddleMouseButton, true, CurrentTime); - XTestFakeButtonEvent(m_display, MiddleMouseButton, false, CurrentTime); - } else if (isRightClick) { - XTestFakeButtonEvent(m_display, RightMouseButton, true, CurrentTime); - XTestFakeButtonEvent(m_display, RightMouseButton, false, CurrentTime); - } else if( isScroll ) { - if (dy < 0) { - XTestFakeButtonEvent(m_display, MouseWheelDown, true, CurrentTime); - XTestFakeButtonEvent(m_display, MouseWheelDown, false, CurrentTime); - } else if (dy > 0) { - XTestFakeButtonEvent(m_display, MouseWheelUp, true, CurrentTime); - XTestFakeButtonEvent(m_display, MouseWheelUp, false, CurrentTime); + if (isSingleClick) { + XTestFakeButtonEvent(m_display, LeftMouseButton, True, 0); + XTestFakeButtonEvent(m_display, LeftMouseButton, False, 0); + } else if (isDoubleClick) { + XTestFakeButtonEvent(m_display, LeftMouseButton, True, 0); + XTestFakeButtonEvent(m_display, LeftMouseButton, False, 0); + XTestFakeButtonEvent(m_display, LeftMouseButton, True, 0); + XTestFakeButtonEvent(m_display, LeftMouseButton, False, 0); + } else if (isMiddleClick) { + XTestFakeButtonEvent(m_display, MiddleMouseButton, True, 0); + XTestFakeButtonEvent(m_display, MiddleMouseButton, False, 0); + } else if (isRightClick) { + XTestFakeButtonEvent(m_display, RightMouseButton, True, 0); + XTestFakeButtonEvent(m_display, RightMouseButton, False, 0); + } else if( isScroll ) { + if (dy < 0) { + XTestFakeButtonEvent(m_display, MouseWheelDown, True, 0); + XTestFakeButtonEvent(m_display, MouseWheelDown, False, 0); + } else if (dy > 0) { + XTestFakeButtonEvent(m_display, MouseWheelUp, True, 0); + XTestFakeButtonEvent(m_display, MouseWheelUp, False, 0); + } + } else if (!key.isEmpty() || specialKey) { + + if (specialKey) + { + if (specialKey > (int)arraySize(SpecialKeysMap)) { + kDebug(debugArea()) << "Unsupported special key identifier"; + return false; } + + int keycode = XKeysymToKeycode(m_display, SpecialKeysMap[specialKey]); + XTestFakeKeyEvent (m_display, keycode, True, 0); + XTestFakeKeyEvent (m_display, keycode, False, 0); + + } else { + + if (!m_fakekey) { + m_fakekey = fakekey_init(m_display); + if (!m_fakekey) { + kDebug(debugArea()) << "Failed to initialize libfakekey"; + return false; + } + } + + //We use fakekey here instead of XTest (above) because it can handle utf characters instead of keycodes. + fakekey_press(m_fakekey, (const unsigned char*)key.toUtf8().constData(), -1, 0); + fakekey_release(m_fakekey); } - XFlush(m_display); + } - } else { + + XFlush(m_display); + + } else { //Is a mouse move event QPoint point = QCursor::pos(); QCursor::setPos(point.x() + (int)dx, point.y() + (int)dy); } diff -Nru kdeconnect-0.7.1/plugins/mousepad/mousepadplugin.h kdeconnect-0.7.3/plugins/mousepad/mousepadplugin.h --- kdeconnect-0.7.1/plugins/mousepad/mousepadplugin.h 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/plugins/mousepad/mousepadplugin.h 2014-10-11 17:03:59.000000000 +0000 @@ -25,22 +25,17 @@ #include #include +#include #define PACKAGE_TYPE_MOUSEPAD QLatin1String("kdeconnect.mousepad") +struct FakeKey; + class MousepadPlugin : public KdeConnectPlugin { Q_OBJECT - enum MouseButtons { - LeftMouseButton = 1, - MiddleMouseButton = 2, - RightMouseButton = 3, - MouseWheelUp = 4, - MouseWheelDown = 5 - }; - public: explicit MousepadPlugin(QObject *parent, const QVariantList &args); virtual ~MousepadPlugin(); @@ -51,6 +46,8 @@ private: Display *m_display; + FakeKey* m_fakekey; + }; #endif diff -Nru kdeconnect-0.7.1/plugins/mpriscontrol/mpriscontrolplugin.cpp kdeconnect-0.7.3/plugins/mpriscontrol/mpriscontrolplugin.cpp --- kdeconnect-0.7.1/plugins/mpriscontrol/mpriscontrolplugin.cpp 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/plugins/mpriscontrol/mpriscontrolplugin.cpp 2014-10-11 17:03:59.000000000 +0000 @@ -20,7 +20,6 @@ #include "mpriscontrolplugin.h" - #include #include #include @@ -62,7 +61,7 @@ if (name.startsWith("org.mpris.MediaPlayer2")) { - kDebug(kdeconnect_kded()) << "Mpris (un)registered in bus" << name << oldOwner << newOwner; + kDebug(debugArea()) << "Mpris (un)registered in bus" << name << oldOwner << newOwner; if (oldOwner.isEmpty()) { addPlayer(name); @@ -78,7 +77,7 @@ //FIXME: This call hangs and returns an empty string if KDED is still starting! const QString identity = mprisInterface.property("Identity").toString(); playerList[identity] = service; - kDebug(kdeconnect_kded()) << "Mpris addPlayer" << service << "->" << identity; + kDebug(debugArea()) << "Mpris addPlayer" << service << "->" << identity; sendPlayerList(); OrgFreedesktopDBusPropertiesInterface* freedesktopInterface = new OrgFreedesktopDBusPropertiesInterface(service, "/org/mpris/MediaPlayer2", QDBusConnection::sessionBus(), this); @@ -132,7 +131,7 @@ void MprisControlPlugin::removePlayer(const QString& ifaceName) { const QString identity = playerList.key(ifaceName); - kDebug(kdeconnect_kded()) << "Mpris removePlayer" << ifaceName << "->" << identity; + kDebug(debugArea()) << "Mpris removePlayer" << ifaceName << "->" << identity; playerList.remove(identity); sendPlayerList(); } @@ -157,18 +156,18 @@ OrgMprisMediaPlayer2PlayerInterface mprisInterface(playerList[player], "/org/mpris/MediaPlayer2", QDBusConnection::sessionBus()); if (np.has("action")) { const QString& action = np.get("action"); - kDebug(kdeconnect_kded()) << "Calling action" << action << "in" << playerList[player]; - //TODO: Check for valid actions + kDebug(debugArea()) << "Calling action" << action << "in" << playerList[player]; + //TODO: Check for valid actions, currently we trust anything the other end sends us mprisInterface.call(action); } if (np.has("setVolume")) { double volume = np.get("setVolume")/100.f; - kDebug(kdeconnect_kded()) << "Setting volume" << volume << "to" << playerList[player]; + kDebug(debugArea()) << "Setting volume" << volume << "to" << playerList[player]; mprisInterface.setVolume(volume); } if (np.has("Seek")) { int offset = np.get("Seek"); - kDebug(kdeconnect_kded()) << "Seeking" << offset << "to" << playerList[player]; + kDebug(debugArea()) << "Seeking" << offset << "to" << playerList[player]; mprisInterface.Seek(offset); } @@ -185,20 +184,15 @@ answer.set("nowPlaying",nowPlaying); - - bool playing = (mprisInterface.playbackStatus() == QLatin1String("Playing")); answer.set("isPlaying", playing); somethingToSend = true; - - } if (np.get("requestVolume")) { int volume = (int)(mprisInterface.volume() * 100); answer.set("volume",volume); somethingToSend = true; - } if (somethingToSend) { answer.set("player", player); @@ -206,7 +200,6 @@ } return true; - } void MprisControlPlugin::sendPlayerList() diff -Nru kdeconnect-0.7.1/plugins/notifications/notificationsdbusinterface.cpp kdeconnect-0.7.3/plugins/notifications/notificationsdbusinterface.cpp --- kdeconnect-0.7.1/plugins/notifications/notificationsdbusinterface.cpp 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/plugins/notifications/notificationsdbusinterface.cpp 2014-10-11 17:03:59.000000000 +0000 @@ -26,18 +26,22 @@ #include #include +#include +#include #include #include + #include "notificationsplugin.h" NotificationsDbusInterface::NotificationsDbusInterface(KdeConnectPlugin* plugin) - : QDBusAbstractAdaptor(plugin) + : QDBusAbstractAdaptor(const_cast(plugin->device())) , mDevice(plugin->device()) , mPlugin(plugin) , mLastId(0) , imagesDir(QDir::temp().absoluteFilePath("kdeconnect")) { imagesDir.mkpath(imagesDir.absolutePath()); + } NotificationsDbusInterface::~NotificationsDbusInterface() @@ -107,10 +111,10 @@ void NotificationsDbusInterface::removeNotification(const QString& internalId) { - kDebug(kdeconnect_kded()) << "removeNotification" << internalId; + kDebug(debugArea()) << "removeNotification" << internalId; if (!mInternalIdToPublicId.contains(internalId)) { - kDebug(kdeconnect_kded()) << "Not found"; + kDebug(debugArea()) << "Not found"; return; } @@ -118,7 +122,7 @@ Notification* noti = mNotifications.take(publicId); if (!noti) { - kDebug(kdeconnect_kded()) << "Not found"; + kDebug(debugArea()) << "Not found"; return; } diff -Nru kdeconnect-0.7.1/plugins/notifications/notificationsdbusinterface.h kdeconnect-0.7.3/plugins/notifications/notificationsdbusinterface.h --- kdeconnect-0.7.1/plugins/notifications/notificationsdbusinterface.h 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/plugins/notifications/notificationsdbusinterface.h 2014-10-11 17:03:59.000000000 +0000 @@ -27,9 +27,11 @@ #include #include -#include #include "notification.h" +class KdeConnectPlugin; +class Device; + class NotificationsDbusInterface : public QDBusAbstractAdaptor { diff -Nru kdeconnect-0.7.1/plugins/pausemusic/pausemusic_config.cpp kdeconnect-0.7.3/plugins/pausemusic/pausemusic_config.cpp --- kdeconnect-0.7.1/plugins/pausemusic/pausemusic_config.cpp 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/plugins/pausemusic/pausemusic_config.cpp 2014-10-11 17:03:59.000000000 +0000 @@ -53,6 +53,7 @@ KCModule::defaults(); m_ui->rad_talking->setChecked(false); m_ui->rad_ringing->setChecked(true); + m_ui->check_pause->setChecked(true); m_ui->check_mute->setChecked(false); Q_EMIT changed(true); } @@ -61,19 +62,23 @@ void PauseMusicConfig::load() { KCModule::load(); - bool talking = m_cfg->group("pause_condition").readEntry("talking_only", false); + bool talking = m_cfg->group("condition").readEntry("talking_only", false); m_ui->rad_talking->setChecked(talking); m_ui->rad_ringing->setChecked(!talking); - bool use_mute = m_cfg->group("use_mute").readEntry("use_mute", false); - m_ui->check_mute->setChecked(use_mute); + + bool pause = m_cfg->group("actions").readEntry("pause", true); + bool mute = m_cfg->group("actions").readEntry("mute", false); + m_ui->check_pause->setChecked(pause); + m_ui->check_mute->setChecked(mute); Q_EMIT changed(false); } void PauseMusicConfig::save() { - m_cfg->group("pause_condition").writeEntry("talking_only", m_ui->rad_talking->isChecked()); - m_cfg->group("use_mute").writeEntry("use_mute", m_ui->check_mute->isChecked()); + m_cfg->group("condition").writeEntry("talking_only", m_ui->rad_talking->isChecked()); + m_cfg->group("actions").writeEntry("pause", m_ui->check_pause->isChecked()); + m_cfg->group("actions").writeEntry("mute", m_ui->check_mute->isChecked()); KCModule::save(); Q_EMIT changed(false); diff -Nru kdeconnect-0.7.1/plugins/pausemusic/pausemusic_config.ui kdeconnect-0.7.3/plugins/pausemusic/pausemusic_config.ui --- kdeconnect-0.7.1/plugins/pausemusic/pausemusic_config.ui 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/plugins/pausemusic/pausemusic_config.ui 2014-10-11 17:03:59.000000000 +0000 @@ -9,14 +9,17 @@ 0 0 - 406 - 155 + 368 + 241 Pause music plugin - + + + 20 + @@ -26,7 +29,7 @@ - Pause condition + Condition @@ -47,23 +50,32 @@ - - - Qt::Vertical - - - - 20 - 40 - + + + + 0 + 0 + - - - - - - Mute system instead of pause + + Actions + + + + + Pause media players + + + + + + + Mute system sound + + + + diff -Nru kdeconnect-0.7.1/plugins/pausemusic/pausemusicplugin.cpp kdeconnect-0.7.3/plugins/pausemusic/pausemusicplugin.cpp --- kdeconnect-0.7.1/plugins/pausemusic/pausemusicplugin.cpp 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/plugins/pausemusic/pausemusicplugin.cpp 2014-10-11 17:03:59.000000000 +0000 @@ -59,6 +59,7 @@ PauseMusicPlugin::PauseMusicPlugin(QObject* parent, const QVariantList& args) : KdeConnectPlugin(parent, args) + , muted(false) { QDBusInterface kmixInterface("org.kde.kmix", "/kmix/KMixWindow/actions/mute", "org.qtproject.Qt.QAction"); } @@ -67,7 +68,7 @@ { //FIXME: There should be a better way to listen to changes in the config file instead of reading the value each time KSharedConfigPtr config = KSharedConfig::openConfig("kdeconnect/plugins/pausemusic"); - bool pauseOnlyWhenTalking = config->group("pause_condition").readEntry("talking_only", false); + bool pauseOnlyWhenTalking = config->group("condition").readEntry("talking_only", false); if (pauseOnlyWhenTalking) { if (np.get("event") != "talking") { @@ -80,16 +81,21 @@ } bool pauseConditionFulfilled = !np.get("isCancel"); - bool use_mute = config->group("use_mute").readEntry("use_mute", false); + + bool pause = config->group("actions").readEntry("pause", true); + bool mute = config->group("actions").readEntry("mute", false); if (pauseConditionFulfilled) { - if (use_mute) { + + if (mute) { QDBusInterface kmixInterface("org.kde.kmix", "/kmix/KMixWindow/actions/mute", "org.qtproject.Qt.QAction"); if (isKMixMuted() == 0) { - pausedSources.insert("mute"); //Fake source + muted = true; kmixInterface.call("trigger"); } - } else { + } + + if (pause) { //Search for interfaces currently playing QStringList interfaces = QDBusConnection::sessionBus().interface()->registeredServiceNames().value(); Q_FOREACH (const QString& iface, interfaces) { @@ -109,14 +115,18 @@ } } } + } else { - if (pausedSources.empty()) return false; - if (use_mute) { + + if (mute && muted) { QDBusInterface kmixInterface("org.kde.kmix", "/kmix/KMixWindow/actions/mute", "org.qtproject.Qt.QAction"); if (isKMixMuted() > 0) { kmixInterface.call("trigger"); } - } else { + muted = false; + } + + if (pause && !pausedSources.empty()) { Q_FOREACH (const QString& iface, pausedSources) { QDBusInterface mprisInterface(iface, "/org/mpris/MediaPlayer2", "org.mpris.MediaPlayer2.Player"); //Calling play does not work for Spotify @@ -126,8 +136,8 @@ mprisInterface.asyncCall("PlayPause"); //End of workaround } + pausedSources.clear(); } - pausedSources.clear(); } diff -Nru kdeconnect-0.7.1/plugins/pausemusic/pausemusicplugin.h kdeconnect-0.7.3/plugins/pausemusic/pausemusicplugin.h --- kdeconnect-0.7.1/plugins/pausemusic/pausemusicplugin.h 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/plugins/pausemusic/pausemusicplugin.h 2014-10-11 17:03:59.000000000 +0000 @@ -46,6 +46,7 @@ private: QSet pausedSources; + bool muted; }; diff -Nru kdeconnect-0.7.1/plugins/ping/pingplugin.cpp kdeconnect-0.7.3/plugins/ping/pingplugin.cpp --- kdeconnect-0.7.1/plugins/ping/pingplugin.cpp 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/plugins/ping/pingplugin.cpp 2014-10-11 17:03:59.000000000 +0000 @@ -34,12 +34,12 @@ PingPlugin::PingPlugin(QObject* parent, const QVariantList& args) : KdeConnectPlugin(parent, args) { - //kDebug(kdeconnect_kded()) << "Ping plugin constructor for device" << device()->name(); + //kDebug(debugArea()) << "Ping plugin constructor for device" << device()->name(); } PingPlugin::~PingPlugin() { - //kDebug(kdeconnect_kded()) << "Ping plugin destructor for device" << device()->name(); + //kDebug(debugArea()) << "Ping plugin destructor for device" << device()->name(); } bool PingPlugin::receivePackage(const NetworkPackage& np) @@ -52,14 +52,23 @@ notification->sendEvent(); return true; - } void PingPlugin::sendPing() { NetworkPackage np(PACKAGE_TYPE_PING); bool success = sendPackage(np); - kDebug(kdeconnect_kded()) << "sendPing:" << success; + kDebug(debugArea()) << "sendPing:" << success; +} + +void PingPlugin::sendPing(const QString& customMessage) +{ + NetworkPackage np(PACKAGE_TYPE_PING); + if (!customMessage.isEmpty()) { + np.set("message", customMessage); + } + bool success = sendPackage(np); + kDebug(debugArea()) << "sendPing:" << success; } void PingPlugin::connected() diff -Nru kdeconnect-0.7.1/plugins/ping/pingplugin.h kdeconnect-0.7.3/plugins/ping/pingplugin.h --- kdeconnect-0.7.1/plugins/ping/pingplugin.h 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/plugins/ping/pingplugin.h 2014-10-11 17:03:59.000000000 +0000 @@ -36,6 +36,7 @@ virtual ~PingPlugin(); Q_SCRIPTABLE void sendPing(); + Q_SCRIPTABLE void sendPing(const QString& customMessage); public Q_SLOTS: virtual bool receivePackage(const NetworkPackage& np); diff -Nru kdeconnect-0.7.1/plugins/ping/README kdeconnect-0.7.3/plugins/ping/README --- kdeconnect-0.7.1/plugins/ping/README 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/plugins/ping/README 2014-10-11 17:03:59.000000000 +0000 @@ -1,3 +1,4 @@ This plugin displays a notification to the user each time a package with type -"kdeconnect.ping" is received, regardless of the content. +"kdeconnect.ping" is received. If the package has something in the "message" +field, that will be displayed in the notification body. diff -Nru kdeconnect-0.7.1/plugins/sftp/kdeconnect_sftp.desktop kdeconnect-0.7.3/plugins/sftp/kdeconnect_sftp.desktop --- kdeconnect-0.7.1/plugins/sftp/kdeconnect_sftp.desktop 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/plugins/sftp/kdeconnect_sftp.desktop 2014-10-11 17:03:59.000000000 +0000 @@ -13,7 +13,7 @@ Icon=system-file-manager Name=Remote filesystem browser Name[bg]=Достъп до отдалечена файлова система -Name[ca]=Navegador per al sistema de fitxers remot +Name[ca]=Navegador pel sistema de fitxers remot Name[cs]=Prohlížeč vzdáleného souborového systému Name[da]=Gennemse eksternt filsystem Name[de]=Datei-Browser für entferne Systeme diff -Nru kdeconnect-0.7.1/plugins/sftp/mounter.cpp kdeconnect-0.7.3/plugins/sftp/mounter.cpp --- kdeconnect-0.7.1/plugins/sftp/mounter.cpp 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/plugins/sftp/mounter.cpp 2014-10-11 17:03:59.000000000 +0000 @@ -59,13 +59,13 @@ m_idleTimer.setSingleShot(false); QTimer::singleShot(0, this, SLOT(start())); - kDebug(kdeconnect_kded()) << "Created"; + kDebug(debugArea()) << "Created"; } Mounter::~Mounter() { unmount(); - kDebug(kdeconnect_kded()) << "Destroyed"; + kDebug(debugArea()) << "Destroyed"; } bool Mounter::wait() @@ -75,7 +75,7 @@ return true; } - kDebug(kdeconnect_kded()) << "Starting loop to wait for mount"; + kDebug(debugArea()) << "Starting loop to wait for mount"; MountLoop loop; connect(this, SIGNAL(mounted()), &loop, SLOT(successed())); @@ -87,14 +87,13 @@ { if (np.get("stop", false)) { - kDebug(kdeconnect_kded()) << "SFTP server stopped"; + kDebug(debugArea()) << "SFTP server stopped"; unmount(); return; } //TODO implement on android side //if (np.get("id") != m_id) return; - //This is the previous code, to access sftp server using KIO. Now we are //using the external binary sshfs, and accessing it as a local filesystem. @@ -121,11 +120,16 @@ QDir().mkpath(mpoint); const QString program = "sshfs"; + + QString path; + if (np.has("multiPaths")) path = "/"; + else path = np.get("path"); + const QStringList arguments = QStringList() << QString("%1@%2:%3") .arg(np.get("user")) .arg(np.get("ip")) - .arg(np.get("path")) + .arg(path) << mpoint << "-p" << np.get("port") << "-d" @@ -142,13 +146,13 @@ cleanMountPoint(); - kDebug(kdeconnect_kded()) << "Staring process: " << m_proc->program().join(" "); + kDebug(debugArea()) << "Staring process: " << m_proc->program().join(" "); m_proc->start(); } void Mounter::onStarted() { - kDebug(kdeconnect_kded()) << "Porcess started"; + kDebug(debugArea()) << "Porcess started"; m_started = true; Q_EMIT mounted(); @@ -167,7 +171,7 @@ { if (error == QProcess::FailedToStart) { - kDebug(kdeconnect_kded()) << "Porcess failed to start"; + kDebug(debugArea()) << "Porcess failed to start"; m_started = false; Q_EMIT failed(i18n("Failed to start sshfs")); } @@ -177,7 +181,7 @@ { if (exitStatus == QProcess::NormalExit) { - kDebug(kdeconnect_kded()) << "Process finished (exit code: " << exitCode << ")"; + kDebug(debugArea()) << "Process finished (exit code: " << exitCode << ")"; if (m_proc->property(idleTimeout_c).toBool()) { @@ -190,7 +194,7 @@ } else { - kDebug(kdeconnect_kded()) << "Porcess failed (exit code: " << exitCode << ")"; + kDebug(debugArea()) << "Porcess failed (exit code: " << exitCode << ")"; Q_EMIT failed(i18n("Error when accessing to filesystem")); } @@ -201,7 +205,7 @@ void Mounter::onMountTimeout() { - kDebug(kdeconnect_kded()) << "Timeout: device not responding"; + kDebug(debugArea()) << "Timeout: device not responding"; Q_EMIT failed(i18n("Failed to mount filesystem: device not responding")); } @@ -211,7 +215,7 @@ if (m_lastActivity.secsTo(QDateTime::currentDateTime()) >= m_idleTimer.interval() / 1000) { - kDebug(kdeconnect_kded()) << "Timeout: there is no activity on moutned filesystem"; + kDebug(debugArea()) << "Timeout: there is no activity on moutned filesystem"; m_proc->setProperty(idleTimeout_c, true); unmount(); } diff -Nru kdeconnect-0.7.1/plugins/sftp/sftp_config.cpp kdeconnect-0.7.3/plugins/sftp/sftp_config.cpp --- kdeconnect-0.7.1/plugins/sftp/sftp_config.cpp 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/plugins/sftp/sftp_config.cpp 2014-10-11 17:03:59.000000000 +0000 @@ -70,7 +70,6 @@ Q_EMIT changed(true); } - void SftpConfig::load() { KCModule::load(); diff -Nru kdeconnect-0.7.1/plugins/sftp/sftpplugin.cpp kdeconnect-0.7.3/plugins/sftp/sftpplugin.cpp --- kdeconnect-0.7.1/plugins/sftp/sftpplugin.cpp 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/plugins/sftp/sftpplugin.cpp 2014-10-11 17:03:59.000000000 +0000 @@ -53,10 +53,10 @@ SftpPlugin::SftpPlugin(QObject *parent, const QVariantList &args) : KdeConnectPlugin(parent, args) - , m_d(new Pimpl) + , m_d(new Pimpl()) { addToDolphin(); - kDebug(kdeconnect_kded()) << "Created device:" << device()->name(); + kDebug(debugArea()) << "Created device:" << device()->name(); } SftpPlugin::~SftpPlugin() @@ -64,7 +64,6 @@ QDBusConnection::sessionBus().unregisterObject(dbusPath(), QDBusConnection::UnregisterTree); removeFromDolphin(); unmount(); - kDebug(kdeconnect_kded()) << "Destroyed device:" << device()->name(); } void SftpPlugin::addToDolphin() @@ -72,7 +71,7 @@ removeFromDolphin(); KUrl kioUrl("kdeconnect://"+device()->id()+"/"); m_d->placesModel.addPlace(device()->name(), kioUrl, "kdeconnect"); - kDebug(kdeconnect_kded()) << "add to dolphin"; + kDebug(debugArea()) << "add to dolphin"; } void SftpPlugin::removeFromDolphin() @@ -88,12 +87,12 @@ void SftpPlugin::connected() { bool state = QDBusConnection::sessionBus().registerObject(dbusPath(), this, QDBusConnection::ExportScriptableContents); - kDebug(kdeconnect_kded()) << "Exposing DBUS interface: " << state; + kDebug(debugArea()) << "Exposing DBUS interface: " << state; } void SftpPlugin::mount() { - kDebug(kdeconnect_kded()) << "Mount device:" << device()->name(); + kDebug(debugArea()) << "Mount device:" << device()->name(); if (m_d->mounter) { return; } @@ -141,14 +140,26 @@ bool SftpPlugin::receivePackage(const NetworkPackage& np) { - if (!(fields_c - np.body().keys().toSet()).isEmpty()) - { + if (!(fields_c - np.body().keys().toSet()).isEmpty()) { // package is invalid return false; } Q_EMIT packageReceived(np); + remoteDirectories.clear(); + if (np.has("multiPaths")) { + QStringList paths = np.get("multiPaths",QStringList()); + QStringList names = np.get("pathNames",QStringList()); + int size = qMin(names.size(), paths.size()); + for (int i = 0; i < size; i++) { + remoteDirectories.insert(mountPoint() + paths.at(i), names.at(i)); + } + } else { + remoteDirectories.insert(mountPoint(), i18n("All files")); + remoteDirectories.insert(mountPoint() + "/DCIM/Camera", i18n("Camera pictures")); + } + return true; } @@ -160,7 +171,7 @@ void SftpPlugin::onMounted() { - kDebug(kdeconnect_kded()) << device()->name() << QString("Remote filesystem mounted at %1").arg(mountPoint()); + kDebug(debugArea()) << device()->name() << QString("Remote filesystem mounted at %1").arg(mountPoint()); Q_EMIT mounted(); } @@ -168,9 +179,9 @@ void SftpPlugin::onUnmounted(bool idleTimeout) { if (idleTimeout) { - kDebug(kdeconnect_kded()) << device()->name() << "Remote filesystem unmounted by idle timeout"; + kDebug(debugArea()) << device()->name() << "Remote filesystem unmounted by idle timeout"; } else { - kDebug(kdeconnect_kded()) << device()->name() << "Remote filesystem unmounted"; + kDebug(debugArea()) << device()->name() << "Remote filesystem unmounted"; } unmount(); @@ -197,3 +208,9 @@ , KNotification::CloseOnTimeout); } +QVariantMap SftpPlugin::getDirectories() +{ + return remoteDirectories; +} + + diff -Nru kdeconnect-0.7.1/plugins/sftp/sftpplugin.h kdeconnect-0.7.3/plugins/sftp/sftpplugin.h --- kdeconnect-0.7.1/plugins/sftp/sftpplugin.h 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/plugins/sftp/sftpplugin.h 2014-10-11 17:03:59.000000000 +0000 @@ -35,12 +35,10 @@ Q_CLASSINFO("D-Bus Interface", "org.kde.kdeconnect.device.sftp") public: - explicit SftpPlugin(QObject *parent, const QVariantList &args); virtual ~SftpPlugin(); Q_SIGNALS: - void packageReceived(const NetworkPackage& np); Q_SCRIPTABLE void mounted(); Q_SCRIPTABLE void unmounted(); @@ -53,11 +51,10 @@ Q_SCRIPTABLE void unmount(); Q_SCRIPTABLE bool mountAndWait(); Q_SCRIPTABLE bool isMounted() const; - + Q_SCRIPTABLE bool startBrowsing(); Q_SCRIPTABLE QString mountPoint(); - - + Q_SCRIPTABLE QVariantMap getDirectories(); //Actually a QMap, but QDBus preffers this private Q_SLOTS: void onMounted(); @@ -73,6 +70,8 @@ private: struct Pimpl; QScopedPointer m_d; + + QVariantMap remoteDirectories; //Actually a QMap, but QDBus preffers this }; diff -Nru kdeconnect-0.7.1/plugins/share/shareplugin.cpp kdeconnect-0.7.3/plugins/share/shareplugin.cpp --- kdeconnect-0.7.1/plugins/share/shareplugin.cpp 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/plugins/share/shareplugin.cpp 2014-10-11 17:03:59.000000000 +0000 @@ -55,7 +55,7 @@ QString url = dir.toLocalFile(); if (url.contains("%1")) url = url.arg(device()->name()); - kDebug(kdeconnect_kded()) << url; + kDebug(debugArea()) << url; QDir().mkpath(url); return url; @@ -64,10 +64,10 @@ bool SharePlugin::receivePackage(const NetworkPackage& np) { /* - //TODO: Use this code to write a test + //TODO: Write a test like this if (np.type() == PACKAGE_TYPE_PING) { - kDebug(kdeconnect_kded()) << "sending file" << (QDesktopServices::storageLocation(QDesktopServices::HomeLocation) + "/.bashrc"); + kDebug(debugArea()) << "sending file" << (QDesktopServices::storageLocation(QDesktopServices::HomeLocation) + "/.bashrc"); NetworkPackage out(PACKAGE_TYPE_SHARE); out.set("filename", mDestinationDir + "itworks.txt"); @@ -83,10 +83,10 @@ } */ - kDebug(kdeconnect_kded()) << "File transfer"; + kDebug(debugArea()) << "File transfer"; if (np.hasPayload()) { - //kDebug(kdeconnect_kded()) << "receiving file"; + //kDebug(debugArea()) << "receiving file"; QString filename = np.get("filename", QString::number(QDateTime::currentMSecsSinceEpoch())); KUrl destination = destinationDir(); destination.addPath(filename); @@ -115,7 +115,7 @@ QUrl url(np.get("url")); QDesktopServices::openUrl(url); } else { - kDebug(kdeconnect_kded()) << "Error: Nothing attached!"; + kDebug(debugArea()) << "Error: Nothing attached!"; } return true; @@ -124,7 +124,7 @@ void SharePlugin::finished(KJob* job) { - kDebug(kdeconnect_kded()) << "File transfer finished"; + kDebug(debugArea()) << "File transfer finished"; bool error = (job->error() != 0); diff -Nru kdeconnect-0.7.1/plugins/telephony/telephonyplugin.cpp kdeconnect-0.7.3/plugins/telephony/telephonyplugin.cpp --- kdeconnect-0.7.1/plugins/telephony/telephonyplugin.cpp 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/plugins/telephony/telephonyplugin.cpp 2014-10-11 17:03:59.000000000 +0000 @@ -60,13 +60,16 @@ } else if (event == "talking") { return NULL; } else { - //TODO: return NULL if !debug +#ifdef NDEBUG + return NULL; +#else type = "unknownEvent"; icon = "pda"; content = i18n("Unknown telephony event: %2", event); +#endif } - kDebug(kdeconnect_kded()) << "Creating notification with type:" << type; + kDebug(debugArea()) << "Creating notification with type:" << type; KNotification* notification = new KNotification(type, KNotification::CloseOnTimeout, this); //, KNotification::Persistent notification->setPixmap(KIcon(icon).pixmap(48, 48)); diff -Nru kdeconnect-0.7.1/po/bg/kdeconnect-kcm.po kdeconnect-0.7.3/po/bg/kdeconnect-kcm.po --- kdeconnect-0.7.1/po/bg/kdeconnect-kcm.po 2014-06-29 16:03:59.000000000 +0000 +++ kdeconnect-0.7.3/po/bg/kdeconnect-kcm.po 2014-10-11 17:05:31.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kdeconnect-kcm\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-15 02:00+0000\n" +"POT-Creation-Date: 2014-08-12 02:06+0000\n" "PO-Revision-Date: 2014-05-19 00:20+0200\n" "Last-Translator: Svetoslav Stefanov \n" "Language-Team: BULGARIAN \n" @@ -19,44 +19,49 @@ "X-Generator: Poedit 1.5.4\n" "X-Poedit-SourceCharset: UTF-8\n" -#: kcm.cpp:144 kcm.cpp:228 +#: kcm.cpp:152 kcm.cpp:236 msgid "(paired)" msgstr "(сдвоени)" -#: kcm.cpp:144 kcm.cpp:200 kcm.cpp:211 +#: kcm.cpp:152 kcm.cpp:208 kcm.cpp:219 msgid "(unpaired)" msgstr "(разкачени)" -#: kcm.cpp:158 +#: kcm.cpp:166 msgid "Plugins" msgstr "Приставки" -#: kcm.cpp:213 +#: kcm.cpp:221 #, kde-format msgid "Error trying to pair: %1" msgstr "Грешка при сдвояване: %1" +#. i18n: ectx: property (text), widget (QPushButton, refresh_button) +#: kcm.ui:41 +msgid "Refresh" +msgstr "" + #. i18n: ectx: property (text), widget (QLabel, name_label) -#: kcm.ui:84 +#: kcm.ui:88 msgid "Device" msgstr "Устройства" #. i18n: ectx: property (text), widget (QLabel, status_label) -#: kcm.ui:97 +#: kcm.ui:101 msgid "(status)" msgstr "(състояние)" #. i18n: ectx: property (text), widget (QPushButton, pair_button) -#: kcm.ui:142 +#: kcm.ui:146 msgid "Request pair" msgstr "Заявка за сдвояване" #. i18n: ectx: property (text), widget (QPushButton, unpair_button) -#: kcm.ui:155 +#: kcm.ui:159 msgid "Unpair" msgstr "Разкачване" #. i18n: ectx: property (text), widget (QPushButton, ping_button) -#: kcm.ui:168 +#: kcm.ui:172 msgid "Send ping" msgstr "Изпращане на пинг" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/bg/kdeconnect-kio.po kdeconnect-0.7.3/po/bg/kdeconnect-kio.po --- kdeconnect-0.7.1/po/bg/kdeconnect-kio.po 2014-06-29 16:03:59.000000000 +0000 +++ kdeconnect-0.7.3/po/bg/kdeconnect-kio.po 2014-10-11 17:05:31.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kdeconnect-kio\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-15 01:46+0000\n" +"POT-Creation-Date: 2014-10-11 01:54+0000\n" "PO-Revision-Date: 2014-05-19 11:41+0200\n" "Last-Translator: Svetoslav Stefanov \n" "Language-Team: BULGARIAN \n" @@ -35,22 +35,14 @@ msgid "Listing devices..." msgstr "Изброяване на устройства..." -#: kiokdeconnect.cpp:130 +#: kiokdeconnect.cpp:131 msgid "Accessing device..." msgstr "Достъп до устройството..." -#: kiokdeconnect.cpp:145 +#: kiokdeconnect.cpp:144 msgid "Could not mount device filesystem" msgstr "Файловата система на устройството не може да бъде монтирана" -#: kiokdeconnect.cpp:160 -msgid "Camera pictures" -msgstr "Снимки от камерата" - -#: kiokdeconnect.cpp:169 -msgid "All files" -msgstr "Всички файлове" - -#: kiokdeconnect.cpp:194 +#: kiokdeconnect.cpp:189 msgid "Could not contact background service." msgstr "Не може да се осъществи връзка с фоновата услуга." \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/bs/kdeconnect-kcm.po kdeconnect-0.7.3/po/bs/kdeconnect-kcm.po --- kdeconnect-0.7.1/po/bs/kdeconnect-kcm.po 2014-06-29 16:04:22.000000000 +0000 +++ kdeconnect-0.7.3/po/bs/kdeconnect-kcm.po 2014-10-11 17:06:25.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: bosnianuniversetranslation\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-15 02:00+0000\n" +"POT-Creation-Date: 2014-08-12 02:06+0000\n" "PO-Revision-Date: 2013-12-15 15:29+0000\n" "Last-Translator: Nermina Ahmić \n" "Language-Team: Bosnian \n" @@ -20,44 +20,49 @@ "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" -#: kcm.cpp:144 kcm.cpp:228 +#: kcm.cpp:152 kcm.cpp:236 msgid "(paired)" msgstr "(upareno)" -#: kcm.cpp:144 kcm.cpp:200 kcm.cpp:211 +#: kcm.cpp:152 kcm.cpp:208 kcm.cpp:219 msgid "(unpaired)" msgstr "(nije upareno)" -#: kcm.cpp:158 +#: kcm.cpp:166 msgid "Plugins" msgstr "Priključci" -#: kcm.cpp:213 +#: kcm.cpp:221 #, kde-format msgid "Error trying to pair: %1" msgstr "Greška pri pokušaju uparivanja: %1" +#. i18n: ectx: property (text), widget (QPushButton, refresh_button) +#: kcm.ui:41 +msgid "Refresh" +msgstr "" + #. i18n: ectx: property (text), widget (QLabel, name_label) -#: kcm.ui:84 +#: kcm.ui:88 msgid "Device" msgstr "Uređaj" #. i18n: ectx: property (text), widget (QLabel, status_label) -#: kcm.ui:97 +#: kcm.ui:101 msgid "(status)" msgstr "(status)" #. i18n: ectx: property (text), widget (QPushButton, pair_button) -#: kcm.ui:142 +#: kcm.ui:146 msgid "Request pair" msgstr "Zatraži par" #. i18n: ectx: property (text), widget (QPushButton, unpair_button) -#: kcm.ui:155 +#: kcm.ui:159 msgid "Unpair" msgstr "Razdvoji" #. i18n: ectx: property (text), widget (QPushButton, ping_button) -#: kcm.ui:168 +#: kcm.ui:172 msgid "Send ping" msgstr "Pošalji ping" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/ca/kdeconnect-cli.po kdeconnect-0.7.3/po/ca/kdeconnect-cli.po --- kdeconnect-0.7.1/po/ca/kdeconnect-cli.po 2014-06-29 16:04:30.000000000 +0000 +++ kdeconnect-0.7.3/po/ca/kdeconnect-cli.po 2014-10-11 17:06:42.000000000 +0000 @@ -8,9 +8,9 @@ msgstr "" "Project-Id-Version: kdeconnect-cli\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-28 01:55+0000\n" -"PO-Revision-Date: 2014-06-28 18:42+0200\n" -"Last-Translator: Antoni Bella Pérez \n" +"POT-Creation-Date: 2014-09-28 08:07+0000\n" +"PO-Revision-Date: 2014-09-28 12:53+0200\n" +"Last-Translator: Antoni Bella Pérez \n" "Language-Team: Catalan \n" "Language: ca\n" "MIME-Version: 1.0\n" @@ -27,51 +27,68 @@ msgid "Your emails" msgstr "antonibella5@orange.es" -#: kdeconnect-cli.cpp:33 +#: kdeconnect-cli.cpp:34 msgid "KDE Connect CLI tool" msgstr "Eina CLI pel KDE Connect" -#: kdeconnect-cli.cpp:34 +#: kdeconnect-cli.cpp:35 msgid "(C) 2013 Aleix Pol Gonzalez" msgstr "(C) 2013 Aleix Pol Gonzalez" -#: kdeconnect-cli.cpp:35 +#: kdeconnect-cli.cpp:36 msgid "Aleix Pol Gonzalez" msgstr "Aleix Pol Gonzalez" -#: kdeconnect-cli.cpp:39 -msgid "List all devices" -msgstr "Llista tots els dispositius" - -#: kdeconnect-cli.cpp:40 -msgid "Share a file to a said device" -msgstr "Comparteix un fitxer amb un dispositiu indicat" +#: kdeconnect-cli.cpp:37 +msgid "Albert Vaca Cintora" +msgstr "Albert Vaca Cintora" #: kdeconnect-cli.cpp:41 -msgid "Request pairing to a said device" -msgstr "Demana aparellar amb un dispositiu indicat" +msgid "List all devices." +msgstr "Llista tots els dispositius." #: kdeconnect-cli.cpp:42 -msgid "Stop pairing to a said device" -msgstr "Atura l'aparellament amb un dispositiu indicat" +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:43 -msgid "Sends a ping to said device" -msgstr "Envia un ping a aquest dispositiu" +msgid "Request pairing to a said device." +msgstr "Demana aparellar amb un dispositiu indicat." #: kdeconnect-cli.cpp:44 -msgid "Device ID" -msgstr "ID del dispositiu" +msgid "Stop pairing to a said device." +msgstr "Atura l'aparellament amb un dispositiu indicat." + +#: kdeconnect-cli.cpp:45 +msgid "Send a ping to said device." +msgstr "Envia un ping a aquest dispositiu." + +#: kdeconnect-cli.cpp:46 +msgid "Same as ping but you can customize the shown message." +msgstr "" +"Igual que el ping però es pot personalitzar el missatge que es mostrarà." + +#: kdeconnect-cli.cpp:47 +msgid "Share a file to a said device." +msgstr "Comparteix un fitxer amb un dispositiu indicat." + +#: kdeconnect-cli.cpp:48 +msgid "Display the notifications on a said device." +msgstr "Mostra les notificacions d'un dispositiu indicat." + +#: kdeconnect-cli.cpp:49 +msgid "Device ID." +msgstr "ID del dispositiu." -#: kdeconnect-cli.cpp:73 +#: kdeconnect-cli.cpp:79 msgid "No device specified" msgstr "No s'ha especificat un dispositiu" -#: kdeconnect-cli.cpp:85 +#: kdeconnect-cli.cpp:91 #, kde-format msgid "Couldn't share %1" msgstr "No s'ha pogut compartir %1" -#: kdeconnect-cli.cpp:106 +#: kdeconnect-cli.cpp:124 msgid "Nothing to be done with the device" msgstr "No es fa res amb el dispositiu" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/ca/kdeconnect-core.po kdeconnect-0.7.3/po/ca/kdeconnect-core.po --- kdeconnect-0.7.1/po/ca/kdeconnect-core.po 2014-06-29 16:04:30.000000000 +0000 +++ kdeconnect-0.7.3/po/ca/kdeconnect-core.po 2014-10-11 17:06:42.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kdeconnect-core\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-18 01:56+0000\n" +"POT-Creation-Date: 2014-07-16 02:16+0000\n" "PO-Revision-Date: 2014-06-19 17:39+0200\n" "Last-Translator: Antoni Bella Pérez \n" "Language-Team: Catalan \n" @@ -19,48 +19,48 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: device.cpp:168 +#: device.cpp:186 msgid "Already paired" msgstr "Ja està aparellat" -#: device.cpp:171 +#: device.cpp:189 msgid "Pairing already requested for this device" msgstr "Ja s'ha demanat aparellar aquest dispositiu" -#: device.cpp:175 +#: device.cpp:193 msgid "Device not reachable" msgstr "No es pot accedir al dispositiu" -#: device.cpp:188 +#: device.cpp:206 msgid "Error contacting device" msgstr "Error en contactar amb el dispositiu" -#: device.cpp:226 +#: device.cpp:244 msgid "Timed out" msgstr "Ha excedit el temps" -#: device.cpp:325 device.cpp:377 +#: device.cpp:343 device.cpp:395 msgid "Canceled by other peer" msgstr "Cancel·lat per l'altre parell" -#: device.cpp:341 +#: device.cpp:359 msgid "Received incorrect key" msgstr "S'ha rebut una clau incorrecta" -#: device.cpp:358 +#: device.cpp:376 #, kde-format msgid "Pairing request from %1" msgstr "S'ha demanat aparellar des de %1" -#: device.cpp:359 +#: device.cpp:377 msgid "Accept" msgstr "Accepta" -#: device.cpp:359 +#: device.cpp:377 msgid "Reject" msgstr "Rebutja" -#: device.cpp:419 +#: device.cpp:437 msgid "Canceled by the user" msgstr "Cancel·lat per l'usuari" diff -Nru kdeconnect-0.7.1/po/ca/kdeconnect-kcm.po kdeconnect-0.7.3/po/ca/kdeconnect-kcm.po --- kdeconnect-0.7.1/po/ca/kdeconnect-kcm.po 2014-06-29 16:04:30.000000000 +0000 +++ kdeconnect-0.7.3/po/ca/kdeconnect-kcm.po 2014-10-11 17:06:42.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: kdeconnect-kcm\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-15 02:00+0000\n" -"PO-Revision-Date: 2014-06-05 21:53+0200\n" +"POT-Creation-Date: 2014-08-12 02:06+0000\n" +"PO-Revision-Date: 2014-08-16 16:41+0200\n" "Last-Translator: Antoni Bella Pérez \n" "Language-Team: Catalan \n" "Language: ca\n" @@ -19,44 +19,49 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: kcm.cpp:144 kcm.cpp:228 +#: kcm.cpp:152 kcm.cpp:236 msgid "(paired)" msgstr "(aparellat)" -#: kcm.cpp:144 kcm.cpp:200 kcm.cpp:211 +#: kcm.cpp:152 kcm.cpp:208 kcm.cpp:219 msgid "(unpaired)" msgstr "(sense aparellar)" -#: kcm.cpp:158 +#: kcm.cpp:166 msgid "Plugins" msgstr "Connectors" -#: kcm.cpp:213 +#: kcm.cpp:221 #, kde-format msgid "Error trying to pair: %1" msgstr "Error en intentar aparellar: %1" +#. i18n: ectx: property (text), widget (QPushButton, refresh_button) +#: kcm.ui:41 +msgid "Refresh" +msgstr "Refresca" + #. i18n: ectx: property (text), widget (QLabel, name_label) -#: kcm.ui:84 +#: kcm.ui:88 msgid "Device" msgstr "Dispositiu" #. i18n: ectx: property (text), widget (QLabel, status_label) -#: kcm.ui:97 +#: kcm.ui:101 msgid "(status)" msgstr "(estat)" #. i18n: ectx: property (text), widget (QPushButton, pair_button) -#: kcm.ui:142 +#: kcm.ui:146 msgid "Request pair" msgstr "Demana aparellar" #. i18n: ectx: property (text), widget (QPushButton, unpair_button) -#: kcm.ui:155 +#: kcm.ui:159 msgid "Unpair" msgstr "Desparella" #. i18n: ectx: property (text), widget (QPushButton, ping_button) -#: kcm.ui:168 +#: kcm.ui:172 msgid "Send ping" msgstr "Envia un ping" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/ca/kdeconnect-kio.po kdeconnect-0.7.3/po/ca/kdeconnect-kio.po --- kdeconnect-0.7.1/po/ca/kdeconnect-kio.po 2014-06-29 16:04:30.000000000 +0000 +++ kdeconnect-0.7.3/po/ca/kdeconnect-kio.po 2014-10-11 17:06:42.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: kdeconnect-kio\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-15 01:46+0000\n" +"POT-Creation-Date: 2014-10-11 01:54+0000\n" "PO-Revision-Date: 2014-06-05 21:57+0200\n" "Last-Translator: Antoni Bella Pérez \n" "Language-Team: Catalan \n" @@ -35,22 +35,14 @@ msgid "Listing devices..." msgstr "S'estan llistant els dispositius..." -#: kiokdeconnect.cpp:130 +#: kiokdeconnect.cpp:131 msgid "Accessing device..." msgstr "S'està accedint al dispositiu..." -#: kiokdeconnect.cpp:145 +#: kiokdeconnect.cpp:144 msgid "Could not mount device filesystem" msgstr "No s'ha pogut muntar el sistema de fitxers del dispositiu" -#: kiokdeconnect.cpp:160 -msgid "Camera pictures" -msgstr "Imatges de la càmera" - -#: kiokdeconnect.cpp:169 -msgid "All files" -msgstr "Tots els fitxers" - -#: kiokdeconnect.cpp:194 +#: kiokdeconnect.cpp:189 msgid "Could not contact background service." msgstr "No s'ha pogut contactar usant el servei en segon pla." \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/ca/kdeconnect-plugins.po kdeconnect-0.7.3/po/ca/kdeconnect-plugins.po --- kdeconnect-0.7.1/po/ca/kdeconnect-plugins.po 2014-06-29 16:04:30.000000000 +0000 +++ kdeconnect-0.7.3/po/ca/kdeconnect-plugins.po 2014-10-11 17:06:42.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: kdeconnect-plugins\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-28 01:55+0000\n" -"PO-Revision-Date: 2014-06-19 17:35+0200\n" +"POT-Creation-Date: 2014-10-11 01:54+0000\n" +"PO-Revision-Date: 2014-10-11 16:59+0200\n" "Last-Translator: Antoni Bella Pérez \n" "Language-Team: Catalan \n" "Language: ca\n" @@ -36,38 +36,48 @@ msgstr "Connector Pausa la música" #. i18n: ectx: property (title), widget (QGroupBox, groupBox) -#: pausemusic/pausemusic_config.ui:29 -msgid "Pause condition" -msgstr "Condició per a la pausa" +#: pausemusic/pausemusic_config.ui:32 +msgid "Condition" +msgstr "Condició" #. i18n: ectx: property (text), widget (QRadioButton, rad_ringing) -#: pausemusic/pausemusic_config.ui:35 +#: pausemusic/pausemusic_config.ui:38 msgid "Pause as soon as phone rings" msgstr "Pausa tan aviat com soni el telèfon" #. i18n: ectx: property (text), widget (QRadioButton, rad_talking) -#: pausemusic/pausemusic_config.ui:42 +#: pausemusic/pausemusic_config.ui:45 msgid "Pause only while talking" msgstr "Pausa només mentre es parla" +#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2) +#: pausemusic/pausemusic_config.ui:61 +msgid "Actions" +msgstr "Accions" + +#. i18n: ectx: property (text), widget (QCheckBox, check_pause) +#: pausemusic/pausemusic_config.ui:67 +msgid "Pause media players" +msgstr "Pausa els reproductors multimèdia" + #. i18n: ectx: property (text), widget (QCheckBox, check_mute) -#: pausemusic/pausemusic_config.ui:65 -msgid "Mute system instead of pause" -msgstr "Silencia el sistema en lloc de fer una pausa" +#: pausemusic/pausemusic_config.ui:74 +msgid "Mute system sound" +msgstr "Silencia el so del sistema" #: ping/pingplugin.cpp:51 msgid "Ping!" msgstr "Ping!" -#: sftp/mounter.cpp:172 +#: sftp/mounter.cpp:176 msgid "Failed to start sshfs" msgstr "Ha fallat en iniciar «sshfs»" -#: sftp/mounter.cpp:194 +#: sftp/mounter.cpp:198 msgid "Error when accessing to filesystem" msgstr "Error en accedir al sistema de fitxers" -#: sftp/mounter.cpp:205 +#: sftp/mounter.cpp:209 msgid "Failed to mount filesystem: device not responding" msgstr "El muntatge del sistema de fitxers ha fallat: el dispositiu no respon" @@ -102,7 +112,15 @@ msgid " min" msgstr " min" -#: sftp/sftpplugin.cpp:196 +#: sftp/sftpplugin.cpp:159 +msgid "All files" +msgstr "Tots els fitxers" + +#: sftp/sftpplugin.cpp:160 +msgid "Camera pictures" +msgstr "Imatges de la càmera" + +#: sftp/sftpplugin.cpp:207 #, kde-format msgid "Device %1" msgstr "Dispositiu %1" @@ -150,7 +168,7 @@ msgid "SMS from %1: %2" msgstr "SMS des de %1: %2" -#: telephony/telephonyplugin.cpp:66 +#: telephony/telephonyplugin.cpp:68 #, kde-format msgid "Unknown telephony event: %2" msgstr "Esdeveniment de telefonia desconegut: %2" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/cs/kdeconnect-cli.po kdeconnect-0.7.3/po/cs/kdeconnect-cli.po --- kdeconnect-0.7.1/po/cs/kdeconnect-cli.po 2014-06-29 16:04:50.000000000 +0000 +++ kdeconnect-0.7.3/po/cs/kdeconnect-cli.po 2014-10-11 17:07:24.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-28 01:55+0000\n" -"PO-Revision-Date: 2014-06-23 10:23+0200\n" +"POT-Creation-Date: 2014-09-28 08:07+0000\n" +"PO-Revision-Date: 2014-09-29 14:01+0200\n" "Last-Translator: Vít Pelčák \n" "Language-Team: Czech \n" "Language: cs\n" @@ -25,51 +25,67 @@ msgid "Your emails" msgstr "vit@pelcak.org" -#: kdeconnect-cli.cpp:33 +#: kdeconnect-cli.cpp:34 msgid "KDE Connect CLI tool" msgstr "CLI nástroj pro KDE Connect" -#: kdeconnect-cli.cpp:34 +#: kdeconnect-cli.cpp:35 msgid "(C) 2013 Aleix Pol Gonzalez" msgstr "(C) 2013 Aleix Pol Gonzalez" -#: kdeconnect-cli.cpp:35 +#: kdeconnect-cli.cpp:36 msgid "Aleix Pol Gonzalez" msgstr "Aleix Pol Gonzalez" -#: kdeconnect-cli.cpp:39 -msgid "List all devices" -msgstr "Vypsat všechna zařízení" - -#: kdeconnect-cli.cpp:40 -msgid "Share a file to a said device" -msgstr "" +#: kdeconnect-cli.cpp:37 +msgid "Albert Vaca Cintora" +msgstr "Albert Vaca Cintora" #: kdeconnect-cli.cpp:41 -msgid "Request pairing to a said device" -msgstr "" +msgid "List all devices." +msgstr "Vypsat všechna zařízení." #: kdeconnect-cli.cpp:42 -msgid "Stop pairing to a said device" -msgstr "" +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:43 -msgid "Sends a ping to said device" -msgstr "" +msgid "Request pairing to a said device." +msgstr "Vyžádat párování s daným zařízením." #: kdeconnect-cli.cpp:44 -msgid "Device ID" -msgstr "ID zařízení" +msgid "Stop pairing to a said device." +msgstr "Zastavit párování s daným zařízením." -#: kdeconnect-cli.cpp:73 +#: kdeconnect-cli.cpp:45 +msgid "Send a ping to said device." +msgstr "Poslat na dané zařízení ping." + +#: kdeconnect-cli.cpp:46 +msgid "Same as ping but you can customize the shown message." +msgstr "Stejné jako ping, ale můžete si vybrat zobrazenou zprávu." + +#: kdeconnect-cli.cpp:47 +msgid "Share a file to a said device." +msgstr "Sdílet soubor s daným zařízením." + +#: kdeconnect-cli.cpp:48 +msgid "Display the notifications on a said device." +msgstr "Zobrazit upozornění na daném zařízení." + +#: kdeconnect-cli.cpp:49 +msgid "Device ID." +msgstr "ID zařízení." + +#: kdeconnect-cli.cpp:79 msgid "No device specified" msgstr "Nebylo zadáno žádné zařízení" -#: kdeconnect-cli.cpp:85 +#: kdeconnect-cli.cpp:91 #, kde-format msgid "Couldn't share %1" -msgstr "" +msgstr "Nelze sdílet %1" -#: kdeconnect-cli.cpp:106 +#: kdeconnect-cli.cpp:124 msgid "Nothing to be done with the device" msgstr "Se zařízením není co provádět" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/cs/kdeconnect-core.po kdeconnect-0.7.3/po/cs/kdeconnect-core.po --- kdeconnect-0.7.1/po/cs/kdeconnect-core.po 2014-06-29 16:04:50.000000000 +0000 +++ kdeconnect-0.7.3/po/cs/kdeconnect-core.po 2014-10-11 17:07:24.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-18 01:56+0000\n" +"POT-Creation-Date: 2014-07-16 02:16+0000\n" "PO-Revision-Date: 2014-06-23 10:25+0200\n" "Last-Translator: Vít Pelčák \n" "Language-Team: Czech \n" @@ -17,48 +17,48 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Lokalize 1.5\n" -#: device.cpp:168 +#: device.cpp:186 msgid "Already paired" msgstr "Již spárováno" -#: device.cpp:171 +#: device.cpp:189 msgid "Pairing already requested for this device" msgstr "Pro toto zařízení již bylo párování vyžádáno" -#: device.cpp:175 +#: device.cpp:193 msgid "Device not reachable" msgstr "Zařízení je nedostupné" -#: device.cpp:188 +#: device.cpp:206 msgid "Error contacting device" msgstr "Chyba při kontaktování zařízení" -#: device.cpp:226 +#: device.cpp:244 msgid "Timed out" msgstr "Čas vypršel" -#: device.cpp:325 device.cpp:377 +#: device.cpp:343 device.cpp:395 msgid "Canceled by other peer" msgstr "Přerušeno druhým uživatelem" -#: device.cpp:341 +#: device.cpp:359 msgid "Received incorrect key" msgstr "Přijat nesprávný klíč" -#: device.cpp:358 +#: device.cpp:376 #, kde-format msgid "Pairing request from %1" msgstr "Požadavek na párování od %1" -#: device.cpp:359 +#: device.cpp:377 msgid "Accept" msgstr "Přijmout" -#: device.cpp:359 +#: device.cpp:377 msgid "Reject" msgstr "Odmítnout" -#: device.cpp:419 +#: device.cpp:437 msgid "Canceled by the user" msgstr "Zrušeno uživatelem" diff -Nru kdeconnect-0.7.1/po/cs/kdeconnect-kcm.po kdeconnect-0.7.3/po/cs/kdeconnect-kcm.po --- kdeconnect-0.7.1/po/cs/kdeconnect-kcm.po 2014-06-29 16:04:50.000000000 +0000 +++ kdeconnect-0.7.3/po/cs/kdeconnect-kcm.po 2014-10-11 17:07:24.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-15 02:00+0000\n" -"PO-Revision-Date: 2014-03-14 15:36+0100\n" +"POT-Creation-Date: 2014-08-12 02:06+0000\n" +"PO-Revision-Date: 2014-08-14 15:16+0200\n" "Last-Translator: Vít Pelčák \n" "Language-Team: Czech \n" "Language: cs\n" @@ -17,44 +17,49 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Lokalize 1.5\n" -#: kcm.cpp:144 kcm.cpp:228 +#: kcm.cpp:152 kcm.cpp:236 msgid "(paired)" msgstr "(spárovaný)" -#: kcm.cpp:144 kcm.cpp:200 kcm.cpp:211 +#: kcm.cpp:152 kcm.cpp:208 kcm.cpp:219 msgid "(unpaired)" msgstr "(nespárovaný)" -#: kcm.cpp:158 +#: kcm.cpp:166 msgid "Plugins" msgstr "Moduly" -#: kcm.cpp:213 +#: kcm.cpp:221 #, kde-format msgid "Error trying to pair: %1" msgstr "Chyba při pokusu o párování: %1" +#. i18n: ectx: property (text), widget (QPushButton, refresh_button) +#: kcm.ui:41 +msgid "Refresh" +msgstr "Obnovit" + #. i18n: ectx: property (text), widget (QLabel, name_label) -#: kcm.ui:84 +#: kcm.ui:88 msgid "Device" msgstr "Zařízení" #. i18n: ectx: property (text), widget (QLabel, status_label) -#: kcm.ui:97 +#: kcm.ui:101 msgid "(status)" msgstr "(stav)" #. i18n: ectx: property (text), widget (QPushButton, pair_button) -#: kcm.ui:142 +#: kcm.ui:146 msgid "Request pair" msgstr "Vyžádat párování" #. i18n: ectx: property (text), widget (QPushButton, unpair_button) -#: kcm.ui:155 +#: kcm.ui:159 msgid "Unpair" msgstr "Zrušit párování" #. i18n: ectx: property (text), widget (QPushButton, ping_button) -#: kcm.ui:168 +#: kcm.ui:172 msgid "Send ping" msgstr "Poslat ping" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/cs/kdeconnect-kio.po kdeconnect-0.7.3/po/cs/kdeconnect-kio.po --- kdeconnect-0.7.1/po/cs/kdeconnect-kio.po 2014-06-29 16:04:50.000000000 +0000 +++ kdeconnect-0.7.3/po/cs/kdeconnect-kio.po 2014-10-11 17:07:24.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-15 01:46+0000\n" +"POT-Creation-Date: 2014-10-11 01:54+0000\n" "PO-Revision-Date: 2014-02-18 10:46+0100\n" "Last-Translator: Vít Pelčák \n" "Language-Team: Czech \n" @@ -33,22 +33,14 @@ msgid "Listing devices..." msgstr "Vypisuji zařízení..." -#: kiokdeconnect.cpp:130 +#: kiokdeconnect.cpp:131 msgid "Accessing device..." msgstr "Přistupuji k zařízení..." -#: kiokdeconnect.cpp:145 +#: kiokdeconnect.cpp:144 msgid "Could not mount device filesystem" msgstr "Nelze připojit souborový systém zařízení" -#: kiokdeconnect.cpp:160 -msgid "Camera pictures" -msgstr "Obrázky z fotoaparátu" - -#: kiokdeconnect.cpp:169 -msgid "All files" -msgstr "Všechny soubory" - -#: kiokdeconnect.cpp:194 +#: kiokdeconnect.cpp:189 msgid "Could not contact background service." msgstr "Nelze kontaktovat službu na pozadí." \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/cs/kdeconnect-plugins.po kdeconnect-0.7.3/po/cs/kdeconnect-plugins.po --- kdeconnect-0.7.1/po/cs/kdeconnect-plugins.po 2014-06-29 16:04:50.000000000 +0000 +++ kdeconnect-0.7.3/po/cs/kdeconnect-plugins.po 2014-10-11 17:07:24.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-28 01:55+0000\n" -"PO-Revision-Date: 2014-06-23 10:21+0200\n" +"POT-Creation-Date: 2014-10-11 01:54+0000\n" +"PO-Revision-Date: 2014-09-18 11:21+0200\n" "Last-Translator: Vít Pelčák \n" "Language-Team: Czech \n" "Language: cs\n" @@ -34,38 +34,48 @@ msgstr "Modul pro pozastavení hudby" #. i18n: ectx: property (title), widget (QGroupBox, groupBox) -#: pausemusic/pausemusic_config.ui:29 -msgid "Pause condition" -msgstr "Podmínka pozastavení" +#: pausemusic/pausemusic_config.ui:32 +msgid "Condition" +msgstr "Podmínka" #. i18n: ectx: property (text), widget (QRadioButton, rad_ringing) -#: pausemusic/pausemusic_config.ui:35 +#: pausemusic/pausemusic_config.ui:38 msgid "Pause as soon as phone rings" msgstr "Pozastavit okamžitě jakmile telefon zazvoní" #. i18n: ectx: property (text), widget (QRadioButton, rad_talking) -#: pausemusic/pausemusic_config.ui:42 +#: pausemusic/pausemusic_config.ui:45 msgid "Pause only while talking" msgstr "Pozastavit pouze během rozhovoru" +#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2) +#: pausemusic/pausemusic_config.ui:61 +msgid "Actions" +msgstr "Činnosti" + +#. i18n: ectx: property (text), widget (QCheckBox, check_pause) +#: pausemusic/pausemusic_config.ui:67 +msgid "Pause media players" +msgstr "Pozastavit multimediální přehrávače" + #. i18n: ectx: property (text), widget (QCheckBox, check_mute) -#: pausemusic/pausemusic_config.ui:65 -msgid "Mute system instead of pause" -msgstr "Ztlumit zvuk namísto pozastavení" +#: pausemusic/pausemusic_config.ui:74 +msgid "Mute system sound" +msgstr "Ztlumit zvuk systému" #: ping/pingplugin.cpp:51 msgid "Ping!" msgstr "Ping!" -#: sftp/mounter.cpp:172 +#: sftp/mounter.cpp:176 msgid "Failed to start sshfs" msgstr "Selhalo spuštění sshfs" -#: sftp/mounter.cpp:194 +#: sftp/mounter.cpp:198 msgid "Error when accessing to filesystem" msgstr "Chyba při přístupu k souborovému systému" -#: sftp/mounter.cpp:205 +#: sftp/mounter.cpp:209 msgid "Failed to mount filesystem: device not responding" msgstr "Chyba při připojení souborového systému: zařízení neodpovídá" @@ -100,7 +110,15 @@ msgid " min" msgstr " min" -#: sftp/sftpplugin.cpp:196 +#: sftp/sftpplugin.cpp:159 +msgid "All files" +msgstr "" + +#: sftp/sftpplugin.cpp:160 +msgid "Camera pictures" +msgstr "" + +#: sftp/sftpplugin.cpp:207 #, kde-format msgid "Device %1" msgstr "Zařízení %1" @@ -148,7 +166,7 @@ msgid "SMS from %1: %2" msgstr "SMS od %1: %2" -#: telephony/telephonyplugin.cpp:66 +#: telephony/telephonyplugin.cpp:68 #, kde-format msgid "Unknown telephony event: %2" msgstr "Neznámá telefonická událost: %2" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/da/kdeconnect-cli.po kdeconnect-0.7.3/po/da/kdeconnect-cli.po --- kdeconnect-0.7.1/po/da/kdeconnect-cli.po 2014-06-29 16:05:11.000000000 +0000 +++ kdeconnect-0.7.3/po/da/kdeconnect-cli.po 2014-10-11 17:20:05.000000000 +0000 @@ -6,15 +6,15 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-28 01:55+0000\n" -"PO-Revision-Date: 2014-06-28 17:22+0200\n" +"POT-Creation-Date: 2014-09-28 08:07+0000\n" +"PO-Revision-Date: 2014-08-06 21:21+0200\n" "Last-Translator: Martin Schlander \n" "Language-Team: Danish \n" "Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" msgctxt "NAME OF TRANSLATORS" @@ -25,51 +25,81 @@ msgid "Your emails" msgstr "mschlander@opensuse.org" -#: kdeconnect-cli.cpp:33 +#: kdeconnect-cli.cpp:34 msgid "KDE Connect CLI tool" msgstr "CLI-værktøj til KDE Connect" -#: kdeconnect-cli.cpp:34 +#: kdeconnect-cli.cpp:35 msgid "(C) 2013 Aleix Pol Gonzalez" msgstr "(C) 2013 Aleix Pol Gonzalez" -#: kdeconnect-cli.cpp:35 +#: kdeconnect-cli.cpp:36 msgid "Aleix Pol Gonzalez" msgstr "Aleix Pol Gonzalez" -#: kdeconnect-cli.cpp:39 -msgid "List all devices" +#: kdeconnect-cli.cpp:37 +msgid "Albert Vaca Cintora" +msgstr "" + +#: kdeconnect-cli.cpp:41 +#, fuzzy +#| msgid "List all devices" +msgid "List all devices." msgstr "Oplist alle enheder" -#: kdeconnect-cli.cpp:40 -msgid "Share a file to a said device" -msgstr "Del en fil til en given enhed" +#: kdeconnect-cli.cpp:42 +msgid "Search for devices in the network and re-establish connections." +msgstr "" -#: kdeconnect-cli.cpp:41 -msgid "Request pairing to a said device" +#: kdeconnect-cli.cpp:43 +#, fuzzy +#| msgid "Request pairing to a said device" +msgid "Request pairing to a said device." msgstr "Anmod om parring med en given enhed" -#: kdeconnect-cli.cpp:42 -msgid "Stop pairing to a said device" +#: kdeconnect-cli.cpp:44 +#, fuzzy +#| msgid "Stop pairing to a said device" +msgid "Stop pairing to a said device." msgstr "Stop parring med en given enhed" -#: kdeconnect-cli.cpp:43 -msgid "Sends a ping to said device" +#: kdeconnect-cli.cpp:45 +#, fuzzy +#| msgid "Sends a ping to said device" +msgid "Send a ping to said device." msgstr "Send et ping til given enhed" -#: kdeconnect-cli.cpp:44 -msgid "Device ID" +#: kdeconnect-cli.cpp:46 +msgid "Same as ping but you can customize the shown message." +msgstr "" + +#: kdeconnect-cli.cpp:47 +#, fuzzy +#| msgid "Share a file to a said device" +msgid "Share a file to a said device." +msgstr "Del en fil til en given enhed" + +#: kdeconnect-cli.cpp:48 +#, fuzzy +#| msgid "Display the notifications on a said device" +msgid "Display the notifications on a said device." +msgstr "Vis bekendtgørelser på en given enhed" + +#: kdeconnect-cli.cpp:49 +#, fuzzy +#| msgid "Device ID" +msgid "Device ID." msgstr "Enheds-id" -#: kdeconnect-cli.cpp:73 +#: kdeconnect-cli.cpp:79 msgid "No device specified" msgstr "Ingen enhed angivet" -#: kdeconnect-cli.cpp:85 +#: kdeconnect-cli.cpp:91 #, kde-format msgid "Couldn't share %1" msgstr "Kunne ikke dele %1" -#: kdeconnect-cli.cpp:106 +#: kdeconnect-cli.cpp:124 msgid "Nothing to be done with the device" msgstr "Intet at gøre med enheden" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/da/kdeconnect-core.po kdeconnect-0.7.3/po/da/kdeconnect-core.po --- kdeconnect-0.7.1/po/da/kdeconnect-core.po 2014-06-29 16:05:11.000000000 +0000 +++ kdeconnect-0.7.3/po/da/kdeconnect-core.po 2014-10-11 17:20:05.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-18 01:56+0000\n" +"POT-Creation-Date: 2014-07-16 02:16+0000\n" "PO-Revision-Date: 2014-06-28 17:22+0200\n" "Last-Translator: Martin Schlander \n" "Language-Team: Danish \n" @@ -14,51 +14,51 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: device.cpp:168 +#: device.cpp:186 msgid "Already paired" msgstr "Allerede parret" -#: device.cpp:171 +#: device.cpp:189 msgid "Pairing already requested for this device" msgstr "Allerede anmodet om parring med denne enhed" -#: device.cpp:175 +#: device.cpp:193 msgid "Device not reachable" msgstr "Enheden kan ikke nås" -#: device.cpp:188 +#: device.cpp:206 msgid "Error contacting device" msgstr "Fejl ved kontakt til enhed" -#: device.cpp:226 +#: device.cpp:244 msgid "Timed out" msgstr "Tidsudløb" -#: device.cpp:325 device.cpp:377 +#: device.cpp:343 device.cpp:395 msgid "Canceled by other peer" msgstr "Annulleret af modpart" -#: device.cpp:341 +#: device.cpp:359 msgid "Received incorrect key" msgstr "Modtog forkert nøgle" -#: device.cpp:358 +#: device.cpp:376 #, kde-format msgid "Pairing request from %1" msgstr "Parringsanmodning fra %1" -#: device.cpp:359 +#: device.cpp:377 msgid "Accept" msgstr "Acceptér" -#: device.cpp:359 +#: device.cpp:377 msgid "Reject" msgstr "Afvis" -#: device.cpp:419 +#: device.cpp:437 msgid "Canceled by the user" msgstr "Annulleret af brugeren" diff -Nru kdeconnect-0.7.1/po/da/kdeconnect-filetiemaction.po kdeconnect-0.7.3/po/da/kdeconnect-filetiemaction.po --- kdeconnect-0.7.1/po/da/kdeconnect-filetiemaction.po 2014-06-29 16:05:11.000000000 +0000 +++ kdeconnect-0.7.3/po/da/kdeconnect-filetiemaction.po 2014-10-11 17:20:05.000000000 +0000 @@ -14,7 +14,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" #: sendfileitemaction.cpp:67 diff -Nru kdeconnect-0.7.1/po/da/kdeconnect-kcm.po kdeconnect-0.7.3/po/da/kdeconnect-kcm.po --- kdeconnect-0.7.1/po/da/kdeconnect-kcm.po 2014-06-29 16:05:11.000000000 +0000 +++ kdeconnect-0.7.3/po/da/kdeconnect-kcm.po 2014-10-11 17:20:05.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-15 02:00+0000\n" -"PO-Revision-Date: 2014-02-23 14:32+0100\n" +"POT-Creation-Date: 2014-08-12 02:06+0000\n" +"PO-Revision-Date: 2014-08-24 21:59+0200\n" "Last-Translator: Martin Schlander \n" "Language-Team: Danish \n" "Language: da\n" @@ -17,44 +17,49 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: kcm.cpp:144 kcm.cpp:228 +#: kcm.cpp:152 kcm.cpp:236 msgid "(paired)" msgstr "(parret)" -#: kcm.cpp:144 kcm.cpp:200 kcm.cpp:211 +#: kcm.cpp:152 kcm.cpp:208 kcm.cpp:219 msgid "(unpaired)" msgstr "(ikke parret)" -#: kcm.cpp:158 +#: kcm.cpp:166 msgid "Plugins" msgstr "Plugins" -#: kcm.cpp:213 +#: kcm.cpp:221 #, kde-format msgid "Error trying to pair: %1" msgstr "Fejl ved parring: %1" +#. i18n: ectx: property (text), widget (QPushButton, refresh_button) +#: kcm.ui:41 +msgid "Refresh" +msgstr "Genopfrisk" + #. i18n: ectx: property (text), widget (QLabel, name_label) -#: kcm.ui:84 +#: kcm.ui:88 msgid "Device" msgstr "Enhed" #. i18n: ectx: property (text), widget (QLabel, status_label) -#: kcm.ui:97 +#: kcm.ui:101 msgid "(status)" msgstr "(status)" #. i18n: ectx: property (text), widget (QPushButton, pair_button) -#: kcm.ui:142 +#: kcm.ui:146 msgid "Request pair" msgstr "Anmod om parring" #. i18n: ectx: property (text), widget (QPushButton, unpair_button) -#: kcm.ui:155 +#: kcm.ui:159 msgid "Unpair" msgstr "Fjern parring" #. i18n: ectx: property (text), widget (QPushButton, ping_button) -#: kcm.ui:168 +#: kcm.ui:172 msgid "Send ping" msgstr "Send ping" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/da/kdeconnect-kio.po kdeconnect-0.7.3/po/da/kdeconnect-kio.po --- kdeconnect-0.7.1/po/da/kdeconnect-kio.po 2014-06-29 16:05:11.000000000 +0000 +++ kdeconnect-0.7.3/po/da/kdeconnect-kio.po 2014-10-11 17:20:05.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-15 01:46+0000\n" +"POT-Creation-Date: 2014-10-11 01:54+0000\n" "PO-Revision-Date: 2014-02-23 14:33+0100\n" "Last-Translator: Martin Schlander \n" "Language-Team: Danish \n" @@ -33,22 +33,14 @@ msgid "Listing devices..." msgstr "Oplistning af enheder..." -#: kiokdeconnect.cpp:130 +#: kiokdeconnect.cpp:131 msgid "Accessing device..." msgstr "Tilgår enhed..." -#: kiokdeconnect.cpp:145 +#: kiokdeconnect.cpp:144 msgid "Could not mount device filesystem" msgstr "Kunne ikke montere enhedens filsystem" -#: kiokdeconnect.cpp:160 -msgid "Camera pictures" -msgstr "Kamerabilleder" - -#: kiokdeconnect.cpp:169 -msgid "All files" -msgstr "Alle filer" - -#: kiokdeconnect.cpp:194 +#: kiokdeconnect.cpp:189 msgid "Could not contact background service." msgstr "Kunne ikke kontakte baggrundstjenesten." \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/da/kdeconnect-plugins.po kdeconnect-0.7.3/po/da/kdeconnect-plugins.po --- kdeconnect-0.7.1/po/da/kdeconnect-plugins.po 2014-06-29 16:05:11.000000000 +0000 +++ kdeconnect-0.7.3/po/da/kdeconnect-plugins.po 2014-10-11 17:20:05.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-28 01:55+0000\n" +"POT-Creation-Date: 2014-10-11 01:54+0000\n" "PO-Revision-Date: 2014-06-28 17:23+0200\n" "Last-Translator: Martin Schlander \n" "Language-Team: Danish \n" @@ -14,7 +14,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" #: battery/batteryplugin.cpp:77 @@ -34,38 +34,52 @@ msgstr "Plugin til at sætte musik på pause" #. i18n: ectx: property (title), widget (QGroupBox, groupBox) -#: pausemusic/pausemusic_config.ui:29 -msgid "Pause condition" +#: pausemusic/pausemusic_config.ui:32 +#, fuzzy +#| msgid "Pause condition" +msgid "Condition" msgstr "Betingelse for pause" #. i18n: ectx: property (text), widget (QRadioButton, rad_ringing) -#: pausemusic/pausemusic_config.ui:35 +#: pausemusic/pausemusic_config.ui:38 msgid "Pause as soon as phone rings" msgstr "Sæt på pause når telefonen ringer" #. i18n: ectx: property (text), widget (QRadioButton, rad_talking) -#: pausemusic/pausemusic_config.ui:42 +#: pausemusic/pausemusic_config.ui:45 msgid "Pause only while talking" msgstr "Sæt kun på pause når der tales" +#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2) +#: pausemusic/pausemusic_config.ui:61 +msgid "Actions" +msgstr "" + +#. i18n: ectx: property (text), widget (QCheckBox, check_pause) +#: pausemusic/pausemusic_config.ui:67 +msgid "Pause media players" +msgstr "" + #. i18n: ectx: property (text), widget (QCheckBox, check_mute) -#: pausemusic/pausemusic_config.ui:65 -msgid "Mute system instead of pause" +#: pausemusic/pausemusic_config.ui:74 +#, fuzzy +#| msgid "Mute system instead of pause" +msgid "Mute system sound" msgstr "Sæt systemet på lydløs i stedet for pause" #: ping/pingplugin.cpp:51 msgid "Ping!" msgstr "Ping!" -#: sftp/mounter.cpp:172 +#: sftp/mounter.cpp:176 msgid "Failed to start sshfs" msgstr "kunne ikke starte sshfs" -#: sftp/mounter.cpp:194 +#: sftp/mounter.cpp:198 msgid "Error when accessing to filesystem" msgstr "Fejl ved tilgang til filsystemet" -#: sftp/mounter.cpp:205 +#: sftp/mounter.cpp:209 msgid "Failed to mount filesystem: device not responding" msgstr "Kunne ikke montere filsystemet: Enheden svarer ikke" @@ -100,7 +114,15 @@ msgid " min" msgstr " min" -#: sftp/sftpplugin.cpp:196 +#: sftp/sftpplugin.cpp:159 +msgid "All files" +msgstr "" + +#: sftp/sftpplugin.cpp:160 +msgid "Camera pictures" +msgstr "" + +#: sftp/sftpplugin.cpp:207 #, kde-format msgid "Device %1" msgstr "Enhed %1" @@ -148,7 +170,7 @@ msgid "SMS from %1: %2" msgstr "SMS fra %1: %2" -#: telephony/telephonyplugin.cpp:66 +#: telephony/telephonyplugin.cpp:68 #, kde-format msgid "Unknown telephony event: %2" msgstr "Ukendt telefonihændelse: %2" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/de/kdeconnect-cli.po kdeconnect-0.7.3/po/de/kdeconnect-cli.po --- kdeconnect-0.7.1/po/de/kdeconnect-cli.po 1970-01-01 00:00:00.000000000 +0000 +++ kdeconnect-0.7.3/po/de/kdeconnect-cli.po 2014-10-11 17:20:28.000000000 +0000 @@ -0,0 +1,92 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Frederik Schwarzer , 2014. +# Burkhard Lück , 2014. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-09-28 08:07+0000\n" +"PO-Revision-Date: 2014-10-06 14:25+0200\n" +"Last-Translator: Burkhard Lück \n" +"Language-Team: German \n" +"Language: de\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 1.5\n" + +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Burkhard Lück" + +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "lueck@hube-lueck.de" + +#: kdeconnect-cli.cpp:34 +msgid "KDE Connect CLI tool" +msgstr "KDE-Connect-Dienstprogramm für die Befehlszeile" + +#: kdeconnect-cli.cpp:35 +msgid "(C) 2013 Aleix Pol Gonzalez" +msgstr "(C) 2013 Aleix Pol Gonzalez" + +#: kdeconnect-cli.cpp:36 +msgid "Aleix Pol Gonzalez" +msgstr "Aleix Pol Gonzalez" + +#: kdeconnect-cli.cpp:37 +msgid "Albert Vaca Cintora" +msgstr "Albert Vaca Cintora" + +#: kdeconnect-cli.cpp:41 +msgid "List all devices." +msgstr "Listet alle Geräte" + +#: kdeconnect-cli.cpp:42 +msgid "Search for devices in the network and re-establish connections." +msgstr "Nach Geräten im Netzwerk suchen und Verbindungen wiederherstellen." + +#: kdeconnect-cli.cpp:43 +msgid "Request pairing to a said device." +msgstr "Verbindung für ein genanntes Gerät anfordern." + +#: kdeconnect-cli.cpp:44 +msgid "Stop pairing to a said device." +msgstr "Verbindung für ein genanntes Gerät trennen." + +#: kdeconnect-cli.cpp:45 +msgid "Send a ping to said device." +msgstr "Ping an ein genanntes Gerät senden." + +#: kdeconnect-cli.cpp:46 +msgid "Same as ping but you can customize the shown message." +msgstr "Wie beim Ping, aber Sie können die angezeigte Nachricht anpassen." + +#: kdeconnect-cli.cpp:47 +msgid "Share a file to a said device." +msgstr "Eine Datei für ein genanntes Gerät freigeben." + +#: kdeconnect-cli.cpp:48 +msgid "Display the notifications on a said device." +msgstr "Benachrichtigungen auf einem genannten Gerät anzeigen." + +#: kdeconnect-cli.cpp:49 +msgid "Device ID." +msgstr "Geräte-Kennung" + +#: kdeconnect-cli.cpp:79 +msgid "No device specified" +msgstr "Kein Gerät angegeben" + +#: kdeconnect-cli.cpp:91 +#, kde-format +msgid "Couldn't share %1" +msgstr "%1 kann nicht freigegeben werden" + +#: kdeconnect-cli.cpp:124 +msgid "Nothing to be done with the device" +msgstr "Für dieses Gerät gibt es nichts zu tun" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/de/kdeconnect-core.po kdeconnect-0.7.3/po/de/kdeconnect-core.po --- kdeconnect-0.7.1/po/de/kdeconnect-core.po 1970-01-01 00:00:00.000000000 +0000 +++ kdeconnect-0.7.3/po/de/kdeconnect-core.po 2014-10-11 17:20:28.000000000 +0000 @@ -0,0 +1,91 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Frederik Schwarzer , 2014. +# Burkhard Lück , 2014. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-07-16 02:16+0000\n" +"PO-Revision-Date: 2014-09-10 14:11+0200\n" +"Last-Translator: Burkhard Lück \n" +"Language-Team: German \n" +"Language: de\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 1.5\n" + +#: device.cpp:186 +msgid "Already paired" +msgstr "Bereits verbunden" + +#: device.cpp:189 +msgid "Pairing already requested for this device" +msgstr "Die Verbindung für dieses Gerät wurde bereits angefragt" + +#: device.cpp:193 +msgid "Device not reachable" +msgstr "Das Gerät ist nicht erreichbar" + +#: device.cpp:206 +msgid "Error contacting device" +msgstr "Fehler beim Verbinden mit dem Gerät" + +#: device.cpp:244 +msgid "Timed out" +msgstr "Zeitüberschreitung" + +#: device.cpp:343 device.cpp:395 +msgid "Canceled by other peer" +msgstr "Abbruch durch Gegenstelle" + +#: device.cpp:359 +msgid "Received incorrect key" +msgstr "Falschen Schlüssel erhalten" + +#: device.cpp:376 +#, kde-format +msgid "Pairing request from %1" +msgstr "Verbindungsanfrage von %1 " + +#: device.cpp:377 +msgid "Accept" +msgstr "Annehmen" + +#: device.cpp:377 +msgid "Reject" +msgstr "Ablehnen" + +#: device.cpp:437 +msgid "Canceled by the user" +msgstr "Vom Benutzer abgebrochen" + +#: filetransferjob.cpp:41 +msgctxt "Device name that will appear on the jobs" +msgid "KDE-Connect" +msgstr "KDE-Connect" + +#: filetransferjob.cpp:60 filetransferjob.cpp:121 +msgid "Receiving file over KDE-Connect" +msgstr "Datei wird über KDE-Connect empfangen" + +#: filetransferjob.cpp:61 filetransferjob.cpp:122 +msgctxt "File transfer origin" +msgid "From" +msgstr "Von" + +#: filetransferjob.cpp:68 +msgid "Incoming file exists" +msgstr "Eingehende Datei existiert bereits" + +#: filetransferjob.cpp:124 +msgctxt "File transfer destination" +msgid "To" +msgstr "Nach" + +#: filetransferjob.cpp:197 +msgid "Received incomplete file" +msgstr "Unvollständige Datei erhalten" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/de/kdeconnect-filetiemaction.po kdeconnect-0.7.3/po/de/kdeconnect-filetiemaction.po --- kdeconnect-0.7.1/po/de/kdeconnect-filetiemaction.po 1970-01-01 00:00:00.000000000 +0000 +++ kdeconnect-0.7.3/po/de/kdeconnect-filetiemaction.po 2014-10-11 17:20:28.000000000 +0000 @@ -0,0 +1,28 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Frederik Schwarzer , 2014. +# Burkhard Lück , 2014. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-06-28 01:55+0000\n" +"PO-Revision-Date: 2014-09-10 14:12+0200\n" +"Last-Translator: Burkhard Lück \n" +"Language-Team: German \n" +"Language: de\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 1.5\n" + +#: sendfileitemaction.cpp:67 +msgid "Send via KDE Connect" +msgstr "Mit KDE-Connect versenden" + +#: sendfileitemaction.cpp:74 +#, kde-format +msgid "Send to '%1' via KDE Connect" +msgstr "„%1“ mit KDE-Connect versenden" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/de/kdeconnect-kcm.po kdeconnect-0.7.3/po/de/kdeconnect-kcm.po --- kdeconnect-0.7.1/po/de/kdeconnect-kcm.po 2014-06-29 16:05:26.000000000 +0000 +++ kdeconnect-0.7.3/po/de/kdeconnect-kcm.po 2014-10-11 17:20:28.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-15 02:00+0000\n" -"PO-Revision-Date: 2014-02-15 10:36+0100\n" +"POT-Creation-Date: 2014-08-12 02:06+0000\n" +"PO-Revision-Date: 2014-09-10 14:12+0200\n" "Last-Translator: Burkhard Lück \n" "Language-Team: German \n" "Language: de\n" @@ -17,44 +17,49 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: kcm.cpp:144 kcm.cpp:228 +#: kcm.cpp:152 kcm.cpp:236 msgid "(paired)" msgstr "(Verbunden)" -#: kcm.cpp:144 kcm.cpp:200 kcm.cpp:211 +#: kcm.cpp:152 kcm.cpp:208 kcm.cpp:219 msgid "(unpaired)" msgstr "(Nicht verbunden)" -#: kcm.cpp:158 +#: kcm.cpp:166 msgid "Plugins" msgstr "Module" -#: kcm.cpp:213 +#: kcm.cpp:221 #, kde-format msgid "Error trying to pair: %1" msgstr "Fehler bei der Verbindung mit: %1" +#. i18n: ectx: property (text), widget (QPushButton, refresh_button) +#: kcm.ui:41 +msgid "Refresh" +msgstr "Aktualisieren" + #. i18n: ectx: property (text), widget (QLabel, name_label) -#: kcm.ui:84 +#: kcm.ui:88 msgid "Device" msgstr "Gerät" #. i18n: ectx: property (text), widget (QLabel, status_label) -#: kcm.ui:97 +#: kcm.ui:101 msgid "(status)" msgstr "(Status)" #. i18n: ectx: property (text), widget (QPushButton, pair_button) -#: kcm.ui:142 +#: kcm.ui:146 msgid "Request pair" msgstr "Verbindung anfragen" #. i18n: ectx: property (text), widget (QPushButton, unpair_button) -#: kcm.ui:155 +#: kcm.ui:159 msgid "Unpair" msgstr "Verbindung trennen" #. i18n: ectx: property (text), widget (QPushButton, ping_button) -#: kcm.ui:168 +#: kcm.ui:172 msgid "Send ping" msgstr "Ping senden" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/de/kdeconnect-kded.po kdeconnect-0.7.3/po/de/kdeconnect-kded.po --- kdeconnect-0.7.1/po/de/kdeconnect-kded.po 2014-06-29 16:05:26.000000000 +0000 +++ kdeconnect-0.7.3/po/de/kdeconnect-kded.po 2014-10-11 17:20:28.000000000 +0000 @@ -2,13 +2,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Burkhard Lück , 2013, 2014. +# Frederik Schwarzer , 2014. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-06-18 01:56+0000\n" -"PO-Revision-Date: 2014-03-04 07:25+0100\n" -"Last-Translator: Burkhard Lück \n" +"PO-Revision-Date: 2014-07-18 22:34+0200\n" +"Last-Translator: Frederik Schwarzer \n" "Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" @@ -30,10 +31,8 @@ msgstr "KdeConnect" #: kdeconnectd.cpp:65 -#, fuzzy -#| msgid "connect devices" msgid "Connect your devices and KDE" -msgstr "Geräte verbinden" +msgstr "Verbinden Sie Ihre Geräte mit KDE" diff -Nru kdeconnect-0.7.1/po/de/kdeconnect-kio.po kdeconnect-0.7.3/po/de/kdeconnect-kio.po --- kdeconnect-0.7.1/po/de/kdeconnect-kio.po 2014-06-29 16:05:26.000000000 +0000 +++ kdeconnect-0.7.3/po/de/kdeconnect-kio.po 2014-10-11 17:20:28.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-15 01:46+0000\n" +"POT-Creation-Date: 2014-10-11 01:54+0000\n" "PO-Revision-Date: 2014-02-15 10:51+0100\n" "Last-Translator: Burkhard Lück \n" "Language-Team: German \n" @@ -33,22 +33,14 @@ msgid "Listing devices..." msgstr "Geräte werden aufgelistet ..." -#: kiokdeconnect.cpp:130 +#: kiokdeconnect.cpp:131 msgid "Accessing device..." msgstr "Zugriff auf Geräte ..." -#: kiokdeconnect.cpp:145 +#: kiokdeconnect.cpp:144 msgid "Could not mount device filesystem" msgstr "Dateisystem des Geräts kann nicht eingebunden werden" -#: kiokdeconnect.cpp:160 -msgid "Camera pictures" -msgstr "Kamerabilder" - -#: kiokdeconnect.cpp:169 -msgid "All files" -msgstr "Alle Dateien" - -#: kiokdeconnect.cpp:194 +#: kiokdeconnect.cpp:189 msgid "Could not contact background service." msgstr "Keine Verbindung zum Hintergrund-Dienst." \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/de/kdeconnect-plugins.po kdeconnect-0.7.3/po/de/kdeconnect-plugins.po --- kdeconnect-0.7.1/po/de/kdeconnect-plugins.po 1970-01-01 00:00:00.000000000 +0000 +++ kdeconnect-0.7.3/po/de/kdeconnect-plugins.po 2014-10-11 17:20:28.000000000 +0000 @@ -0,0 +1,173 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Frederik Schwarzer , 2014. +# Burkhard Lück , 2014. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-10-11 01:54+0000\n" +"PO-Revision-Date: 2014-10-03 22:39+0200\n" +"Last-Translator: Burkhard Lück \n" +"Language-Team: German \n" +"Language: de\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 1.5\n" + +#: battery/batteryplugin.cpp:77 +#, kde-format +msgctxt "device name: low battery" +msgid "%1: low battery" +msgstr "%1: Niedriger Ladestand" + +#: battery/batteryplugin.cpp:78 +#, kde-format +msgid "Battery at %1%" +msgstr "Akku bei %1 %" + +#. i18n: ectx: property (windowTitle), widget (QWidget, PauseMusicConfigUi) +#: pausemusic/pausemusic_config.ui:17 +msgid "Pause music plugin" +msgstr "Modul für das Anhalten der Musikwiedergabe" + +#. i18n: ectx: property (title), widget (QGroupBox, groupBox) +#: pausemusic/pausemusic_config.ui:32 +msgid "Condition" +msgstr "Bedingung" + +#. i18n: ectx: property (text), widget (QRadioButton, rad_ringing) +#: pausemusic/pausemusic_config.ui:38 +msgid "Pause as soon as phone rings" +msgstr "So schnell wie möglich anhalten" + +#. i18n: ectx: property (text), widget (QRadioButton, rad_talking) +#: pausemusic/pausemusic_config.ui:45 +msgid "Pause only while talking" +msgstr "Anhalten nur beim Sprechen" + +#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2) +#: pausemusic/pausemusic_config.ui:61 +msgid "Actions" +msgstr "Aktionen" + +#. i18n: ectx: property (text), widget (QCheckBox, check_pause) +#: pausemusic/pausemusic_config.ui:67 +msgid "Pause media players" +msgstr "Medienspieler anhalten" + +#. i18n: ectx: property (text), widget (QCheckBox, check_mute) +#: pausemusic/pausemusic_config.ui:74 +msgid "Mute system sound" +msgstr "Sound stummschalten" + +#: ping/pingplugin.cpp:51 +msgid "Ping!" +msgstr "Ping!" + +#: sftp/mounter.cpp:176 +msgid "Failed to start sshfs" +msgstr "Start von SSHFS ist fehlgeschlagen" + +#: sftp/mounter.cpp:198 +msgid "Error when accessing to filesystem" +msgstr "Fehler beim Zugriff auf das Dateisystem" + +#: sftp/mounter.cpp:209 +msgid "Failed to mount filesystem: device not responding" +msgstr "Fehler beim Einbinden des Dateisystems: Das Gerät antwortet nicht" + +#. i18n: ectx: property (windowTitle), widget (QWidget, ShareConfigUi) +#. i18n: ectx: property (windowTitle), widget (QWidget, SftpConfigUi) +#: sftp/sftp_config.ui:17 share/share_config.ui:17 +msgid "Share plugin settings" +msgstr "Modul-Einstellungen für Veröffentlichung" + +#. i18n: ectx: property (title), widget (QGroupBox, error) +#: sftp/sftp_config.ui:23 +msgid "Error" +msgstr "Fehler" + +#. i18n: ectx: property (text), widget (QLabel, label) +#: sftp/sftp_config.ui:45 +msgid "sshfs not found in PATH" +msgstr "SSHFS wurde im Pfad nicht gefunden" + +#. i18n: ectx: property (text), widget (QCheckBox, idle) +#: sftp/sftp_config.ui:86 +msgid "Disconnect when idle" +msgstr "Verbindung bei Inaktivität trennen" + +#. i18n: ectx: property (text), widget (QLabel, label_2) +#: sftp/sftp_config.ui:115 +msgid "Timeout:" +msgstr "Zeitüberschreitung:" + +#. i18n: ectx: property (suffix), widget (QSpinBox, timeout) +#: sftp/sftp_config.ui:131 +msgid " min" +msgstr " min" + +#: sftp/sftpplugin.cpp:159 +msgid "All files" +msgstr "" + +#: sftp/sftpplugin.cpp:160 +msgid "Camera pictures" +msgstr "" + +#: sftp/sftpplugin.cpp:207 +#, kde-format +msgid "Device %1" +msgstr "Gerät %1" + +#. i18n: ectx: property (title), widget (QGroupBox, groupBox) +#: share/share_config.ui:23 +msgid "Receiving" +msgstr "Empfang" + +#. i18n: ectx: property (text), widget (QLabel, label) +#: share/share_config.ui:31 +msgid "Save files in:" +msgstr "Dateien speichern unter:" + +#. i18n: ectx: property (text), widget (QLabel, label_2) +#: share/share_config.ui:53 +#, no-c-format, kde-format +msgid "%1 in the path will be replaced with the specific device name." +msgstr "%1 im Pfad wird durch den angegebenen Gerätenamen ersetzt." + +#: share/shareplugin.cpp:135 +msgid "Transfer finished" +msgstr "Übertragung abgeschlossen" + +#: share/shareplugin.cpp:137 +msgid "Open destination folder" +msgstr "Zielordner öffnen" + +#: telephony/telephonyplugin.cpp:41 +msgid "unknown number" +msgstr "Unbekannte Nummer" + +#: telephony/telephonyplugin.cpp:50 +#, kde-format +msgid "Incoming call from %1" +msgstr "Eingehender Anruf von %1" + +#: telephony/telephonyplugin.cpp:54 +#, kde-format +msgid "Missed call from %1" +msgstr "Verpasster Anruf von %1" + +#: telephony/telephonyplugin.cpp:59 +#, kde-format +msgid "SMS from %1: %2" +msgstr "SMS von %1: %2" + +#: telephony/telephonyplugin.cpp:68 +#, kde-format +msgid "Unknown telephony event: %2" +msgstr "Unbekanntes Telefon-Ereignis: %2" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/es/kdeconnect-cli.po kdeconnect-0.7.3/po/es/kdeconnect-cli.po --- kdeconnect-0.7.1/po/es/kdeconnect-cli.po 1970-01-01 00:00:00.000000000 +0000 +++ kdeconnect-0.7.3/po/es/kdeconnect-cli.po 2014-10-11 17:21:55.000000000 +0000 @@ -0,0 +1,105 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Victor Rodrigo Cordoba , 2014. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-09-28 08:07+0000\n" +"PO-Revision-Date: 2014-07-05 17:24+0200\n" +"Last-Translator: Victor Rodrigo Cordoba \n" +"Language-Team: Spanish \n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 1.5\n" + +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Víctor Rodrigo Córdoba" + +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "vrcordoba@gmail.com" + +#: kdeconnect-cli.cpp:34 +msgid "KDE Connect CLI tool" +msgstr "Herramienta de línea de comandos para KDE Connect" + +#: kdeconnect-cli.cpp:35 +msgid "(C) 2013 Aleix Pol Gonzalez" +msgstr "«©» 2013 Aleix Pol Gonzalez" + +#: kdeconnect-cli.cpp:36 +msgid "Aleix Pol Gonzalez" +msgstr "Aleix Pol Gonzalez" + +#: kdeconnect-cli.cpp:37 +msgid "Albert Vaca Cintora" +msgstr "" + +#: kdeconnect-cli.cpp:41 +#, fuzzy +#| msgid "List all devices" +msgid "List all devices." +msgstr "Mostrar todos los dispositivos" + +#: kdeconnect-cli.cpp:42 +msgid "Search for devices in the network and re-establish connections." +msgstr "" + +#: kdeconnect-cli.cpp:43 +#, fuzzy +#| msgid "Request pairing to a said device" +msgid "Request pairing to a said device." +msgstr "Solicitar emparejamiento con un dispositivo dado" + +#: kdeconnect-cli.cpp:44 +#, fuzzy +#| msgid "Stop pairing to a said device" +msgid "Stop pairing to a said device." +msgstr "Parar emparejamiento con un dispositivo dado" + +#: kdeconnect-cli.cpp:45 +#, fuzzy +#| msgid "Sends a ping to said device" +msgid "Send a ping to said device." +msgstr "Envía un ping a un dispositivo dado" + +#: kdeconnect-cli.cpp:46 +msgid "Same as ping but you can customize the shown message." +msgstr "" + +#: kdeconnect-cli.cpp:47 +#, fuzzy +#| msgid "Share a file to a said device" +msgid "Share a file to a said device." +msgstr "Compartir un archivo con un dispositivo dado" + +#: kdeconnect-cli.cpp:48 +#, fuzzy +#| msgid "Display the notifications on a said device" +msgid "Display the notifications on a said device." +msgstr "Mostrar las notificaciones de un dispositivo dado" + +#: kdeconnect-cli.cpp:49 +#, fuzzy +#| msgid "Device ID" +msgid "Device ID." +msgstr "Identificador del dispositivo" + +#: kdeconnect-cli.cpp:79 +msgid "No device specified" +msgstr "No se ha especificado ningún dispositivo" + +#: kdeconnect-cli.cpp:91 +#, kde-format +msgid "Couldn't share %1" +msgstr "No se pudo compartir %1" + +#: kdeconnect-cli.cpp:124 +msgid "Nothing to be done with the device" +msgstr "Nada que hacer con el dispositivo" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/es/kdeconnect-core.po kdeconnect-0.7.3/po/es/kdeconnect-core.po --- kdeconnect-0.7.1/po/es/kdeconnect-core.po 1970-01-01 00:00:00.000000000 +0000 +++ kdeconnect-0.7.3/po/es/kdeconnect-core.po 2014-10-11 17:21:55.000000000 +0000 @@ -0,0 +1,90 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Victor Rodrigo Cordoba , 2014. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-07-16 02:16+0000\n" +"PO-Revision-Date: 2014-06-20 16:28+0200\n" +"Last-Translator: Victor Rodrigo Cordoba \n" +"Language-Team: Spanish \n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 1.5\n" + +#: device.cpp:186 +msgid "Already paired" +msgstr "Ya conectado" + +#: device.cpp:189 +msgid "Pairing already requested for this device" +msgstr "Conexión ya solicitada para este dispositivo" + +#: device.cpp:193 +msgid "Device not reachable" +msgstr "Dispositivo no accesible" + +#: device.cpp:206 +msgid "Error contacting device" +msgstr "Error al contactar con el dispositivo" + +#: device.cpp:244 +msgid "Timed out" +msgstr "Se alcanzó el tiempo máximo de espera" + +#: device.cpp:343 device.cpp:395 +msgid "Canceled by other peer" +msgstr "Cancelado por otro par" + +#: device.cpp:359 +msgid "Received incorrect key" +msgstr "Se recibió una clave incorrecta" + +#: device.cpp:376 +#, kde-format +msgid "Pairing request from %1" +msgstr "Petición de conexión por parte de %1" + +#: device.cpp:377 +msgid "Accept" +msgstr "Aceptar" + +#: device.cpp:377 +msgid "Reject" +msgstr "Rechazar" + +#: device.cpp:437 +msgid "Canceled by the user" +msgstr "Cancelado por el usuario" + +#: filetransferjob.cpp:41 +msgctxt "Device name that will appear on the jobs" +msgid "KDE-Connect" +msgstr "KDE-Connect" + +#: filetransferjob.cpp:60 filetransferjob.cpp:121 +msgid "Receiving file over KDE-Connect" +msgstr "Recibiendo archivo a través de KDE-Connect" + +#: filetransferjob.cpp:61 filetransferjob.cpp:122 +msgctxt "File transfer origin" +msgid "From" +msgstr "Desde" + +#: filetransferjob.cpp:68 +msgid "Incoming file exists" +msgstr "El archivo entrante ya existe" + +#: filetransferjob.cpp:124 +msgctxt "File transfer destination" +msgid "To" +msgstr "Hacia" + +#: filetransferjob.cpp:197 +msgid "Received incomplete file" +msgstr "Se recibió un archivo incompleto" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/es/kdeconnect-filetiemaction.po kdeconnect-0.7.3/po/es/kdeconnect-filetiemaction.po --- kdeconnect-0.7.1/po/es/kdeconnect-filetiemaction.po 1970-01-01 00:00:00.000000000 +0000 +++ kdeconnect-0.7.3/po/es/kdeconnect-filetiemaction.po 2014-10-11 17:21:55.000000000 +0000 @@ -0,0 +1,27 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Victor Rodrigo Cordoba , 2014. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-06-28 01:55+0000\n" +"PO-Revision-Date: 2014-06-20 16:17+0200\n" +"Last-Translator: Victor Rodrigo Cordoba \n" +"Language-Team: Spanish \n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 1.5\n" + +#: sendfileitemaction.cpp:67 +msgid "Send via KDE Connect" +msgstr "Enviar a través de KDE Connect" + +#: sendfileitemaction.cpp:74 +#, kde-format +msgid "Send to '%1' via KDE Connect" +msgstr "Enviar a «%1» a través de KDE Connect" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/es/kdeconnect-kcm.po kdeconnect-0.7.3/po/es/kdeconnect-kcm.po --- kdeconnect-0.7.1/po/es/kdeconnect-kcm.po 2014-06-29 16:06:01.000000000 +0000 +++ kdeconnect-0.7.3/po/es/kdeconnect-kcm.po 2014-10-11 17:21:55.000000000 +0000 @@ -2,13 +2,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Eloy Cuadra , 2013, 2014. +# Victor Rodrigo Cordoba , 2014. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-15 02:00+0000\n" -"PO-Revision-Date: 2014-02-18 15:38+0100\n" -"Last-Translator: Eloy Cuadra \n" +"POT-Creation-Date: 2014-08-12 02:06+0000\n" +"PO-Revision-Date: 2014-08-25 10:30+0200\n" +"Last-Translator: Victor Rodrigo Cordoba \n" "Language-Team: Spanish \n" "Language: es\n" "MIME-Version: 1.0\n" @@ -17,44 +18,49 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: kcm.cpp:144 kcm.cpp:228 +#: kcm.cpp:152 kcm.cpp:236 msgid "(paired)" msgstr "(vinculado)" -#: kcm.cpp:144 kcm.cpp:200 kcm.cpp:211 +#: kcm.cpp:152 kcm.cpp:208 kcm.cpp:219 msgid "(unpaired)" msgstr "(desvinculado)" -#: kcm.cpp:158 +#: kcm.cpp:166 msgid "Plugins" msgstr "Complementos" -#: kcm.cpp:213 +#: kcm.cpp:221 #, kde-format msgid "Error trying to pair: %1" msgstr "Ha ocurrido un error al tratar de vincular: %1" +#. i18n: ectx: property (text), widget (QPushButton, refresh_button) +#: kcm.ui:41 +msgid "Refresh" +msgstr "Actualizar" + #. i18n: ectx: property (text), widget (QLabel, name_label) -#: kcm.ui:84 +#: kcm.ui:88 msgid "Device" msgstr "Dispositivo" #. i18n: ectx: property (text), widget (QLabel, status_label) -#: kcm.ui:97 +#: kcm.ui:101 msgid "(status)" msgstr "(estado)" #. i18n: ectx: property (text), widget (QPushButton, pair_button) -#: kcm.ui:142 +#: kcm.ui:146 msgid "Request pair" msgstr "Solicitar vinculación" #. i18n: ectx: property (text), widget (QPushButton, unpair_button) -#: kcm.ui:155 +#: kcm.ui:159 msgid "Unpair" msgstr "Desvincular" #. i18n: ectx: property (text), widget (QPushButton, ping_button) -#: kcm.ui:168 +#: kcm.ui:172 msgid "Send ping" msgstr "Enviar ping" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/es/kdeconnect-kio.po kdeconnect-0.7.3/po/es/kdeconnect-kio.po --- kdeconnect-0.7.1/po/es/kdeconnect-kio.po 2014-06-29 16:06:01.000000000 +0000 +++ kdeconnect-0.7.3/po/es/kdeconnect-kio.po 2014-10-11 17:21:55.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-15 01:46+0000\n" +"POT-Creation-Date: 2014-10-11 01:54+0000\n" "PO-Revision-Date: 2014-02-18 15:48+0100\n" "Last-Translator: Eloy Cuadra \n" "Language-Team: Spanish \n" @@ -33,22 +33,14 @@ msgid "Listing devices..." msgstr "Listando dispositivos..." -#: kiokdeconnect.cpp:130 +#: kiokdeconnect.cpp:131 msgid "Accessing device..." msgstr "Accediendo al dispositivo..." -#: kiokdeconnect.cpp:145 +#: kiokdeconnect.cpp:144 msgid "Could not mount device filesystem" msgstr "No se ha podido montar el sistema de archivos del dispositivo" -#: kiokdeconnect.cpp:160 -msgid "Camera pictures" -msgstr "Imágenes de la cámara" - -#: kiokdeconnect.cpp:169 -msgid "All files" -msgstr "Todos los archivos" - -#: kiokdeconnect.cpp:194 +#: kiokdeconnect.cpp:189 msgid "Could not contact background service." msgstr "No se ha podido contactar con el servicio en segundo plano." \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/es/kdeconnect-plugins.po kdeconnect-0.7.3/po/es/kdeconnect-plugins.po --- kdeconnect-0.7.1/po/es/kdeconnect-plugins.po 1970-01-01 00:00:00.000000000 +0000 +++ kdeconnect-0.7.3/po/es/kdeconnect-plugins.po 2014-10-11 17:21:55.000000000 +0000 @@ -0,0 +1,173 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Victor Rodrigo Cordoba , 2014. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-10-11 01:54+0000\n" +"PO-Revision-Date: 2014-09-26 20:11+0200\n" +"Last-Translator: Victor Rodrigo Cordoba \n" +"Language-Team: Spanish \n" +"Language: es\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 1.5\n" + +#: battery/batteryplugin.cpp:77 +#, kde-format +msgctxt "device name: low battery" +msgid "%1: low battery" +msgstr "%1: batería baja" + +#: battery/batteryplugin.cpp:78 +#, kde-format +msgid "Battery at %1%" +msgstr "Batería al %1%" + +#. i18n: ectx: property (windowTitle), widget (QWidget, PauseMusicConfigUi) +#: pausemusic/pausemusic_config.ui:17 +msgid "Pause music plugin" +msgstr "Pausar complemento musical" + +#. i18n: ectx: property (title), widget (QGroupBox, groupBox) +#: pausemusic/pausemusic_config.ui:32 +msgid "Condition" +msgstr "Condición" + +#. i18n: ectx: property (text), widget (QRadioButton, rad_ringing) +#: pausemusic/pausemusic_config.ui:38 +msgid "Pause as soon as phone rings" +msgstr "Pausar cuando el teléfono suene" + +#. i18n: ectx: property (text), widget (QRadioButton, rad_talking) +#: pausemusic/pausemusic_config.ui:45 +msgid "Pause only while talking" +msgstr "Pausar solo mientras se habla" + +#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2) +#: pausemusic/pausemusic_config.ui:61 +msgid "Actions" +msgstr "Acciones" + +#. i18n: ectx: property (text), widget (QCheckBox, check_pause) +#: pausemusic/pausemusic_config.ui:67 +msgid "Pause media players" +msgstr "Pausar reproductores de medios" + +#. i18n: ectx: property (text), widget (QCheckBox, check_mute) +#: pausemusic/pausemusic_config.ui:74 +msgid "Mute system sound" +msgstr "Silenciar el sonido del sistema" + +#: ping/pingplugin.cpp:51 +msgid "Ping!" +msgstr "¡Ping!" + +#: sftp/mounter.cpp:176 +msgid "Failed to start sshfs" +msgstr "Fallo al iniciar sshfs" + +#: sftp/mounter.cpp:198 +msgid "Error when accessing to filesystem" +msgstr "Error al acceder al sistema de archivos" + +#: sftp/mounter.cpp:209 +msgid "Failed to mount filesystem: device not responding" +msgstr "Fallo al montar el sistema de archivos: el dispositivo no responde" + +#. i18n: ectx: property (windowTitle), widget (QWidget, ShareConfigUi) +#. i18n: ectx: property (windowTitle), widget (QWidget, SftpConfigUi) +#: sftp/sftp_config.ui:17 share/share_config.ui:17 +msgid "Share plugin settings" +msgstr "Preferencias del complemento de compartición" + +#. i18n: ectx: property (title), widget (QGroupBox, error) +#: sftp/sftp_config.ui:23 +msgid "Error" +msgstr "Error" + +#. i18n: ectx: property (text), widget (QLabel, label) +#: sftp/sftp_config.ui:45 +msgid "sshfs not found in PATH" +msgstr "sshfs no encontrado en PATH" + +#. i18n: ectx: property (text), widget (QCheckBox, idle) +#: sftp/sftp_config.ui:86 +msgid "Disconnect when idle" +msgstr "Desconectar cuando se encuentre inactivo" + +#. i18n: ectx: property (text), widget (QLabel, label_2) +#: sftp/sftp_config.ui:115 +msgid "Timeout:" +msgstr "Tiempo de espera:" + +#. i18n: ectx: property (suffix), widget (QSpinBox, timeout) +#: sftp/sftp_config.ui:131 +msgid " min" +msgstr " minutos" + +#: sftp/sftpplugin.cpp:159 +msgid "All files" +msgstr "" + +#: sftp/sftpplugin.cpp:160 +msgid "Camera pictures" +msgstr "" + +#: sftp/sftpplugin.cpp:207 +#, kde-format +msgid "Device %1" +msgstr "Dispositivo %1" + +#. i18n: ectx: property (title), widget (QGroupBox, groupBox) +#: share/share_config.ui:23 +msgid "Receiving" +msgstr "Recibiendo" + +#. i18n: ectx: property (text), widget (QLabel, label) +#: share/share_config.ui:31 +msgid "Save files in:" +msgstr "Guardar archivos en:" + +#. i18n: ectx: property (text), widget (QLabel, label_2) +#: share/share_config.ui:53 +#, no-c-format, kde-format +msgid "%1 in the path will be replaced with the specific device name." +msgstr "" +"%1 será remplazado en la ruta por el nombre específico del dispositivo." + +#: share/shareplugin.cpp:135 +msgid "Transfer finished" +msgstr "Transferencia finalizada" + +#: share/shareplugin.cpp:137 +msgid "Open destination folder" +msgstr "Abrir carpeta destino" + +#: telephony/telephonyplugin.cpp:41 +msgid "unknown number" +msgstr "número desconocido" + +#: telephony/telephonyplugin.cpp:50 +#, kde-format +msgid "Incoming call from %1" +msgstr "Llamada entrante desde %1" + +#: telephony/telephonyplugin.cpp:54 +#, kde-format +msgid "Missed call from %1" +msgstr "Llamada perdida de %1" + +#: telephony/telephonyplugin.cpp:59 +#, kde-format +msgid "SMS from %1: %2" +msgstr "SMS de %1: %2" + +#: telephony/telephonyplugin.cpp:68 +#, kde-format +msgid "Unknown telephony event: %2" +msgstr "Evento de telefonía desconocido: %2" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/fr/kdeconnect-cli.po kdeconnect-0.7.3/po/fr/kdeconnect-cli.po --- kdeconnect-0.7.1/po/fr/kdeconnect-cli.po 1970-01-01 00:00:00.000000000 +0000 +++ kdeconnect-0.7.3/po/fr/kdeconnect-cli.po 2014-10-11 17:23:29.000000000 +0000 @@ -0,0 +1,108 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# Sebastien Renard , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-09-28 08:07+0000\n" +"PO-Revision-Date: 2014-09-21 18:01+0200\n" +"Last-Translator: Sebastien Renard \n" +"Language-Team: French \n" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: Lokalize 1.5\n" +"X-Environment: kde\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" + +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Sébastien Renard" + +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "renard@kde.org" + +#: kdeconnect-cli.cpp:34 +msgid "KDE Connect CLI tool" +msgstr "Outil ligne de commande de KDE Connect" + +#: kdeconnect-cli.cpp:35 +msgid "(C) 2013 Aleix Pol Gonzalez" +msgstr "(C) 2013 Aleix Pol Gonzalez" + +#: kdeconnect-cli.cpp:36 +msgid "Aleix Pol Gonzalez" +msgstr "Aleix Pol Gonzalez" + +#: kdeconnect-cli.cpp:37 +msgid "Albert Vaca Cintora" +msgstr "" + +#: kdeconnect-cli.cpp:41 +#, fuzzy +#| msgid "List all devices" +msgid "List all devices." +msgstr "Afficher tous les périphériques" + +#: kdeconnect-cli.cpp:42 +msgid "Search for devices in the network and re-establish connections." +msgstr "" + +#: kdeconnect-cli.cpp:43 +#, fuzzy +#| msgid "Request pairing to a said device" +msgid "Request pairing to a said device." +msgstr "Demander l'appariement avec le périphérique indiqué" + +#: kdeconnect-cli.cpp:44 +#, fuzzy +#| msgid "Stop pairing to a said device" +msgid "Stop pairing to a said device." +msgstr "Cesser l'appariement avec le périphérique indiqué" + +#: kdeconnect-cli.cpp:45 +#, fuzzy +#| msgid "Sends a ping to said device" +msgid "Send a ping to said device." +msgstr "Envoi un ping au périphérique indiqué" + +#: kdeconnect-cli.cpp:46 +msgid "Same as ping but you can customize the shown message." +msgstr "" + +#: kdeconnect-cli.cpp:47 +#, fuzzy +#| msgid "Share a file to a said device" +msgid "Share a file to a said device." +msgstr "Partager un fichier avec le périphérique indiqué" + +#: kdeconnect-cli.cpp:48 +#, fuzzy +#| msgid "Display the notifications on a said device" +msgid "Display the notifications on a said device." +msgstr "Afficher toutes les notifications sur le périphérique indiqué" + +#: kdeconnect-cli.cpp:49 +#, fuzzy +#| msgid "Device ID" +msgid "Device ID." +msgstr "N° de périphérique" + +#: kdeconnect-cli.cpp:79 +msgid "No device specified" +msgstr "Aucun périphérique indiqué" + +#: kdeconnect-cli.cpp:91 +#, kde-format +msgid "Couldn't share %1" +msgstr "Impossible de partager %1" + +#: kdeconnect-cli.cpp:124 +msgid "Nothing to be done with the device" +msgstr "Aucune action à effectuer avec ce périphérique" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/fr/kdeconnect-kcm.po kdeconnect-0.7.3/po/fr/kdeconnect-kcm.po --- kdeconnect-0.7.1/po/fr/kdeconnect-kcm.po 2014-06-29 16:07:01.000000000 +0000 +++ kdeconnect-0.7.3/po/fr/kdeconnect-kcm.po 2014-10-11 17:23:29.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-15 02:00+0000\n" +"POT-Creation-Date: 2014-08-12 02:06+0000\n" "PO-Revision-Date: 2014-02-17 11:20+0100\n" "Last-Translator: Nicolas Ménard \n" "Language-Team: French \n" @@ -21,44 +21,49 @@ "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: kcm.cpp:144 kcm.cpp:228 +#: kcm.cpp:152 kcm.cpp:236 msgid "(paired)" msgstr "(apparié)" -#: kcm.cpp:144 kcm.cpp:200 kcm.cpp:211 +#: kcm.cpp:152 kcm.cpp:208 kcm.cpp:219 msgid "(unpaired)" msgstr "(non apparié)" -#: kcm.cpp:158 +#: kcm.cpp:166 msgid "Plugins" msgstr "Modules externes" -#: kcm.cpp:213 +#: kcm.cpp:221 #, kde-format msgid "Error trying to pair: %1" msgstr "Erreur lors de la tentative d'appariement : %1" +#. i18n: ectx: property (text), widget (QPushButton, refresh_button) +#: kcm.ui:41 +msgid "Refresh" +msgstr "" + #. i18n: ectx: property (text), widget (QLabel, name_label) -#: kcm.ui:84 +#: kcm.ui:88 msgid "Device" msgstr "Périphérique" #. i18n: ectx: property (text), widget (QLabel, status_label) -#: kcm.ui:97 +#: kcm.ui:101 msgid "(status)" msgstr "(état)" #. i18n: ectx: property (text), widget (QPushButton, pair_button) -#: kcm.ui:142 +#: kcm.ui:146 msgid "Request pair" msgstr "Demander un appariement" #. i18n: ectx: property (text), widget (QPushButton, unpair_button) -#: kcm.ui:155 +#: kcm.ui:159 msgid "Unpair" msgstr "Désapparier" #. i18n: ectx: property (text), widget (QPushButton, ping_button) -#: kcm.ui:168 +#: kcm.ui:172 msgid "Send ping" msgstr "Envoyer une commande « ping »" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/fr/kdeconnect-kio.po kdeconnect-0.7.3/po/fr/kdeconnect-kio.po --- kdeconnect-0.7.1/po/fr/kdeconnect-kio.po 2014-06-29 16:07:01.000000000 +0000 +++ kdeconnect-0.7.3/po/fr/kdeconnect-kio.po 2014-10-11 17:23:29.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-15 01:46+0000\n" +"POT-Creation-Date: 2014-10-11 01:54+0000\n" "PO-Revision-Date: 2014-02-24 14:13+0100\n" "Last-Translator: Nicolas Ménard \n" "Language-Team: French \n" @@ -36,22 +36,14 @@ msgid "Listing devices..." msgstr "Recherche de périphériques..." -#: kiokdeconnect.cpp:130 +#: kiokdeconnect.cpp:131 msgid "Accessing device..." msgstr "Accès au périphérique..." -#: kiokdeconnect.cpp:145 +#: kiokdeconnect.cpp:144 msgid "Could not mount device filesystem" msgstr "Impossible de monter le système de fichiers du périphérique" -#: kiokdeconnect.cpp:160 -msgid "Camera pictures" -msgstr "Photos" - -#: kiokdeconnect.cpp:169 -msgid "All files" -msgstr "Tous les fichiers" - -#: kiokdeconnect.cpp:194 +#: kiokdeconnect.cpp:189 msgid "Could not contact background service." msgstr "Impossible de contacter le service d'arrière plan." \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/fr/kdeconnect-plugins.po kdeconnect-0.7.3/po/fr/kdeconnect-plugins.po --- kdeconnect-0.7.1/po/fr/kdeconnect-plugins.po 1970-01-01 00:00:00.000000000 +0000 +++ kdeconnect-0.7.3/po/fr/kdeconnect-plugins.po 2014-10-11 17:23:29.000000000 +0000 @@ -0,0 +1,176 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# Sebastien Renard , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-10-11 01:54+0000\n" +"PO-Revision-Date: 2014-09-21 18:03+0200\n" +"Last-Translator: Sebastien Renard \n" +"Language-Team: French \n" +"Language: fr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n > 1);\n" +"X-Generator: Lokalize 1.5\n" +"X-Environment: kde\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" + +#: battery/batteryplugin.cpp:77 +#, kde-format +msgctxt "device name: low battery" +msgid "%1: low battery" +msgstr "%1 : batterie faible" + +#: battery/batteryplugin.cpp:78 +#, kde-format +msgid "Battery at %1%" +msgstr "Batterie à %1 %" + +#. i18n: ectx: property (windowTitle), widget (QWidget, PauseMusicConfigUi) +#: pausemusic/pausemusic_config.ui:17 +msgid "Pause music plugin" +msgstr "Module de mise en pause de la musique" + +#. i18n: ectx: property (title), widget (QGroupBox, groupBox) +#: pausemusic/pausemusic_config.ui:32 +msgid "Condition" +msgstr "Condition" + +#. i18n: ectx: property (text), widget (QRadioButton, rad_ringing) +#: pausemusic/pausemusic_config.ui:38 +msgid "Pause as soon as phone rings" +msgstr "Mettre en pause dès que le téléphone sonne" + +#. i18n: ectx: property (text), widget (QRadioButton, rad_talking) +#: pausemusic/pausemusic_config.ui:45 +msgid "Pause only while talking" +msgstr "Mettre en pause seulement en parlant" + +#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2) +#: pausemusic/pausemusic_config.ui:61 +msgid "Actions" +msgstr "Actions" + +#. i18n: ectx: property (text), widget (QCheckBox, check_pause) +#: pausemusic/pausemusic_config.ui:67 +msgid "Pause media players" +msgstr "Lecteurs vidéo" + +#. i18n: ectx: property (text), widget (QCheckBox, check_mute) +#: pausemusic/pausemusic_config.ui:74 +msgid "Mute system sound" +msgstr "Couper/Rétablir le son" + +#: ping/pingplugin.cpp:51 +msgid "Ping!" +msgstr "Ping !" + +#: sftp/mounter.cpp:176 +msgid "Failed to start sshfs" +msgstr "Impossible de démarrer sshfs" + +#: sftp/mounter.cpp:198 +msgid "Error when accessing to filesystem" +msgstr "Erreur lors de l'accès au système de fichiers" + +#: sftp/mounter.cpp:209 +msgid "Failed to mount filesystem: device not responding" +msgstr "" +"Impossible de monter le système de fichiers : le périphérique ne répond pas" + +#. i18n: ectx: property (windowTitle), widget (QWidget, ShareConfigUi) +#. i18n: ectx: property (windowTitle), widget (QWidget, SftpConfigUi) +#: sftp/sftp_config.ui:17 share/share_config.ui:17 +msgid "Share plugin settings" +msgstr "Paramètres du module de partage" + +#. i18n: ectx: property (title), widget (QGroupBox, error) +#: sftp/sftp_config.ui:23 +msgid "Error" +msgstr "Erreur" + +#. i18n: ectx: property (text), widget (QLabel, label) +#: sftp/sftp_config.ui:45 +msgid "sshfs not found in PATH" +msgstr "Impossible de trouver sshfs dans le PATH" + +#. i18n: ectx: property (text), widget (QCheckBox, idle) +#: sftp/sftp_config.ui:86 +msgid "Disconnect when idle" +msgstr "Déconnecter en cas d'inactivité" + +#. i18n: ectx: property (text), widget (QLabel, label_2) +#: sftp/sftp_config.ui:115 +msgid "Timeout:" +msgstr "Délai :" + +#. i18n: ectx: property (suffix), widget (QSpinBox, timeout) +#: sftp/sftp_config.ui:131 +msgid " min" +msgstr " min" + +#: sftp/sftpplugin.cpp:159 +msgid "All files" +msgstr "" + +#: sftp/sftpplugin.cpp:160 +msgid "Camera pictures" +msgstr "" + +#: sftp/sftpplugin.cpp:207 +#, kde-format +msgid "Device %1" +msgstr "Périphérique %1" + +#. i18n: ectx: property (title), widget (QGroupBox, groupBox) +#: share/share_config.ui:23 +msgid "Receiving" +msgstr "Réception" + +#. i18n: ectx: property (text), widget (QLabel, label) +#: share/share_config.ui:31 +msgid "Save files in:" +msgstr "Enregistrer les fichiers dans :" + +#. i18n: ectx: property (text), widget (QLabel, label_2) +#: share/share_config.ui:53 +#, no-c-format, kde-format +msgid "%1 in the path will be replaced with the specific device name." +msgstr "%1 dans l'emplacement sera remplacé par le nom du périphérique" + +#: share/shareplugin.cpp:135 +msgid "Transfer finished" +msgstr "Transfert terminé" + +#: share/shareplugin.cpp:137 +msgid "Open destination folder" +msgstr "Ouvrir le dossier de destination" + +#: telephony/telephonyplugin.cpp:41 +msgid "unknown number" +msgstr "nombre inconnu" + +#: telephony/telephonyplugin.cpp:50 +#, kde-format +msgid "Incoming call from %1" +msgstr "Appel entrant provenant de %1" + +#: telephony/telephonyplugin.cpp:54 +#, kde-format +msgid "Missed call from %1" +msgstr "Appel manqué provenant de %1" + +#: telephony/telephonyplugin.cpp:59 +#, kde-format +msgid "SMS from %1: %2" +msgstr "SMS provenant de %1 : %2" + +#: telephony/telephonyplugin.cpp:68 +#, kde-format +msgid "Unknown telephony event: %2" +msgstr "Évènement de téléphonie inconnu : %2" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/hu/kdeconnect-kcm.po kdeconnect-0.7.3/po/hu/kdeconnect-kcm.po --- kdeconnect-0.7.1/po/hu/kdeconnect-kcm.po 2014-06-29 16:08:45.000000000 +0000 +++ kdeconnect-0.7.3/po/hu/kdeconnect-kcm.po 2014-10-11 17:26:36.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-15 02:00+0000\n" +"POT-Creation-Date: 2014-08-12 02:06+0000\n" "PO-Revision-Date: 2014-02-16 18:49+0100\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" @@ -17,44 +17,49 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 1.5\n" -#: kcm.cpp:144 kcm.cpp:228 +#: kcm.cpp:152 kcm.cpp:236 msgid "(paired)" msgstr "(párosítva)" -#: kcm.cpp:144 kcm.cpp:200 kcm.cpp:211 +#: kcm.cpp:152 kcm.cpp:208 kcm.cpp:219 msgid "(unpaired)" msgstr "(leválasztva)" -#: kcm.cpp:158 +#: kcm.cpp:166 msgid "Plugins" msgstr "Bővítmények" -#: kcm.cpp:213 +#: kcm.cpp:221 #, kde-format msgid "Error trying to pair: %1" msgstr "Hiba a párosítási kísérletkor: %1" +#. i18n: ectx: property (text), widget (QPushButton, refresh_button) +#: kcm.ui:41 +msgid "Refresh" +msgstr "" + #. i18n: ectx: property (text), widget (QLabel, name_label) -#: kcm.ui:84 +#: kcm.ui:88 msgid "Device" msgstr "Eszköz" #. i18n: ectx: property (text), widget (QLabel, status_label) -#: kcm.ui:97 +#: kcm.ui:101 msgid "(status)" msgstr "(állapot)" #. i18n: ectx: property (text), widget (QPushButton, pair_button) -#: kcm.ui:142 +#: kcm.ui:146 msgid "Request pair" msgstr "Párosítás kérése" #. i18n: ectx: property (text), widget (QPushButton, unpair_button) -#: kcm.ui:155 +#: kcm.ui:159 msgid "Unpair" msgstr "Leválasztás" #. i18n: ectx: property (text), widget (QPushButton, ping_button) -#: kcm.ui:168 +#: kcm.ui:172 msgid "Send ping" msgstr "Ping küldése" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/hu/kdeconnect-kio.po kdeconnect-0.7.3/po/hu/kdeconnect-kio.po --- kdeconnect-0.7.1/po/hu/kdeconnect-kio.po 2014-06-29 16:08:45.000000000 +0000 +++ kdeconnect-0.7.3/po/hu/kdeconnect-kio.po 2014-10-11 17:26:36.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-15 01:46+0000\n" +"POT-Creation-Date: 2014-10-11 01:54+0000\n" "PO-Revision-Date: 2014-02-16 19:46+0100\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" @@ -33,22 +33,14 @@ msgid "Listing devices..." msgstr "Eszközök listázása…" -#: kiokdeconnect.cpp:130 +#: kiokdeconnect.cpp:131 msgid "Accessing device..." msgstr "Hozzáférés az eszközhöz…" -#: kiokdeconnect.cpp:145 +#: kiokdeconnect.cpp:144 msgid "Could not mount device filesystem" msgstr "Nem sikerült csatolni az eszköz fájlrendszerét" -#: kiokdeconnect.cpp:160 -msgid "Camera pictures" -msgstr "Fényképezőgép képek" - -#: kiokdeconnect.cpp:169 -msgid "All files" -msgstr "Minden fájl" - -#: kiokdeconnect.cpp:194 +#: kiokdeconnect.cpp:189 msgid "Could not contact background service." msgstr "Nem sikerült csatlakozni a háttérszolgáltatáshoz." \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/it/kdeconnect-kcm.po kdeconnect-0.7.3/po/it/kdeconnect-kcm.po --- kdeconnect-0.7.1/po/it/kdeconnect-kcm.po 2014-06-29 16:09:05.000000000 +0000 +++ kdeconnect-0.7.3/po/it/kdeconnect-kcm.po 2014-10-11 17:27:27.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: 2014-06-15 02:00+0000\n" +"POT-Creation-Date: 2014-08-12 02:06+0000\n" "PO-Revision-Date: 2013-11-04 12:02+0100\n" "Last-Translator: Mauro Panzeri \n" "Language-Team: Italian \n" @@ -15,46 +15,50 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.5\n" -#: kcm.cpp:144 kcm.cpp:228 +#: kcm.cpp:152 kcm.cpp:236 msgid "(paired)" msgstr "(associato)" -#: kcm.cpp:144 kcm.cpp:200 kcm.cpp:211 +#: kcm.cpp:152 kcm.cpp:208 kcm.cpp:219 msgid "(unpaired)" msgstr "(disassociato)" -#: kcm.cpp:158 +#: kcm.cpp:166 msgid "Plugins" msgstr "Estensioni" -#: kcm.cpp:213 +#: kcm.cpp:221 #, kde-format msgid "Error trying to pair: %1" msgstr "Errore durante l'associazione: %1" +#. i18n: ectx: property (text), widget (QPushButton, refresh_button) +#: kcm.ui:41 +msgid "Refresh" +msgstr "" + #. i18n: ectx: property (text), widget (QLabel, name_label) -#: kcm.ui:84 +#: kcm.ui:88 msgid "Device" msgstr "Dispositivo" #. i18n: ectx: property (text), widget (QLabel, status_label) -#: kcm.ui:97 +#: kcm.ui:101 msgid "(status)" msgstr "(stato)" #. i18n: ectx: property (text), widget (QPushButton, pair_button) -#: kcm.ui:142 +#: kcm.ui:146 msgid "Request pair" msgstr "Richiedi l'associazione" #. i18n: ectx: property (text), widget (QPushButton, unpair_button) -#: kcm.ui:155 +#: kcm.ui:159 msgid "Unpair" msgstr "Disassocia" #. i18n: ectx: property (text), widget (QPushButton, ping_button) -#: kcm.ui:168 +#: kcm.ui:172 msgid "Send ping" msgstr "Invia ping" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/it/kdeconnect-kded.po kdeconnect-0.7.3/po/it/kdeconnect-kded.po --- kdeconnect-0.7.1/po/it/kdeconnect-kded.po 2014-06-29 16:09:05.000000000 +0000 +++ kdeconnect-0.7.3/po/it/kdeconnect-kded.po 2014-10-11 17:27:27.000000000 +0000 @@ -15,7 +15,6 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.5\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" diff -Nru kdeconnect-0.7.1/po/it/plasma_applet_kdeconnect.po kdeconnect-0.7.3/po/it/plasma_applet_kdeconnect.po --- kdeconnect-0.7.1/po/it/plasma_applet_kdeconnect.po 2014-06-29 16:09:05.000000000 +0000 +++ kdeconnect-0.7.3/po/it/plasma_applet_kdeconnect.po 2014-10-11 17:27:27.000000000 +0000 @@ -15,7 +15,6 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.5\n" #: package/contents/ui/Battery.qml:36 msgid "Charging: %1%" diff -Nru kdeconnect-0.7.1/po/ja/kdeconnect-cli.po kdeconnect-0.7.3/po/ja/kdeconnect-cli.po --- kdeconnect-0.7.1/po/ja/kdeconnect-cli.po 1970-01-01 00:00:00.000000000 +0000 +++ kdeconnect-0.7.3/po/ja/kdeconnect-cli.po 2014-10-11 17:27:50.000000000 +0000 @@ -0,0 +1,88 @@ +msgid "" +msgstr "" +"Project-Id-Version: kdeconnect-cli\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-09-28 08:07+0000\n" +"PO-Revision-Date: 2014-07-06 00:29-0700\n" +"Last-Translator: Japanese KDE translation team \n" +"Language-Team: Japanese \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" + +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "" + +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "" + +#: kdeconnect-cli.cpp:34 +msgid "KDE Connect CLI tool" +msgstr "" + +#: kdeconnect-cli.cpp:35 +msgid "(C) 2013 Aleix Pol Gonzalez" +msgstr "" + +#: kdeconnect-cli.cpp:36 +msgid "Aleix Pol Gonzalez" +msgstr "" + +#: kdeconnect-cli.cpp:37 +msgid "Albert Vaca Cintora" +msgstr "" + +#: kdeconnect-cli.cpp:41 +msgid "List all devices." +msgstr "" + +#: kdeconnect-cli.cpp:42 +msgid "Search for devices in the network and re-establish connections." +msgstr "" + +#: kdeconnect-cli.cpp:43 +msgid "Request pairing to a said device." +msgstr "" + +#: kdeconnect-cli.cpp:44 +msgid "Stop pairing to a said device." +msgstr "" + +#: kdeconnect-cli.cpp:45 +msgid "Send a ping to said device." +msgstr "" + +#: kdeconnect-cli.cpp:46 +msgid "Same as ping but you can customize the shown message." +msgstr "" + +#: kdeconnect-cli.cpp:47 +msgid "Share a file to a said device." +msgstr "" + +#: kdeconnect-cli.cpp:48 +msgid "Display the notifications on a said device." +msgstr "" + +#: kdeconnect-cli.cpp:49 +msgid "Device ID." +msgstr "" + +#: kdeconnect-cli.cpp:79 +msgid "No device specified" +msgstr "" + +#: kdeconnect-cli.cpp:91 +#, kde-format +msgid "Couldn't share %1" +msgstr "" + +#: kdeconnect-cli.cpp:124 +msgid "Nothing to be done with the device" +msgstr "" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/ja/kdeconnect-core.po kdeconnect-0.7.3/po/ja/kdeconnect-core.po --- kdeconnect-0.7.1/po/ja/kdeconnect-core.po 1970-01-01 00:00:00.000000000 +0000 +++ kdeconnect-0.7.3/po/ja/kdeconnect-core.po 2014-10-11 17:27:50.000000000 +0000 @@ -0,0 +1,87 @@ +msgid "" +msgstr "" +"Project-Id-Version: kdeconnect-core\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-07-16 02:16+0000\n" +"PO-Revision-Date: 2014-07-06 00:29-0700\n" +"Last-Translator: Japanese KDE translation team \n" +"Language-Team: Japanese \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" + +#: device.cpp:186 +msgid "Already paired" +msgstr "" + +#: device.cpp:189 +msgid "Pairing already requested for this device" +msgstr "" + +#: device.cpp:193 +msgid "Device not reachable" +msgstr "" + +#: device.cpp:206 +msgid "Error contacting device" +msgstr "" + +#: device.cpp:244 +msgid "Timed out" +msgstr "" + +#: device.cpp:343 device.cpp:395 +msgid "Canceled by other peer" +msgstr "" + +#: device.cpp:359 +msgid "Received incorrect key" +msgstr "" + +#: device.cpp:376 +#, kde-format +msgid "Pairing request from %1" +msgstr "" + +#: device.cpp:377 +msgid "Accept" +msgstr "" + +#: device.cpp:377 +msgid "Reject" +msgstr "" + +#: device.cpp:437 +msgid "Canceled by the user" +msgstr "" + +#: filetransferjob.cpp:41 +msgctxt "Device name that will appear on the jobs" +msgid "KDE-Connect" +msgstr "" + +#: filetransferjob.cpp:60 filetransferjob.cpp:121 +msgid "Receiving file over KDE-Connect" +msgstr "" + +#: filetransferjob.cpp:61 filetransferjob.cpp:122 +msgctxt "File transfer origin" +msgid "From" +msgstr "" + +#: filetransferjob.cpp:68 +msgid "Incoming file exists" +msgstr "" + +#: filetransferjob.cpp:124 +msgctxt "File transfer destination" +msgid "To" +msgstr "" + +#: filetransferjob.cpp:197 +msgid "Received incomplete file" +msgstr "" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/ja/kdeconnect-filetiemaction.po kdeconnect-0.7.3/po/ja/kdeconnect-filetiemaction.po --- kdeconnect-0.7.1/po/ja/kdeconnect-filetiemaction.po 1970-01-01 00:00:00.000000000 +0000 +++ kdeconnect-0.7.3/po/ja/kdeconnect-filetiemaction.po 2014-10-11 17:27:50.000000000 +0000 @@ -0,0 +1,24 @@ +msgid "" +msgstr "" +"Project-Id-Version: kdeconnect-filetiemaction\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-06-28 01:55+0000\n" +"PO-Revision-Date: 2014-07-06 00:29-0700\n" +"Last-Translator: Japanese KDE translation team \n" +"Language-Team: Japanese \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" + +#: sendfileitemaction.cpp:67 +msgid "Send via KDE Connect" +msgstr "" + +#: sendfileitemaction.cpp:74 +#, kde-format +msgid "Send to '%1' via KDE Connect" +msgstr "" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/ja/kdeconnect-kcm.po kdeconnect-0.7.3/po/ja/kdeconnect-kcm.po --- kdeconnect-0.7.1/po/ja/kdeconnect-kcm.po 2014-06-29 16:09:15.000000000 +0000 +++ kdeconnect-0.7.3/po/ja/kdeconnect-kcm.po 2014-10-11 17:27:50.000000000 +0000 @@ -2,10 +2,10 @@ msgstr "" "Project-Id-Version: kdeconnect-kcm\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-15 02:00+0000\n" +"POT-Creation-Date: 2014-08-12 02:06+0000\n" "PO-Revision-Date: 2013-09-13 00:14-0700\n" -"Last-Translator: Japanese KDE translation team \n" -"Language-Team: Japanese \n" +"Last-Translator: Japanese KDE translation team \n" +"Language-Team: Japanese \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -14,44 +14,49 @@ "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: kcm.cpp:144 kcm.cpp:228 +#: kcm.cpp:152 kcm.cpp:236 msgid "(paired)" msgstr "" -#: kcm.cpp:144 kcm.cpp:200 kcm.cpp:211 +#: kcm.cpp:152 kcm.cpp:208 kcm.cpp:219 msgid "(unpaired)" msgstr "" -#: kcm.cpp:158 +#: kcm.cpp:166 msgid "Plugins" msgstr "" -#: kcm.cpp:213 +#: kcm.cpp:221 #, kde-format msgid "Error trying to pair: %1" msgstr "" +#. i18n: ectx: property (text), widget (QPushButton, refresh_button) +#: kcm.ui:41 +msgid "Refresh" +msgstr "" + #. i18n: ectx: property (text), widget (QLabel, name_label) -#: kcm.ui:84 +#: kcm.ui:88 msgid "Device" msgstr "" #. i18n: ectx: property (text), widget (QLabel, status_label) -#: kcm.ui:97 +#: kcm.ui:101 msgid "(status)" msgstr "" #. i18n: ectx: property (text), widget (QPushButton, pair_button) -#: kcm.ui:142 +#: kcm.ui:146 msgid "Request pair" msgstr "" #. i18n: ectx: property (text), widget (QPushButton, unpair_button) -#: kcm.ui:155 +#: kcm.ui:159 msgid "Unpair" msgstr "" #. i18n: ectx: property (text), widget (QPushButton, ping_button) -#: kcm.ui:168 +#: kcm.ui:172 msgid "Send ping" msgstr "" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/ja/kdeconnect-kded.po kdeconnect-0.7.3/po/ja/kdeconnect-kded.po --- kdeconnect-0.7.1/po/ja/kdeconnect-kded.po 2014-06-29 16:09:15.000000000 +0000 +++ kdeconnect-0.7.3/po/ja/kdeconnect-kded.po 2014-10-11 17:27:50.000000000 +0000 @@ -4,8 +4,8 @@ "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-06-18 01:56+0000\n" "PO-Revision-Date: 2013-09-13 00:14-0700\n" -"Last-Translator: Japanese KDE translation team \n" -"Language-Team: Japanese \n" +"Last-Translator: Japanese KDE translation team \n" +"Language-Team: Japanese \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -Nru kdeconnect-0.7.1/po/ja/kdeconnect-kio.po kdeconnect-0.7.3/po/ja/kdeconnect-kio.po --- kdeconnect-0.7.1/po/ja/kdeconnect-kio.po 2014-06-29 16:09:15.000000000 +0000 +++ kdeconnect-0.7.3/po/ja/kdeconnect-kio.po 2014-10-11 17:27:50.000000000 +0000 @@ -2,10 +2,10 @@ msgstr "" "Project-Id-Version: kdeconnect-kio\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-15 01:46+0000\n" +"POT-Creation-Date: 2014-10-11 01:54+0000\n" "PO-Revision-Date: 2014-02-22 22:22-0800\n" -"Last-Translator: Japanese KDE translation team \n" -"Language-Team: Japanese \n" +"Last-Translator: Japanese KDE translation team \n" +"Language-Team: Japanese \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -30,22 +30,14 @@ msgid "Listing devices..." msgstr "" -#: kiokdeconnect.cpp:130 +#: kiokdeconnect.cpp:131 msgid "Accessing device..." msgstr "" -#: kiokdeconnect.cpp:145 +#: kiokdeconnect.cpp:144 msgid "Could not mount device filesystem" msgstr "" -#: kiokdeconnect.cpp:160 -msgid "Camera pictures" -msgstr "" - -#: kiokdeconnect.cpp:169 -msgid "All files" -msgstr "" - -#: kiokdeconnect.cpp:194 +#: kiokdeconnect.cpp:189 msgid "Could not contact background service." msgstr "" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/ja/kdeconnect-plugins.po kdeconnect-0.7.3/po/ja/kdeconnect-plugins.po --- kdeconnect-0.7.1/po/ja/kdeconnect-plugins.po 1970-01-01 00:00:00.000000000 +0000 +++ kdeconnect-0.7.3/po/ja/kdeconnect-plugins.po 2014-10-11 17:27:50.000000000 +0000 @@ -0,0 +1,169 @@ +msgid "" +msgstr "" +"Project-Id-Version: kdeconnect-plugins\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-10-11 01:54+0000\n" +"PO-Revision-Date: 2014-07-06 00:29-0700\n" +"Last-Translator: Japanese KDE translation team \n" +"Language-Team: Japanese \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" + +#: battery/batteryplugin.cpp:77 +#, kde-format +msgctxt "device name: low battery" +msgid "%1: low battery" +msgstr "" + +#: battery/batteryplugin.cpp:78 +#, kde-format +msgid "Battery at %1%" +msgstr "" + +#. i18n: ectx: property (windowTitle), widget (QWidget, PauseMusicConfigUi) +#: pausemusic/pausemusic_config.ui:17 +msgid "Pause music plugin" +msgstr "" + +#. i18n: ectx: property (title), widget (QGroupBox, groupBox) +#: pausemusic/pausemusic_config.ui:32 +msgid "Condition" +msgstr "" + +#. i18n: ectx: property (text), widget (QRadioButton, rad_ringing) +#: pausemusic/pausemusic_config.ui:38 +msgid "Pause as soon as phone rings" +msgstr "" + +#. i18n: ectx: property (text), widget (QRadioButton, rad_talking) +#: pausemusic/pausemusic_config.ui:45 +msgid "Pause only while talking" +msgstr "" + +#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2) +#: pausemusic/pausemusic_config.ui:61 +msgid "Actions" +msgstr "" + +#. i18n: ectx: property (text), widget (QCheckBox, check_pause) +#: pausemusic/pausemusic_config.ui:67 +msgid "Pause media players" +msgstr "" + +#. i18n: ectx: property (text), widget (QCheckBox, check_mute) +#: pausemusic/pausemusic_config.ui:74 +msgid "Mute system sound" +msgstr "" + +#: ping/pingplugin.cpp:51 +msgid "Ping!" +msgstr "" + +#: sftp/mounter.cpp:176 +msgid "Failed to start sshfs" +msgstr "" + +#: sftp/mounter.cpp:198 +msgid "Error when accessing to filesystem" +msgstr "" + +#: sftp/mounter.cpp:209 +msgid "Failed to mount filesystem: device not responding" +msgstr "" + +#. i18n: ectx: property (windowTitle), widget (QWidget, ShareConfigUi) +#. i18n: ectx: property (windowTitle), widget (QWidget, SftpConfigUi) +#: sftp/sftp_config.ui:17 share/share_config.ui:17 +msgid "Share plugin settings" +msgstr "" + +#. i18n: ectx: property (title), widget (QGroupBox, error) +#: sftp/sftp_config.ui:23 +msgid "Error" +msgstr "" + +#. i18n: ectx: property (text), widget (QLabel, label) +#: sftp/sftp_config.ui:45 +msgid "sshfs not found in PATH" +msgstr "" + +#. i18n: ectx: property (text), widget (QCheckBox, idle) +#: sftp/sftp_config.ui:86 +msgid "Disconnect when idle" +msgstr "" + +#. i18n: ectx: property (text), widget (QLabel, label_2) +#: sftp/sftp_config.ui:115 +msgid "Timeout:" +msgstr "" + +#. i18n: ectx: property (suffix), widget (QSpinBox, timeout) +#: sftp/sftp_config.ui:131 +msgid " min" +msgstr "" + +#: sftp/sftpplugin.cpp:159 +msgid "All files" +msgstr "" + +#: sftp/sftpplugin.cpp:160 +msgid "Camera pictures" +msgstr "" + +#: sftp/sftpplugin.cpp:207 +#, kde-format +msgid "Device %1" +msgstr "" + +#. i18n: ectx: property (title), widget (QGroupBox, groupBox) +#: share/share_config.ui:23 +msgid "Receiving" +msgstr "" + +#. i18n: ectx: property (text), widget (QLabel, label) +#: share/share_config.ui:31 +msgid "Save files in:" +msgstr "" + +#. i18n: ectx: property (text), widget (QLabel, label_2) +#: share/share_config.ui:53 +#, no-c-format, kde-format +msgid "%1 in the path will be replaced with the specific device name." +msgstr "" + +#: share/shareplugin.cpp:135 +msgid "Transfer finished" +msgstr "" + +#: share/shareplugin.cpp:137 +msgid "Open destination folder" +msgstr "" + +#: telephony/telephonyplugin.cpp:41 +msgid "unknown number" +msgstr "" + +#: telephony/telephonyplugin.cpp:50 +#, kde-format +msgid "Incoming call from %1" +msgstr "" + +#: telephony/telephonyplugin.cpp:54 +#, kde-format +msgid "Missed call from %1" +msgstr "" + +#: telephony/telephonyplugin.cpp:59 +#, kde-format +msgid "SMS from %1: %2" +msgstr "" + +#: telephony/telephonyplugin.cpp:68 +#, kde-format +msgid "Unknown telephony event: %2" +msgstr "" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/ja/plasma_applet_kdeconnect.po kdeconnect-0.7.3/po/ja/plasma_applet_kdeconnect.po --- kdeconnect-0.7.1/po/ja/plasma_applet_kdeconnect.po 2014-06-29 16:09:15.000000000 +0000 +++ kdeconnect-0.7.3/po/ja/plasma_applet_kdeconnect.po 2014-10-11 17:27:50.000000000 +0000 @@ -4,8 +4,8 @@ "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-03-01 01:46+0000\n" "PO-Revision-Date: 2013-09-13 00:14-0700\n" -"Last-Translator: Japanese KDE translation team \n" -"Language-Team: Japanese \n" +"Last-Translator: Japanese KDE translation team \n" +"Language-Team: Japanese \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff -Nru kdeconnect-0.7.1/po/ko/kdeconnect-kcm.po kdeconnect-0.7.3/po/ko/kdeconnect-kcm.po --- kdeconnect-0.7.1/po/ko/kdeconnect-kcm.po 2014-06-29 16:09:46.000000000 +0000 +++ kdeconnect-0.7.3/po/ko/kdeconnect-kcm.po 2014-10-11 17:29:17.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-15 02:00+0000\n" +"POT-Creation-Date: 2014-08-12 02:06+0000\n" "PO-Revision-Date: 2014-03-10 00:43+0900\n" "Last-Translator: Park Shinjo \n" "Language-Team: Korean \n" @@ -16,44 +16,49 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: kcm.cpp:144 kcm.cpp:228 +#: kcm.cpp:152 kcm.cpp:236 msgid "(paired)" msgstr "(페어링됨)" -#: kcm.cpp:144 kcm.cpp:200 kcm.cpp:211 +#: kcm.cpp:152 kcm.cpp:208 kcm.cpp:219 msgid "(unpaired)" msgstr "(페어링 해제됨)" -#: kcm.cpp:158 +#: kcm.cpp:166 msgid "Plugins" msgstr "플러그인" -#: kcm.cpp:213 +#: kcm.cpp:221 #, kde-format msgid "Error trying to pair: %1" msgstr "페어링 중 오류 발생: %1" +#. i18n: ectx: property (text), widget (QPushButton, refresh_button) +#: kcm.ui:41 +msgid "Refresh" +msgstr "" + #. i18n: ectx: property (text), widget (QLabel, name_label) -#: kcm.ui:84 +#: kcm.ui:88 msgid "Device" msgstr "장치" #. i18n: ectx: property (text), widget (QLabel, status_label) -#: kcm.ui:97 +#: kcm.ui:101 msgid "(status)" msgstr "(상태)" #. i18n: ectx: property (text), widget (QPushButton, pair_button) -#: kcm.ui:142 +#: kcm.ui:146 msgid "Request pair" msgstr "페어링 요청" #. i18n: ectx: property (text), widget (QPushButton, unpair_button) -#: kcm.ui:155 +#: kcm.ui:159 msgid "Unpair" msgstr "페어링 해제" #. i18n: ectx: property (text), widget (QPushButton, ping_button) -#: kcm.ui:168 +#: kcm.ui:172 msgid "Send ping" msgstr "핑 보내기" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/ko/kdeconnect-kio.po kdeconnect-0.7.3/po/ko/kdeconnect-kio.po --- kdeconnect-0.7.1/po/ko/kdeconnect-kio.po 2014-06-29 16:09:46.000000000 +0000 +++ kdeconnect-0.7.3/po/ko/kdeconnect-kio.po 2014-10-11 17:29:17.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-15 01:46+0000\n" +"POT-Creation-Date: 2014-10-11 01:54+0000\n" "PO-Revision-Date: 2014-03-10 00:43+0900\n" "Last-Translator: Park Shinjo \n" "Language-Team: Korean \n" @@ -32,22 +32,14 @@ msgid "Listing devices..." msgstr "장치 목록 표시 중..." -#: kiokdeconnect.cpp:130 +#: kiokdeconnect.cpp:131 msgid "Accessing device..." msgstr "장치에 접근 중..." -#: kiokdeconnect.cpp:145 +#: kiokdeconnect.cpp:144 msgid "Could not mount device filesystem" msgstr "장치 파일 시스템을 마운트할 수 없음" -#: kiokdeconnect.cpp:160 -msgid "Camera pictures" -msgstr "카메라 사진" - -#: kiokdeconnect.cpp:169 -msgid "All files" -msgstr "모든 파일" - -#: kiokdeconnect.cpp:194 +#: kiokdeconnect.cpp:189 msgid "Could not contact background service." msgstr "백그라운드 서비스에 연결할 수 없습니다." \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/lt/kdeconnect-cli.po kdeconnect-0.7.3/po/lt/kdeconnect-cli.po --- kdeconnect-0.7.1/po/lt/kdeconnect-cli.po 1970-01-01 00:00:00.000000000 +0000 +++ kdeconnect-0.7.3/po/lt/kdeconnect-cli.po 2014-10-11 17:30:22.000000000 +0000 @@ -0,0 +1,92 @@ +# Lithuanian translations for l package. +# Copyright (C) 2014 This_file_is_part_of_KDE +# This file is distributed under the same license as the l package. +# Automatically generated, 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: l 10n\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-09-28 08:07+0000\n" +"PO-Revision-Date: 2014-07-01 02:07+0000\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n%10>=2 && (n%100<10 || n" +"%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n" + +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "" + +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "" + +#: kdeconnect-cli.cpp:34 +msgid "KDE Connect CLI tool" +msgstr "" + +#: kdeconnect-cli.cpp:35 +msgid "(C) 2013 Aleix Pol Gonzalez" +msgstr "" + +#: kdeconnect-cli.cpp:36 +msgid "Aleix Pol Gonzalez" +msgstr "" + +#: kdeconnect-cli.cpp:37 +msgid "Albert Vaca Cintora" +msgstr "" + +#: kdeconnect-cli.cpp:41 +msgid "List all devices." +msgstr "" + +#: kdeconnect-cli.cpp:42 +msgid "Search for devices in the network and re-establish connections." +msgstr "" + +#: kdeconnect-cli.cpp:43 +msgid "Request pairing to a said device." +msgstr "" + +#: kdeconnect-cli.cpp:44 +msgid "Stop pairing to a said device." +msgstr "" + +#: kdeconnect-cli.cpp:45 +msgid "Send a ping to said device." +msgstr "" + +#: kdeconnect-cli.cpp:46 +msgid "Same as ping but you can customize the shown message." +msgstr "" + +#: kdeconnect-cli.cpp:47 +msgid "Share a file to a said device." +msgstr "" + +#: kdeconnect-cli.cpp:48 +msgid "Display the notifications on a said device." +msgstr "" + +#: kdeconnect-cli.cpp:49 +msgid "Device ID." +msgstr "" + +#: kdeconnect-cli.cpp:79 +msgid "No device specified" +msgstr "" + +#: kdeconnect-cli.cpp:91 +#, kde-format +msgid "Couldn't share %1" +msgstr "" + +#: kdeconnect-cli.cpp:124 +msgid "Nothing to be done with the device" +msgstr "" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/lt/kdeconnect-core.po kdeconnect-0.7.3/po/lt/kdeconnect-core.po --- kdeconnect-0.7.1/po/lt/kdeconnect-core.po 1970-01-01 00:00:00.000000000 +0000 +++ kdeconnect-0.7.3/po/lt/kdeconnect-core.po 2014-10-11 17:30:22.000000000 +0000 @@ -0,0 +1,91 @@ +# Lithuanian translations for l package. +# Copyright (C) 2014 This_file_is_part_of_KDE +# This file is distributed under the same license as the l package. +# Automatically generated, 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: l 10n\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-07-16 02:16+0000\n" +"PO-Revision-Date: 2014-06-18 01:56+0000\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n%10>=2 && (n%100<10 || n" +"%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n" + +#: device.cpp:186 +msgid "Already paired" +msgstr "" + +#: device.cpp:189 +msgid "Pairing already requested for this device" +msgstr "" + +#: device.cpp:193 +msgid "Device not reachable" +msgstr "" + +#: device.cpp:206 +msgid "Error contacting device" +msgstr "" + +#: device.cpp:244 +msgid "Timed out" +msgstr "" + +#: device.cpp:343 device.cpp:395 +msgid "Canceled by other peer" +msgstr "" + +#: device.cpp:359 +msgid "Received incorrect key" +msgstr "" + +#: device.cpp:376 +#, kde-format +msgid "Pairing request from %1" +msgstr "" + +#: device.cpp:377 +msgid "Accept" +msgstr "" + +#: device.cpp:377 +msgid "Reject" +msgstr "" + +#: device.cpp:437 +msgid "Canceled by the user" +msgstr "" + +#: filetransferjob.cpp:41 +msgctxt "Device name that will appear on the jobs" +msgid "KDE-Connect" +msgstr "" + +#: filetransferjob.cpp:60 filetransferjob.cpp:121 +msgid "Receiving file over KDE-Connect" +msgstr "" + +#: filetransferjob.cpp:61 filetransferjob.cpp:122 +msgctxt "File transfer origin" +msgid "From" +msgstr "" + +#: filetransferjob.cpp:68 +msgid "Incoming file exists" +msgstr "" + +#: filetransferjob.cpp:124 +msgctxt "File transfer destination" +msgid "To" +msgstr "" + +#: filetransferjob.cpp:197 +msgid "Received incomplete file" +msgstr "" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/lt/kdeconnect-filetiemaction.po kdeconnect-0.7.3/po/lt/kdeconnect-filetiemaction.po --- kdeconnect-0.7.1/po/lt/kdeconnect-filetiemaction.po 1970-01-01 00:00:00.000000000 +0000 +++ kdeconnect-0.7.3/po/lt/kdeconnect-filetiemaction.po 2014-10-11 17:30:22.000000000 +0000 @@ -0,0 +1,28 @@ +# Lithuanian translations for l package. +# Copyright (C) 2014 This_file_is_part_of_KDE +# This file is distributed under the same license as the l package. +# Automatically generated, 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: l 10n\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-06-28 01:55+0000\n" +"PO-Revision-Date: 2014-06-28 01:55+0000\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n%10>=2 && (n%100<10 || n" +"%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n" + +#: sendfileitemaction.cpp:67 +msgid "Send via KDE Connect" +msgstr "" + +#: sendfileitemaction.cpp:74 +#, kde-format +msgid "Send to '%1' via KDE Connect" +msgstr "" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/lt/kdeconnect-kcm.po kdeconnect-0.7.3/po/lt/kdeconnect-kcm.po --- kdeconnect-0.7.1/po/lt/kdeconnect-kcm.po 2014-06-29 16:10:08.000000000 +0000 +++ kdeconnect-0.7.3/po/lt/kdeconnect-kcm.po 2014-10-11 17:30:22.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: l 10n\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-15 02:00+0000\n" +"POT-Creation-Date: 2014-08-12 02:06+0000\n" "PO-Revision-Date: 2014-03-15 02:50+0200\n" "Last-Translator: Liudas Ališauskas \n" "Language-Team: Lithuanian \n" @@ -20,44 +20,49 @@ "%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n" "X-Generator: Lokalize 1.5\n" -#: kcm.cpp:144 kcm.cpp:228 +#: kcm.cpp:152 kcm.cpp:236 msgid "(paired)" msgstr "(suporuotas)" -#: kcm.cpp:144 kcm.cpp:200 kcm.cpp:211 +#: kcm.cpp:152 kcm.cpp:208 kcm.cpp:219 msgid "(unpaired)" msgstr "(nesuporuotas)" -#: kcm.cpp:158 +#: kcm.cpp:166 msgid "Plugins" msgstr "Įskiepiai" -#: kcm.cpp:213 +#: kcm.cpp:221 #, kde-format msgid "Error trying to pair: %1" msgstr "Klaida bandant suporuoti: %1" +#. i18n: ectx: property (text), widget (QPushButton, refresh_button) +#: kcm.ui:41 +msgid "Refresh" +msgstr "" + #. i18n: ectx: property (text), widget (QLabel, name_label) -#: kcm.ui:84 +#: kcm.ui:88 msgid "Device" msgstr "Įrenginys" #. i18n: ectx: property (text), widget (QLabel, status_label) -#: kcm.ui:97 +#: kcm.ui:101 msgid "(status)" msgstr "(būsena)" #. i18n: ectx: property (text), widget (QPushButton, pair_button) -#: kcm.ui:142 +#: kcm.ui:146 msgid "Request pair" msgstr "Užklausti poros" #. i18n: ectx: property (text), widget (QPushButton, unpair_button) -#: kcm.ui:155 +#: kcm.ui:159 msgid "Unpair" msgstr "Atrišti" #. i18n: ectx: property (text), widget (QPushButton, ping_button) -#: kcm.ui:168 +#: kcm.ui:172 msgid "Send ping" msgstr "Siųsti ping" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/lt/kdeconnect-kio.po kdeconnect-0.7.3/po/lt/kdeconnect-kio.po --- kdeconnect-0.7.1/po/lt/kdeconnect-kio.po 1970-01-01 00:00:00.000000000 +0000 +++ kdeconnect-0.7.3/po/lt/kdeconnect-kio.po 2014-10-11 17:30:22.000000000 +0000 @@ -0,0 +1,47 @@ +# Lithuanian translations for l package. +# Copyright (C) 2014 This_file_is_part_of_KDE +# This file is distributed under the same license as the l package. +# Automatically generated, 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: l 10n\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-10-11 01:54+0000\n" +"PO-Revision-Date: 2014-02-15 01:46+0000\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n%10>=2 && (n%100<10 || n" +"%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n" + +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "" + +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "" + +#: kiokdeconnect.cpp:39 +msgid "kiokdeconnect" +msgstr "" + +#: kiokdeconnect.cpp:93 +msgid "Listing devices..." +msgstr "" + +#: kiokdeconnect.cpp:131 +msgid "Accessing device..." +msgstr "" + +#: kiokdeconnect.cpp:144 +msgid "Could not mount device filesystem" +msgstr "" + +#: kiokdeconnect.cpp:189 +msgid "Could not contact background service." +msgstr "" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/lt/kdeconnect-plugins.po kdeconnect-0.7.3/po/lt/kdeconnect-plugins.po --- kdeconnect-0.7.1/po/lt/kdeconnect-plugins.po 1970-01-01 00:00:00.000000000 +0000 +++ kdeconnect-0.7.3/po/lt/kdeconnect-plugins.po 2014-10-11 17:30:22.000000000 +0000 @@ -0,0 +1,173 @@ +# Lithuanian translations for l package. +# Copyright (C) 2014 This_file_is_part_of_KDE +# This file is distributed under the same license as the l package. +# Automatically generated, 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: l 10n\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-10-11 01:54+0000\n" +"PO-Revision-Date: 2014-06-28 01:55+0000\n" +"Last-Translator: Automatically generated\n" +"Language-Team: none\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n%10>=2 && (n%100<10 || n" +"%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n" + +#: battery/batteryplugin.cpp:77 +#, kde-format +msgctxt "device name: low battery" +msgid "%1: low battery" +msgstr "" + +#: battery/batteryplugin.cpp:78 +#, kde-format +msgid "Battery at %1%" +msgstr "" + +#. i18n: ectx: property (windowTitle), widget (QWidget, PauseMusicConfigUi) +#: pausemusic/pausemusic_config.ui:17 +msgid "Pause music plugin" +msgstr "" + +#. i18n: ectx: property (title), widget (QGroupBox, groupBox) +#: pausemusic/pausemusic_config.ui:32 +msgid "Condition" +msgstr "" + +#. i18n: ectx: property (text), widget (QRadioButton, rad_ringing) +#: pausemusic/pausemusic_config.ui:38 +msgid "Pause as soon as phone rings" +msgstr "" + +#. i18n: ectx: property (text), widget (QRadioButton, rad_talking) +#: pausemusic/pausemusic_config.ui:45 +msgid "Pause only while talking" +msgstr "" + +#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2) +#: pausemusic/pausemusic_config.ui:61 +msgid "Actions" +msgstr "" + +#. i18n: ectx: property (text), widget (QCheckBox, check_pause) +#: pausemusic/pausemusic_config.ui:67 +msgid "Pause media players" +msgstr "" + +#. i18n: ectx: property (text), widget (QCheckBox, check_mute) +#: pausemusic/pausemusic_config.ui:74 +msgid "Mute system sound" +msgstr "" + +#: ping/pingplugin.cpp:51 +msgid "Ping!" +msgstr "" + +#: sftp/mounter.cpp:176 +msgid "Failed to start sshfs" +msgstr "" + +#: sftp/mounter.cpp:198 +msgid "Error when accessing to filesystem" +msgstr "" + +#: sftp/mounter.cpp:209 +msgid "Failed to mount filesystem: device not responding" +msgstr "" + +#. i18n: ectx: property (windowTitle), widget (QWidget, ShareConfigUi) +#. i18n: ectx: property (windowTitle), widget (QWidget, SftpConfigUi) +#: sftp/sftp_config.ui:17 share/share_config.ui:17 +msgid "Share plugin settings" +msgstr "" + +#. i18n: ectx: property (title), widget (QGroupBox, error) +#: sftp/sftp_config.ui:23 +msgid "Error" +msgstr "" + +#. i18n: ectx: property (text), widget (QLabel, label) +#: sftp/sftp_config.ui:45 +msgid "sshfs not found in PATH" +msgstr "" + +#. i18n: ectx: property (text), widget (QCheckBox, idle) +#: sftp/sftp_config.ui:86 +msgid "Disconnect when idle" +msgstr "" + +#. i18n: ectx: property (text), widget (QLabel, label_2) +#: sftp/sftp_config.ui:115 +msgid "Timeout:" +msgstr "" + +#. i18n: ectx: property (suffix), widget (QSpinBox, timeout) +#: sftp/sftp_config.ui:131 +msgid " min" +msgstr "" + +#: sftp/sftpplugin.cpp:159 +msgid "All files" +msgstr "" + +#: sftp/sftpplugin.cpp:160 +msgid "Camera pictures" +msgstr "" + +#: sftp/sftpplugin.cpp:207 +#, kde-format +msgid "Device %1" +msgstr "" + +#. i18n: ectx: property (title), widget (QGroupBox, groupBox) +#: share/share_config.ui:23 +msgid "Receiving" +msgstr "" + +#. i18n: ectx: property (text), widget (QLabel, label) +#: share/share_config.ui:31 +msgid "Save files in:" +msgstr "" + +#. i18n: ectx: property (text), widget (QLabel, label_2) +#: share/share_config.ui:53 +#, no-c-format, kde-format +msgid "%1 in the path will be replaced with the specific device name." +msgstr "" + +#: share/shareplugin.cpp:135 +msgid "Transfer finished" +msgstr "" + +#: share/shareplugin.cpp:137 +msgid "Open destination folder" +msgstr "" + +#: telephony/telephonyplugin.cpp:41 +msgid "unknown number" +msgstr "" + +#: telephony/telephonyplugin.cpp:50 +#, kde-format +msgid "Incoming call from %1" +msgstr "" + +#: telephony/telephonyplugin.cpp:54 +#, kde-format +msgid "Missed call from %1" +msgstr "" + +#: telephony/telephonyplugin.cpp:59 +#, kde-format +msgid "SMS from %1: %2" +msgstr "" + +#: telephony/telephonyplugin.cpp:68 +#, kde-format +msgid "Unknown telephony event: %2" +msgstr "" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/nl/kdeconnect-cli.po kdeconnect-0.7.3/po/nl/kdeconnect-cli.po --- kdeconnect-0.7.1/po/nl/kdeconnect-cli.po 2014-06-29 16:11:29.000000000 +0000 +++ kdeconnect-0.7.3/po/nl/kdeconnect-cli.po 2014-10-11 17:33:56.000000000 +0000 @@ -6,15 +6,15 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-28 01:55+0000\n" -"PO-Revision-Date: 2014-06-28 12:06+0200\n" +"POT-Creation-Date: 2014-09-28 08:07+0000\n" +"PO-Revision-Date: 2014-09-28 12:27+0200\n" "Last-Translator: Freek de Kruijf \n" "Language-Team: Dutch \n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" msgctxt "NAME OF TRANSLATORS" @@ -25,51 +25,67 @@ msgid "Your emails" msgstr "freekdekruijf@kde.nl" -#: kdeconnect-cli.cpp:33 +#: kdeconnect-cli.cpp:34 msgid "KDE Connect CLI tool" msgstr "CLI-hulpmiddel van KDE Connect" -#: kdeconnect-cli.cpp:34 +#: kdeconnect-cli.cpp:35 msgid "(C) 2013 Aleix Pol Gonzalez" msgstr "(C) 2013 Aleix Pol Gonzalez" -#: kdeconnect-cli.cpp:35 +#: kdeconnect-cli.cpp:36 msgid "Aleix Pol Gonzalez" msgstr "Aleix Pol Gonzalez" -#: kdeconnect-cli.cpp:39 -msgid "List all devices" -msgstr "Maak een lijst van alle apparaten" - -#: kdeconnect-cli.cpp:40 -msgid "Share a file to a said device" -msgstr "Deel een bestand met een aangegeven apparaat" +#: kdeconnect-cli.cpp:37 +msgid "Albert Vaca Cintora" +msgstr "Albert Vaca Cintora" #: kdeconnect-cli.cpp:41 -msgid "Request pairing to a said device" -msgstr "Verzoek voor maken van een paar met een aangeven apparaat" +msgid "List all devices." +msgstr "Maak een lijst van alle apparaten." #: kdeconnect-cli.cpp:42 -msgid "Stop pairing to a said device" -msgstr "Stop met het zijn van een paar met een aangeven apparaat" +msgid "Search for devices in the network and re-establish connections." +msgstr "Zoek naar apparaten in het netwerk en maak opnieuw verbindingen." #: kdeconnect-cli.cpp:43 -msgid "Sends a ping to said device" -msgstr "Stuurt een ping naar het aangeven apparaat" +msgid "Request pairing to a said device." +msgstr "Verzoek voor maken van een paar met een aangeven apparaat." #: kdeconnect-cli.cpp:44 -msgid "Device ID" -msgstr "Apparaat-id" +msgid "Stop pairing to a said device." +msgstr "Stop met het zijn van een paar met een aangeven apparaat." + +#: kdeconnect-cli.cpp:45 +msgid "Send a ping to said device." +msgstr "Stuurt een ping naar het aangeven apparaat." + +#: kdeconnect-cli.cpp:46 +msgid "Same as ping but you can customize the shown message." +msgstr "Hetzelfde als ping maar u kunt het getoonde bericht aanpassen." + +#: kdeconnect-cli.cpp:47 +msgid "Share a file to a said device." +msgstr "Deel een bestand met een aangegeven apparaat." + +#: kdeconnect-cli.cpp:48 +msgid "Display the notifications on a said device." +msgstr "De meldingen tonen op een aangegeven apparaat." + +#: kdeconnect-cli.cpp:49 +msgid "Device ID." +msgstr "Apparaat-id." -#: kdeconnect-cli.cpp:73 +#: kdeconnect-cli.cpp:79 msgid "No device specified" msgstr "Geen apparaat gespecificeerd" -#: kdeconnect-cli.cpp:85 +#: kdeconnect-cli.cpp:91 #, kde-format msgid "Couldn't share %1" msgstr "Kan %1 niet delen" -#: kdeconnect-cli.cpp:106 +#: kdeconnect-cli.cpp:124 msgid "Nothing to be done with the device" msgstr "Er is niets te doen met dit apparaat" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/nl/kdeconnect-core.po kdeconnect-0.7.3/po/nl/kdeconnect-core.po --- kdeconnect-0.7.1/po/nl/kdeconnect-core.po 2014-06-29 16:11:29.000000000 +0000 +++ kdeconnect-0.7.3/po/nl/kdeconnect-core.po 2014-10-11 17:33:56.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-18 01:56+0000\n" +"POT-Creation-Date: 2014-07-16 02:16+0000\n" "PO-Revision-Date: 2014-06-18 10:20+0200\n" "Last-Translator: Freek de Kruijf \n" "Language-Team: Dutch \n" @@ -14,51 +14,51 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: device.cpp:168 +#: device.cpp:186 msgid "Already paired" msgstr "Paar al gemaakt" -#: device.cpp:171 +#: device.cpp:189 msgid "Pairing already requested for this device" msgstr "Paar maken voor dit apparaat is al gevraagd" -#: device.cpp:175 +#: device.cpp:193 msgid "Device not reachable" msgstr "Apparaat niet bereikbaar" -#: device.cpp:188 +#: device.cpp:206 msgid "Error contacting device" msgstr "Fout bij het contact maken met apparaat" -#: device.cpp:226 +#: device.cpp:244 msgid "Timed out" msgstr "Tijdslimiet overschreden" -#: device.cpp:325 device.cpp:377 +#: device.cpp:343 device.cpp:395 msgid "Canceled by other peer" msgstr "Geannuleerd door andere kant" -#: device.cpp:341 +#: device.cpp:359 msgid "Received incorrect key" msgstr "Onjuiste sleutel ontvangen" -#: device.cpp:358 +#: device.cpp:376 #, kde-format msgid "Pairing request from %1" msgstr "Verzoek om een paar te maken van %1" -#: device.cpp:359 +#: device.cpp:377 msgid "Accept" msgstr "Accepteren" -#: device.cpp:359 +#: device.cpp:377 msgid "Reject" msgstr "Afwijzen" -#: device.cpp:419 +#: device.cpp:437 msgid "Canceled by the user" msgstr "Geannuleerd door de gebruiker" diff -Nru kdeconnect-0.7.1/po/nl/kdeconnect-filetiemaction.po kdeconnect-0.7.3/po/nl/kdeconnect-filetiemaction.po --- kdeconnect-0.7.1/po/nl/kdeconnect-filetiemaction.po 2014-06-29 16:11:29.000000000 +0000 +++ kdeconnect-0.7.3/po/nl/kdeconnect-filetiemaction.po 2014-10-11 17:33:56.000000000 +0000 @@ -14,7 +14,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" #: sendfileitemaction.cpp:67 diff -Nru kdeconnect-0.7.1/po/nl/kdeconnect-kcm.po kdeconnect-0.7.3/po/nl/kdeconnect-kcm.po --- kdeconnect-0.7.1/po/nl/kdeconnect-kcm.po 2014-06-29 16:11:29.000000000 +0000 +++ kdeconnect-0.7.3/po/nl/kdeconnect-kcm.po 2014-10-11 17:33:56.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-15 02:00+0000\n" -"PO-Revision-Date: 2014-02-15 16:53+0100\n" +"POT-Creation-Date: 2014-08-12 02:06+0000\n" +"PO-Revision-Date: 2014-08-12 10:33+0200\n" "Last-Translator: Freek de Kruijf \n" "Language-Team: Dutch \n" "Language: nl\n" @@ -17,44 +17,49 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: kcm.cpp:144 kcm.cpp:228 +#: kcm.cpp:152 kcm.cpp:236 msgid "(paired)" msgstr "(gepaard)" -#: kcm.cpp:144 kcm.cpp:200 kcm.cpp:211 +#: kcm.cpp:152 kcm.cpp:208 kcm.cpp:219 msgid "(unpaired)" msgstr "(niet gepaard)" -#: kcm.cpp:158 +#: kcm.cpp:166 msgid "Plugins" msgstr "Plug-ins" -#: kcm.cpp:213 +#: kcm.cpp:221 #, kde-format msgid "Error trying to pair: %1" msgstr "Fout bij het maken van een paar: %1" +#. i18n: ectx: property (text), widget (QPushButton, refresh_button) +#: kcm.ui:41 +msgid "Refresh" +msgstr "Verversen" + #. i18n: ectx: property (text), widget (QLabel, name_label) -#: kcm.ui:84 +#: kcm.ui:88 msgid "Device" msgstr "Apparaat" #. i18n: ectx: property (text), widget (QLabel, status_label) -#: kcm.ui:97 +#: kcm.ui:101 msgid "(status)" msgstr "(status)" #. i18n: ectx: property (text), widget (QPushButton, pair_button) -#: kcm.ui:142 +#: kcm.ui:146 msgid "Request pair" msgstr "Om een paar verzoeken" #. i18n: ectx: property (text), widget (QPushButton, unpair_button) -#: kcm.ui:155 +#: kcm.ui:159 msgid "Unpair" msgstr "Paar uit elkaar halen" #. i18n: ectx: property (text), widget (QPushButton, ping_button) -#: kcm.ui:168 +#: kcm.ui:172 msgid "Send ping" msgstr "Ping verzenden" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/nl/kdeconnect-kio.po kdeconnect-0.7.3/po/nl/kdeconnect-kio.po --- kdeconnect-0.7.1/po/nl/kdeconnect-kio.po 2014-06-29 16:11:29.000000000 +0000 +++ kdeconnect-0.7.3/po/nl/kdeconnect-kio.po 2014-10-11 17:33:56.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-15 01:46+0000\n" +"POT-Creation-Date: 2014-10-11 01:54+0000\n" "PO-Revision-Date: 2014-02-15 16:59+0100\n" "Last-Translator: Freek de Kruijf \n" "Language-Team: Dutch \n" @@ -33,22 +33,14 @@ msgid "Listing devices..." msgstr "Lijst met apparaten maken..." -#: kiokdeconnect.cpp:130 +#: kiokdeconnect.cpp:131 msgid "Accessing device..." msgstr "Toegang tot apparaat proberen..." -#: kiokdeconnect.cpp:145 +#: kiokdeconnect.cpp:144 msgid "Could not mount device filesystem" msgstr "Kon het bestandssysteem van het apparaat niet aankoppelen" -#: kiokdeconnect.cpp:160 -msgid "Camera pictures" -msgstr "Afbeeldingen van camera" - -#: kiokdeconnect.cpp:169 -msgid "All files" -msgstr "Alle bestanden" - -#: kiokdeconnect.cpp:194 +#: kiokdeconnect.cpp:189 msgid "Could not contact background service." msgstr "Kon geen contact maken met de achtergrondservice." \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/nl/kdeconnect-plugins.po kdeconnect-0.7.3/po/nl/kdeconnect-plugins.po --- kdeconnect-0.7.1/po/nl/kdeconnect-plugins.po 2014-06-29 16:11:29.000000000 +0000 +++ kdeconnect-0.7.3/po/nl/kdeconnect-plugins.po 2014-10-11 17:33:56.000000000 +0000 @@ -6,15 +6,15 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-28 01:55+0000\n" -"PO-Revision-Date: 2014-06-18 10:21+0200\n" -"Last-Translator: Freek de Kruijf \n" +"POT-Creation-Date: 2014-10-11 01:54+0000\n" +"PO-Revision-Date: 2014-09-18 12:16+0200\n" +"Last-Translator: Freek de Kruijf \n" "Language-Team: Dutch \n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" #: battery/batteryplugin.cpp:77 @@ -34,38 +34,48 @@ msgstr "Plug-in voor muziek pauzeren" #. i18n: ectx: property (title), widget (QGroupBox, groupBox) -#: pausemusic/pausemusic_config.ui:29 -msgid "Pause condition" -msgstr "Staat: gepauzeerd" +#: pausemusic/pausemusic_config.ui:32 +msgid "Condition" +msgstr "Staat" #. i18n: ectx: property (text), widget (QRadioButton, rad_ringing) -#: pausemusic/pausemusic_config.ui:35 +#: pausemusic/pausemusic_config.ui:38 msgid "Pause as soon as phone rings" msgstr "Pauzeren zodra de telefoon belt" #. i18n: ectx: property (text), widget (QRadioButton, rad_talking) -#: pausemusic/pausemusic_config.ui:42 +#: pausemusic/pausemusic_config.ui:45 msgid "Pause only while talking" msgstr "Alleen pauzeren bij praten" +#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2) +#: pausemusic/pausemusic_config.ui:61 +msgid "Actions" +msgstr "Acties" + +#. i18n: ectx: property (text), widget (QCheckBox, check_pause) +#: pausemusic/pausemusic_config.ui:67 +msgid "Pause media players" +msgstr "Mediaspelers pauzeren" + #. i18n: ectx: property (text), widget (QCheckBox, check_mute) -#: pausemusic/pausemusic_config.ui:65 -msgid "Mute system instead of pause" -msgstr "Demp het systeem in plaats van pauzeren" +#: pausemusic/pausemusic_config.ui:74 +msgid "Mute system sound" +msgstr "Systeemgeluid dempen" #: ping/pingplugin.cpp:51 msgid "Ping!" msgstr "Ping!" -#: sftp/mounter.cpp:172 +#: sftp/mounter.cpp:176 msgid "Failed to start sshfs" msgstr "Starten van sshfs is mislukt" -#: sftp/mounter.cpp:194 +#: sftp/mounter.cpp:198 msgid "Error when accessing to filesystem" msgstr "Fout bij toegang tot bestandssysteem" -#: sftp/mounter.cpp:205 +#: sftp/mounter.cpp:209 msgid "Failed to mount filesystem: device not responding" msgstr "Bestandssysteem aankoppelen is mislukt: apparaat geeft geen respons" @@ -100,7 +110,15 @@ msgid " min" msgstr " min" -#: sftp/sftpplugin.cpp:196 +#: sftp/sftpplugin.cpp:159 +msgid "All files" +msgstr "" + +#: sftp/sftpplugin.cpp:160 +msgid "Camera pictures" +msgstr "" + +#: sftp/sftpplugin.cpp:207 #, kde-format msgid "Device %1" msgstr "Apparaat %1" @@ -149,7 +167,7 @@ msgid "SMS from %1: %2" msgstr "SMS van %1: %2" -#: telephony/telephonyplugin.cpp:66 +#: telephony/telephonyplugin.cpp:68 #, kde-format msgid "Unknown telephony event: %2" msgstr "Onbekende telefoongebeurtenis: %2" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/pl/kdeconnect-cli.po kdeconnect-0.7.3/po/pl/kdeconnect-cli.po --- kdeconnect-0.7.1/po/pl/kdeconnect-cli.po 2014-06-29 16:12:03.000000000 +0000 +++ kdeconnect-0.7.3/po/pl/kdeconnect-cli.po 2014-10-11 17:35:32.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-28 01:55+0000\n" -"PO-Revision-Date: 2014-06-29 14:10+0200\n" +"POT-Creation-Date: 2014-09-28 08:07+0000\n" +"PO-Revision-Date: 2014-10-04 09:18+0200\n" "Last-Translator: Łukasz Wojniłowicz \n" "Language-Team: Polish \n" "Language: pl\n" @@ -26,51 +26,67 @@ msgid "Your emails" msgstr "lukasz.wojnilowicz@gmail.com" -#: kdeconnect-cli.cpp:33 +#: kdeconnect-cli.cpp:34 msgid "KDE Connect CLI tool" msgstr "Narzędzie CLI KDE Connect" -#: kdeconnect-cli.cpp:34 +#: kdeconnect-cli.cpp:35 msgid "(C) 2013 Aleix Pol Gonzalez" msgstr "(C) 2013 Aleix Pol Gonzalez" -#: kdeconnect-cli.cpp:35 +#: kdeconnect-cli.cpp:36 msgid "Aleix Pol Gonzalez" msgstr "Aleix Pol Gonzalez" -#: kdeconnect-cli.cpp:39 -msgid "List all devices" -msgstr "Wyszczególnij wszystkie urządzenia" - -#: kdeconnect-cli.cpp:40 -msgid "Share a file to a said device" -msgstr "Udostępnij plik podanemu urządzeniu" +#: kdeconnect-cli.cpp:37 +msgid "Albert Vaca Cintora" +msgstr "Albert Vaca Cintora" #: kdeconnect-cli.cpp:41 -msgid "Request pairing to a said device" -msgstr "Zażądaj sparowania z podanym urządzeniem" +msgid "List all devices." +msgstr "Wyszczególnij wszystkie urządzenia." #: kdeconnect-cli.cpp:42 -msgid "Stop pairing to a said device" -msgstr "Zatrzymaj parowanie z podanym urządzeniem" +msgid "Search for devices in the network and re-establish connections." +msgstr "Wyszukaj urządzeń w sieci i ponownie ustanów połączenia." #: kdeconnect-cli.cpp:43 -msgid "Sends a ping to said device" -msgstr "Wysyła ping do podanego urządzenia" +msgid "Request pairing to a said device." +msgstr "Zażądaj sparowania z danym urządzeniem." #: kdeconnect-cli.cpp:44 -msgid "Device ID" -msgstr "ID urządzenia" +msgid "Stop pairing to a said device." +msgstr "Zatrzymaj parowanie z danym urządzeniem." + +#: kdeconnect-cli.cpp:45 +msgid "Send a ping to said device." +msgstr "Wyślij ping do danego urządzenia." + +#: kdeconnect-cli.cpp:46 +msgid "Same as ping but you can customize the shown message." +msgstr "To samo co ping, lecz można dostosować wyświetlaną wiadomość." + +#: kdeconnect-cli.cpp:47 +msgid "Share a file to a said device." +msgstr "Udostępnij plik danemu urządzeniu." + +#: kdeconnect-cli.cpp:48 +msgid "Display the notifications on a said device." +msgstr "Wyświetl powiadomienia na danym urządzeniu." + +#: kdeconnect-cli.cpp:49 +msgid "Device ID." +msgstr "ID urządzenia." -#: kdeconnect-cli.cpp:73 +#: kdeconnect-cli.cpp:79 msgid "No device specified" msgstr "Nie podano urządzenia" -#: kdeconnect-cli.cpp:85 +#: kdeconnect-cli.cpp:91 #, kde-format msgid "Couldn't share %1" msgstr "Nie można udostępnić %1" -#: kdeconnect-cli.cpp:106 +#: kdeconnect-cli.cpp:124 msgid "Nothing to be done with the device" msgstr "Nie można zrobić nic z urządzeniem" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/pl/kdeconnect-core.po kdeconnect-0.7.3/po/pl/kdeconnect-core.po --- kdeconnect-0.7.1/po/pl/kdeconnect-core.po 2014-06-29 16:12:03.000000000 +0000 +++ kdeconnect-0.7.3/po/pl/kdeconnect-core.po 2014-10-11 17:35:32.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-18 01:56+0000\n" +"POT-Creation-Date: 2014-07-16 02:16+0000\n" "PO-Revision-Date: 2014-06-29 14:11+0200\n" "Last-Translator: Łukasz Wojniłowicz \n" "Language-Team: Polish \n" @@ -18,48 +18,48 @@ "|| n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.5\n" -#: device.cpp:168 +#: device.cpp:186 msgid "Already paired" msgstr "Już sparowane" -#: device.cpp:171 +#: device.cpp:189 msgid "Pairing already requested for this device" msgstr "Już zażądano parowania dla tego urządzenia" -#: device.cpp:175 +#: device.cpp:193 msgid "Device not reachable" msgstr "Urządzenie nieosiągalne" -#: device.cpp:188 +#: device.cpp:206 msgid "Error contacting device" msgstr "Błąd połączenia z urządzeniem" -#: device.cpp:226 +#: device.cpp:244 msgid "Timed out" msgstr "Upłynął czasu oczekiwania" -#: device.cpp:325 device.cpp:377 +#: device.cpp:343 device.cpp:395 msgid "Canceled by other peer" msgstr "Anulowane przez innego uczestnika" -#: device.cpp:341 +#: device.cpp:359 msgid "Received incorrect key" msgstr "Otrzymano niepoprawny klucz" -#: device.cpp:358 +#: device.cpp:376 #, kde-format msgid "Pairing request from %1" msgstr "Żądanie parowania z %1" -#: device.cpp:359 +#: device.cpp:377 msgid "Accept" msgstr "Przyjmij" -#: device.cpp:359 +#: device.cpp:377 msgid "Reject" msgstr "Odrzuć" -#: device.cpp:419 +#: device.cpp:437 msgid "Canceled by the user" msgstr "Anulowane przez użytkownika" diff -Nru kdeconnect-0.7.1/po/pl/kdeconnect-kcm.po kdeconnect-0.7.3/po/pl/kdeconnect-kcm.po --- kdeconnect-0.7.1/po/pl/kdeconnect-kcm.po 2014-06-29 16:12:03.000000000 +0000 +++ kdeconnect-0.7.3/po/pl/kdeconnect-kcm.po 2014-10-11 17:35:32.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-15 02:00+0000\n" -"PO-Revision-Date: 2014-03-23 06:42+0100\n" +"POT-Creation-Date: 2014-08-12 02:06+0000\n" +"PO-Revision-Date: 2014-08-15 07:58+0200\n" "Last-Translator: Łukasz Wojniłowicz \n" "Language-Team: Polish \n" "Language: pl\n" @@ -18,44 +18,49 @@ "|| n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.5\n" -#: kcm.cpp:144 kcm.cpp:228 +#: kcm.cpp:152 kcm.cpp:236 msgid "(paired)" msgstr "(sparowane)" -#: kcm.cpp:144 kcm.cpp:200 kcm.cpp:211 +#: kcm.cpp:152 kcm.cpp:208 kcm.cpp:219 msgid "(unpaired)" msgstr "(niesparowane)" -#: kcm.cpp:158 +#: kcm.cpp:166 msgid "Plugins" msgstr "Wtyczki" -#: kcm.cpp:213 +#: kcm.cpp:221 #, kde-format msgid "Error trying to pair: %1" msgstr "Błąd przy próbie parowania: %1" +#. i18n: ectx: property (text), widget (QPushButton, refresh_button) +#: kcm.ui:41 +msgid "Refresh" +msgstr "Odśwież" + #. i18n: ectx: property (text), widget (QLabel, name_label) -#: kcm.ui:84 +#: kcm.ui:88 msgid "Device" msgstr "Urządzenie" #. i18n: ectx: property (text), widget (QLabel, status_label) -#: kcm.ui:97 +#: kcm.ui:101 msgid "(status)" msgstr "(stan)" #. i18n: ectx: property (text), widget (QPushButton, pair_button) -#: kcm.ui:142 +#: kcm.ui:146 msgid "Request pair" msgstr "Zażądaj sparowania" #. i18n: ectx: property (text), widget (QPushButton, unpair_button) -#: kcm.ui:155 +#: kcm.ui:159 msgid "Unpair" msgstr "Odparuj" #. i18n: ectx: property (text), widget (QPushButton, ping_button) -#: kcm.ui:168 +#: kcm.ui:172 msgid "Send ping" msgstr "Wyślij ping" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/pl/kdeconnect-kio.po kdeconnect-0.7.3/po/pl/kdeconnect-kio.po --- kdeconnect-0.7.1/po/pl/kdeconnect-kio.po 2014-06-29 16:12:03.000000000 +0000 +++ kdeconnect-0.7.3/po/pl/kdeconnect-kio.po 2014-10-11 17:35:32.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-15 01:46+0000\n" +"POT-Creation-Date: 2014-10-11 01:54+0000\n" "PO-Revision-Date: 2014-03-23 06:42+0100\n" "Last-Translator: Łukasz Wojniłowicz \n" "Language-Team: Polish \n" @@ -34,22 +34,14 @@ msgid "Listing devices..." msgstr "Wyszczególnianie urządzeń..." -#: kiokdeconnect.cpp:130 +#: kiokdeconnect.cpp:131 msgid "Accessing device..." msgstr "Uzyskiwanie dostępu do urządzenia..." -#: kiokdeconnect.cpp:145 +#: kiokdeconnect.cpp:144 msgid "Could not mount device filesystem" msgstr "Nie można zamontować systemu plików urządzenia" -#: kiokdeconnect.cpp:160 -msgid "Camera pictures" -msgstr "Zdjęcia z aparatu" - -#: kiokdeconnect.cpp:169 -msgid "All files" -msgstr "Wszystkie pliki" - -#: kiokdeconnect.cpp:194 +#: kiokdeconnect.cpp:189 msgid "Could not contact background service." msgstr "Nie można połączyć z usługą w tle." \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/pl/kdeconnect-plugins.po kdeconnect-0.7.3/po/pl/kdeconnect-plugins.po --- kdeconnect-0.7.1/po/pl/kdeconnect-plugins.po 2014-06-29 16:12:03.000000000 +0000 +++ kdeconnect-0.7.3/po/pl/kdeconnect-plugins.po 2014-10-11 17:35:32.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-28 01:55+0000\n" -"PO-Revision-Date: 2014-06-29 14:12+0200\n" +"POT-Creation-Date: 2014-10-11 01:54+0000\n" +"PO-Revision-Date: 2014-09-19 15:33+0200\n" "Last-Translator: Łukasz Wojniłowicz \n" "Language-Team: Polish \n" "Language: pl\n" @@ -35,38 +35,48 @@ msgstr "Wtyczka wstrzymywania muzyki" #. i18n: ectx: property (title), widget (QGroupBox, groupBox) -#: pausemusic/pausemusic_config.ui:29 -msgid "Pause condition" -msgstr "Warunek wstrzymania" +#: pausemusic/pausemusic_config.ui:32 +msgid "Condition" +msgstr "Warunek" #. i18n: ectx: property (text), widget (QRadioButton, rad_ringing) -#: pausemusic/pausemusic_config.ui:35 +#: pausemusic/pausemusic_config.ui:38 msgid "Pause as soon as phone rings" msgstr "Wstrzymaj w momencie dzwonienia" #. i18n: ectx: property (text), widget (QRadioButton, rad_talking) -#: pausemusic/pausemusic_config.ui:42 +#: pausemusic/pausemusic_config.ui:45 msgid "Pause only while talking" msgstr "Wstrzymaj tylko podczas rozmawiania" +#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2) +#: pausemusic/pausemusic_config.ui:61 +msgid "Actions" +msgstr "Działania" + +#. i18n: ectx: property (text), widget (QCheckBox, check_pause) +#: pausemusic/pausemusic_config.ui:67 +msgid "Pause media players" +msgstr "Wstrzymaj odtwarzacze multimediów" + #. i18n: ectx: property (text), widget (QCheckBox, check_mute) -#: pausemusic/pausemusic_config.ui:65 -msgid "Mute system instead of pause" -msgstr "Wycisz system zamiast wstrzymywać" +#: pausemusic/pausemusic_config.ui:74 +msgid "Mute system sound" +msgstr "Wycisz dźwięk w systemie" #: ping/pingplugin.cpp:51 msgid "Ping!" msgstr "Ping!" -#: sftp/mounter.cpp:172 +#: sftp/mounter.cpp:176 msgid "Failed to start sshfs" msgstr "Nieudane uruchamianie sshfs" -#: sftp/mounter.cpp:194 +#: sftp/mounter.cpp:198 msgid "Error when accessing to filesystem" msgstr "Błąd przy uzyskiwaniu dostępu do systemu plików" -#: sftp/mounter.cpp:205 +#: sftp/mounter.cpp:209 msgid "Failed to mount filesystem: device not responding" msgstr "Nieudane montowanie systemu plików: urządzenie nie odpowiada" @@ -101,7 +111,15 @@ msgid " min" msgstr " min" -#: sftp/sftpplugin.cpp:196 +#: sftp/sftpplugin.cpp:159 +msgid "All files" +msgstr "" + +#: sftp/sftpplugin.cpp:160 +msgid "Camera pictures" +msgstr "" + +#: sftp/sftpplugin.cpp:207 #, kde-format msgid "Device %1" msgstr "Urządzenie %1" @@ -149,7 +167,7 @@ msgid "SMS from %1: %2" msgstr "SMS od %1: %2" -#: telephony/telephonyplugin.cpp:66 +#: telephony/telephonyplugin.cpp:68 #, kde-format msgid "Unknown telephony event: %2" msgstr "Nieznane zdarzenie telefoniczne: %2" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/pt/kdeconnect-cli.po kdeconnect-0.7.3/po/pt/kdeconnect-cli.po --- kdeconnect-0.7.1/po/pt/kdeconnect-cli.po 2014-06-29 16:12:16.000000000 +0000 +++ kdeconnect-0.7.3/po/pt/kdeconnect-cli.po 2014-10-11 17:36:27.000000000 +0000 @@ -2,15 +2,16 @@ msgstr "" "Project-Id-Version: kdeconnect-cli\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-28 01:55+0000\n" -"PO-Revision-Date: 2014-06-28 12:33+0100\n" +"POT-Creation-Date: 2014-09-28 08:07+0000\n" +"PO-Revision-Date: 2014-09-28 11:40+0100\n" "Last-Translator: José Nuno Coelho Pires \n" "Language-Team: Portuguese \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-POFile-SpellExtra: Gonzalez Pol Connect Aleix\n" +"X-POFile-SpellExtra: Gonzalez Pol Connect Aleix Cintora\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" @@ -20,51 +21,67 @@ msgid "Your emails" msgstr "zepires@gmail.com" -#: kdeconnect-cli.cpp:33 +#: kdeconnect-cli.cpp:34 msgid "KDE Connect CLI tool" msgstr "Ferramenta da linha de comandos do KDE-Connect" -#: kdeconnect-cli.cpp:34 +#: kdeconnect-cli.cpp:35 msgid "(C) 2013 Aleix Pol Gonzalez" msgstr "(C) 2013 Aleix Pol Gonzalez" -#: kdeconnect-cli.cpp:35 +#: kdeconnect-cli.cpp:36 msgid "Aleix Pol Gonzalez" msgstr "Aleix Pol Gonzalez" -#: kdeconnect-cli.cpp:39 -msgid "List all devices" -msgstr "Apresenta todos os dispositivos" - -#: kdeconnect-cli.cpp:40 -msgid "Share a file to a said device" -msgstr "Partilhar um ficheiro para um dado dispositivo" +#: kdeconnect-cli.cpp:37 +msgid "Albert Vaca Cintora" +msgstr "Albert Vaca Cintora" #: kdeconnect-cli.cpp:41 -msgid "Request pairing to a said device" -msgstr "Pedir o emparelhamento a um dado dispositivo" +msgid "List all devices." +msgstr "Apresentar todos os dispositivos." #: kdeconnect-cli.cpp:42 -msgid "Stop pairing to a said device" -msgstr "Parar o emparelhamento com um dado dispositivo" +msgid "Search for devices in the network and re-establish connections." +msgstr "Procurar por dispositivos na rede e voltar a estabelecer as ligações." #: kdeconnect-cli.cpp:43 -msgid "Sends a ping to said device" -msgstr "Enviar um contacto para um dado dispositivo" +msgid "Request pairing to a said device." +msgstr "Pedir o emparelhamento a um dado dispositivo." #: kdeconnect-cli.cpp:44 -msgid "Device ID" -msgstr "ID do Dispositivo" +msgid "Stop pairing to a said device." +msgstr "Parar o emparelhamento com um dado dispositivo." + +#: kdeconnect-cli.cpp:45 +msgid "Send a ping to said device." +msgstr "Enviar um contacto para um dado dispositivo." + +#: kdeconnect-cli.cpp:46 +msgid "Same as ping but you can customize the shown message." +msgstr "Igual ao contacto, mas poderá personalizar a mensagem apresentada." + +#: kdeconnect-cli.cpp:47 +msgid "Share a file to a said device." +msgstr "Partilhar um ficheiro com um dado dispositivo." + +#: kdeconnect-cli.cpp:48 +msgid "Display the notifications on a said device." +msgstr "Mostrar as notificações de um dado dispositivo." + +#: kdeconnect-cli.cpp:49 +msgid "Device ID." +msgstr "O ID do dispositivo." -#: kdeconnect-cli.cpp:73 +#: kdeconnect-cli.cpp:79 msgid "No device specified" msgstr "Não foi indicado nenhum dispositivo" -#: kdeconnect-cli.cpp:85 +#: kdeconnect-cli.cpp:91 #, kde-format msgid "Couldn't share %1" msgstr "Não foi possível partilhar o %1" -#: kdeconnect-cli.cpp:106 +#: kdeconnect-cli.cpp:124 msgid "Nothing to be done with the device" msgstr "Não existe nada a fazer com o dispositivo" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/pt/kdeconnect-core.po kdeconnect-0.7.3/po/pt/kdeconnect-core.po --- kdeconnect-0.7.1/po/pt/kdeconnect-core.po 2014-06-29 16:12:16.000000000 +0000 +++ kdeconnect-0.7.3/po/pt/kdeconnect-core.po 2014-10-11 17:36:27.000000000 +0000 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: kdeconnect-core\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-18 01:56+0000\n" +"POT-Creation-Date: 2014-07-16 02:16+0000\n" "PO-Revision-Date: 2014-06-18 09:43+0100\n" "Last-Translator: José Nuno Coelho Pires \n" "Language-Team: Portuguese \n" @@ -11,49 +11,50 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-POFile-SpellExtra: Connect\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" -#: device.cpp:168 +#: device.cpp:186 msgid "Already paired" msgstr "Já emparelhado" -#: device.cpp:171 +#: device.cpp:189 msgid "Pairing already requested for this device" msgstr "Já foi pedido o emparelhamento deste dispositivo" -#: device.cpp:175 +#: device.cpp:193 msgid "Device not reachable" msgstr "Dispositivo inacessível" -#: device.cpp:188 +#: device.cpp:206 msgid "Error contacting device" msgstr "Ocorreu um erro ao contactar o dispositivo" -#: device.cpp:226 +#: device.cpp:244 msgid "Timed out" msgstr "Tempo-limite expirado" -#: device.cpp:325 device.cpp:377 +#: device.cpp:343 device.cpp:395 msgid "Canceled by other peer" msgstr "Cancelado pelo outro dispositivo" -#: device.cpp:341 +#: device.cpp:359 msgid "Received incorrect key" msgstr "Foi recebida uma chave incorrecta" -#: device.cpp:358 +#: device.cpp:376 #, kde-format msgid "Pairing request from %1" msgstr "Pedido de emparelhamento de %1" -#: device.cpp:359 +#: device.cpp:377 msgid "Accept" msgstr "Aceitar" -#: device.cpp:359 +#: device.cpp:377 msgid "Reject" msgstr "Rejeitar" -#: device.cpp:419 +#: device.cpp:437 msgid "Canceled by the user" msgstr "Cancelado pelo utilizador" diff -Nru kdeconnect-0.7.1/po/pt/kdeconnect-filetiemaction.po kdeconnect-0.7.3/po/pt/kdeconnect-filetiemaction.po --- kdeconnect-0.7.1/po/pt/kdeconnect-filetiemaction.po 2014-06-29 16:12:16.000000000 +0000 +++ kdeconnect-0.7.3/po/pt/kdeconnect-filetiemaction.po 2014-10-11 17:36:27.000000000 +0000 @@ -11,6 +11,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-POFile-SpellExtra: Connect\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" #: sendfileitemaction.cpp:67 msgid "Send via KDE Connect" diff -Nru kdeconnect-0.7.1/po/pt/kdeconnect-kcm.po kdeconnect-0.7.3/po/pt/kdeconnect-kcm.po --- kdeconnect-0.7.1/po/pt/kdeconnect-kcm.po 2014-06-29 16:12:16.000000000 +0000 +++ kdeconnect-0.7.3/po/pt/kdeconnect-kcm.po 2014-10-11 17:36:27.000000000 +0000 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: kdeconnect-kcm\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-15 02:00+0000\n" +"POT-Creation-Date: 2014-08-12 02:06+0000\n" "PO-Revision-Date: 2013-09-13 09:47+0100\n" "Last-Translator: José Nuno Coelho Pires \n" "Language-Team: Portuguese \n" @@ -12,44 +12,49 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: kcm.cpp:144 kcm.cpp:228 +#: kcm.cpp:152 kcm.cpp:236 msgid "(paired)" msgstr "(emparelhado)" -#: kcm.cpp:144 kcm.cpp:200 kcm.cpp:211 +#: kcm.cpp:152 kcm.cpp:208 kcm.cpp:219 msgid "(unpaired)" msgstr "(não-emparelhado)" -#: kcm.cpp:158 +#: kcm.cpp:166 msgid "Plugins" msgstr "'Plugins'" -#: kcm.cpp:213 +#: kcm.cpp:221 #, kde-format msgid "Error trying to pair: %1" msgstr "Erro ao tentar emparelhar: %1" +#. i18n: ectx: property (text), widget (QPushButton, refresh_button) +#: kcm.ui:41 +msgid "Refresh" +msgstr "Actualizar" + #. i18n: ectx: property (text), widget (QLabel, name_label) -#: kcm.ui:84 +#: kcm.ui:88 msgid "Device" msgstr "Dispositivo" #. i18n: ectx: property (text), widget (QLabel, status_label) -#: kcm.ui:97 +#: kcm.ui:101 msgid "(status)" msgstr "(estado)" #. i18n: ectx: property (text), widget (QPushButton, pair_button) -#: kcm.ui:142 +#: kcm.ui:146 msgid "Request pair" msgstr "Pedir o emparelhamento" #. i18n: ectx: property (text), widget (QPushButton, unpair_button) -#: kcm.ui:155 +#: kcm.ui:159 msgid "Unpair" msgstr "Cancelar o emparelhamento" #. i18n: ectx: property (text), widget (QPushButton, ping_button) -#: kcm.ui:168 +#: kcm.ui:172 msgid "Send ping" msgstr "Enviar um pedido de rede" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/pt/kdeconnect-kio.po kdeconnect-0.7.3/po/pt/kdeconnect-kio.po --- kdeconnect-0.7.1/po/pt/kdeconnect-kio.po 2014-06-29 16:12:16.000000000 +0000 +++ kdeconnect-0.7.3/po/pt/kdeconnect-kio.po 2014-10-11 17:36:27.000000000 +0000 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: kdeconnect-kio\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-15 01:46+0000\n" +"POT-Creation-Date: 2014-10-11 01:54+0000\n" "PO-Revision-Date: 2014-02-15 12:42+0000\n" "Last-Translator: José Nuno Coelho Pires \n" "Language-Team: Portuguese \n" @@ -29,22 +29,14 @@ msgid "Listing devices..." msgstr "A enumerar os dispositivos..." -#: kiokdeconnect.cpp:130 +#: kiokdeconnect.cpp:131 msgid "Accessing device..." msgstr "A aceder ao dispositivo..." -#: kiokdeconnect.cpp:145 +#: kiokdeconnect.cpp:144 msgid "Could not mount device filesystem" msgstr "Não foi possível montar o sistema de ficheiros do dispositivo" -#: kiokdeconnect.cpp:160 -msgid "Camera pictures" -msgstr "Imagens da máquina fotográfica" - -#: kiokdeconnect.cpp:169 -msgid "All files" -msgstr "Todos os ficheiros" - -#: kiokdeconnect.cpp:194 +#: kiokdeconnect.cpp:189 msgid "Could not contact background service." msgstr "Não foi possível contactar o serviço em segundo plano." \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/pt/kdeconnect-plugins.po kdeconnect-0.7.3/po/pt/kdeconnect-plugins.po --- kdeconnect-0.7.1/po/pt/kdeconnect-plugins.po 2014-06-29 16:12:16.000000000 +0000 +++ kdeconnect-0.7.3/po/pt/kdeconnect-plugins.po 2014-10-11 17:36:27.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: kdeconnect-plugins\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-28 01:55+0000\n" -"PO-Revision-Date: 2014-06-18 10:25+0100\n" +"POT-Creation-Date: 2014-10-11 01:54+0000\n" +"PO-Revision-Date: 2014-10-11 12:47+0100\n" "Last-Translator: José Nuno Coelho Pires \n" "Language-Team: Portuguese \n" "Language: \n" @@ -16,6 +16,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-POFile-SpellExtra: min sshfs\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" #: battery/batteryplugin.cpp:77 #, kde-format @@ -34,38 +35,48 @@ msgstr "'Plugin' de pausa da música" #. i18n: ectx: property (title), widget (QGroupBox, groupBox) -#: pausemusic/pausemusic_config.ui:29 -msgid "Pause condition" -msgstr "Condição de pausa" +#: pausemusic/pausemusic_config.ui:32 +msgid "Condition" +msgstr "Condição" #. i18n: ectx: property (text), widget (QRadioButton, rad_ringing) -#: pausemusic/pausemusic_config.ui:35 +#: pausemusic/pausemusic_config.ui:38 msgid "Pause as soon as phone rings" msgstr "Pausar assim que o telefone tocar" #. i18n: ectx: property (text), widget (QRadioButton, rad_talking) -#: pausemusic/pausemusic_config.ui:42 +#: pausemusic/pausemusic_config.ui:45 msgid "Pause only while talking" msgstr "Pausar apenas enquanto falar" +#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2) +#: pausemusic/pausemusic_config.ui:61 +msgid "Actions" +msgstr "Acções" + +#. i18n: ectx: property (text), widget (QCheckBox, check_pause) +#: pausemusic/pausemusic_config.ui:67 +msgid "Pause media players" +msgstr "Pausar os leitores multimédia" + #. i18n: ectx: property (text), widget (QCheckBox, check_mute) -#: pausemusic/pausemusic_config.ui:65 -msgid "Mute system instead of pause" -msgstr "Silenciar o sistema em vez de pausar" +#: pausemusic/pausemusic_config.ui:74 +msgid "Mute system sound" +msgstr "Silenciar o som do sistema" #: ping/pingplugin.cpp:51 msgid "Ping!" msgstr "Contacto!" -#: sftp/mounter.cpp:172 +#: sftp/mounter.cpp:176 msgid "Failed to start sshfs" msgstr "Não foi possível iniciar o 'sshfs'" -#: sftp/mounter.cpp:194 +#: sftp/mounter.cpp:198 msgid "Error when accessing to filesystem" msgstr "Ocorreu um erro ao aceder ao sistema de ficheiros" -#: sftp/mounter.cpp:205 +#: sftp/mounter.cpp:209 msgid "Failed to mount filesystem: device not responding" msgstr "" "Não foi possível montar o sistema de ficheiros: o dispositivo não responde" @@ -101,7 +112,15 @@ msgid " min" msgstr " min" -#: sftp/sftpplugin.cpp:196 +#: sftp/sftpplugin.cpp:159 +msgid "All files" +msgstr "Todos os ficheiros" + +#: sftp/sftpplugin.cpp:160 +msgid "Camera pictures" +msgstr "Fotografias" + +#: sftp/sftpplugin.cpp:207 #, kde-format msgid "Device %1" msgstr "Dispositivo %1" @@ -150,7 +169,7 @@ msgid "SMS from %1: %2" msgstr "SMS de %1: %2" -#: telephony/telephonyplugin.cpp:66 +#: telephony/telephonyplugin.cpp:68 #, kde-format msgid "Unknown telephony event: %2" msgstr "Evento de telefonia desconhecido: %2" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/pt_BR/kdeconnect-cli.po kdeconnect-0.7.3/po/pt_BR/kdeconnect-cli.po --- kdeconnect-0.7.1/po/pt_BR/kdeconnect-cli.po 2014-06-29 16:12:32.000000000 +0000 +++ kdeconnect-0.7.3/po/pt_BR/kdeconnect-cli.po 2014-10-11 17:36:58.000000000 +0000 @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # André Marcelo Alvarenga , 2014. +# Aracele Torres , 2014. msgid "" msgstr "" "Project-Id-Version: kdeconnect-cli\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-28 01:55+0000\n" -"PO-Revision-Date: 2014-06-28 17:37-0300\n" -"Last-Translator: André Marcelo Alvarenga \n" -"Language-Team: Brazilian Portuguese \n" +"POT-Creation-Date: 2014-09-28 08:07+0000\n" +"PO-Revision-Date: 2014-09-28 14:49-0300\n" +"Last-Translator: Aracele Torres \n" +"Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,57 +21,73 @@ msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "André Marcelo Alvarenga" +msgstr "André Marcelo Alvarenga, Aracele Torres" msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "alvarenga@kde.org" +msgstr "alvarenga@kde.org, aracele@kde.org" -#: kdeconnect-cli.cpp:33 +#: kdeconnect-cli.cpp:34 msgid "KDE Connect CLI tool" msgstr "Ferramenta da linha de comando do KDE-Connect" -#: kdeconnect-cli.cpp:34 +#: kdeconnect-cli.cpp:35 msgid "(C) 2013 Aleix Pol Gonzalez" msgstr "(C) 2013 Aleix Pol Gonzalez" -#: kdeconnect-cli.cpp:35 +#: kdeconnect-cli.cpp:36 msgid "Aleix Pol Gonzalez" msgstr "Aleix Pol Gonzalez" -#: kdeconnect-cli.cpp:39 -msgid "List all devices" -msgstr "Listar todos os dispositivos" - -#: kdeconnect-cli.cpp:40 -msgid "Share a file to a said device" -msgstr "Compartilhar um arquivo para um determinado dispositivo" +#: kdeconnect-cli.cpp:37 +msgid "Albert Vaca Cintora" +msgstr "Albert Vaca Cintora" #: kdeconnect-cli.cpp:41 -msgid "Request pairing to a said device" -msgstr "Solicitar o emparelhamento a um determinado dispositivo" +msgid "List all devices." +msgstr "Listar todos os dispositivos." #: kdeconnect-cli.cpp:42 -msgid "Stop pairing to a said device" -msgstr "Parar o emparelhamento de um determinado dispositivo" +msgid "Search for devices in the network and re-establish connections." +msgstr "Procurar dispositivos na rede e restabelecer conexões." #: kdeconnect-cli.cpp:43 -msgid "Sends a ping to said device" -msgstr "Enviar um ping para o dispositivo" +msgid "Request pairing to a said device." +msgstr "Solicitar o emparelhamento a um determinado dispositivo." #: kdeconnect-cli.cpp:44 -msgid "Device ID" -msgstr "ID do dispositivo" +msgid "Stop pairing to a said device." +msgstr "Parar o emparelhamento de um determinado dispositivo." + +#: kdeconnect-cli.cpp:45 +msgid "Send a ping to said device." +msgstr "Enviar um ping para um determinado dispositivo." + +#: kdeconnect-cli.cpp:46 +msgid "Same as ping but you can customize the shown message." +msgstr "Igual ao ping mas você pode personalizar a mensagem mostrada." + +#: kdeconnect-cli.cpp:47 +msgid "Share a file to a said device." +msgstr "Compartilhar um arquivo com um determinado dispositivo." + +#: kdeconnect-cli.cpp:48 +msgid "Display the notifications on a said device." +msgstr "Mostrar as notificações em um determinado dispositivo." + +#: kdeconnect-cli.cpp:49 +msgid "Device ID." +msgstr "ID do dispositivo." -#: kdeconnect-cli.cpp:73 +#: kdeconnect-cli.cpp:79 msgid "No device specified" msgstr "Nenhum dispositivo indicado" -#: kdeconnect-cli.cpp:85 +#: kdeconnect-cli.cpp:91 #, kde-format msgid "Couldn't share %1" msgstr "Não foi possível compartilhar o %1" -#: kdeconnect-cli.cpp:106 +#: kdeconnect-cli.cpp:124 msgid "Nothing to be done with the device" msgstr "Não há nada a ser feito com o dispositivo" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/pt_BR/kdeconnect-core.po kdeconnect-0.7.3/po/pt_BR/kdeconnect-core.po --- kdeconnect-0.7.1/po/pt_BR/kdeconnect-core.po 2014-06-29 16:12:32.000000000 +0000 +++ kdeconnect-0.7.3/po/pt_BR/kdeconnect-core.po 2014-10-11 17:36:58.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kdeconnect-core\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-18 01:56+0000\n" +"POT-Creation-Date: 2014-07-16 02:16+0000\n" "PO-Revision-Date: 2014-06-18 08:15-0300\n" "Last-Translator: André Marcelo Alvarenga \n" "Language-Team: Brazilian Portuguese \n" @@ -18,48 +18,48 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 1.5\n" -#: device.cpp:168 +#: device.cpp:186 msgid "Already paired" msgstr "Já emparelhado" -#: device.cpp:171 +#: device.cpp:189 msgid "Pairing already requested for this device" msgstr "Já foi solicitado o emparelhamento deste dispositivo" -#: device.cpp:175 +#: device.cpp:193 msgid "Device not reachable" msgstr "Dispositivo inacessível" -#: device.cpp:188 +#: device.cpp:206 msgid "Error contacting device" msgstr "Erro ao contactar o dispositivo" -#: device.cpp:226 +#: device.cpp:244 msgid "Timed out" msgstr "Tempo limite expirou" -#: device.cpp:325 device.cpp:377 +#: device.cpp:343 device.cpp:395 msgid "Canceled by other peer" msgstr "Cancelado pelo outro dispositivo" -#: device.cpp:341 +#: device.cpp:359 msgid "Received incorrect key" msgstr "Chave incorreta recebida" -#: device.cpp:358 +#: device.cpp:376 #, kde-format msgid "Pairing request from %1" msgstr "Solicitação de emparelhamento de %1" -#: device.cpp:359 +#: device.cpp:377 msgid "Accept" msgstr "Aceitar" -#: device.cpp:359 +#: device.cpp:377 msgid "Reject" msgstr "Rejeitar" -#: device.cpp:419 +#: device.cpp:437 msgid "Canceled by the user" msgstr "Cancelada pelo usuário" diff -Nru kdeconnect-0.7.1/po/pt_BR/kdeconnect-kcm.po kdeconnect-0.7.3/po/pt_BR/kdeconnect-kcm.po --- kdeconnect-0.7.1/po/pt_BR/kdeconnect-kcm.po 2014-06-29 16:12:32.000000000 +0000 +++ kdeconnect-0.7.3/po/pt_BR/kdeconnect-kcm.po 2014-10-11 17:36:58.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: kdeconnect-kcm\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-15 02:00+0000\n" -"PO-Revision-Date: 2014-02-15 10:37-0200\n" +"POT-Creation-Date: 2014-08-12 02:06+0000\n" +"PO-Revision-Date: 2014-08-13 22:23-0300\n" "Last-Translator: André Marcelo Alvarenga \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" @@ -18,44 +18,49 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 1.5\n" -#: kcm.cpp:144 kcm.cpp:228 +#: kcm.cpp:152 kcm.cpp:236 msgid "(paired)" msgstr "(emparelhado)" -#: kcm.cpp:144 kcm.cpp:200 kcm.cpp:211 +#: kcm.cpp:152 kcm.cpp:208 kcm.cpp:219 msgid "(unpaired)" msgstr "(não emparelhado)" -#: kcm.cpp:158 +#: kcm.cpp:166 msgid "Plugins" msgstr "Plugins" -#: kcm.cpp:213 +#: kcm.cpp:221 #, kde-format msgid "Error trying to pair: %1" msgstr "Erro ao tentar emparelhar: %1" +#. i18n: ectx: property (text), widget (QPushButton, refresh_button) +#: kcm.ui:41 +msgid "Refresh" +msgstr "Atualizar" + #. i18n: ectx: property (text), widget (QLabel, name_label) -#: kcm.ui:84 +#: kcm.ui:88 msgid "Device" msgstr "Dispositivo" #. i18n: ectx: property (text), widget (QLabel, status_label) -#: kcm.ui:97 +#: kcm.ui:101 msgid "(status)" msgstr "(Status)" #. i18n: ectx: property (text), widget (QPushButton, pair_button) -#: kcm.ui:142 +#: kcm.ui:146 msgid "Request pair" msgstr "Solicitar emparelhamento" #. i18n: ectx: property (text), widget (QPushButton, unpair_button) -#: kcm.ui:155 +#: kcm.ui:159 msgid "Unpair" msgstr "Cancelar emparelhamento" #. i18n: ectx: property (text), widget (QPushButton, ping_button) -#: kcm.ui:168 +#: kcm.ui:172 msgid "Send ping" msgstr "Enviar ping" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/pt_BR/kdeconnect-kio.po kdeconnect-0.7.3/po/pt_BR/kdeconnect-kio.po --- kdeconnect-0.7.1/po/pt_BR/kdeconnect-kio.po 2014-06-29 16:12:32.000000000 +0000 +++ kdeconnect-0.7.3/po/pt_BR/kdeconnect-kio.po 2014-10-11 17:36:58.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: kdeconnect-kio\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-15 01:46+0000\n" +"POT-Creation-Date: 2014-10-11 01:54+0000\n" "PO-Revision-Date: 2014-02-17 00:36-0300\n" "Last-Translator: André Marcelo Alvarenga \n" "Language-Team: Brazilian Portuguese \n" @@ -34,22 +34,14 @@ msgid "Listing devices..." msgstr "Listando dispositivos..." -#: kiokdeconnect.cpp:130 +#: kiokdeconnect.cpp:131 msgid "Accessing device..." msgstr "Acessando dispositivo..." -#: kiokdeconnect.cpp:145 +#: kiokdeconnect.cpp:144 msgid "Could not mount device filesystem" msgstr "Não foi possível montar o sistema de arquivos do dispositivo" -#: kiokdeconnect.cpp:160 -msgid "Camera pictures" -msgstr "Imagens da câmera" - -#: kiokdeconnect.cpp:169 -msgid "All files" -msgstr "Todos os arquivos" - -#: kiokdeconnect.cpp:194 +#: kiokdeconnect.cpp:189 msgid "Could not contact background service." msgstr "Não foi possível contactar o serviço em segundo plano." \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/pt_BR/kdeconnect-plugins.po kdeconnect-0.7.3/po/pt_BR/kdeconnect-plugins.po --- kdeconnect-0.7.1/po/pt_BR/kdeconnect-plugins.po 2014-06-29 16:12:32.000000000 +0000 +++ kdeconnect-0.7.3/po/pt_BR/kdeconnect-plugins.po 2014-10-11 17:36:58.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: kdeconnect-plugins\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-28 01:55+0000\n" -"PO-Revision-Date: 2014-06-18 08:18-0300\n" +"POT-Creation-Date: 2014-10-11 01:54+0000\n" +"PO-Revision-Date: 2014-10-11 08:21-0300\n" "Last-Translator: André Marcelo Alvarenga \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" @@ -35,38 +35,48 @@ msgstr "Plugin de pausa da música" #. i18n: ectx: property (title), widget (QGroupBox, groupBox) -#: pausemusic/pausemusic_config.ui:29 -msgid "Pause condition" -msgstr "Condição de pausa" +#: pausemusic/pausemusic_config.ui:32 +msgid "Condition" +msgstr "Condição" #. i18n: ectx: property (text), widget (QRadioButton, rad_ringing) -#: pausemusic/pausemusic_config.ui:35 +#: pausemusic/pausemusic_config.ui:38 msgid "Pause as soon as phone rings" msgstr "Pausar assim que o telefone tocar" #. i18n: ectx: property (text), widget (QRadioButton, rad_talking) -#: pausemusic/pausemusic_config.ui:42 +#: pausemusic/pausemusic_config.ui:45 msgid "Pause only while talking" msgstr "Pausar apenas enquanto estiver falando" +#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2) +#: pausemusic/pausemusic_config.ui:61 +msgid "Actions" +msgstr "Ações" + +#. i18n: ectx: property (text), widget (QCheckBox, check_pause) +#: pausemusic/pausemusic_config.ui:67 +msgid "Pause media players" +msgstr "Pausar os reprodutores multimídia" + #. i18n: ectx: property (text), widget (QCheckBox, check_mute) -#: pausemusic/pausemusic_config.ui:65 -msgid "Mute system instead of pause" -msgstr "Silenciar o sistema em vez de pausar" +#: pausemusic/pausemusic_config.ui:74 +msgid "Mute system sound" +msgstr "Silenciar o sistema de som" #: ping/pingplugin.cpp:51 msgid "Ping!" msgstr "Ping!" -#: sftp/mounter.cpp:172 +#: sftp/mounter.cpp:176 msgid "Failed to start sshfs" msgstr "Ocorreu uma falha ao iniciar o sshfs" -#: sftp/mounter.cpp:194 +#: sftp/mounter.cpp:198 msgid "Error when accessing to filesystem" msgstr "Erro ao acessar o sistema de arquivos" -#: sftp/mounter.cpp:205 +#: sftp/mounter.cpp:209 msgid "Failed to mount filesystem: device not responding" msgstr "" "Ocorreu uma falha ao montar o sistema de arquivos: dispositivo não responde" @@ -102,7 +112,15 @@ msgid " min" msgstr " min" -#: sftp/sftpplugin.cpp:196 +#: sftp/sftpplugin.cpp:159 +msgid "All files" +msgstr "Todos os arquivos" + +#: sftp/sftpplugin.cpp:160 +msgid "Camera pictures" +msgstr "Imagens da câmera" + +#: sftp/sftpplugin.cpp:207 #, kde-format msgid "Device %1" msgstr "Dispositivo %1" @@ -151,7 +169,7 @@ msgid "SMS from %1: %2" msgstr "SMS de %1: %2" -#: telephony/telephonyplugin.cpp:66 +#: telephony/telephonyplugin.cpp:68 #, kde-format msgid "Unknown telephony event: %2" msgstr "Evento telefônico desconhecido: %2" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/ro/kdeconnect-kcm.po kdeconnect-0.7.3/po/ro/kdeconnect-kcm.po --- kdeconnect-0.7.1/po/ro/kdeconnect-kcm.po 2014-06-29 16:12:40.000000000 +0000 +++ kdeconnect-0.7.3/po/ro/kdeconnect-kcm.po 2014-10-11 17:37:22.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-15 02:00+0000\n" +"POT-Creation-Date: 2014-08-12 02:06+0000\n" "PO-Revision-Date: 2014-03-25 16:46+0200\n" "Last-Translator: Sergiu Bivol \n" "Language-Team: Romanian \n" @@ -18,44 +18,49 @@ "20)) ? 1 : 2;\n" "X-Generator: Lokalize 1.5\n" -#: kcm.cpp:144 kcm.cpp:228 +#: kcm.cpp:152 kcm.cpp:236 msgid "(paired)" msgstr "(asociat)" -#: kcm.cpp:144 kcm.cpp:200 kcm.cpp:211 +#: kcm.cpp:152 kcm.cpp:208 kcm.cpp:219 msgid "(unpaired)" msgstr "(neasociat)" -#: kcm.cpp:158 +#: kcm.cpp:166 msgid "Plugins" msgstr "Extensii" -#: kcm.cpp:213 +#: kcm.cpp:221 #, kde-format msgid "Error trying to pair: %1" msgstr "Eroare la încercarea de asociere: %1" +#. i18n: ectx: property (text), widget (QPushButton, refresh_button) +#: kcm.ui:41 +msgid "Refresh" +msgstr "" + #. i18n: ectx: property (text), widget (QLabel, name_label) -#: kcm.ui:84 +#: kcm.ui:88 msgid "Device" msgstr "Dispozitiv" #. i18n: ectx: property (text), widget (QLabel, status_label) -#: kcm.ui:97 +#: kcm.ui:101 msgid "(status)" msgstr "(stare)" #. i18n: ectx: property (text), widget (QPushButton, pair_button) -#: kcm.ui:142 +#: kcm.ui:146 msgid "Request pair" msgstr "Cere asocierea" #. i18n: ectx: property (text), widget (QPushButton, unpair_button) -#: kcm.ui:155 +#: kcm.ui:159 msgid "Unpair" msgstr "Dezasociază" #. i18n: ectx: property (text), widget (QPushButton, ping_button) -#: kcm.ui:168 +#: kcm.ui:172 msgid "Send ping" msgstr "Trimite ping" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/ro/kdeconnect-kio.po kdeconnect-0.7.3/po/ro/kdeconnect-kio.po --- kdeconnect-0.7.1/po/ro/kdeconnect-kio.po 2014-06-29 16:12:40.000000000 +0000 +++ kdeconnect-0.7.3/po/ro/kdeconnect-kio.po 2014-10-11 17:37:22.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-15 01:46+0000\n" +"POT-Creation-Date: 2014-10-11 01:54+0000\n" "PO-Revision-Date: 2014-03-25 16:44+0200\n" "Last-Translator: Sergiu Bivol \n" "Language-Team: Romanian \n" @@ -34,22 +34,14 @@ msgid "Listing devices..." msgstr "Se enumeră dispozitivele..." -#: kiokdeconnect.cpp:130 +#: kiokdeconnect.cpp:131 msgid "Accessing device..." msgstr "Se accesează dispozitivul..." -#: kiokdeconnect.cpp:145 +#: kiokdeconnect.cpp:144 msgid "Could not mount device filesystem" msgstr "Sistemul de fișiere de pe dispozitiv nu a putut fi montat" -#: kiokdeconnect.cpp:160 -msgid "Camera pictures" -msgstr "Imagini de pe aparat foto" - -#: kiokdeconnect.cpp:169 -msgid "All files" -msgstr "Toate fișierele" - -#: kiokdeconnect.cpp:194 +#: kiokdeconnect.cpp:189 msgid "Could not contact background service." msgstr "Serviciul de fundal nu a putut fi contactat." \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/ru/kdeconnect-kcm.po kdeconnect-0.7.3/po/ru/kdeconnect-kcm.po --- kdeconnect-0.7.1/po/ru/kdeconnect-kcm.po 2014-06-29 16:12:48.000000000 +0000 +++ kdeconnect-0.7.3/po/ru/kdeconnect-kcm.po 2014-10-11 17:37:41.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-15 02:00+0000\n" +"POT-Creation-Date: 2014-08-12 02:06+0000\n" "PO-Revision-Date: 2013-10-10 19:34+0400\n" "Last-Translator: Julia Dronova \n" "Language-Team: Russian \n" @@ -18,44 +18,49 @@ "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Lokalize 1.5\n" -#: kcm.cpp:144 kcm.cpp:228 +#: kcm.cpp:152 kcm.cpp:236 msgid "(paired)" msgstr "(спарены)" -#: kcm.cpp:144 kcm.cpp:200 kcm.cpp:211 +#: kcm.cpp:152 kcm.cpp:208 kcm.cpp:219 msgid "(unpaired)" msgstr "(разделены)" -#: kcm.cpp:158 +#: kcm.cpp:166 msgid "Plugins" msgstr "Модули" -#: kcm.cpp:213 +#: kcm.cpp:221 #, kde-format msgid "Error trying to pair: %1" msgstr "Ошибка при попытке связать: %1" +#. i18n: ectx: property (text), widget (QPushButton, refresh_button) +#: kcm.ui:41 +msgid "Refresh" +msgstr "" + #. i18n: ectx: property (text), widget (QLabel, name_label) -#: kcm.ui:84 +#: kcm.ui:88 msgid "Device" msgstr "Устройство" #. i18n: ectx: property (text), widget (QLabel, status_label) -#: kcm.ui:97 +#: kcm.ui:101 msgid "(status)" msgstr "(статус)" #. i18n: ectx: property (text), widget (QPushButton, pair_button) -#: kcm.ui:142 +#: kcm.ui:146 msgid "Request pair" msgstr "Запросить пару" #. i18n: ectx: property (text), widget (QPushButton, unpair_button) -#: kcm.ui:155 +#: kcm.ui:159 msgid "Unpair" msgstr "Разделить спаренные устройства" #. i18n: ectx: property (text), widget (QPushButton, ping_button) -#: kcm.ui:168 +#: kcm.ui:172 msgid "Send ping" msgstr "Отправить пинг" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/sk/kdeconnect-cli.po kdeconnect-0.7.3/po/sk/kdeconnect-cli.po --- kdeconnect-0.7.1/po/sk/kdeconnect-cli.po 2014-06-29 16:13:12.000000000 +0000 +++ kdeconnect-0.7.3/po/sk/kdeconnect-cli.po 2014-10-11 17:38:47.000000000 +0000 @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: kdeconnect-cli\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-28 01:55+0000\n" -"PO-Revision-Date: 2014-06-19 08:59+0200\n" +"POT-Creation-Date: 2014-09-28 08:07+0000\n" +"PO-Revision-Date: 2014-10-09 13:42+0200\n" "Last-Translator: Roman Paholik \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -23,51 +23,67 @@ msgid "Your emails" msgstr "wizzardsk@gmail.com" -#: kdeconnect-cli.cpp:33 +#: kdeconnect-cli.cpp:34 msgid "KDE Connect CLI tool" msgstr "CLI nástroj KDE Connect" -#: kdeconnect-cli.cpp:34 +#: kdeconnect-cli.cpp:35 msgid "(C) 2013 Aleix Pol Gonzalez" msgstr "(C) 2013 Aleix Pol Gonzalez" -#: kdeconnect-cli.cpp:35 +#: kdeconnect-cli.cpp:36 msgid "Aleix Pol Gonzalez" msgstr "Aleix Pol Gonzalez" -#: kdeconnect-cli.cpp:39 -msgid "List all devices" -msgstr "Vypísať všetky zariadenia" - -#: kdeconnect-cli.cpp:40 -msgid "Share a file to a said device" -msgstr "" +#: kdeconnect-cli.cpp:37 +msgid "Albert Vaca Cintora" +msgstr "Albert Vaca Cintora" #: kdeconnect-cli.cpp:41 -msgid "Request pairing to a said device" -msgstr "" +msgid "List all devices." +msgstr "Vypísať všetky zariadenia." #: kdeconnect-cli.cpp:42 -msgid "Stop pairing to a said device" -msgstr "" +msgid "Search for devices in the network and re-establish connections." +msgstr "Hľadať zariadenia v sieti a znovu ich pripojiť." #: kdeconnect-cli.cpp:43 -msgid "Sends a ping to said device" -msgstr "" +msgid "Request pairing to a said device." +msgstr "Vyžiadať párovanie na dané zariadenie." #: kdeconnect-cli.cpp:44 -msgid "Device ID" -msgstr "ID zariadenia" +msgid "Stop pairing to a said device." +msgstr "Zastaviť párovanie na dané zariadenie." -#: kdeconnect-cli.cpp:73 +#: kdeconnect-cli.cpp:45 +msgid "Send a ping to said device." +msgstr "Poslať ping na dané zariadenie." + +#: kdeconnect-cli.cpp:46 +msgid "Same as ping but you can customize the shown message." +msgstr "Rovnaké ako ping, ale môžete si prispôsobiť zobrazenú správu." + +#: kdeconnect-cli.cpp:47 +msgid "Share a file to a said device." +msgstr "Zdieľať súbor na dané zariadenie." + +#: kdeconnect-cli.cpp:48 +msgid "Display the notifications on a said device." +msgstr "Zobraziť oznámenia na danom zariadení." + +#: kdeconnect-cli.cpp:49 +msgid "Device ID." +msgstr "ID zariadenia." + +#: kdeconnect-cli.cpp:79 msgid "No device specified" msgstr "Neurčené zariadenie" -#: kdeconnect-cli.cpp:85 +#: kdeconnect-cli.cpp:91 #, kde-format msgid "Couldn't share %1" -msgstr "" +msgstr "Nemôžem zdieľať %1" -#: kdeconnect-cli.cpp:106 +#: kdeconnect-cli.cpp:124 msgid "Nothing to be done with the device" msgstr "Nič sa nedá robiť so zariadením" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/sk/kdeconnect-core.po kdeconnect-0.7.3/po/sk/kdeconnect-core.po --- kdeconnect-0.7.1/po/sk/kdeconnect-core.po 2014-06-29 16:13:12.000000000 +0000 +++ kdeconnect-0.7.3/po/sk/kdeconnect-core.po 2014-10-11 17:38:47.000000000 +0000 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: kdeconnect-core\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-18 01:56+0000\n" +"POT-Creation-Date: 2014-07-16 02:16+0000\n" "PO-Revision-Date: 2014-06-19 08:59+0200\n" "Last-Translator: Roman Paholik \n" "Language-Team: Slovak \n" @@ -15,48 +15,48 @@ "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: device.cpp:168 +#: device.cpp:186 msgid "Already paired" msgstr "Už spárované" -#: device.cpp:171 +#: device.cpp:189 msgid "Pairing already requested for this device" msgstr "Párovanie už vyžiadané pre toto zariadenie" -#: device.cpp:175 +#: device.cpp:193 msgid "Device not reachable" msgstr "Zariadenie nedosiahnuteľné" -#: device.cpp:188 +#: device.cpp:206 msgid "Error contacting device" msgstr "Chyba kontaktovania zariadenia" -#: device.cpp:226 +#: device.cpp:244 msgid "Timed out" msgstr "Časový limit vypršal" -#: device.cpp:325 device.cpp:377 +#: device.cpp:343 device.cpp:395 msgid "Canceled by other peer" msgstr "Zrušené iným klientom" -#: device.cpp:341 +#: device.cpp:359 msgid "Received incorrect key" msgstr "Získaný nesprávny kľúč" -#: device.cpp:358 +#: device.cpp:376 #, kde-format msgid "Pairing request from %1" msgstr "Požiadavka spárovania od %1" -#: device.cpp:359 +#: device.cpp:377 msgid "Accept" msgstr "Prijať" -#: device.cpp:359 +#: device.cpp:377 msgid "Reject" msgstr "Odmietnuť" -#: device.cpp:419 +#: device.cpp:437 msgid "Canceled by the user" msgstr "Zrušené používateľom" diff -Nru kdeconnect-0.7.1/po/sk/kdeconnect-kcm.po kdeconnect-0.7.3/po/sk/kdeconnect-kcm.po --- kdeconnect-0.7.1/po/sk/kdeconnect-kcm.po 2014-06-29 16:13:12.000000000 +0000 +++ kdeconnect-0.7.3/po/sk/kdeconnect-kcm.po 2014-10-11 17:38:47.000000000 +0000 @@ -4,9 +4,9 @@ msgstr "" "Project-Id-Version: kdeconnect-kcm\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-15 02:00+0000\n" -"PO-Revision-Date: 2014-02-16 19:16+0100\n" -"Last-Translator: Roman Paholík \n" +"POT-Creation-Date: 2014-08-12 02:06+0000\n" +"PO-Revision-Date: 2014-08-14 12:35+0200\n" +"Last-Translator: Roman Paholik \n" "Language-Team: Slovak \n" "Language: sk\n" "MIME-Version: 1.0\n" @@ -15,44 +15,49 @@ "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: kcm.cpp:144 kcm.cpp:228 +#: kcm.cpp:152 kcm.cpp:236 msgid "(paired)" msgstr "(spárované)" -#: kcm.cpp:144 kcm.cpp:200 kcm.cpp:211 +#: kcm.cpp:152 kcm.cpp:208 kcm.cpp:219 msgid "(unpaired)" msgstr "(nespárované)" -#: kcm.cpp:158 +#: kcm.cpp:166 msgid "Plugins" msgstr "Pluginy" -#: kcm.cpp:213 +#: kcm.cpp:221 #, kde-format msgid "Error trying to pair: %1" msgstr "Chyba pokusu o spárovanie: %1" +#. i18n: ectx: property (text), widget (QPushButton, refresh_button) +#: kcm.ui:41 +msgid "Refresh" +msgstr "Obnoviť" + #. i18n: ectx: property (text), widget (QLabel, name_label) -#: kcm.ui:84 +#: kcm.ui:88 msgid "Device" msgstr "Zariadenie" #. i18n: ectx: property (text), widget (QLabel, status_label) -#: kcm.ui:97 +#: kcm.ui:101 msgid "(status)" msgstr "(stav)" #. i18n: ectx: property (text), widget (QPushButton, pair_button) -#: kcm.ui:142 +#: kcm.ui:146 msgid "Request pair" msgstr "Vyžiadať spárovanie" #. i18n: ectx: property (text), widget (QPushButton, unpair_button) -#: kcm.ui:155 +#: kcm.ui:159 msgid "Unpair" msgstr "Odpárovať" #. i18n: ectx: property (text), widget (QPushButton, ping_button) -#: kcm.ui:168 +#: kcm.ui:172 msgid "Send ping" msgstr "Poslať ping" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/sk/kdeconnect-kio.po kdeconnect-0.7.3/po/sk/kdeconnect-kio.po --- kdeconnect-0.7.1/po/sk/kdeconnect-kio.po 2014-06-29 16:13:12.000000000 +0000 +++ kdeconnect-0.7.3/po/sk/kdeconnect-kio.po 2014-10-11 17:38:47.000000000 +0000 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: kdeconnect-kio\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-15 01:46+0000\n" +"POT-Creation-Date: 2014-10-11 01:54+0000\n" "PO-Revision-Date: 2014-02-16 19:16+0100\n" "Last-Translator: Roman Paholík \n" "Language-Team: Slovak \n" @@ -31,22 +31,14 @@ msgid "Listing devices..." msgstr "Vypisovanie zariadení..." -#: kiokdeconnect.cpp:130 +#: kiokdeconnect.cpp:131 msgid "Accessing device..." msgstr "Pristupujem k zariadeniu..." -#: kiokdeconnect.cpp:145 +#: kiokdeconnect.cpp:144 msgid "Could not mount device filesystem" msgstr "Nemôžem pripojiť súborový systém zariadenia" -#: kiokdeconnect.cpp:160 -msgid "Camera pictures" -msgstr "Obrázky fotoaparátu" - -#: kiokdeconnect.cpp:169 -msgid "All files" -msgstr "Všetky súbory" - -#: kiokdeconnect.cpp:194 +#: kiokdeconnect.cpp:189 msgid "Could not contact background service." msgstr "Nemôžem kontaktovať službu pozadia." \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/sk/kdeconnect-plugins.po kdeconnect-0.7.3/po/sk/kdeconnect-plugins.po --- kdeconnect-0.7.1/po/sk/kdeconnect-plugins.po 2014-06-29 16:13:12.000000000 +0000 +++ kdeconnect-0.7.3/po/sk/kdeconnect-plugins.po 2014-10-11 17:38:47.000000000 +0000 @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: kdeconnect-plugins\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-28 01:55+0000\n" -"PO-Revision-Date: 2014-06-19 09:00+0200\n" +"POT-Creation-Date: 2014-10-11 01:54+0000\n" +"PO-Revision-Date: 2014-10-11 15:26+0200\n" "Last-Translator: Roman Paholik \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -32,38 +32,48 @@ msgstr "Pozastaviť hudobný plugin" #. i18n: ectx: property (title), widget (QGroupBox, groupBox) -#: pausemusic/pausemusic_config.ui:29 -msgid "Pause condition" -msgstr "Podmienka pozastavenia" +#: pausemusic/pausemusic_config.ui:32 +msgid "Condition" +msgstr "Podmienka" #. i18n: ectx: property (text), widget (QRadioButton, rad_ringing) -#: pausemusic/pausemusic_config.ui:35 +#: pausemusic/pausemusic_config.ui:38 msgid "Pause as soon as phone rings" msgstr "Pozastaviť hneď, ako zazvoní telefón" #. i18n: ectx: property (text), widget (QRadioButton, rad_talking) -#: pausemusic/pausemusic_config.ui:42 +#: pausemusic/pausemusic_config.ui:45 msgid "Pause only while talking" msgstr "Pozastaviť iba počas hovoru" +#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2) +#: pausemusic/pausemusic_config.ui:61 +msgid "Actions" +msgstr "Akcie" + +#. i18n: ectx: property (text), widget (QCheckBox, check_pause) +#: pausemusic/pausemusic_config.ui:67 +msgid "Pause media players" +msgstr "Pozastaviť prehrávače médií" + #. i18n: ectx: property (text), widget (QCheckBox, check_mute) -#: pausemusic/pausemusic_config.ui:65 -msgid "Mute system instead of pause" -msgstr "Stlmiť systém namiesto pozastavenia" +#: pausemusic/pausemusic_config.ui:74 +msgid "Mute system sound" +msgstr "Stlmiť systémové zvuky" #: ping/pingplugin.cpp:51 msgid "Ping!" msgstr "Ping!" -#: sftp/mounter.cpp:172 +#: sftp/mounter.cpp:176 msgid "Failed to start sshfs" msgstr "Zlyhalo spustenie sshfs" -#: sftp/mounter.cpp:194 +#: sftp/mounter.cpp:198 msgid "Error when accessing to filesystem" msgstr "Chyba pri prístupe na súborový systém" -#: sftp/mounter.cpp:205 +#: sftp/mounter.cpp:209 msgid "Failed to mount filesystem: device not responding" msgstr "Zlyhalo pripojenie súborového systému: zariadenie neodpovedá" @@ -98,7 +108,15 @@ msgid " min" msgstr " min" -#: sftp/sftpplugin.cpp:196 +#: sftp/sftpplugin.cpp:159 +msgid "All files" +msgstr "Všetky súbory" + +#: sftp/sftpplugin.cpp:160 +msgid "Camera pictures" +msgstr "Obrázky fotoaparátu" + +#: sftp/sftpplugin.cpp:207 #, kde-format msgid "Device %1" msgstr "Zariadenie %1" @@ -146,7 +164,7 @@ msgid "SMS from %1: %2" msgstr "SMS od %1: %2" -#: telephony/telephonyplugin.cpp:66 +#: telephony/telephonyplugin.cpp:68 #, kde-format msgid "Unknown telephony event: %2" msgstr "Neznáma telefónna udalosť: %2" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/sv/kdeconnect-cli.po kdeconnect-0.7.3/po/sv/kdeconnect-cli.po --- kdeconnect-0.7.1/po/sv/kdeconnect-cli.po 2014-06-29 16:13:59.000000000 +0000 +++ kdeconnect-0.7.3/po/sv/kdeconnect-cli.po 2014-10-11 17:41:34.000000000 +0000 @@ -6,16 +6,16 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-28 01:55+0000\n" -"PO-Revision-Date: 2014-06-28 09:09+0200\n" +"POT-Creation-Date: 2014-09-28 08:07+0000\n" +"PO-Revision-Date: 2014-09-28 11:44+0200\n" "Last-Translator: Stefan Asserhäll \n" "Language-Team: Swedish \n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 1.4\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 1.5\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" @@ -25,51 +25,67 @@ msgid "Your emails" msgstr "stefan.asserhall@bredband.net" -#: kdeconnect-cli.cpp:33 +#: kdeconnect-cli.cpp:34 msgid "KDE Connect CLI tool" msgstr "KDE-anslut kommandoradsverktyg" -#: kdeconnect-cli.cpp:34 +#: kdeconnect-cli.cpp:35 msgid "(C) 2013 Aleix Pol Gonzalez" msgstr "© 2013 Aleix Pol Gonzalez" -#: kdeconnect-cli.cpp:35 +#: kdeconnect-cli.cpp:36 msgid "Aleix Pol Gonzalez" msgstr "Aleix Pol Gonzalez" -#: kdeconnect-cli.cpp:39 -msgid "List all devices" -msgstr "Lista alla enheter" - -#: kdeconnect-cli.cpp:40 -msgid "Share a file to a said device" -msgstr "Dela en fil med sagda enhet" +#: kdeconnect-cli.cpp:37 +msgid "Albert Vaca Cintora" +msgstr "Albert Vaca Cintora" #: kdeconnect-cli.cpp:41 -msgid "Request pairing to a said device" -msgstr "Begär ihopparning med sagda enhet" +msgid "List all devices." +msgstr "Lista alla enheter." #: kdeconnect-cli.cpp:42 -msgid "Stop pairing to a said device" -msgstr "Stoppa ihopparning med sagda enhet" +msgid "Search for devices in the network and re-establish connections." +msgstr "Sök efter enheter på nätverket och återupprätta anslutningar." #: kdeconnect-cli.cpp:43 -msgid "Sends a ping to said device" -msgstr "Skicka ping till sagd enhet" +msgid "Request pairing to a said device." +msgstr "Begär ihopparning med sagd enhet." #: kdeconnect-cli.cpp:44 -msgid "Device ID" -msgstr "Enhetsidentifierare" +msgid "Stop pairing to a said device." +msgstr "Stoppa ihopparning med sagd enhet." + +#: kdeconnect-cli.cpp:45 +msgid "Send a ping to said device." +msgstr "Skicka ping till sagd enhet." + +#: kdeconnect-cli.cpp:46 +msgid "Same as ping but you can customize the shown message." +msgstr "Samma som ping, men det går att anpassa det visade meddelandet." + +#: kdeconnect-cli.cpp:47 +msgid "Share a file to a said device." +msgstr "Dela en fil med sagd enhet." + +#: kdeconnect-cli.cpp:48 +msgid "Display the notifications on a said device." +msgstr "Visa underrättelser på sagd enhet." + +#: kdeconnect-cli.cpp:49 +msgid "Device ID." +msgstr "Enhetsidentifierare." -#: kdeconnect-cli.cpp:73 +#: kdeconnect-cli.cpp:79 msgid "No device specified" msgstr "Ingen enhet angiven" -#: kdeconnect-cli.cpp:85 +#: kdeconnect-cli.cpp:91 #, kde-format msgid "Couldn't share %1" msgstr "Kunde inte dela %1" -#: kdeconnect-cli.cpp:106 +#: kdeconnect-cli.cpp:124 msgid "Nothing to be done with the device" msgstr "Ingenting att utföra med enheten" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/sv/kdeconnect-core.po kdeconnect-0.7.3/po/sv/kdeconnect-core.po --- kdeconnect-0.7.1/po/sv/kdeconnect-core.po 2014-06-29 16:13:59.000000000 +0000 +++ kdeconnect-0.7.3/po/sv/kdeconnect-core.po 2014-10-11 17:41:34.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-18 01:56+0000\n" +"POT-Creation-Date: 2014-07-16 02:16+0000\n" "PO-Revision-Date: 2014-06-18 20:18+0200\n" "Last-Translator: Stefan Asserhäll \n" "Language-Team: Swedish \n" @@ -14,51 +14,51 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.4\n" -#: device.cpp:168 +#: device.cpp:186 msgid "Already paired" msgstr "Redan ihopparade" -#: device.cpp:171 +#: device.cpp:189 msgid "Pairing already requested for this device" msgstr "Ihopparning redan begärd för apparaten" -#: device.cpp:175 +#: device.cpp:193 msgid "Device not reachable" msgstr "Apparaten kan inte nås" -#: device.cpp:188 +#: device.cpp:206 msgid "Error contacting device" msgstr "Fel vid försök att kontakta apparaten" -#: device.cpp:226 +#: device.cpp:244 msgid "Timed out" msgstr "Tidsgräns överskriden" -#: device.cpp:325 device.cpp:377 +#: device.cpp:343 device.cpp:395 msgid "Canceled by other peer" msgstr "Avbruten av motparten" -#: device.cpp:341 +#: device.cpp:359 msgid "Received incorrect key" msgstr "Mottog felaktig nyckel" -#: device.cpp:358 +#: device.cpp:376 #, kde-format msgid "Pairing request from %1" msgstr "Begäran om ihopparning från %1" -#: device.cpp:359 +#: device.cpp:377 msgid "Accept" msgstr "Acceptera" -#: device.cpp:359 +#: device.cpp:377 msgid "Reject" msgstr "Avslå" -#: device.cpp:419 +#: device.cpp:437 msgid "Canceled by the user" msgstr "Avbruten av användaren" diff -Nru kdeconnect-0.7.1/po/sv/kdeconnect-filetiemaction.po kdeconnect-0.7.3/po/sv/kdeconnect-filetiemaction.po --- kdeconnect-0.7.1/po/sv/kdeconnect-filetiemaction.po 2014-06-29 16:13:59.000000000 +0000 +++ kdeconnect-0.7.3/po/sv/kdeconnect-filetiemaction.po 2014-10-11 17:41:34.000000000 +0000 @@ -14,7 +14,7 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.4\n" #: sendfileitemaction.cpp:67 diff -Nru kdeconnect-0.7.1/po/sv/kdeconnect-kcm.po kdeconnect-0.7.3/po/sv/kdeconnect-kcm.po --- kdeconnect-0.7.1/po/sv/kdeconnect-kcm.po 2014-06-29 16:13:59.000000000 +0000 +++ kdeconnect-0.7.3/po/sv/kdeconnect-kcm.po 2014-10-11 17:41:34.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-15 02:00+0000\n" -"PO-Revision-Date: 2014-02-15 08:57+0100\n" +"POT-Creation-Date: 2014-08-12 02:06+0000\n" +"PO-Revision-Date: 2014-08-12 17:33+0200\n" "Last-Translator: Stefan Asserhäll \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -15,46 +15,51 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" -#: kcm.cpp:144 kcm.cpp:228 +#: kcm.cpp:152 kcm.cpp:236 msgid "(paired)" msgstr "(ihopparad)" -#: kcm.cpp:144 kcm.cpp:200 kcm.cpp:211 +#: kcm.cpp:152 kcm.cpp:208 kcm.cpp:219 msgid "(unpaired)" msgstr "(oparad)" -#: kcm.cpp:158 +#: kcm.cpp:166 msgid "Plugins" msgstr "Insticksprogram" -#: kcm.cpp:213 +#: kcm.cpp:221 #, kde-format msgid "Error trying to pair: %1" msgstr "Fel vid försök att para ihop: %1" +#. i18n: ectx: property (text), widget (QPushButton, refresh_button) +#: kcm.ui:41 +msgid "Refresh" +msgstr "Uppdatera" + #. i18n: ectx: property (text), widget (QLabel, name_label) -#: kcm.ui:84 +#: kcm.ui:88 msgid "Device" msgstr "Apparat" #. i18n: ectx: property (text), widget (QLabel, status_label) -#: kcm.ui:97 +#: kcm.ui:101 msgid "(status)" msgstr "(status)" #. i18n: ectx: property (text), widget (QPushButton, pair_button) -#: kcm.ui:142 +#: kcm.ui:146 msgid "Request pair" msgstr "Begär ihopparning" #. i18n: ectx: property (text), widget (QPushButton, unpair_button) -#: kcm.ui:155 +#: kcm.ui:159 msgid "Unpair" msgstr "Ta bort ihopparning" #. i18n: ectx: property (text), widget (QPushButton, ping_button) -#: kcm.ui:168 +#: kcm.ui:172 msgid "Send ping" msgstr "Skicka ping" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/sv/kdeconnect-kio.po kdeconnect-0.7.3/po/sv/kdeconnect-kio.po --- kdeconnect-0.7.1/po/sv/kdeconnect-kio.po 2014-06-29 16:13:59.000000000 +0000 +++ kdeconnect-0.7.3/po/sv/kdeconnect-kio.po 2014-10-11 17:41:34.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-15 01:46+0000\n" +"POT-Creation-Date: 2014-10-11 01:54+0000\n" "PO-Revision-Date: 2014-02-15 09:01+0100\n" "Last-Translator: Stefan Asserhäll \n" "Language-Team: Swedish \n" @@ -33,22 +33,14 @@ msgid "Listing devices..." msgstr "Listar apparater..." -#: kiokdeconnect.cpp:130 +#: kiokdeconnect.cpp:131 msgid "Accessing device..." msgstr "Åtkomst av apparat..." -#: kiokdeconnect.cpp:145 +#: kiokdeconnect.cpp:144 msgid "Could not mount device filesystem" msgstr "Kunde inte montera apparatens filsystem" -#: kiokdeconnect.cpp:160 -msgid "Camera pictures" -msgstr "Kamerabilder" - -#: kiokdeconnect.cpp:169 -msgid "All files" -msgstr "Alla filer" - -#: kiokdeconnect.cpp:194 +#: kiokdeconnect.cpp:189 msgid "Could not contact background service." msgstr "Kunde inte kontakta bakgrundstjänst." \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/sv/kdeconnect-plugins.po kdeconnect-0.7.3/po/sv/kdeconnect-plugins.po --- kdeconnect-0.7.1/po/sv/kdeconnect-plugins.po 2014-06-29 16:13:59.000000000 +0000 +++ kdeconnect-0.7.3/po/sv/kdeconnect-plugins.po 2014-10-11 17:41:34.000000000 +0000 @@ -6,16 +6,16 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-28 01:55+0000\n" -"PO-Revision-Date: 2014-06-18 20:18+0200\n" +"POT-Creation-Date: 2014-10-11 01:54+0000\n" +"PO-Revision-Date: 2014-10-11 18:02+0200\n" "Last-Translator: Stefan Asserhäll \n" "Language-Team: Swedish \n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 1.4\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 1.5\n" #: battery/batteryplugin.cpp:77 #, kde-format @@ -34,38 +34,48 @@ msgstr "Pausa musikinsticksprogram" #. i18n: ectx: property (title), widget (QGroupBox, groupBox) -#: pausemusic/pausemusic_config.ui:29 -msgid "Pause condition" -msgstr "Pausvillkor" +#: pausemusic/pausemusic_config.ui:32 +msgid "Condition" +msgstr "Villkor" #. i18n: ectx: property (text), widget (QRadioButton, rad_ringing) -#: pausemusic/pausemusic_config.ui:35 +#: pausemusic/pausemusic_config.ui:38 msgid "Pause as soon as phone rings" msgstr "Pausa så fort telefonen ringer" #. i18n: ectx: property (text), widget (QRadioButton, rad_talking) -#: pausemusic/pausemusic_config.ui:42 +#: pausemusic/pausemusic_config.ui:45 msgid "Pause only while talking" msgstr "Pausa bara under samtal" +#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2) +#: pausemusic/pausemusic_config.ui:61 +msgid "Actions" +msgstr "Åtgärder" + +#. i18n: ectx: property (text), widget (QCheckBox, check_pause) +#: pausemusic/pausemusic_config.ui:67 +msgid "Pause media players" +msgstr "Pausa mediaspelare" + #. i18n: ectx: property (text), widget (QCheckBox, check_mute) -#: pausemusic/pausemusic_config.ui:65 -msgid "Mute system instead of pause" -msgstr "Tysta systemet istället för paus" +#: pausemusic/pausemusic_config.ui:74 +msgid "Mute system sound" +msgstr "Tysta systemljud" #: ping/pingplugin.cpp:51 msgid "Ping!" msgstr "Ping!" -#: sftp/mounter.cpp:172 +#: sftp/mounter.cpp:176 msgid "Failed to start sshfs" msgstr "Misslyckades starta sshfs" -#: sftp/mounter.cpp:194 +#: sftp/mounter.cpp:198 msgid "Error when accessing to filesystem" msgstr "Fel vid åtkomst av filsystem" -#: sftp/mounter.cpp:205 +#: sftp/mounter.cpp:209 msgid "Failed to mount filesystem: device not responding" msgstr "Misslyckades montera filsystem: apparaten svarar inte" @@ -100,7 +110,15 @@ msgid " min" msgstr " min" -#: sftp/sftpplugin.cpp:196 +#: sftp/sftpplugin.cpp:159 +msgid "All files" +msgstr "Alla filer" + +#: sftp/sftpplugin.cpp:160 +msgid "Camera pictures" +msgstr "Kamerabilder" + +#: sftp/sftpplugin.cpp:207 #, kde-format msgid "Device %1" msgstr "Enhet %1" @@ -148,7 +166,7 @@ msgid "SMS from %1: %2" msgstr "SMS från %1: %2" -#: telephony/telephonyplugin.cpp:66 +#: telephony/telephonyplugin.cpp:68 #, kde-format msgid "Unknown telephony event: %2" msgstr "Okänd telefonhändelse: %2" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/tr/plasma_applet_kdeconnect.po kdeconnect-0.7.3/po/tr/plasma_applet_kdeconnect.po --- kdeconnect-0.7.1/po/tr/plasma_applet_kdeconnect.po 2014-06-29 16:14:33.000000000 +0000 +++ kdeconnect-0.7.3/po/tr/plasma_applet_kdeconnect.po 2014-10-11 17:43:03.000000000 +0000 @@ -1,7 +1,7 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. -# +# # Translators: # Volkan Gezer , 2014 msgid "" @@ -11,11 +11,12 @@ "POT-Creation-Date: 2014-03-01 01:46+0000\n" "PO-Revision-Date: 2014-06-08 14:05+0000\n" "Last-Translator: Volkan Gezer \n" -"Language-Team: Turkish (http://www.transifex.com/projects/p/playground-base-k-tr/language/tr/)\n" +"Language-Team: Turkish (http://www.transifex.com/projects/p/playground-base-" +"k-tr/language/tr/)\n" +"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: tr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" #: package/contents/ui/Battery.qml:36 diff -Nru kdeconnect-0.7.1/po/uk/kdeconnect-cli.po kdeconnect-0.7.3/po/uk/kdeconnect-cli.po --- kdeconnect-0.7.1/po/uk/kdeconnect-cli.po 2014-06-29 16:14:51.000000000 +0000 +++ kdeconnect-0.7.3/po/uk/kdeconnect-cli.po 2014-10-11 17:43:53.000000000 +0000 @@ -1,13 +1,15 @@ -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. +# Translation of kdeconnect-cli.po to Ukrainian +# Copyright (C) 2014 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. # # Yuri Chornoivan , 2014. msgid "" msgstr "" -"Project-Id-Version: \n" +"Project-Id-Version: kdeconnect-cli\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-28 01:55+0000\n" -"PO-Revision-Date: 2014-06-28 09:14+0300\n" +"POT-Creation-Date: 2014-09-28 08:07+0000\n" +"PO-Revision-Date: 2014-09-28 14:35+0300\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" "Language: uk\n" @@ -26,51 +28,69 @@ msgid "Your emails" msgstr "yurchor@ukr.net" -#: kdeconnect-cli.cpp:33 +#: kdeconnect-cli.cpp:34 msgid "KDE Connect CLI tool" msgstr "Інструмент керування KDE Connect з командного рядка" -#: kdeconnect-cli.cpp:34 +#: kdeconnect-cli.cpp:35 msgid "(C) 2013 Aleix Pol Gonzalez" msgstr "© Aleix Pol Gonzalez, 2013" -#: kdeconnect-cli.cpp:35 +#: kdeconnect-cli.cpp:36 msgid "Aleix Pol Gonzalez" msgstr "Aleix Pol Gonzalez" -#: kdeconnect-cli.cpp:39 -msgid "List all devices" -msgstr "Вивести список усіх пристроїв" - -#: kdeconnect-cli.cpp:40 -msgid "Share a file to a said device" -msgstr "Надати файл у спільне зі вказаним пристроєм користування" +#: kdeconnect-cli.cpp:37 +msgid "Albert Vaca Cintora" +msgstr "Albert Vaca Cintora" #: kdeconnect-cli.cpp:41 -msgid "Request pairing to a said device" -msgstr "Надіслати запит щодо встановлення зв’язку із вказаним пристроєм" +msgid "List all devices." +msgstr "Вивести список усіх пристроїв." #: kdeconnect-cli.cpp:42 -msgid "Stop pairing to a said device" -msgstr "Розірвати зв’язок із вказаним пристроєм" +msgid "Search for devices in the network and re-establish connections." +msgstr "Виконати пошук пристроїв у мережі і повторно встановити з’єднання." #: kdeconnect-cli.cpp:43 -msgid "Sends a ping to said device" -msgstr "Надіслати луна-імпульс підтримання зв’язку до вказаного пристрою" +msgid "Request pairing to a said device." +msgstr "Надіслати запит щодо встановлення зв’язку із вказаним пристроєм." #: kdeconnect-cli.cpp:44 -msgid "Device ID" -msgstr "Ід. пристрою" +msgid "Stop pairing to a said device." +msgstr "Розірвати зв’язок із вказаним пристроєм." + +#: kdeconnect-cli.cpp:45 +msgid "Send a ping to said device." +msgstr "Надіслати луна-імпульс підтримання зв’язку до вказаного пристрою" + +#: kdeconnect-cli.cpp:46 +msgid "Same as ping but you can customize the shown message." +msgstr "" +"Те саме, що і надсилання луна-імпульсу, але можна налаштувати показане " +"повідомлення." + +#: kdeconnect-cli.cpp:47 +msgid "Share a file to a said device." +msgstr "Надати файл у спільне зі вказаним пристроєм користування." + +#: kdeconnect-cli.cpp:48 +msgid "Display the notifications on a said device." +msgstr "Показувати сповіщення щодо вказаного пристрою." + +#: kdeconnect-cli.cpp:49 +msgid "Device ID." +msgstr "Ідентифікатор пристрою." -#: kdeconnect-cli.cpp:73 +#: kdeconnect-cli.cpp:79 msgid "No device specified" msgstr "Не вказано пристрій" -#: kdeconnect-cli.cpp:85 +#: kdeconnect-cli.cpp:91 #, kde-format msgid "Couldn't share %1" msgstr "Не вдалося надати у спільне користування %1" -#: kdeconnect-cli.cpp:106 +#: kdeconnect-cli.cpp:124 msgid "Nothing to be done with the device" msgstr "Дій із пристроєм не передбачено" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/uk/kdeconnect-core.po kdeconnect-0.7.3/po/uk/kdeconnect-core.po --- kdeconnect-0.7.1/po/uk/kdeconnect-core.po 2014-06-29 16:14:51.000000000 +0000 +++ kdeconnect-0.7.3/po/uk/kdeconnect-core.po 2014-10-11 17:43:53.000000000 +0000 @@ -1,12 +1,14 @@ -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. +# Translation of kdeconnect-core.po to Ukrainian +# Copyright (C) 2014 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. # # Yuri Chornoivan , 2014. msgid "" msgstr "" -"Project-Id-Version: \n" +"Project-Id-Version: kdeconnect-core\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-18 01:56+0000\n" +"POT-Creation-Date: 2014-07-16 02:16+0000\n" "PO-Revision-Date: 2014-06-18 07:57+0300\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" @@ -14,52 +16,52 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"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" +"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n" +"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Lokalize 1.5\n" -#: device.cpp:168 +#: device.cpp:186 msgid "Already paired" msgstr "Вже пов’язано" -#: device.cpp:171 +#: device.cpp:189 msgid "Pairing already requested for this device" msgstr "Запит щодо пов’язування цього пристрою вже надійшов" -#: device.cpp:175 +#: device.cpp:193 msgid "Device not reachable" msgstr "Пристрій недоступний" -#: device.cpp:188 +#: device.cpp:206 msgid "Error contacting device" msgstr "Помилка під час спроби встановити зв’язок із пристроєм" -#: device.cpp:226 +#: device.cpp:244 msgid "Timed out" msgstr "Перевищено час очікування" -#: device.cpp:325 device.cpp:377 +#: device.cpp:343 device.cpp:395 msgid "Canceled by other peer" msgstr "Скасовано іншим вузлом" -#: device.cpp:341 +#: device.cpp:359 msgid "Received incorrect key" msgstr "Отримано помилковий ключ" -#: device.cpp:358 +#: device.cpp:376 #, kde-format msgid "Pairing request from %1" msgstr "Запит щодо пов’язування від %1" -#: device.cpp:359 +#: device.cpp:377 msgid "Accept" msgstr "Прийняти" -#: device.cpp:359 +#: device.cpp:377 msgid "Reject" msgstr "Відхилити" -#: device.cpp:419 +#: device.cpp:437 msgid "Canceled by the user" msgstr "Скасовано користувачем" diff -Nru kdeconnect-0.7.1/po/uk/kdeconnect-filetiemaction.po kdeconnect-0.7.3/po/uk/kdeconnect-filetiemaction.po --- kdeconnect-0.7.1/po/uk/kdeconnect-filetiemaction.po 2014-06-29 16:14:51.000000000 +0000 +++ kdeconnect-0.7.3/po/uk/kdeconnect-filetiemaction.po 2014-10-11 17:43:53.000000000 +0000 @@ -1,10 +1,12 @@ -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. +# Translation of kdeconnect-filetiemaction.po to Ukrainian +# Copyright (C) 2014 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. # # Yuri Chornoivan , 2014. msgid "" msgstr "" -"Project-Id-Version: \n" +"Project-Id-Version: kdeconnect-filetiemaction\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-06-28 01:55+0000\n" "PO-Revision-Date: 2014-06-18 07:54+0300\n" @@ -14,8 +16,8 @@ "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"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" +"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n" +"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Lokalize 1.5\n" #: sendfileitemaction.cpp:67 diff -Nru kdeconnect-0.7.1/po/uk/kdeconnect-kcm.po kdeconnect-0.7.3/po/uk/kdeconnect-kcm.po --- kdeconnect-0.7.1/po/uk/kdeconnect-kcm.po 2014-06-29 16:14:51.000000000 +0000 +++ kdeconnect-0.7.3/po/uk/kdeconnect-kcm.po 2014-10-11 17:43:53.000000000 +0000 @@ -1,13 +1,15 @@ -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. +# Translation of kdeconnect-kcm.po to Ukrainian +# Copyright (C) 2013-2014 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. # # Yuri Chornoivan , 2013, 2014. msgid "" msgstr "" "Project-Id-Version: kdeconnect-kcm\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-15 02:00+0000\n" -"PO-Revision-Date: 2014-02-15 08:52+0200\n" +"POT-Creation-Date: 2014-08-12 02:06+0000\n" +"PO-Revision-Date: 2014-08-12 09:03+0300\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" "Language: uk\n" @@ -18,44 +20,49 @@ "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Lokalize 1.5\n" -#: kcm.cpp:144 kcm.cpp:228 +#: kcm.cpp:152 kcm.cpp:236 msgid "(paired)" msgstr "(пов’язано)" -#: kcm.cpp:144 kcm.cpp:200 kcm.cpp:211 +#: kcm.cpp:152 kcm.cpp:208 kcm.cpp:219 msgid "(unpaired)" msgstr "(не пов’язано)" -#: kcm.cpp:158 +#: kcm.cpp:166 msgid "Plugins" msgstr "Додатки" -#: kcm.cpp:213 +#: kcm.cpp:221 #, kde-format msgid "Error trying to pair: %1" msgstr "Помилка під час спроби пов’язати: %1" +#. i18n: ectx: property (text), widget (QPushButton, refresh_button) +#: kcm.ui:41 +msgid "Refresh" +msgstr "Оновити" + #. i18n: ectx: property (text), widget (QLabel, name_label) -#: kcm.ui:84 +#: kcm.ui:88 msgid "Device" msgstr "Пристрій" #. i18n: ectx: property (text), widget (QLabel, status_label) -#: kcm.ui:97 +#: kcm.ui:101 msgid "(status)" msgstr "(стан)" #. i18n: ectx: property (text), widget (QPushButton, pair_button) -#: kcm.ui:142 +#: kcm.ui:146 msgid "Request pair" msgstr "Запит щодо пов’язування" #. i18n: ectx: property (text), widget (QPushButton, unpair_button) -#: kcm.ui:155 +#: kcm.ui:159 msgid "Unpair" msgstr "Скасувати пов’язування" #. i18n: ectx: property (text), widget (QPushButton, ping_button) -#: kcm.ui:168 +#: kcm.ui:172 msgid "Send ping" msgstr "Надіслати сигнал підтримання зв’язку" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/uk/kdeconnect-kded.po kdeconnect-0.7.3/po/uk/kdeconnect-kded.po --- kdeconnect-0.7.1/po/uk/kdeconnect-kded.po 2014-06-29 16:14:51.000000000 +0000 +++ kdeconnect-0.7.3/po/uk/kdeconnect-kded.po 2014-10-11 17:43:53.000000000 +0000 @@ -1,5 +1,7 @@ -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. +# Translation of kdeconnect-kded.po to Ukrainian +# Copyright (C) 2013-2014 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. # # Yuri Chornoivan , 2013, 2014. msgid "" diff -Nru kdeconnect-0.7.1/po/uk/kdeconnect-kio.po kdeconnect-0.7.3/po/uk/kdeconnect-kio.po --- kdeconnect-0.7.1/po/uk/kdeconnect-kio.po 2014-06-29 16:14:51.000000000 +0000 +++ kdeconnect-0.7.3/po/uk/kdeconnect-kio.po 2014-10-11 17:43:53.000000000 +0000 @@ -1,12 +1,14 @@ -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. +# Translation of kdeconnect-kio.po to Ukrainian +# Copyright (C) 2014 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. # # Yuri Chornoivan , 2014. msgid "" msgstr "" "Project-Id-Version: kdeconnect-kio\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-15 01:46+0000\n" +"POT-Creation-Date: 2014-10-11 01:54+0000\n" "PO-Revision-Date: 2014-02-15 09:07+0200\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" @@ -34,22 +36,14 @@ msgid "Listing devices..." msgstr "Побудова списку пристроїв…" -#: kiokdeconnect.cpp:130 +#: kiokdeconnect.cpp:131 msgid "Accessing device..." msgstr "Отримання доступу до пристрою…" -#: kiokdeconnect.cpp:145 +#: kiokdeconnect.cpp:144 msgid "Could not mount device filesystem" msgstr "Не вдалося змонтувати файлову систему на пристрої" -#: kiokdeconnect.cpp:160 -msgid "Camera pictures" -msgstr "Зображення з фотоапарата" - -#: kiokdeconnect.cpp:169 -msgid "All files" -msgstr "Усі файли" - -#: kiokdeconnect.cpp:194 +#: kiokdeconnect.cpp:189 msgid "Could not contact background service." msgstr "Не вдалося встановити зв’язок із фоновою службою." \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/uk/kdeconnect-plugins.po kdeconnect-0.7.3/po/uk/kdeconnect-plugins.po --- kdeconnect-0.7.1/po/uk/kdeconnect-plugins.po 2014-06-29 16:14:51.000000000 +0000 +++ kdeconnect-0.7.3/po/uk/kdeconnect-plugins.po 2014-10-11 17:43:53.000000000 +0000 @@ -1,21 +1,23 @@ -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. +# Translation of kdeconnect-plugins.po to Ukrainian +# Copyright (C) 2014 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. # # Yuri Chornoivan , 2014. msgid "" msgstr "" -"Project-Id-Version: \n" +"Project-Id-Version: kdeconnect-plugins\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-06-28 01:55+0000\n" -"PO-Revision-Date: 2014-06-18 08:01+0300\n" +"POT-Creation-Date: 2014-10-11 01:54+0000\n" +"PO-Revision-Date: 2014-10-11 08:23+0300\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" "Language: uk\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"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" +"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n" +"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Lokalize 1.5\n" #: battery/batteryplugin.cpp:77 @@ -35,38 +37,48 @@ msgstr "Додаток призупинення відтворення" #. i18n: ectx: property (title), widget (QGroupBox, groupBox) -#: pausemusic/pausemusic_config.ui:29 -msgid "Pause condition" -msgstr "Умова призупинення" +#: pausemusic/pausemusic_config.ui:32 +msgid "Condition" +msgstr "Умова" #. i18n: ectx: property (text), widget (QRadioButton, rad_ringing) -#: pausemusic/pausemusic_config.ui:35 +#: pausemusic/pausemusic_config.ui:38 msgid "Pause as soon as phone rings" msgstr "Призупиняти, щойно надійде телефонний дзвінок" #. i18n: ectx: property (text), widget (QRadioButton, rad_talking) -#: pausemusic/pausemusic_config.ui:42 +#: pausemusic/pausemusic_config.ui:45 msgid "Pause only while talking" msgstr "Призупинити лише на час розмови" +#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2) +#: pausemusic/pausemusic_config.ui:61 +msgid "Actions" +msgstr "Дії" + +#. i18n: ectx: property (text), widget (QCheckBox, check_pause) +#: pausemusic/pausemusic_config.ui:67 +msgid "Pause media players" +msgstr "Призупинити відтворення мультимедійних даних" + #. i18n: ectx: property (text), widget (QCheckBox, check_mute) -#: pausemusic/pausemusic_config.ui:65 -msgid "Mute system instead of pause" -msgstr "Вимкнути звук замість призупинення" +#: pausemusic/pausemusic_config.ui:74 +msgid "Mute system sound" +msgstr "Вимкнути звук у системі" #: ping/pingplugin.cpp:51 msgid "Ping!" msgstr "Перевірити!" -#: sftp/mounter.cpp:172 +#: sftp/mounter.cpp:176 msgid "Failed to start sshfs" msgstr "Не вдалося запустити sshfs" -#: sftp/mounter.cpp:194 +#: sftp/mounter.cpp:198 msgid "Error when accessing to filesystem" msgstr "Помилка під час спроби доступу до файлової системи" -#: sftp/mounter.cpp:205 +#: sftp/mounter.cpp:209 msgid "Failed to mount filesystem: device not responding" msgstr "Не вдалося змонтувати файлову систему: пристрій не відповідає" @@ -101,7 +113,15 @@ msgid " min" msgstr " хв" -#: sftp/sftpplugin.cpp:196 +#: sftp/sftpplugin.cpp:159 +msgid "All files" +msgstr "Усі файли" + +#: sftp/sftpplugin.cpp:160 +msgid "Camera pictures" +msgstr "Знімки фотоапарата" + +#: sftp/sftpplugin.cpp:207 #, kde-format msgid "Device %1" msgstr "Пристрій %1" @@ -149,7 +169,7 @@ msgid "SMS from %1: %2" msgstr "SMS від %1: %2" -#: telephony/telephonyplugin.cpp:66 +#: telephony/telephonyplugin.cpp:68 #, kde-format msgid "Unknown telephony event: %2" msgstr "Невідома подія телефонії: %2" \ No newline at end of file diff -Nru kdeconnect-0.7.1/po/uk/plasma_applet_kdeconnect.po kdeconnect-0.7.3/po/uk/plasma_applet_kdeconnect.po --- kdeconnect-0.7.1/po/uk/plasma_applet_kdeconnect.po 2014-06-29 16:14:51.000000000 +0000 +++ kdeconnect-0.7.3/po/uk/plasma_applet_kdeconnect.po 2014-10-11 17:43:53.000000000 +0000 @@ -1,5 +1,7 @@ -# Copyright (C) YEAR This_file_is_part_of_KDE -# This file is distributed under the same license as the PACKAGE package. +# Translation of plasma_applet_kdeconnect.po to Ukrainian +# Copyright (C) 2014 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. # # Yuri Chornoivan , 2014. msgid "" diff -Nru kdeconnect-0.7.1/tests/testsocketlinereader.cpp kdeconnect-0.7.3/tests/testsocketlinereader.cpp --- kdeconnect-0.7.1/tests/testsocketlinereader.cpp 2014-06-29 16:03:14.000000000 +0000 +++ kdeconnect-0.7.3/tests/testsocketlinereader.cpp 2014-10-11 17:03:59.000000000 +0000 @@ -79,6 +79,9 @@ } QTcpSocket *sock = mServer->nextPendingConnection(); + + QVERIFY2(sock != 0, "Could not open a connection to the client"); + mReader = new SocketLineReader(sock, this); connect(mReader, SIGNAL(readyRead()), SLOT(newPackage())); mTimer.start();