diff -Nru kdeconnect-0.5/debian/changelog kdeconnect-0.5.1/debian/changelog --- kdeconnect-0.5/debian/changelog 2014-02-19 20:55:42.000000000 +0000 +++ kdeconnect-0.5.1/debian/changelog 2014-04-04 13:16:06.000000000 +0000 @@ -1,3 +1,9 @@ +kdeconnect (0.5.1-0ubuntu1) trusty; urgency=medium + + * New upstream release + + -- Rohan Garg Fri, 04 Apr 2014 15:16:04 +0200 + kdeconnect (0.5-0ubuntu1) trusty; urgency=medium * New upstream release diff -Nru kdeconnect-0.5/kcm/kcm_kdeconnect.desktop kdeconnect-0.5.1/kcm/kcm_kdeconnect.desktop --- kdeconnect-0.5/kcm/kcm_kdeconnect.desktop 2014-02-19 20:17:31.000000000 +0000 +++ kdeconnect-0.5.1/kcm/kcm_kdeconnect.desktop 2014-03-07 23:40:36.000000000 +0000 @@ -14,7 +14,7 @@ Name=KDE Connect Name[bs]=Konekcija KDE Name[da]=KDE Connect -Name[de]=KDE Connect +Name[de]=KDE-Connect Name[es]=KDE Connect Name[fr]=KDE Connect Name[hu]=KDE csatlakozás diff -Nru kdeconnect-0.5/kcm/kdeconnect.desktop kdeconnect-0.5.1/kcm/kdeconnect.desktop --- kdeconnect-0.5/kcm/kdeconnect.desktop 2014-02-19 20:17:31.000000000 +0000 +++ kdeconnect-0.5.1/kcm/kdeconnect.desktop 2014-03-07 23:40:36.000000000 +0000 @@ -6,7 +6,7 @@ Name=KDE Connect Name[bs]=Konekcija KDE Name[da]=KDE Connect -Name[de]=KDE Connect +Name[de]=KDE-Connect Name[es]=KDE Connect Name[fr]=KDE Connect Name[hu]=KDE csatlakozás @@ -21,7 +21,9 @@ Name[uk]=З’єднання KDE Name[x-test]=xxKDE Connectxx GenericName=Connect smartphones to your KDE Plasma Workspace +GenericName[da]=Forbind smartphones med din KDE Plasma Workspace GenericName[de]=Verbindung von Smartphones mit demKDE-Plasma-Arbeitsbereich +GenericName[fr]=Connectez votre smartphone à votre espace de travail KDE Plasma GenericName[hu]=Okostelefonok csatlakoztatása a KDE Plasma munkaterülethez GenericName[nl]=Smartphones verbinden met uw KDE Plasma werkruimte GenericName[pt]=Ligue os 'smartphones' à sua Área de Trabalho do KDE diff -Nru kdeconnect-0.5/kded/autotests/CMakeLists.txt kdeconnect-0.5.1/kded/autotests/CMakeLists.txt --- kdeconnect-0.5/kded/autotests/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ kdeconnect-0.5.1/kded/autotests/CMakeLists.txt 2014-03-07 23:40:36.000000000 +0000 @@ -0,0 +1,5 @@ +set(_testname testsocketlinereader) +qt4_generate_moc(${_testname}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testname}.moc) +include_directories(${QT_INCLUDES} ${KDE4_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}) +kde4_add_unit_test(${_testname} ${_testname}.cpp ${_testname}.moc ../backends/lan/socketlinereader.cpp ../kdebugnamespace.cpp) +target_link_libraries(${_testname} ${KDE4_KDECORE_LIBS} ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY}) \ No newline at end of file diff -Nru kdeconnect-0.5/kded/autotests/testsocketlinereader.cpp kdeconnect-0.5.1/kded/autotests/testsocketlinereader.cpp --- kdeconnect-0.5/kded/autotests/testsocketlinereader.cpp 1970-01-01 00:00:00.000000000 +0000 +++ kdeconnect-0.5.1/kded/autotests/testsocketlinereader.cpp 2014-03-07 23:40:36.000000000 +0000 @@ -0,0 +1,116 @@ +/************************************************************************************* + * Copyright (C) 2014 by Alejandro Fiestas Olivares * + * * + * This library is free software; you can redistribute it and/or * + * modify it under the terms of the GNU Lesser General Public * + * License as published by the Free Software Foundation; either * + * version 2.1 of the License, or (at your option) any later version. * + * * + * This library 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 * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this library; if not, write to the Free Software * + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * + *************************************************************************************/ + +#include "../backends/lan/socketlinereader.h" + +#include +#include +#include +#include +#include +#include +#include + +class TestSocketLineReader : public QObject +{ + Q_OBJECT +public Q_SLOTS: + void initTestCase(); + void newPackage(); + +private Q_SLOTS: + void socketLineReader(); + +private: + QTimer mTimer; + QEventLoop mLoop; + QList mPackages; + QTcpServer *mServer; + QTcpSocket *mConn; + SocketLineReader *mReader; +}; + +void TestSocketLineReader::initTestCase() +{ + mServer = new QTcpServer(this); + QVERIFY2(mServer->listen(QHostAddress::LocalHost, 8694), "Failed to create local tcp server"); + + mTimer.setInterval(4000);//For second is more enough to send some data via local socket + mTimer.setSingleShot(true); + connect(&mTimer, SIGNAL(timeout()), &mLoop, SLOT(quit())); + + mConn = new QTcpSocket(this); + mConn->connectToHost(QHostAddress::LocalHost, 8694); + connect(mConn, SIGNAL(connected()), &mLoop, SLOT(quit())); + mTimer.start(); + mLoop.exec(); + + QVERIFY2(mConn->isOpen(), "Could not connect to local tcp server"); +} + +void TestSocketLineReader::socketLineReader() +{ + QList dataToSend; + dataToSend << "foobar\n" << "barfoo\n" << "foobar?\n" << "\n" << "barfoo!\n" << "panda\n"; + Q_FOREACH(const QByteArray &line, dataToSend) { + mConn->write(line); + } + mConn->flush(); + + int maxAttemps = 5; + while(!mServer->hasPendingConnections() && maxAttemps > 0) { + --maxAttemps; + QTest::qSleep(1000); + } + + QTcpSocket *sock = mServer->nextPendingConnection(); + mReader = new SocketLineReader(sock, this); + connect(mReader, SIGNAL(readyRead()), SLOT(newPackage())); + mTimer.start(); + mLoop.exec(); + + QCOMPARE(mPackages.count(), 5);//We expect 5 Packages + for(int x = 0;x < 5; ++x) { + QCOMPARE(mPackages[x], dataToSend[x]); + } +} + +void TestSocketLineReader::newPackage() +{ + if (!mReader->bytesAvailable()) { + return; + } + + int maxLoops = 5; + while(mReader->bytesAvailable() > 0 && maxLoops > 0) { + --maxLoops; + const QByteArray package = mReader->readLine(); + if (!package.isEmpty()) { + mPackages.append(package); + } + + if (mPackages.count() == 5) { + mLoop.exit(); + } + } +} + + +QTEST_MAIN(TestSocketLineReader) + +#include "testsocketlinereader.moc" \ No newline at end of file diff -Nru kdeconnect-0.5/kded/backends/lan/uploadjob.cpp kdeconnect-0.5.1/kded/backends/lan/uploadjob.cpp --- kdeconnect-0.5/kded/backends/lan/uploadjob.cpp 2014-02-19 20:17:31.000000000 +0000 +++ kdeconnect-0.5.1/kded/backends/lan/uploadjob.cpp 2014-03-07 23:40:36.000000000 +0000 @@ -28,6 +28,9 @@ mInput = source; mServer = new QTcpServer(this); mSocket = 0; + + connect(mInput.data(), SIGNAL(readyRead()), this, SLOT(readyRead())); + connect(mInput.data(), SIGNAL(aboutToClose()), this, SLOT(aboutToClose())); } void UploadJob::start() @@ -49,15 +52,13 @@ if (mSocket || !mServer->hasPendingConnections()) return; - mSocket = mServer->nextPendingConnection(); - - connect(mInput.data(), SIGNAL(readyRead()), this, SLOT(readyRead())); - connect(mInput.data(), SIGNAL(aboutToClose()), this, SLOT(aboutToClose())); - if (!mInput->open(QIODevice::ReadOnly)) { + qWarning() << "error when opening the input to upload"; return; //TODO: Handle error, clean up... } + mSocket = mServer->nextPendingConnection(); + readyRead(); } void UploadJob::readyRead() @@ -65,7 +66,10 @@ //TODO: Implement payload encryption qint64 bytes = qMax(mInput->bytesAvailable(), (qint64)4096); - mSocket->write(mInput->read(bytes)); + int w = mSocket->write(mInput->read(bytes)); + if (w<0) { + qWarning() << "error when writing data to upload" << bytes << mInput->bytesAvailable(); + } } void UploadJob::aboutToClose() diff -Nru kdeconnect-0.5/kded/CMakeLists.txt kdeconnect-0.5.1/kded/CMakeLists.txt --- kdeconnect-0.5/kded/CMakeLists.txt 2014-02-19 20:17:31.000000000 +0000 +++ kdeconnect-0.5.1/kded/CMakeLists.txt 2014-03-07 23:40:36.000000000 +0000 @@ -1,4 +1,5 @@ add_subdirectory(plugins) +add_subdirectory(autotests) find_package (QJSON 0.8.1 REQUIRED) find_package (QCA2 REQUIRED) diff -Nru kdeconnect-0.5/kded/device.cpp kdeconnect-0.5.1/kded/device.cpp --- kdeconnect-0.5/kded/device.cpp 2014-02-19 20:17:31.000000000 +0000 +++ kdeconnect-0.5.1/kded/device.cpp 2014-03-07 23:40:36.000000000 +0000 @@ -160,7 +160,10 @@ return; } - if (m_pairStatus == Device::Paired) return; + if (m_pairStatus == Device::Paired) { + return; + } + pairingTimer.setSingleShot(true); pairingTimer.start(30 * 1000); connect(&pairingTimer, SIGNAL(timeout()), diff -Nru kdeconnect-0.5/kded/filetransferjob.cpp kdeconnect-0.5.1/kded/filetransferjob.cpp --- kdeconnect-0.5/kded/filetransferjob.cpp 2014-02-19 20:17:31.000000000 +0000 +++ kdeconnect-0.5.1/kded/filetransferjob.cpp 2014-03-07 23:40:36.000000000 +0000 @@ -21,7 +21,9 @@ #include "filetransferjob.h" #include +#include +#include #include #include "kdebugnamespace.h" @@ -30,13 +32,15 @@ { Q_ASSERT(destination.isLocalFile()); //TODO: Make a precondition before calling this function that destination file exists - QFile(destination.path()).open(QIODevice::WriteOnly | QIODevice::Truncate); //HACK: KIO is so dumb it can't create the file if it doesn't exist - mDestination = KIO::open(destination, QIODevice::WriteOnly); - connect(mDestination, SIGNAL(open(KIO::Job*)), this, SLOT(open(KIO::Job*))); - connect(mDestination, SIGNAL(result(KJob*)), this, SLOT(openFinished(KJob*))); mOrigin = origin; mSize = size; mWritten = 0; + m_speedBytes = 0; + mDestination = destination; + mDestinationJob = 0; + mDeviceName = i18nc("Device name that will appear on the jobs", "KDE-Connect"); + + setCapabilities(Killable); kDebug(kdeconnect_kded()) << "FileTransferJob Downloading payload to" << destination; } @@ -47,10 +51,85 @@ void FileTransferJob::start() { + QMetaObject::invokeMethod(this, "doStart", Qt::QueuedConnection); //kDebug(kdeconnect_kded()) << "FileTransferJob start"; +} + +void FileTransferJob::doStart() +{ + description(this, i18n("Receiving file over KDE-Connect"), + QPair(i18nc("File transfer origin", "From"), + QString(mDeviceName)) + ); + KUrl destCheck = mDestination; + if (QFile::exists(destCheck.path())) { + QFileInfo destInfo(destCheck.path()); + KIO::RenameDialog *dialog = new KIO::RenameDialog(0, + i18n("Incoming file exists"), + KUrl(mDeviceName + ":/" + destCheck.fileName()), + destCheck, + KIO::M_OVERWRITE, + mSize, + destInfo.size(), + -1, + destInfo.created().toTime_t(), + -1, + destInfo.lastModified().toTime_t() + ); + connect(this, SIGNAL(finished(KJob*)), dialog, SLOT(deleteLater())); + connect(dialog, SIGNAL(finished(int)), SLOT(renameDone(int))); + dialog->show(); + return; + } + + startTransfer(); +} + +void FileTransferJob::renameDone(int result) +{ + KIO::RenameDialog *renameDialog = qobject_cast(sender()); + switch (result) { + case KIO::R_CANCEL: + //The user cancelled, killing the job + emitResult(); + case KIO::R_RENAME: + mDestination = renameDialog->newDestUrl(); + break; + case KIO::R_OVERWRITE: + { + // Delete the old file if exists + QFile oldFile(mDestination.path()); + if (oldFile.exists()) { + oldFile.remove(); + } + break; + } + default: + kWarning() << "Unknown Error"; + emitResult(); + } + + renameDialog->deleteLater(); + startTransfer(); +} + +void FileTransferJob::startTransfer() +{ + setTotalAmount(Bytes, mSize); + setProcessedAmount(Bytes, 0); + m_time = QTime::currentTime(); + description(this, i18n("Receiving file over KDE-Connect"), + QPair(i18nc("File transfer origin", "From"), + QString(mDeviceName)), + QPair(i18nc("File transfer destination", "To"), mDestination.path())); + + QFile(mDestination.path()).open(QIODevice::WriteOnly | QIODevice::Truncate); //HACK: KIO is so dumb it can't create the file if it doesn't exist + mDestinationJob = KIO::open(mDestination, QIODevice::WriteOnly); + connect(mDestinationJob, SIGNAL(open(KIO::Job*)), this, SLOT(open(KIO::Job*))); + connect(mDestinationJob, SIGNAL(result(KJob*)), this, SLOT(openFinished(KJob*))); //Open destination file - mDestination->start(); + mDestinationJob->start(); } void FileTransferJob::open(KIO::Job* job) @@ -78,13 +157,24 @@ { int bytes = qMin(qint64(4096), mOrigin->bytesAvailable()); QByteArray data = mOrigin->read(bytes); - mDestination->write(data); - mWritten += bytes; + mDestinationJob->write(data); + mWritten += data.size(); + setProcessedAmount(Bytes, mWritten); //kDebug(kdeconnect_kded()) << "readyRead" << mSize << mWritten << bytes; if (mSize > -1) { - setPercent((mWritten*100)/mSize); + //If a least 1 second has passed since last update + int secondsSinceLastTime = m_time.secsTo(QTime::currentTime()); + if (secondsSinceLastTime > 0 && m_speedBytes > 0) { + float speed = (mWritten - m_speedBytes) / secondsSinceLastTime; + emitSpeed(speed); + + m_time = QTime::currentTime(); + m_speedBytes = mWritten; + } else if(m_speedBytes == 0) { + m_speedBytes = mWritten; + } } if (mSize > -1 && mWritten >= mSize) { //At the end or expected size reached @@ -106,10 +196,20 @@ setError(1); setErrorText(i18n("Received incomplete file")); } else { - kDebug(kdeconnect_kded()) << "Finished transfer" << mDestination->url(); + kDebug(kdeconnect_kded()) << "Finished transfer" << mDestinationJob->url(); } - mDestination->close(); - mDestination->deleteLater(); + mDestinationJob->close(); + mDestinationJob->deleteLater(); emitResult(); } +bool FileTransferJob::doKill() +{ + if (mDestinationJob) { + mDestinationJob->close(); + } + if (mOrigin) { + mOrigin->close(); + } + return true; +} diff -Nru kdeconnect-0.5/kded/filetransferjob.h kdeconnect-0.5.1/kded/filetransferjob.h --- kdeconnect-0.5/kded/filetransferjob.h 2014-02-19 20:17:31.000000000 +0000 +++ kdeconnect-0.5.1/kded/filetransferjob.h 2014-03-07 23:40:36.000000000 +0000 @@ -22,6 +22,7 @@ #define FILETRANSFERJOB_H #include +#include #include #include @@ -38,17 +39,27 @@ public: FileTransferJob(const QSharedPointer& origin, int size, const KUrl& destination); virtual void start(); - KUrl destination() { return mDestination->url(); } + KUrl destination() const { return mDestination; } + void setDeviceName(const QString &deviceName) {mDeviceName = deviceName;}; public Q_SLOTS: + void doStart(); + void renameDone(int result); void readyRead(); void open(KIO::Job*); void sourceFinished(); void openFinished(KJob*); +protected: + virtual bool doKill(); private: + void startTransfer(); QSharedPointer mOrigin; - KIO::FileJob* mDestination; + KIO::FileJob* mDestinationJob; + QString mDeviceName; + KUrl mDestination; + QTime m_time; + qulonglong m_speedBytes; int mSize; int mWritten; diff -Nru kdeconnect-0.5/kded/kdeconnectd.cpp kdeconnect-0.5.1/kded/kdeconnectd.cpp --- kdeconnect-0.5/kded/kdeconnectd.cpp 2014-02-19 20:17:31.000000000 +0000 +++ kdeconnect-0.5.1/kded/kdeconnectd.cpp 2014-03-07 23:40:36.000000000 +0000 @@ -43,11 +43,11 @@ } } -void initializeTermHandlers(QCoreApplication* app) +void initializeTermHandlers(QCoreApplication* app, Daemon* daemon) { ::socketpair(AF_UNIX, SOCK_STREAM, 0, sigtermfd); QSocketNotifier* snTerm = new QSocketNotifier(sigtermfd[1], QSocketNotifier::Read, app); - QObject::connect(snTerm, SIGNAL(activated(int)), app, SLOT(quit())); + QObject::connect(snTerm, SIGNAL(activated(int)), daemon, SLOT(deleteLater())); action.sa_handler = sighandler; sigemptyset(&action.sa_mask); @@ -59,7 +59,7 @@ int main(int argc, char* argv[]) { - KAboutData aboutData("kdeconnectd", "kdeconnectd", + KAboutData aboutData("kdeconnect", "kdeconnect-kded", ki18n("kdeconnect"), "0.1", ki18n("connect devices"), @@ -72,9 +72,15 @@ KApplication app(true); // WARNING GUI required for QClipboard access app.disableSessionManagement(); + app.setQuitOnLastWindowClosed(false); - initializeTermHandlers(&app); - new Daemon(&app); + + //Force daemon to destroy when KApplications in alive + //belongs to bug KApplications resoure freeing + Daemon* daemon = new Daemon(0); + QObject::connect(daemon, SIGNAL(destroyed(QObject*)), &app, SLOT(quit())); + initializeTermHandlers(&app, daemon); + return app.exec(); } diff -Nru kdeconnect-0.5/kded/kdeconnect.desktop kdeconnect-0.5.1/kded/kdeconnect.desktop --- kdeconnect-0.5/kded/kdeconnect.desktop 2014-02-19 20:17:31.000000000 +0000 +++ kdeconnect-0.5.1/kded/kdeconnect.desktop 2014-03-07 23:40:36.000000000 +0000 @@ -11,7 +11,7 @@ Name=KDE Connect Name[bs]=Konekcija KDE Name[da]=KDE Connect -Name[de]=KDE Connect +Name[de]=KDE-Connect Name[es]=KDE Connect Name[fr]=KDE Connect Name[hu]=KDE csatlakozás diff -Nru kdeconnect-0.5/kded/kdeconnect.notifyrc kdeconnect-0.5.1/kded/kdeconnect.notifyrc --- kdeconnect-0.5/kded/kdeconnect.notifyrc 2014-02-19 20:17:31.000000000 +0000 +++ kdeconnect-0.5.1/kded/kdeconnect.notifyrc 2014-03-07 23:40:36.000000000 +0000 @@ -3,7 +3,7 @@ Name=KDE Connect Name[bs]=Konekcija KDE Name[da]=KDE Connect -Name[de]=KDE Connect +Name[de]=KDE-Connect Name[es]=KDE Connect Name[fr]=KDE Connect Name[hu]=KDE csatlakozás @@ -304,7 +304,10 @@ [Event/mounted] Name=Mounted +Name[da]=Monteret Name[de]=Eingebunden +Name[fr]=Monté +Name[hu]=Csatolva Name[nl]=Aangekoppeld Name[pt]=Montado Name[pt_BR]=Montado @@ -313,7 +316,10 @@ Name[uk]=Змонтовано Name[x-test]=xxMountedxx Comment=Filesystem mounted +Comment[da]=Filsystem monteret Comment[de]=Dateisystem eingebunden +Comment[fr]=Système de fichiers monté +Comment[hu]=Fájlrendszer csatolva Comment[nl]=Bestandssysteem aangekoppeld Comment[pt]=Sistema de ficheiros montado Comment[pt_BR]=Sistema de arquivos montado @@ -325,7 +331,10 @@ [Event/unmounted] Name=Unmounted +Name[da]=Afmonteret Name[de]=Einbindung gelöst +Name[fr]=Libéré +Name[hu]=Leválasztva Name[nl]=Afgekoppeld Name[pt]=Desmontado Name[pt_BR]=Desmontado @@ -334,7 +343,10 @@ Name[uk]=Демонтовано Name[x-test]=xxUnmountedxx Comment=Filesystem unmounted +Comment[da]=Filsystem afmonteret Comment[de]=Einbindung des Dateisystems gelöst +Comment[fr]=Système de fichiers libéré +Comment[hu]=Fájlrendszer leválasztva Comment[nl]=Bestandssysteem afgekoppeld Comment[pt]=Sistema de ficheiros desmontado Comment[pt_BR]=Sistema de arquivos desmontado diff -Nru kdeconnect-0.5/kded/kded.cpp kdeconnect-0.5.1/kded/kded.cpp --- kdeconnect-0.5/kded/kded.cpp 2014-02-19 20:17:31.000000000 +0000 +++ kdeconnect-0.5.1/kded/kded.cpp 2014-03-07 23:40:36.000000000 +0000 @@ -28,13 +28,13 @@ #include "kdebugnamespace.h" K_PLUGIN_FACTORY(KdeConnectFactory, registerPlugin();) -K_EXPORT_PLUGIN(KdeConnectFactory("kdeconnect", "kdeconnect")) +K_EXPORT_PLUGIN(KdeConnectFactory("kdeconnect", "kdeconnect-kded")) Kded::Kded(QObject *parent, const QList&) : KDEDModule(parent) , m_daemon(0) { - start(); + QMetaObject::invokeMethod(this, "start", Qt::QueuedConnection); kDebug(kdeconnect_kded()) << "kded_kdeconnect started"; } @@ -44,54 +44,38 @@ kDebug(kdeconnect_kded()) << "kded_kdeconnect stopped"; } -bool Kded::start() +void Kded::start() { - if (m_daemon) - { - return true; + if (m_daemon) { + return; } const QString daemon = KStandardDirs::locate("exe", "kdeconnectd"); kDebug(kdeconnect_kded()) << "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))); connect(m_daemon, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(onFinished(int,QProcess::ExitStatus))); connect(m_daemon, SIGNAL(finished(int,QProcess::ExitStatus)), m_daemon, SLOT(deleteLater())); m_daemon->setProgram(daemon); m_daemon->setOutputChannelMode(KProcess::SeparateChannels); - m_daemon->start(); - if (!m_daemon->waitForStarted(2000)) //FIXME: KDEDs should be non-blocking, do we really need to wait for it to start? - { - kError(kdeconnect_kded()) << "Can't start " << daemon; - return false; - } - m_daemon->closeReadChannel(KProcess::StandardOutput); - - kDebug(kdeconnect_kded()) << "Daemon successfuly started"; - return true; + m_daemon->start(); } void Kded::stop() { - if (m_daemon) - { - m_daemon->terminate(); - if (m_daemon->waitForFinished(10000)) - { - kDebug(kdeconnect_kded()) << "Daemon successfuly stopped"; - } - else - { - m_daemon->kill(); - kWarning(kdeconnect_kded()) << "Daemon killed"; - } - m_daemon = 0; + if (!m_daemon) { + return; } + + m_daemon->terminate(); + m_daemon->setProperty("terminate", true); + QTimer::singleShot(10000, this, SLOT(checkIfDaemonTerminated())); } -bool Kded::restart() +void Kded::restart() { stop(); return start(); @@ -102,19 +86,33 @@ kError(kdeconnect_kded()) << "Process error code=" << errorCode; } +void Kded::daemonStarted() +{ + kDebug(kdeconnect_kded()) << "Daemon successfuly started"; + Q_EMIT started(); +} + void Kded::onFinished(int exitCode, QProcess::ExitStatus status) { - if (status == QProcess::CrashExit) - { + if (status == QProcess::CrashExit) { kError(kdeconnect_kded()) << "Process crashed with code=" << exitCode; kError(kdeconnect_kded()) << m_daemon->readAllStandardError(); kWarning(kdeconnect_kded()) << "Restarting in 5 sec..."; QTimer::singleShot(5000, this, SLOT(start())); - } - else - { + } else { kWarning(kdeconnect_kded()) << "Process finished with code=" << exitCode; } + + Q_EMIT stopped(); m_daemon = 0; } +void Kded::checkIfDaemonTerminated() +{ + if (!m_daemon || !m_daemon->property("terminate").isValid()) { + return; + } + + m_daemon->kill(); + kWarning(kdeconnect_kded()) << "Daemon killed"; +} diff -Nru kdeconnect-0.5/kded/kded.h kdeconnect-0.5.1/kded/kded.h --- kdeconnect-0.5/kded/kded.h 2014-02-19 20:17:31.000000000 +0000 +++ kdeconnect-0.5.1/kded/kded.h 2014-03-07 23:40:36.000000000 +0000 @@ -36,13 +36,19 @@ public Q_SLOTS: - Q_SCRIPTABLE bool start(); + Q_SCRIPTABLE void start(); Q_SCRIPTABLE void stop(); - Q_SCRIPTABLE bool restart(); + Q_SCRIPTABLE void restart(); + +Q_SIGNALS: + Q_SCRIPTABLE void started(); + Q_SCRIPTABLE void stopped(); private Q_SLOTS: void onError(QProcess::ProcessError); void onFinished(int, QProcess::ExitStatus); + void daemonStarted(); + void checkIfDaemonTerminated(); private: KProcess* m_daemon; diff -Nru kdeconnect-0.5/kded/networkpackage.cpp kdeconnect-0.5.1/kded/networkpackage.cpp --- kdeconnect-0.5/kded/networkpackage.cpp 2014-02-19 20:17:31.000000000 +0000 +++ kdeconnect-0.5.1/kded/networkpackage.cpp 2014-03-07 23:40:36.000000000 +0000 @@ -49,7 +49,7 @@ void NetworkPackage::createIdentityPackage(NetworkPackage* np) { KSharedConfigPtr config = KSharedConfig::openConfig("kdeconnectrc"); - QString id = config->group("myself").readEntry("id",""); + const QString id = config->group("myself").readEntry("id",""); np->mId = QString::number(QDateTime::currentMSecsSinceEpoch()); np->mType = PACKAGE_TYPE_IDENTITY; np->mPayload = QSharedPointer(); @@ -73,7 +73,7 @@ if (hasPayload()) { //kDebug(kdeconnect_kded()) << "Serializing payloadTransferInfo"; - variant["payloadSize"] = 0; + variant["payloadSize"] = payloadSize(); variant["payloadTransferInfo"] = mPayloadTransferInfo; } @@ -112,6 +112,9 @@ } np->mPayloadSize = variant["payloadSize"].toInt(); //Will return 0 if was not present, which is ok + if (np->mPayloadSize == -1) { + np->mPayloadSize = np->get("size", -1); + } np->mPayloadTransferInfo = variant["payloadTransferInfo"].toMap(); //Will return an empty qvariantmap if was not present, which is ok return true; @@ -127,9 +130,9 @@ QStringList chunks; while (!serialized.isEmpty()) { - QByteArray chunk = serialized.left(chunkSize); + const QByteArray chunk = serialized.left(chunkSize); serialized = serialized.mid(chunkSize); - QByteArray encryptedChunk = key.encrypt(chunk, NetworkPackage::EncryptionAlgorithm).toByteArray(); + const QByteArray encryptedChunk = key.encrypt(chunk, NetworkPackage::EncryptionAlgorithm).toByteArray(); chunks.append( encryptedChunk.toBase64() ); } @@ -149,7 +152,7 @@ QByteArray decryptedJson; Q_FOREACH(const QString& chunk, chunks) { - QByteArray encryptedChunk = QByteArray::fromBase64(chunk.toAscii()); + const QByteArray encryptedChunk = QByteArray::fromBase64(chunk.toAscii()); QCA::SecureArray decryptedChunk; bool success = key.decrypt(encryptedChunk, &decryptedChunk, NetworkPackage::EncryptionAlgorithm); if (!success) { @@ -160,7 +163,9 @@ bool success = unserialize(decryptedJson, out); - if (!success) return false; + if (!success) { + return false; + } if (hasPayload()) { out->mPayload = mPayload; diff -Nru kdeconnect-0.5/kded/plugins/battery/batteryplugin.cpp kdeconnect-0.5.1/kded/plugins/battery/batteryplugin.cpp --- kdeconnect-0.5/kded/plugins/battery/batteryplugin.cpp 2014-02-19 20:17:31.000000000 +0000 +++ kdeconnect-0.5.1/kded/plugins/battery/batteryplugin.cpp 2014-03-07 23:40:36.000000000 +0000 @@ -73,7 +73,7 @@ if ( thresholdEvent == ThresholdBatteryLow && !isCharging ) { KNotification* notification = new KNotification("batteryLow"); notification->setPixmap(KIcon("battery-040").pixmap(48, 48)); - notification->setComponentData(KComponentData("kdeconnect", "kdeconnect")); + notification->setComponentData(KComponentData("kdeconnect", "kdeconnect-kded")); notification->setTitle(i18nc("device name: low battery", "%1: low battery", device()->name())); notification->setText(i18n("Battery at %1%", currentCharge)); notification->sendEvent(); diff -Nru kdeconnect-0.5/kded/plugins/mpriscontrol/mpriscontrolplugin.cpp kdeconnect-0.5.1/kded/plugins/mpriscontrol/mpriscontrolplugin.cpp --- kdeconnect-0.5/kded/plugins/mpriscontrol/mpriscontrolplugin.cpp 2014-02-19 20:17:31.000000000 +0000 +++ kdeconnect-0.5.1/kded/plugins/mpriscontrol/mpriscontrolplugin.cpp 2014-03-07 23:40:36.000000000 +0000 @@ -75,7 +75,7 @@ { QDBusInterface mprisInterface(service, "/org/mpris/MediaPlayer2", "org.mpris.MediaPlayer2"); //FIXME: This call hangs and returns an empty string if KDED is still starting! - const QString& identity = mprisInterface.property("Identity").toString(); + const QString identity = mprisInterface.property("Identity").toString(); playerList[identity] = service; kDebug(kdeconnect_kded()) << "Mpris addPlayer" << service << "->" << identity; sendPlayerList(); @@ -130,7 +130,7 @@ void MprisControlPlugin::removePlayer(const QString& ifaceName) { - QString identity = playerList.key(ifaceName); + const QString identity = playerList.key(ifaceName); kDebug(kdeconnect_kded()) << "Mpris removePlayer" << ifaceName << "->" << identity; playerList.remove(identity); sendPlayerList(); @@ -143,7 +143,7 @@ } //Send the player list - const QString& player = np.get("player"); + const QString player = np.get("player"); bool valid_player = playerList.contains(player); if (!valid_player || np.get("requestPlayerList")) { sendPlayerList(); diff -Nru kdeconnect-0.5/kded/plugins/pausemusic/pausemusic_config.cpp kdeconnect-0.5.1/kded/plugins/pausemusic/pausemusic_config.cpp --- kdeconnect-0.5/kded/plugins/pausemusic/pausemusic_config.cpp 2014-02-19 20:17:31.000000000 +0000 +++ kdeconnect-0.5.1/kded/plugins/pausemusic/pausemusic_config.cpp 2014-03-07 23:40:36.000000000 +0000 @@ -29,7 +29,7 @@ #include "ui_pausemusic_config.h" K_PLUGIN_FACTORY(PauseMusicConfigFactory, registerPlugin();) -K_EXPORT_PLUGIN(PauseMusicConfigFactory("kdeconnect_pausemusic_config", "kdeconnect_pausemusic_config")) +K_EXPORT_PLUGIN(PauseMusicConfigFactory("kdeconnect_pausemusic_config", "kdeconnect-kded")) PauseMusicConfig::PauseMusicConfig(QWidget *parent, const QVariantList& ) : KCModule(PauseMusicConfigFactory::componentData(), parent) diff -Nru kdeconnect-0.5/kded/plugins/ping/pingplugin.cpp kdeconnect-0.5.1/kded/plugins/ping/pingplugin.cpp --- kdeconnect-0.5/kded/plugins/ping/pingplugin.cpp 2014-02-19 20:17:31.000000000 +0000 +++ kdeconnect-0.5.1/kded/plugins/ping/pingplugin.cpp 2014-03-07 23:40:36.000000000 +0000 @@ -44,7 +44,7 @@ { KNotification* notification = new KNotification("pingReceived"); //KNotification::Persistent notification->setPixmap(KIcon("dialog-ok").pixmap(48, 48)); - notification->setComponentData(KComponentData("kdeconnect", "kdeconnect")); + notification->setComponentData(KComponentData("kdeconnect", "kdeconnect-kded")); notification->setTitle(device()->name()); notification->setText(np.get("message",i18n("Ping!"))); //This can be a source of spam notification->sendEvent(); diff -Nru kdeconnect-0.5/kded/plugins/pluginloader.cpp kdeconnect-0.5.1/kded/plugins/pluginloader.cpp --- kdeconnect-0.5/kded/plugins/pluginloader.cpp 2014-02-19 20:17:31.000000000 +0000 +++ kdeconnect-0.5.1/kded/plugins/pluginloader.cpp 2014-03-07 23:40:36.000000000 +0000 @@ -77,7 +77,8 @@ QVariant deviceVariant = QVariant::fromValue(device); - ret.plugin = (KdeConnectPlugin*) factory->create(device, QVariantList() << deviceVariant); + //FIXME any reason to use QObject in template param instead KdeConnectPlugin? + ret.plugin = factory->create(device, QVariantList() << deviceVariant); if (!ret.plugin) { kDebug(kdeconnect_kded()) << "Error loading plugin"; return ret; diff -Nru kdeconnect-0.5/kded/plugins/sftp/CMakeLists.txt kdeconnect-0.5.1/kded/plugins/sftp/CMakeLists.txt --- kdeconnect-0.5/kded/plugins/sftp/CMakeLists.txt 2014-02-19 20:17:31.000000000 +0000 +++ kdeconnect-0.5.1/kded/plugins/sftp/CMakeLists.txt 2014-03-07 23:40:36.000000000 +0000 @@ -35,8 +35,8 @@ ${QCA2_LIBRARIES} ) -install(TARGETS kdeconnect_sftp DESTINATION ${PLUGIN_INSTALL_DIR} ) -install(FILES kdeconnect_sftp.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +#install(TARGETS kdeconnect_sftp DESTINATION ${PLUGIN_INSTALL_DIR} ) +#install(FILES kdeconnect_sftp.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) include(../../../macros.cmake) diff -Nru kdeconnect-0.5/kded/plugins/sftp/kdeconnect_sftp_config.desktop kdeconnect-0.5.1/kded/plugins/sftp/kdeconnect_sftp_config.desktop --- kdeconnect-0.5/kded/plugins/sftp/kdeconnect_sftp_config.desktop 2014-02-19 20:17:31.000000000 +0000 +++ kdeconnect-0.5.1/kded/plugins/sftp/kdeconnect_sftp_config.desktop 2014-03-07 23:40:36.000000000 +0000 @@ -6,7 +6,9 @@ X-KDE-ParentComponents=kdeconnect_sftp Name=SFTP filebrowser plugin settings +Name[da]=Indstilling af filhåndteringens SFTP-plugin Name[de]=Modul-Einstellungen für SFTP-Dateibrowser +Name[fr]=Paramètres du module du navigateur de fichiers SFTP Name[hu]=SFTP fájlböngésző bővítmény beállításai Name[nl]=Plug-in-instellingen van SFTP-bestandenbrowser Name[pt]=Configuração do 'plugin' de navegação de ficheiros por SFTP diff -Nru kdeconnect-0.5/kded/plugins/sftp/kdeconnect_sftp.desktop kdeconnect-0.5.1/kded/plugins/sftp/kdeconnect_sftp.desktop --- kdeconnect-0.5/kded/plugins/sftp/kdeconnect_sftp.desktop 2014-02-19 20:17:31.000000000 +0000 +++ kdeconnect-0.5.1/kded/plugins/sftp/kdeconnect_sftp.desktop 2014-03-07 23:40:36.000000000 +0000 @@ -12,7 +12,9 @@ X-KDE-PluginInfo-EnabledByDefault=true Icon=system-file-manager Name=Remote filesystem browser +Name[da]=Gennemse eksternt filsystem Name[de]=Datei-Browser für entferne Systeme +Name[fr]=Contrôlez à distance le navigateur du système de fichiers Name[hu]=Távoli fájlrendszer böngésző Name[nl]=Bestandssysteembrowser op afstand Name[pt]=Navegador do sistema de ficheiros remoto @@ -22,7 +24,9 @@ Name[uk]=Перегляд віддалених файлових систем Name[x-test]=xxRemote filesystem browserxx Comment=Browse the remote device filesystem using SFTP +Comment[da]=Gennemse filsystemet på den eksterne enhed med SFTP Comment[de]=Browsen im Dateisystem des entfernten Geräts mit SFTP +Comment[fr]=Visualiser le système de fichiers de l'appareil distant en utilisant SFTP Comment[hu]=A távoli eszköz fájlrendszerének böngészése SFTP használatával Comment[nl]=Blader door het bestandssysteem met SFTP op het apparaat op afstand Comment[pt]=Navegue pelo sistema de ficheiros do dispositivo por SFTP diff -Nru kdeconnect-0.5/kded/plugins/sftp/sftp_config.cpp kdeconnect-0.5.1/kded/plugins/sftp/sftp_config.cpp --- kdeconnect-0.5/kded/plugins/sftp/sftp_config.cpp 2014-02-19 20:17:31.000000000 +0000 +++ kdeconnect-0.5.1/kded/plugins/sftp/sftp_config.cpp 2014-03-07 23:40:36.000000000 +0000 @@ -32,7 +32,7 @@ #include "ui_sftp_config.h" K_PLUGIN_FACTORY(SftpConfigFactory, registerPlugin();) -K_EXPORT_PLUGIN(SftpConfigFactory("kdeconnect_sftp_config", "kdeconnect_sftp_config")) +K_EXPORT_PLUGIN(SftpConfigFactory("kdeconnect_sftp_config", "kdeconnect-kded")) SftpConfig::SftpConfig(QWidget *parent, const QVariantList& ) : KCModule(SftpConfigFactory::componentData(), parent) diff -Nru kdeconnect-0.5/kded/plugins/sftp/sftpplugin.cpp kdeconnect-0.5.1/kded/plugins/sftp/sftpplugin.cpp --- kdeconnect-0.5/kded/plugins/sftp/sftpplugin.cpp 2014-02-19 20:17:31.000000000 +0000 +++ kdeconnect-0.5.1/kded/plugins/sftp/sftpplugin.cpp 2014-03-07 23:40:36.000000000 +0000 @@ -38,19 +38,16 @@ #include "../../kdebugnamespace.h" K_PLUGIN_FACTORY( KdeConnectPluginFactory, registerPlugin< SftpPlugin >(); ) -K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_sftp", "kdeconnect_sftp") ) +K_EXPORT_PLUGIN( KdeConnectPluginFactory("kdeconnect_sftp", "kdeconnect-kded") ) static const QSet fields_c = QSet() << "ip" << "port" << "user" << "port" << "path"; struct SftpPlugin::Pimpl { - Pimpl() - { - //Add KIO entry to Dolphin's Places - placesModel = new KFilePlacesModel(); - } + Pimpl() {} - KFilePlacesModel* placesModel; + //Add KIO entry to Dolphin's Places + KFilePlacesModel placesModel; QPointer mounter; }; @@ -74,17 +71,17 @@ { removeFromDolphin(); KUrl kioUrl("kdeconnect://"+device()->id()+"/"); - m_d->placesModel->addPlace(device()->name(), kioUrl, "kdeconnect"); + m_d->placesModel.addPlace(device()->name(), kioUrl, "kdeconnect"); kDebug(kdeconnect_kded()) << "add to dolphin"; } void SftpPlugin::removeFromDolphin() { KUrl kioUrl("kdeconnect://"+device()->id()+"/"); - QModelIndex index = m_d->placesModel->closestItem(kioUrl); + QModelIndex index = m_d->placesModel.closestItem(kioUrl); while (index.row() != -1) { - m_d->placesModel->removePlace(index); - index = m_d->placesModel->closestItem(kioUrl); + m_d->placesModel.removePlace(index); + index = m_d->placesModel.closestItem(kioUrl); } } @@ -167,9 +164,9 @@ KNotification* notification = new KNotification("mounted", KNotification::CloseOnTimeout, this); notification->setPixmap(KIconLoader::global()->loadIcon("drive-removable-media", KIconLoader::Desktop)); - notification->setComponentData(KComponentData("kdeconnect", "kdeconnect")); - notification->setTitle(i18n("Device %1").arg(device()->name())); - notification->setText(i18n("Filesystem mounted at %1").arg(mountPoint())); + notification->setComponentData(KComponentData("kdeconnect", "kdeconnect-kded")); + notification->setTitle(i18n("Device %1", device()->name())); + notification->setText(i18n("Filesystem mounted at %1", mountPoint())); notification->sendEvent(); Q_EMIT mounted(); @@ -189,7 +186,7 @@ KNotification* notification = new KNotification("unmounted", KNotification::CloseOnTimeout, this); notification->setPixmap(KIconLoader::global()->loadIcon("dialog-ok", KIconLoader::Desktop)); notification->setComponentData(KComponentData("kdeconnect", "kdeconnect")); - notification->setTitle(i18n("Device %1").arg(device()->name())); + notification->setTitle(i18n("Device %1", device()->name())); notification->setText(i18n("Filesystem unmounted")); notification->sendEvent(); @@ -214,7 +211,7 @@ void SftpPlugin::knotify(int type, const QString& text, const QPixmap& icon) const { KNotification::event(KNotification::StandardEvent(type) - , i18n("Device %1").arg(device()->name()), text, icon, 0 + , i18n("Device %1", device()->name()), text, icon, 0 , KNotification::CloseOnTimeout); } diff -Nru kdeconnect-0.5/kded/plugins/share/shareplugin.cpp kdeconnect-0.5.1/kded/plugins/share/shareplugin.cpp --- kdeconnect-0.5/kded/plugins/share/shareplugin.cpp 2014-02-19 20:17:31.000000000 +0000 +++ kdeconnect-0.5.1/kded/plugins/share/shareplugin.cpp 2014-03-07 23:40:36.000000000 +0000 @@ -26,10 +26,12 @@ #include #include #include +#include #include #include #include +#include #include "../../kdebugnamespace.h" #include "../../filetransferjob.h" @@ -41,20 +43,16 @@ SharePlugin::SharePlugin(QObject* parent, const QVariantList& args) : KdeConnectPlugin(parent, args) { - } -QString SharePlugin::destinationDir() +KUrl SharePlugin::destinationDir() const { - QString defaultPath = KGlobalSettings::downloadPath(); - //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/share"); - QString dir = config->group("receive").readEntry("path", defaultPath); + KUrl dir = config->group("receive").readEntry("path", KGlobalSettings::downloadPath()); + dir.adjustPath(KUrl::AddTrailingSlash); - if (!dir.endsWith('/')) dir.append('/'); - - QDir().mkpath(KUrl(dir).path()); //Using KUrl to remove file:/// protocol, wich seems to confuse QDir.mkpath + QDir().mkpath(dir.toLocalFile()); kDebug(kdeconnect_kded()) << dir; @@ -89,8 +87,13 @@ //kDebug(kdeconnect_kded()) << "receiving file"; QString filename = np.get("filename", QString::number(QDateTime::currentMSecsSinceEpoch())); //TODO: Ask before overwritting or rename file if it already exists - FileTransferJob* job = np.createPayloadTransferJob(destinationDir() + filename); + + KUrl destination = destinationDir(); + destination.addPath(filename); + FileTransferJob* job = np.createPayloadTransferJob(destination); + job->setDeviceName(device()->name()); connect(job, SIGNAL(result(KJob*)), this, SLOT(finished(KJob*))); + KIO::getJobTracker()->registerJob(job); job->start(); } else if (np.has("text")) { QString text = np.get("text"); @@ -128,7 +131,7 @@ FileTransferJob* transferJob = (FileTransferJob*)job; KNotification* notification = new KNotification("pingReceived"); //KNotification::Persistent notification->setPixmap(KIcon(error? "edit-delete" : "dialog-ok").pixmap(48, 48)); - notification->setComponentData(KComponentData("kdeconnect", "kdeconnect")); + notification->setComponentData(KComponentData("kdeconnect", "kdeconnect-kded")); notification->setTitle(i18n("Transfer finished")); notification->setText(transferJob->destination().fileName()); notification->setActions(QStringList(i18n("Open destination folder"))); @@ -140,3 +143,26 @@ { QDesktopServices::openUrl(destinationDir()); } + +void SharePlugin::shareUrl(const QUrl& url) +{ + NetworkPackage package(PACKAGE_TYPE_SHARE); + if(url.isLocalFile()) { + QSharedPointer ioFile(new QFile(url.toLocalFile())); + package.setPayload(ioFile, ioFile->size()); + package.set("filename", KUrl(url).fileName()); + } else { + package.set("url", url.toString()); + } + device()->sendPackage(package); +} + +void SharePlugin::connected() +{ + QDBusConnection::sessionBus().registerObject(dbusPath(), this, QDBusConnection::ExportAllContents); +} + +QString SharePlugin::dbusPath() const +{ + return "/modules/kdeconnect/devices/" + device()->id() + "/share"; +} diff -Nru kdeconnect-0.5/kded/plugins/share/shareplugin.h kdeconnect-0.5.1/kded/plugins/share/shareplugin.h --- kdeconnect-0.5/kded/plugins/share/shareplugin.h 2014-02-19 20:17:31.000000000 +0000 +++ kdeconnect-0.5.1/kded/plugins/share/shareplugin.h 2014-03-07 23:40:36.000000000 +0000 @@ -32,20 +32,26 @@ : public KdeConnectPlugin { Q_OBJECT + Q_CLASSINFO("D-Bus Interface", "org.kde.kdeconnect.device.share") public: explicit SharePlugin(QObject *parent, const QVariantList &args); + ///Helper method, QDBus won't recognize QUrl + Q_SCRIPTABLE void shareUrl(const QString& url) { shareUrl(QUrl(url)); } public Q_SLOTS: virtual bool receivePackage(const NetworkPackage& np); - virtual void connected() { } - void finished(KJob*); + virtual void connected(); private Q_SLOTS: + void finished(KJob*); void openDestinationFolder(); private: - QString destinationDir(); + void shareUrl(const QUrl& url); + + QString dbusPath() const; + KUrl destinationDir() const; }; #endif diff -Nru kdeconnect-0.5/kded/plugins/telephony/telephonyplugin.cpp kdeconnect-0.5.1/kded/plugins/telephony/telephonyplugin.cpp --- kdeconnect-0.5/kded/plugins/telephony/telephonyplugin.cpp 2014-02-19 20:17:31.000000000 +0000 +++ kdeconnect-0.5.1/kded/plugins/telephony/telephonyplugin.cpp 2014-03-07 23:40:36.000000000 +0000 @@ -37,12 +37,12 @@ KNotification* TelephonyPlugin::createNotification(const NetworkPackage& np) { - QString event = np.get("event"); - QString phoneNumber = np.get("phoneNumber", i18n("unknown number")); + const QString event = np.get("event"); + const QString phoneNumber = np.get("phoneNumber", i18n("unknown number")); - QString title, content, type, icon; + QString content, type, icon; - title = device()->name(); + const QString title = device()->name(); if (event == "ringing") { type = "callReceived"; @@ -70,7 +70,7 @@ KNotification* notification = new KNotification(type, KNotification::CloseOnTimeout, this); //, KNotification::Persistent notification->setPixmap(KIcon(icon).pixmap(48, 48)); - notification->setComponentData(KComponentData("kdeconnect", "kdeconnect")); + notification->setComponentData(KComponentData("kdeconnect", "kdeconnect-kded")); notification->setTitle(title); notification->setText(content); diff -Nru kdeconnect-0.5/plasmoid/declarativeplugin/kdeconnectdeclarativeplugin.cpp kdeconnect-0.5.1/plasmoid/declarativeplugin/kdeconnectdeclarativeplugin.cpp --- kdeconnect-0.5/plasmoid/declarativeplugin/kdeconnectdeclarativeplugin.cpp 2014-02-19 20:17:31.000000000 +0000 +++ kdeconnect-0.5.1/plasmoid/declarativeplugin/kdeconnectdeclarativeplugin.cpp 2014-03-07 23:40:36.000000000 +0000 @@ -32,7 +32,7 @@ #include "libkdeconnect/devicesmodel.h" #include "libkdeconnect/notificationsmodel.h" -Q_EXPORT_PLUGIN2(kdeconnectdeclarativeplugin, KdeConnectDeclarativePlugin); +Q_EXPORT_PLUGIN2(kdeconnectdeclarativeplugin, KdeConnectDeclarativePlugin) QObject* createDeviceDbusInterface(QVariant deviceId) { diff -Nru kdeconnect-0.5/plasmoid/declarativeplugin/objectfactory.h kdeconnect-0.5.1/plasmoid/declarativeplugin/objectfactory.h --- kdeconnect-0.5/plasmoid/declarativeplugin/objectfactory.h 2014-02-19 20:17:31.000000000 +0000 +++ kdeconnect-0.5.1/plasmoid/declarativeplugin/objectfactory.h 2014-03-07 23:40:36.000000000 +0000 @@ -19,7 +19,7 @@ ObjectFactory(QObject* parent, Func1 f1) : QObject(parent), m_f0(0), m_f1(f1), m_f2(0) {} ObjectFactory(QObject* parent, Func2 f2) : QObject(parent), m_f0(0), m_f1(0), m_f2(f2) {} - virtual ~ObjectFactory() {}; + virtual ~ObjectFactory() {} Q_INVOKABLE QObject* create() { diff -Nru kdeconnect-0.5/plasmoid/package/contents/ui/Battery.qml kdeconnect-0.5.1/plasmoid/package/contents/ui/Battery.qml --- kdeconnect-0.5/plasmoid/package/contents/ui/Battery.qml 2014-02-19 20:17:31.000000000 +0000 +++ kdeconnect-0.5.1/plasmoid/package/contents/ui/Battery.qml 2014-03-07 23:40:36.000000000 +0000 @@ -33,7 +33,7 @@ property bool charging: false property int charge: -1 - property string displayString: (available && charge > -1) ? ((charging) ? (i18n("Charging, %1").arg(charge)) : (i18n("Discharging, %1").arg(charge))) : i18n("No info") + property string displayString: (available && charge > -1) ? ((charging) ? (i18n("Charging: %1%", charge)) : (i18n("Discharging: %1%", charge))) : i18n("No info") property variant battery: null property variant nested1: DBusAsyncResponse { diff -Nru kdeconnect-0.5/po/bs/kdeconnect-kded.po kdeconnect-0.5.1/po/bs/kdeconnect-kded.po --- kdeconnect-0.5/po/bs/kdeconnect-kded.po 2014-02-19 20:18:17.000000000 +0000 +++ kdeconnect-0.5.1/po/bs/kdeconnect-kded.po 2014-03-07 23:41:53.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-02-17 02:14+0000\n" +"POT-Creation-Date: 2014-03-05 01:52+0000\n" "PO-Revision-Date: 2014-02-09 16:23+0100\n" "Last-Translator: Samir Ribić \n" "Language-Team: Bosnian \n" @@ -44,36 +44,59 @@ msgid "Error contacting device" msgstr "Greška u povezivanju sa uređajem" -#: device.cpp:196 +#: device.cpp:199 msgid "Timed out" msgstr "Isteklo vrijeme" -#: device.cpp:295 device.cpp:347 +#: device.cpp:298 device.cpp:350 msgid "Canceled by other peer" msgstr "Otkazano od strane drugog saradnika" -#: device.cpp:311 +#: device.cpp:314 msgid "Received incorrect key" msgstr "Primljena pogrešna tipka" -#: device.cpp:328 +#: device.cpp:331 #, kde-format msgid "Pairing request from %1" msgstr "Zahtjev za uparivanje od %1" -#: device.cpp:329 +#: device.cpp:332 msgid "Accept" msgstr "Prihvati" -#: device.cpp:329 +#: device.cpp:332 msgid "Reject" msgstr "Odbaci" -#: device.cpp:388 +#: device.cpp:391 msgid "Canceled by the user" msgstr "Otkazano od strane korisnika" -#: filetransferjob.cpp:107 +#: 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 "Primljen nekompletan fajl" @@ -177,18 +200,18 @@ msgid " min" msgstr "" -#: plugins/sftp/sftpplugin.cpp:170 plugins/sftp/sftpplugin.cpp:191 -#: plugins/sftp/sftpplugin.cpp:216 +#: plugins/sftp/sftpplugin.cpp:168 plugins/sftp/sftpplugin.cpp:189 +#: plugins/sftp/sftpplugin.cpp:214 #, kde-format msgid "Device %1" msgstr "" -#: plugins/sftp/sftpplugin.cpp:171 +#: plugins/sftp/sftpplugin.cpp:169 #, kde-format msgid "Filesystem mounted at %1" msgstr "" -#: plugins/sftp/sftpplugin.cpp:192 +#: plugins/sftp/sftpplugin.cpp:190 msgid "Filesystem unmounted" msgstr "" @@ -202,11 +225,11 @@ msgid "Save files in:" msgstr "Snimi datoteke u:" -#: plugins/share/shareplugin.cpp:132 +#: plugins/share/shareplugin.cpp:135 msgid "Transfer finished" msgstr "Prebacivanje završeno" -#: plugins/share/shareplugin.cpp:134 +#: plugins/share/shareplugin.cpp:137 msgid "Open destination folder" msgstr "Otvori odredisni folder" diff -Nru kdeconnect-0.5/po/bs/plasma_applet_kdeconnect.po kdeconnect-0.5.1/po/bs/plasma_applet_kdeconnect.po --- kdeconnect-0.5/po/bs/plasma_applet_kdeconnect.po 2014-02-19 20:18:17.000000000 +0000 +++ kdeconnect-0.5.1/po/bs/plasma_applet_kdeconnect.po 2014-03-07 23:41:53.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: $2\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-17 02:14+0000\n" +"POT-Creation-Date: 2014-03-01 01:46+0000\n" "PO-Revision-Date: 2014-01-31 22:39+0100\n" "Last-Translator: Samir Ribić \n" "Language-Team: none\n" @@ -19,15 +19,15 @@ "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" -#: package/contents/ui/Battery.qml:34 -msgid "Charging, %1" +#: package/contents/ui/Battery.qml:36 +msgid "Charging: %1%" msgstr "" -#: package/contents/ui/Battery.qml:34 -msgid "Discharging, %1" +#: package/contents/ui/Battery.qml:36 +msgid "Discharging: %1%" msgstr "" -#: package/contents/ui/Battery.qml:34 +#: package/contents/ui/Battery.qml:36 msgid "No info" msgstr "" @@ -35,17 +35,11 @@ msgid "KDE Connect device notifications" msgstr "" -#: package/contents/ui/DeviceDelegate.qml:53 -#: package/contents/ui/DeviceDelegate.qml:59 -#: package/contents/ui/DeviceDelegate.qml:64 -msgid "Browse" -msgstr "" - -#: package/contents/ui/DeviceDelegate.qml:107 +#: package/contents/ui/DeviceDelegate.qml:77 msgid "Battery" msgstr "Baterija" -#: package/contents/ui/DeviceDelegate.qml:122 +#: package/contents/ui/DeviceDelegate.qml:92 msgid "Notifications" msgstr "Napomene" diff -Nru kdeconnect-0.5/po/cs/kdeconnect-kded.po kdeconnect-0.5.1/po/cs/kdeconnect-kded.po --- kdeconnect-0.5/po/cs/kdeconnect-kded.po 2014-02-19 20:18:34.000000000 +0000 +++ kdeconnect-0.5.1/po/cs/kdeconnect-kded.po 2014-03-07 23:42:31.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-17 02:14+0000\n" -"PO-Revision-Date: 2014-01-15 16:38+0100\n" +"POT-Creation-Date: 2014-03-05 01:52+0000\n" +"PO-Revision-Date: 2014-02-18 10:53+0100\n" "Last-Translator: Vít Pelčák \n" "Language-Team: Czech \n" "Language: cs\n" @@ -41,36 +41,59 @@ msgid "Error contacting device" msgstr "" -#: device.cpp:196 +#: device.cpp:199 msgid "Timed out" msgstr "Čas vypršel" -#: device.cpp:295 device.cpp:347 +#: device.cpp:298 device.cpp:350 msgid "Canceled by other peer" msgstr "" -#: device.cpp:311 +#: device.cpp:314 msgid "Received incorrect key" msgstr "" -#: device.cpp:328 +#: device.cpp:331 #, kde-format msgid "Pairing request from %1" msgstr "" -#: device.cpp:329 +#: device.cpp:332 msgid "Accept" msgstr "Přijmout" -#: device.cpp:329 +#: device.cpp:332 msgid "Reject" msgstr "Odmítnout" -#: device.cpp:388 +#: device.cpp:391 msgid "Canceled by the user" msgstr "" -#: filetransferjob.cpp:107 +#: 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 "" @@ -91,7 +114,7 @@ #: plugins/battery/batteryplugin.cpp:78 #, kde-format msgid "Battery at %1%" -msgstr "" +msgstr "Baterie je na %1%" #. i18n: ectx: property (windowTitle), widget (QWidget, PauseMusicConfigUi) #: plugins/pausemusic/pausemusic_config.ui:17 @@ -148,7 +171,7 @@ #. i18n: ectx: property (title), widget (QGroupBox, error) #: plugins/sftp/sftp_config.ui:59 msgid "Error" -msgstr "" +msgstr "Chyba" #. i18n: ectx: property (text), widget (QLabel, label) #: plugins/sftp/sftp_config.ui:81 @@ -158,32 +181,30 @@ #. i18n: ectx: property (text), widget (QLabel, label_3) #: plugins/sftp/sftp_config.ui:113 msgid "Mountpoint:" -msgstr "" +msgstr "Místo připojení:" #. i18n: ectx: property (text), widget (QLabel, label_2) #: plugins/sftp/sftp_config.ui:144 -#, fuzzy -#| msgid "Timed out" msgid "Timeout:" -msgstr "Čas vypršel" +msgstr "Časový limit:" #. i18n: ectx: property (suffix), widget (QSpinBox, timeout) #: plugins/sftp/sftp_config.ui:160 msgid " min" msgstr "" -#: plugins/sftp/sftpplugin.cpp:170 plugins/sftp/sftpplugin.cpp:191 -#: plugins/sftp/sftpplugin.cpp:216 +#: plugins/sftp/sftpplugin.cpp:168 plugins/sftp/sftpplugin.cpp:189 +#: plugins/sftp/sftpplugin.cpp:214 #, kde-format msgid "Device %1" msgstr "" -#: plugins/sftp/sftpplugin.cpp:171 +#: plugins/sftp/sftpplugin.cpp:169 #, kde-format msgid "Filesystem mounted at %1" msgstr "" -#: plugins/sftp/sftpplugin.cpp:192 +#: plugins/sftp/sftpplugin.cpp:190 msgid "Filesystem unmounted" msgstr "" @@ -197,11 +218,11 @@ msgid "Save files in:" msgstr "Uložit soubory v:" -#: plugins/share/shareplugin.cpp:132 +#: plugins/share/shareplugin.cpp:135 msgid "Transfer finished" msgstr "" -#: plugins/share/shareplugin.cpp:134 +#: plugins/share/shareplugin.cpp:137 msgid "Open destination folder" msgstr "" diff -Nru kdeconnect-0.5/po/cs/kdeconnect-kio.po kdeconnect-0.5.1/po/cs/kdeconnect-kio.po --- kdeconnect-0.5/po/cs/kdeconnect-kio.po 1970-01-01 00:00:00.000000000 +0000 +++ kdeconnect-0.5.1/po/cs/kdeconnect-kio.po 2014-03-07 23:42:31.000000000 +0000 @@ -0,0 +1,54 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# Vít Pelčák , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-02-15 01:46+0000\n" +"PO-Revision-Date: 2014-02-18 10:46+0100\n" +"Last-Translator: Vít Pelčák \n" +"Language-Team: Czech \n" +"Language: cs\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==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" +"X-Generator: Lokalize 1.5\n" + +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Vít Pelčák" + +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "vit@pelcak.org" + +#: kiokdeconnect.cpp:39 +msgid "kiokdeconnect" +msgstr "kiokdeconnect" + +#: kiokdeconnect.cpp:93 +msgid "Listing devices..." +msgstr "Vypisuji zařízení..." + +#: kiokdeconnect.cpp:130 +msgid "Accessing device..." +msgstr "Přistupuji k zařízení..." + +#: kiokdeconnect.cpp:145 +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 +msgid "Could not contact background service." +msgstr "Nelze kontaktovat službu na pozadí." \ No newline at end of file diff -Nru kdeconnect-0.5/po/cs/plasma_applet_kdeconnect.po kdeconnect-0.5.1/po/cs/plasma_applet_kdeconnect.po --- kdeconnect-0.5/po/cs/plasma_applet_kdeconnect.po 2014-02-19 20:18:34.000000000 +0000 +++ kdeconnect-0.5.1/po/cs/plasma_applet_kdeconnect.po 2014-03-07 23:42:31.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-17 02:14+0000\n" +"POT-Creation-Date: 2014-03-01 01:46+0000\n" "PO-Revision-Date: 2014-01-15 16:38+0100\n" "Last-Translator: Vít Pelčák \n" "Language-Team: Czech \n" @@ -17,15 +17,15 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Lokalize 1.5\n" -#: package/contents/ui/Battery.qml:34 -msgid "Charging, %1" +#: package/contents/ui/Battery.qml:36 +msgid "Charging: %1%" msgstr "" -#: package/contents/ui/Battery.qml:34 -msgid "Discharging, %1" +#: package/contents/ui/Battery.qml:36 +msgid "Discharging: %1%" msgstr "" -#: package/contents/ui/Battery.qml:34 +#: package/contents/ui/Battery.qml:36 msgid "No info" msgstr "" @@ -33,17 +33,11 @@ msgid "KDE Connect device notifications" msgstr "" -#: package/contents/ui/DeviceDelegate.qml:53 -#: package/contents/ui/DeviceDelegate.qml:59 -#: package/contents/ui/DeviceDelegate.qml:64 -msgid "Browse" -msgstr "" - -#: package/contents/ui/DeviceDelegate.qml:107 +#: package/contents/ui/DeviceDelegate.qml:77 msgid "Battery" msgstr "Baterie" -#: package/contents/ui/DeviceDelegate.qml:122 +#: package/contents/ui/DeviceDelegate.qml:92 msgid "Notifications" msgstr "Oznamování" diff -Nru kdeconnect-0.5/po/da/kdeconnect-kcm.po kdeconnect-0.5.1/po/da/kdeconnect-kcm.po --- kdeconnect-0.5/po/da/kdeconnect-kcm.po 2014-02-19 20:18:49.000000000 +0000 +++ kdeconnect-0.5.1/po/da/kdeconnect-kcm.po 2014-03-07 23:42:55.000000000 +0000 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Martin Schlander , 2013. +# Martin Schlander , 2013, 2014. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-02-15 01:46+0000\n" -"PO-Revision-Date: 2013-11-24 16:27+0100\n" +"PO-Revision-Date: 2014-02-23 14:32+0100\n" "Last-Translator: Martin Schlander \n" "Language-Team: Danish \n" "Language: da\n" @@ -62,4 +62,4 @@ #. i18n: ectx: property (text), widget (QPushButton, browse_button) #: kcm.ui:175 msgid "Browse" -msgstr "" \ No newline at end of file +msgstr "Gennemse" \ No newline at end of file diff -Nru kdeconnect-0.5/po/da/kdeconnect-kded.po kdeconnect-0.5.1/po/da/kdeconnect-kded.po --- kdeconnect-0.5/po/da/kdeconnect-kded.po 2014-02-19 20:18:49.000000000 +0000 +++ kdeconnect-0.5.1/po/da/kdeconnect-kded.po 2014-03-07 23:42:55.000000000 +0000 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Martin Schlander , 2013. +# Martin Schlander , 2013, 2014. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-17 02:14+0000\n" -"PO-Revision-Date: 2013-11-30 20:15+0100\n" +"POT-Creation-Date: 2014-03-05 01:52+0000\n" +"PO-Revision-Date: 2014-03-05 19:27+0100\n" "Last-Translator: Martin Schlander \n" "Language-Team: Danish \n" "Language: da\n" @@ -19,11 +19,11 @@ msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "" +msgstr "Martin Schlander" msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "" +msgstr "mschlander@opensuse.org" #: device.cpp:139 msgid "Already paired" @@ -41,48 +41,69 @@ msgid "Error contacting device" msgstr "Fejl ved kontakt til enhed" -#: device.cpp:196 +#: device.cpp:199 msgid "Timed out" msgstr "Tidsudløb" -#: device.cpp:295 device.cpp:347 +#: device.cpp:298 device.cpp:350 msgid "Canceled by other peer" msgstr "Annulleret af modpart" -#: device.cpp:311 +#: device.cpp:314 msgid "Received incorrect key" msgstr "Modtog forkert nøgle" -#: device.cpp:328 +#: device.cpp:331 #, kde-format msgid "Pairing request from %1" msgstr "Parringsanmodning fra %1" -#: device.cpp:329 +#: device.cpp:332 msgid "Accept" msgstr "Acceptér" -#: device.cpp:329 +#: device.cpp:332 msgid "Reject" msgstr "Afvis" -#: device.cpp:388 +#: device.cpp:391 msgid "Canceled by the user" msgstr "Annulleret af brugeren" -#: filetransferjob.cpp:107 +#: 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 "Modtagelse af fil over KDE-Connect" + +#: filetransferjob.cpp:61 filetransferjob.cpp:122 +msgctxt "File transfer origin" +msgid "From" +msgstr "Fra" + +#: filetransferjob.cpp:68 +msgid "Incoming file exists" +msgstr "Indkommende fil findes" + +#: filetransferjob.cpp:124 +msgctxt "File transfer destination" +msgid "To" +msgstr "Til" + +#: filetransferjob.cpp:197 msgid "Received incomplete file" msgstr "Modtog ukomplet fil" #: kdeconnectd.cpp:63 msgid "kdeconnect" -msgstr "" +msgstr "kdeconnect" #: kdeconnectd.cpp:65 -#, fuzzy -#| msgid "Error contacting device" msgid "connect devices" -msgstr "Fejl ved kontakt til enhed" +msgstr "forbind enheder" #: plugins/battery/batteryplugin.cpp:77 #, kde-format @@ -118,7 +139,7 @@ #. i18n: ectx: property (text), widget (QCheckBox, check_mute) #: plugins/pausemusic/pausemusic_config.ui:65 msgid "Mute system instead of pause" -msgstr "" +msgstr "Sæt systemet på lydløs i stedet for pause" #: plugins/ping/pingplugin.cpp:49 msgid "Ping!" @@ -126,15 +147,15 @@ #: plugins/sftp/mounter.cpp:172 msgid "Failed to start sshfs" -msgstr "" +msgstr "kunne ikke starte sshfs" #: plugins/sftp/mounter.cpp:194 msgid "Error when accessing to filesystem" -msgstr "" +msgstr "Fejl ved tilgang til filsystemet" #: plugins/sftp/mounter.cpp:205 msgid "Failed to mount filesystem: device not responding" -msgstr "" +msgstr "Kunne ikke montere filsystemet: Enheden svarer ikke" #. i18n: ectx: property (windowTitle), widget (QWidget, ShareConfigUi) #. i18n: ectx: property (windowTitle), widget (QWidget, SftpConfigUi) @@ -145,49 +166,47 @@ #. i18n: ectx: property (text), widget (QCheckBox, idle) #: plugins/sftp/sftp_config.ui:49 msgid "Disconnect when idle" -msgstr "" +msgstr "Afbryd forbindelse når inaktiv" #. i18n: ectx: property (title), widget (QGroupBox, error) #: plugins/sftp/sftp_config.ui:59 msgid "Error" -msgstr "" +msgstr "Fejl" #. i18n: ectx: property (text), widget (QLabel, label) #: plugins/sftp/sftp_config.ui:81 msgid "sshfsf not found in PATH" -msgstr "" +msgstr "sshfsf ikke fundet i PATH" #. i18n: ectx: property (text), widget (QLabel, label_3) #: plugins/sftp/sftp_config.ui:113 msgid "Mountpoint:" -msgstr "" +msgstr "Monteringspunkt:" #. i18n: ectx: property (text), widget (QLabel, label_2) #: plugins/sftp/sftp_config.ui:144 -#, fuzzy -#| msgid "Timed out" msgid "Timeout:" -msgstr "Tidsudløb" +msgstr "Tidsudløb:" #. i18n: ectx: property (suffix), widget (QSpinBox, timeout) #: plugins/sftp/sftp_config.ui:160 msgid " min" -msgstr "" +msgstr " min" -#: plugins/sftp/sftpplugin.cpp:170 plugins/sftp/sftpplugin.cpp:191 -#: plugins/sftp/sftpplugin.cpp:216 +#: plugins/sftp/sftpplugin.cpp:168 plugins/sftp/sftpplugin.cpp:189 +#: plugins/sftp/sftpplugin.cpp:214 #, kde-format msgid "Device %1" -msgstr "" +msgstr "Enhed %1" -#: plugins/sftp/sftpplugin.cpp:171 +#: plugins/sftp/sftpplugin.cpp:169 #, kde-format msgid "Filesystem mounted at %1" -msgstr "" +msgstr "Filsystem monteret i %1" -#: plugins/sftp/sftpplugin.cpp:192 +#: plugins/sftp/sftpplugin.cpp:190 msgid "Filesystem unmounted" -msgstr "" +msgstr "Filsystem afmonteret" #. i18n: ectx: property (title), widget (QGroupBox, groupBox) #: plugins/share/share_config.ui:23 @@ -199,11 +218,11 @@ msgid "Save files in:" msgstr "Gem filer i:" -#: plugins/share/shareplugin.cpp:132 +#: plugins/share/shareplugin.cpp:135 msgid "Transfer finished" msgstr "Overførsel gennemført" -#: plugins/share/shareplugin.cpp:134 +#: plugins/share/shareplugin.cpp:137 msgid "Open destination folder" msgstr "Åbn destinationsmappe" diff -Nru kdeconnect-0.5/po/da/kdeconnect-kio.po kdeconnect-0.5.1/po/da/kdeconnect-kio.po --- kdeconnect-0.5/po/da/kdeconnect-kio.po 1970-01-01 00:00:00.000000000 +0000 +++ kdeconnect-0.5.1/po/da/kdeconnect-kio.po 2014-03-07 23:42:55.000000000 +0000 @@ -0,0 +1,54 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Martin Schlander , 2014. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-02-15 01:46+0000\n" +"PO-Revision-Date: 2014-02-23 14:33+0100\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" +"X-Generator: Lokalize 1.5\n" + +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Martin Schlander" + +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "mschlander@opensuse.org" + +#: kiokdeconnect.cpp:39 +msgid "kiokdeconnect" +msgstr "kiokdeconnect" + +#: kiokdeconnect.cpp:93 +msgid "Listing devices..." +msgstr "Oplistning af enheder..." + +#: kiokdeconnect.cpp:130 +msgid "Accessing device..." +msgstr "Tilgår enhed..." + +#: kiokdeconnect.cpp:145 +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 +msgid "Could not contact background service." +msgstr "Kunne ikke kontakte baggrundstjenesten." \ No newline at end of file diff -Nru kdeconnect-0.5/po/da/plasma_applet_kdeconnect.po kdeconnect-0.5.1/po/da/plasma_applet_kdeconnect.po --- kdeconnect-0.5/po/da/plasma_applet_kdeconnect.po 2014-02-19 20:18:49.000000000 +0000 +++ kdeconnect-0.5.1/po/da/plasma_applet_kdeconnect.po 2014-03-07 23:42:55.000000000 +0000 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Martin Schlander , 2013. +# Martin Schlander , 2013, 2014. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-17 02:14+0000\n" -"PO-Revision-Date: 2013-11-24 16:26+0100\n" +"POT-Creation-Date: 2014-03-01 01:46+0000\n" +"PO-Revision-Date: 2014-03-05 19:28+0100\n" "Last-Translator: Martin Schlander \n" "Language-Team: Danish \n" "Language: da\n" @@ -17,33 +17,27 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: package/contents/ui/Battery.qml:34 -msgid "Charging, %1" -msgstr "" - -#: package/contents/ui/Battery.qml:34 -msgid "Discharging, %1" -msgstr "" +#: package/contents/ui/Battery.qml:36 +msgid "Charging: %1%" +msgstr "Lader op: %1%" + +#: package/contents/ui/Battery.qml:36 +msgid "Discharging: %1%" +msgstr "Aflader: %1%" -#: package/contents/ui/Battery.qml:34 +#: package/contents/ui/Battery.qml:36 msgid "No info" -msgstr "" +msgstr "Ingen info" #: package/contents/ui/CompactRepresentation.qml:48 msgid "KDE Connect device notifications" -msgstr "" - -#: package/contents/ui/DeviceDelegate.qml:53 -#: package/contents/ui/DeviceDelegate.qml:59 -#: package/contents/ui/DeviceDelegate.qml:64 -msgid "Browse" -msgstr "" +msgstr "Enhedsbekendtgørelser fra KDE Connect" -#: package/contents/ui/DeviceDelegate.qml:107 +#: package/contents/ui/DeviceDelegate.qml:77 msgid "Battery" msgstr "Batteri" -#: package/contents/ui/DeviceDelegate.qml:122 +#: package/contents/ui/DeviceDelegate.qml:92 msgid "Notifications" msgstr "Bekendtgørelser" diff -Nru kdeconnect-0.5/po/de/kdeconnect-kded.po kdeconnect-0.5.1/po/de/kdeconnect-kded.po --- kdeconnect-0.5/po/de/kdeconnect-kded.po 2014-02-19 20:18:54.000000000 +0000 +++ kdeconnect-0.5.1/po/de/kdeconnect-kded.po 2014-03-07 23:43:09.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-17 02:14+0000\n" -"PO-Revision-Date: 2014-02-17 07:24+0100\n" +"POT-Creation-Date: 2014-03-05 01:52+0000\n" +"PO-Revision-Date: 2014-03-04 07:25+0100\n" "Last-Translator: Burkhard Lück \n" "Language-Team: German \n" "Language: de\n" @@ -41,36 +41,59 @@ msgid "Error contacting device" msgstr "Fehler beim Verbinden mit dem Gerät" -#: device.cpp:196 +#: device.cpp:199 msgid "Timed out" msgstr "Zeitüberschreitung" -#: device.cpp:295 device.cpp:347 +#: device.cpp:298 device.cpp:350 msgid "Canceled by other peer" msgstr "Abbruch durch Gegenstelle" -#: device.cpp:311 +#: device.cpp:314 msgid "Received incorrect key" msgstr "Falschen Schlüssen erhalten" -#: device.cpp:328 +#: device.cpp:331 #, kde-format msgid "Pairing request from %1" msgstr "Verbindungsanfrage von %1 " -#: device.cpp:329 +#: device.cpp:332 msgid "Accept" msgstr "Annehmen" -#: device.cpp:329 +#: device.cpp:332 msgid "Reject" msgstr "Ablehnen" -#: device.cpp:388 +#: device.cpp:391 msgid "Canceled by the user" msgstr "Vom Benutzer abgebrochen" -#: filetransferjob.cpp:107 +#: 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 "Zu" + +#: filetransferjob.cpp:197 msgid "Received incomplete file" msgstr "Unvollständige Datei erhalten" @@ -170,18 +193,18 @@ msgid " min" msgstr " Min" -#: plugins/sftp/sftpplugin.cpp:170 plugins/sftp/sftpplugin.cpp:191 -#: plugins/sftp/sftpplugin.cpp:216 +#: plugins/sftp/sftpplugin.cpp:168 plugins/sftp/sftpplugin.cpp:189 +#: plugins/sftp/sftpplugin.cpp:214 #, kde-format msgid "Device %1" msgstr "Gerät %1" -#: plugins/sftp/sftpplugin.cpp:171 +#: plugins/sftp/sftpplugin.cpp:169 #, kde-format msgid "Filesystem mounted at %1" msgstr "Dateisystem eingebunden an %1" -#: plugins/sftp/sftpplugin.cpp:192 +#: plugins/sftp/sftpplugin.cpp:190 msgid "Filesystem unmounted" msgstr "Einbindung des Dateisystems gelöst" @@ -195,11 +218,11 @@ msgid "Save files in:" msgstr "Dateien speichern unter:" -#: plugins/share/shareplugin.cpp:132 +#: plugins/share/shareplugin.cpp:135 msgid "Transfer finished" msgstr "Übertragung abgeschlossen" -#: plugins/share/shareplugin.cpp:134 +#: plugins/share/shareplugin.cpp:137 msgid "Open destination folder" msgstr "Zielordner öffnen" diff -Nru kdeconnect-0.5/po/de/plasma_applet_kdeconnect.po kdeconnect-0.5.1/po/de/plasma_applet_kdeconnect.po --- kdeconnect-0.5/po/de/plasma_applet_kdeconnect.po 2014-02-19 20:18:54.000000000 +0000 +++ kdeconnect-0.5.1/po/de/plasma_applet_kdeconnect.po 2014-03-07 23:43:09.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-17 02:14+0000\n" -"PO-Revision-Date: 2014-02-15 10:52+0100\n" +"POT-Creation-Date: 2014-03-01 01:46+0000\n" +"PO-Revision-Date: 2014-03-01 09:54+0100\n" "Last-Translator: Burkhard Lück \n" "Language-Team: German \n" "Language: de\n" @@ -17,15 +17,15 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: package/contents/ui/Battery.qml:34 -msgid "Charging, %1" -msgstr "Wird geladen, %1" - -#: package/contents/ui/Battery.qml:34 -msgid "Discharging, %1" -msgstr "Wird entladen, %1" +#: package/contents/ui/Battery.qml:36 +msgid "Charging: %1%" +msgstr "Wird geladen: %1 %" + +#: package/contents/ui/Battery.qml:36 +msgid "Discharging: %1%" +msgstr "Wird entladen: %1 %" -#: package/contents/ui/Battery.qml:34 +#: package/contents/ui/Battery.qml:36 msgid "No info" msgstr "Keine Information" @@ -33,17 +33,11 @@ msgid "KDE Connect device notifications" msgstr "Geräte-Benachrichtigungen für KDE-Connect" -#: package/contents/ui/DeviceDelegate.qml:53 -#: package/contents/ui/DeviceDelegate.qml:59 -#: package/contents/ui/DeviceDelegate.qml:64 -msgid "Browse" -msgstr "Durchsehen" - -#: package/contents/ui/DeviceDelegate.qml:107 +#: package/contents/ui/DeviceDelegate.qml:77 msgid "Battery" msgstr "Akku" -#: package/contents/ui/DeviceDelegate.qml:122 +#: package/contents/ui/DeviceDelegate.qml:92 msgid "Notifications" msgstr "Benachrichtigungen" diff -Nru kdeconnect-0.5/po/es/kdeconnect-kded.po kdeconnect-0.5.1/po/es/kdeconnect-kded.po --- kdeconnect-0.5/po/es/kdeconnect-kded.po 2014-02-19 20:19:16.000000000 +0000 +++ kdeconnect-0.5.1/po/es/kdeconnect-kded.po 2014-03-07 23:43:47.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-17 02:14+0000\n" +"POT-Creation-Date: 2014-03-05 01:52+0000\n" "PO-Revision-Date: 2014-02-18 15:45+0100\n" "Last-Translator: Eloy Cuadra \n" "Language-Team: Spanish \n" @@ -42,36 +42,59 @@ msgid "Error contacting device" msgstr "Ha ocurrido un error al contactar con el dispositivo" -#: device.cpp:196 +#: device.cpp:199 msgid "Timed out" msgstr "Se ha agotado el tiempo" -#: device.cpp:295 device.cpp:347 +#: device.cpp:298 device.cpp:350 msgid "Canceled by other peer" msgstr "Cancelado por la otra parte" -#: device.cpp:311 +#: device.cpp:314 msgid "Received incorrect key" msgstr "Se ha recibido una clave incorrecta" -#: device.cpp:328 +#: device.cpp:331 #, kde-format msgid "Pairing request from %1" msgstr "Solicitud de vinculación de %1" -#: device.cpp:329 +#: device.cpp:332 msgid "Accept" msgstr "Aceptar" -#: device.cpp:329 +#: device.cpp:332 msgid "Reject" msgstr "Rechazar" -#: device.cpp:388 +#: device.cpp:391 msgid "Canceled by the user" msgstr "Cancelado por el usuario" -#: filetransferjob.cpp:107 +#: 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 "Se ha recibido un archivo incompleto" @@ -172,18 +195,18 @@ msgid " min" msgstr " min" -#: plugins/sftp/sftpplugin.cpp:170 plugins/sftp/sftpplugin.cpp:191 -#: plugins/sftp/sftpplugin.cpp:216 +#: plugins/sftp/sftpplugin.cpp:168 plugins/sftp/sftpplugin.cpp:189 +#: plugins/sftp/sftpplugin.cpp:214 #, kde-format msgid "Device %1" msgstr "Dispositivo %1" -#: plugins/sftp/sftpplugin.cpp:171 +#: plugins/sftp/sftpplugin.cpp:169 #, kde-format msgid "Filesystem mounted at %1" msgstr "Sistema de archivos montado en %1" -#: plugins/sftp/sftpplugin.cpp:192 +#: plugins/sftp/sftpplugin.cpp:190 msgid "Filesystem unmounted" msgstr "Sistema de archivos desmontado" @@ -197,11 +220,11 @@ msgid "Save files in:" msgstr "Guardar archivos en:" -#: plugins/share/shareplugin.cpp:132 +#: plugins/share/shareplugin.cpp:135 msgid "Transfer finished" msgstr "Transferencia finalizada" -#: plugins/share/shareplugin.cpp:134 +#: plugins/share/shareplugin.cpp:137 msgid "Open destination folder" msgstr "Abrir carpeta de destino" diff -Nru kdeconnect-0.5/po/es/plasma_applet_kdeconnect.po kdeconnect-0.5.1/po/es/plasma_applet_kdeconnect.po --- kdeconnect-0.5/po/es/plasma_applet_kdeconnect.po 2014-02-19 20:19:16.000000000 +0000 +++ kdeconnect-0.5.1/po/es/plasma_applet_kdeconnect.po 2014-03-07 23:43:47.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-17 02:14+0000\n" +"POT-Creation-Date: 2014-03-01 01:46+0000\n" "PO-Revision-Date: 2013-09-18 22:52+0200\n" "Last-Translator: Eloy Cuadra \n" "Language-Team: Spanish \n" @@ -17,15 +17,15 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: package/contents/ui/Battery.qml:34 -msgid "Charging, %1" +#: package/contents/ui/Battery.qml:36 +msgid "Charging: %1%" msgstr "" -#: package/contents/ui/Battery.qml:34 -msgid "Discharging, %1" +#: package/contents/ui/Battery.qml:36 +msgid "Discharging: %1%" msgstr "" -#: package/contents/ui/Battery.qml:34 +#: package/contents/ui/Battery.qml:36 msgid "No info" msgstr "" @@ -33,17 +33,11 @@ msgid "KDE Connect device notifications" msgstr "" -#: package/contents/ui/DeviceDelegate.qml:53 -#: package/contents/ui/DeviceDelegate.qml:59 -#: package/contents/ui/DeviceDelegate.qml:64 -msgid "Browse" -msgstr "" - -#: package/contents/ui/DeviceDelegate.qml:107 +#: package/contents/ui/DeviceDelegate.qml:77 msgid "Battery" msgstr "" -#: package/contents/ui/DeviceDelegate.qml:122 +#: package/contents/ui/DeviceDelegate.qml:92 msgid "Notifications" msgstr "Notificaciones" diff -Nru kdeconnect-0.5/po/fi/plasma_applet_kdeconnect.po kdeconnect-0.5.1/po/fi/plasma_applet_kdeconnect.po --- kdeconnect-0.5/po/fi/plasma_applet_kdeconnect.po 2014-02-19 20:19:38.000000000 +0000 +++ kdeconnect-0.5.1/po/fi/plasma_applet_kdeconnect.po 2014-03-07 23:45:11.000000000 +0000 @@ -1,14 +1,14 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # Tommi Nieminen , 2013. -# Lasse Liehu , 2013. +# Lasse Liehu , 2013, 2014. # msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-17 02:14+0000\n" -"PO-Revision-Date: 2013-11-16 19:04+0200\n" +"POT-Creation-Date: 2014-03-01 01:46+0000\n" +"PO-Revision-Date: 2014-02-22 19:21+0200\n" "Last-Translator: Lasse Liehu \n" "Language-Team: Finnish \n" "Language: fi\n" @@ -18,33 +18,31 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 1.5\n" -#: package/contents/ui/Battery.qml:34 -msgid "Charging, %1" -msgstr "" - -#: package/contents/ui/Battery.qml:34 -msgid "Discharging, %1" -msgstr "" +#: package/contents/ui/Battery.qml:36 +#, fuzzy +#| msgid "Charging, %1" +msgid "Charging: %1%" +msgstr "Latautuu, %1" + +#: package/contents/ui/Battery.qml:36 +#, fuzzy +#| msgid "Discharging, %1" +msgid "Discharging: %1%" +msgstr "Purkautuu, %1" -#: package/contents/ui/Battery.qml:34 +#: package/contents/ui/Battery.qml:36 msgid "No info" -msgstr "" +msgstr "Ei tietoja" #: package/contents/ui/CompactRepresentation.qml:48 msgid "KDE Connect device notifications" -msgstr "" - -#: package/contents/ui/DeviceDelegate.qml:53 -#: package/contents/ui/DeviceDelegate.qml:59 -#: package/contents/ui/DeviceDelegate.qml:64 -msgid "Browse" -msgstr "" +msgstr "KDE Connect -laiteilmoitukset" -#: package/contents/ui/DeviceDelegate.qml:107 +#: package/contents/ui/DeviceDelegate.qml:77 msgid "Battery" msgstr "Akku" -#: package/contents/ui/DeviceDelegate.qml:122 +#: package/contents/ui/DeviceDelegate.qml:92 msgid "Notifications" msgstr "Ilmoitukset" diff -Nru kdeconnect-0.5/po/fr/kdeconnect-kcm.po kdeconnect-0.5.1/po/fr/kdeconnect-kcm.po --- kdeconnect-0.5/po/fr/kdeconnect-kcm.po 2014-02-19 20:19:44.000000000 +0000 +++ kdeconnect-0.5.1/po/fr/kdeconnect-kcm.po 2014-03-07 23:45:25.000000000 +0000 @@ -1,15 +1,16 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # Joëlle Cornavin , 2013. +# Nicolas Ménard , 2014. # msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" "POT-Creation-Date: 2014-02-15 01:46+0000\n" -"PO-Revision-Date: 2013-09-17 10:17+0200\n" -"Last-Translator: Joëlle Cornavin \n" -"Language-Team: French \n" +"PO-Revision-Date: 2014-02-17 11:20+0100\n" +"Last-Translator: Nicolas Ménard \n" +"Language-Team: French \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -60,9 +61,9 @@ #. i18n: ectx: property (text), widget (QPushButton, ping_button) #: kcm.ui:168 msgid "Send ping" -msgstr "Envoyer une commande « ping »" +msgstr "Envoyer une commande « ping »" #. i18n: ectx: property (text), widget (QPushButton, browse_button) #: kcm.ui:175 msgid "Browse" -msgstr "" \ No newline at end of file +msgstr "Visualiser" \ No newline at end of file diff -Nru kdeconnect-0.5/po/fr/kdeconnect-kded.po kdeconnect-0.5.1/po/fr/kdeconnect-kded.po --- kdeconnect-0.5/po/fr/kdeconnect-kded.po 2014-02-19 20:19:44.000000000 +0000 +++ kdeconnect-0.5.1/po/fr/kdeconnect-kded.po 2014-03-07 23:45:25.000000000 +0000 @@ -2,15 +2,17 @@ # This file is distributed under the same license as the PACKAGE package. # Joëlle Cornavin , 2013. # Vincent PINON , 2013. +# Nicolas Ménard , 2014. +# Sebastien Renard , 2014. # msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-17 02:14+0000\n" -"PO-Revision-Date: 2013-12-09 13:42+0100\n" -"Last-Translator: Vincent PINON \n" -"Language-Team: French \n" +"POT-Creation-Date: 2014-02-28 03:59+0000\n" +"PO-Revision-Date: 2014-02-24 11:03+0100\n" +"Last-Translator: Nicolas Ménard \n" +"Language-Team: French \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -23,11 +25,11 @@ msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "" +msgstr "Nicolas MÉNARD" msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "" +msgstr "nico.menard@gmail.com" #: device.cpp:139 msgid "Already paired" @@ -47,7 +49,7 @@ #: device.cpp:196 msgid "Timed out" -msgstr "Temps imparti expiré" +msgstr "Délai expiré" #: device.cpp:295 device.cpp:347 msgid "Canceled by other peer" @@ -55,7 +57,7 @@ #: device.cpp:311 msgid "Received incorrect key" -msgstr "Reçu une clé incorrecte" +msgstr "Clé incorrecte reçue" #: device.cpp:328 #, kde-format @@ -76,17 +78,15 @@ #: filetransferjob.cpp:107 msgid "Received incomplete file" -msgstr "Reçu un fichier incomplet" +msgstr "Fichier incomplet reçu" #: kdeconnectd.cpp:63 msgid "kdeconnect" -msgstr "" +msgstr "kdeconnect" #: kdeconnectd.cpp:65 -#, fuzzy -#| msgid "Error contacting device" msgid "connect devices" -msgstr "Erreur lors du contact du périphérique" +msgstr "connecter des périphériques" #: plugins/battery/batteryplugin.cpp:77 #, kde-format @@ -122,7 +122,7 @@ #. i18n: ectx: property (text), widget (QCheckBox, check_mute) #: plugins/pausemusic/pausemusic_config.ui:65 msgid "Mute system instead of pause" -msgstr "" +msgstr "Mettre en sourdine plutôt qu'en pause" #: plugins/ping/pingplugin.cpp:49 msgid "Ping!" @@ -130,15 +130,16 @@ #: plugins/sftp/mounter.cpp:172 msgid "Failed to start sshfs" -msgstr "" +msgstr "Impossible de démarrer sshfs" #: plugins/sftp/mounter.cpp:194 msgid "Error when accessing to filesystem" -msgstr "" +msgstr "Erreur lors de l'accès au système de fichiers" #: plugins/sftp/mounter.cpp:205 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) @@ -149,49 +150,47 @@ #. i18n: ectx: property (text), widget (QCheckBox, idle) #: plugins/sftp/sftp_config.ui:49 msgid "Disconnect when idle" -msgstr "" +msgstr "Déconnecter en cas d'inactivité" #. i18n: ectx: property (title), widget (QGroupBox, error) #: plugins/sftp/sftp_config.ui:59 msgid "Error" -msgstr "" +msgstr "Erreur" #. i18n: ectx: property (text), widget (QLabel, label) #: plugins/sftp/sftp_config.ui:81 msgid "sshfsf not found in PATH" -msgstr "" +msgstr "Impossible de trouver sshfsf dans le PATH" #. i18n: ectx: property (text), widget (QLabel, label_3) #: plugins/sftp/sftp_config.ui:113 msgid "Mountpoint:" -msgstr "" +msgstr "Point de montage :" #. i18n: ectx: property (text), widget (QLabel, label_2) #: plugins/sftp/sftp_config.ui:144 -#, fuzzy -#| msgid "Timed out" msgid "Timeout:" -msgstr "Temps imparti expiré" +msgstr "Délai : " #. i18n: ectx: property (suffix), widget (QSpinBox, timeout) #: plugins/sftp/sftp_config.ui:160 msgid " min" -msgstr "" +msgstr " min" -#: plugins/sftp/sftpplugin.cpp:170 plugins/sftp/sftpplugin.cpp:191 -#: plugins/sftp/sftpplugin.cpp:216 +#: plugins/sftp/sftpplugin.cpp:168 plugins/sftp/sftpplugin.cpp:189 +#: plugins/sftp/sftpplugin.cpp:214 #, kde-format msgid "Device %1" -msgstr "" +msgstr "Périphérique %1" -#: plugins/sftp/sftpplugin.cpp:171 +#: plugins/sftp/sftpplugin.cpp:169 #, kde-format msgid "Filesystem mounted at %1" -msgstr "" +msgstr "Système de fichiers monté à %1" -#: plugins/sftp/sftpplugin.cpp:192 +#: plugins/sftp/sftpplugin.cpp:190 msgid "Filesystem unmounted" -msgstr "" +msgstr "Système de fichiers libéré" #. i18n: ectx: property (title), widget (QGroupBox, groupBox) #: plugins/share/share_config.ui:23 diff -Nru kdeconnect-0.5/po/fr/kdeconnect-kio.po kdeconnect-0.5.1/po/fr/kdeconnect-kio.po --- kdeconnect-0.5/po/fr/kdeconnect-kio.po 1970-01-01 00:00:00.000000000 +0000 +++ kdeconnect-0.5.1/po/fr/kdeconnect-kio.po 2014-03-07 23:45:25.000000000 +0000 @@ -0,0 +1,57 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# Nicolas Ménard , 2014. +# +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2014-02-15 01:46+0000\n" +"PO-Revision-Date: 2014-02-24 14:13+0100\n" +"Last-Translator: Nicolas Ménard \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 "Nicolas MÉNARD" + +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "nico.menard@gmail.com" + +#: kiokdeconnect.cpp:39 +msgid "kiokdeconnect" +msgstr "kiokdeconnect" + +#: kiokdeconnect.cpp:93 +msgid "Listing devices..." +msgstr "Recherche de périphériques..." + +#: kiokdeconnect.cpp:130 +msgid "Accessing device..." +msgstr "Accès au périphérique..." + +#: kiokdeconnect.cpp:145 +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 +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.5/po/fr/plasma_applet_kdeconnect.po kdeconnect-0.5.1/po/fr/plasma_applet_kdeconnect.po --- kdeconnect-0.5/po/fr/plasma_applet_kdeconnect.po 2014-02-19 20:19:44.000000000 +0000 +++ kdeconnect-0.5.1/po/fr/plasma_applet_kdeconnect.po 2014-03-07 23:45:25.000000000 +0000 @@ -2,15 +2,16 @@ # This file is distributed under the same license as the PACKAGE package. # Joëlle Cornavin , 2013. # Vincent PINON , 2013. +# Nicolas Ménard , 2014. # msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-17 02:14+0000\n" -"PO-Revision-Date: 2013-12-09 12:49+0100\n" -"Last-Translator: Vincent PINON \n" -"Language-Team: French \n" +"POT-Creation-Date: 2014-03-01 01:46+0000\n" +"PO-Revision-Date: 2014-02-24 12:04+0100\n" +"Last-Translator: Nicolas Ménard \n" +"Language-Team: French \n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,33 +22,27 @@ "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: package/contents/ui/Battery.qml:34 -msgid "Charging, %1" +#: package/contents/ui/Battery.qml:36 +msgid "Charging: %1%" msgstr "" -#: package/contents/ui/Battery.qml:34 -msgid "Discharging, %1" +#: package/contents/ui/Battery.qml:36 +msgid "Discharging: %1%" msgstr "" -#: package/contents/ui/Battery.qml:34 +#: package/contents/ui/Battery.qml:36 msgid "No info" -msgstr "" +msgstr "Pas d'information" #: package/contents/ui/CompactRepresentation.qml:48 msgid "KDE Connect device notifications" -msgstr "" - -#: package/contents/ui/DeviceDelegate.qml:53 -#: package/contents/ui/DeviceDelegate.qml:59 -#: package/contents/ui/DeviceDelegate.qml:64 -msgid "Browse" -msgstr "" +msgstr "Notifications de périphérique KDE Connect" -#: package/contents/ui/DeviceDelegate.qml:107 +#: package/contents/ui/DeviceDelegate.qml:77 msgid "Battery" msgstr "Batterie" -#: package/contents/ui/DeviceDelegate.qml:122 +#: package/contents/ui/DeviceDelegate.qml:92 msgid "Notifications" msgstr "Notifications" diff -Nru kdeconnect-0.5/po/gl/plasma_applet_kdeconnect.po kdeconnect-0.5.1/po/gl/plasma_applet_kdeconnect.po --- kdeconnect-0.5/po/gl/plasma_applet_kdeconnect.po 2014-02-19 20:20:05.000000000 +0000 +++ kdeconnect-0.5.1/po/gl/plasma_applet_kdeconnect.po 2014-03-07 23:45:52.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-17 02:14+0000\n" +"POT-Creation-Date: 2014-03-01 01:46+0000\n" "PO-Revision-Date: 2013-11-03 22:59+0100\n" "Last-Translator: Marce Villarino \n" "Language-Team: Galician \n" @@ -20,15 +20,15 @@ "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: package/contents/ui/Battery.qml:34 -msgid "Charging, %1" +#: package/contents/ui/Battery.qml:36 +msgid "Charging: %1%" msgstr "" -#: package/contents/ui/Battery.qml:34 -msgid "Discharging, %1" +#: package/contents/ui/Battery.qml:36 +msgid "Discharging: %1%" msgstr "" -#: package/contents/ui/Battery.qml:34 +#: package/contents/ui/Battery.qml:36 msgid "No info" msgstr "" @@ -36,17 +36,11 @@ msgid "KDE Connect device notifications" msgstr "" -#: package/contents/ui/DeviceDelegate.qml:53 -#: package/contents/ui/DeviceDelegate.qml:59 -#: package/contents/ui/DeviceDelegate.qml:64 -msgid "Browse" -msgstr "" - -#: package/contents/ui/DeviceDelegate.qml:107 +#: package/contents/ui/DeviceDelegate.qml:77 msgid "Battery" msgstr "" -#: package/contents/ui/DeviceDelegate.qml:122 +#: package/contents/ui/DeviceDelegate.qml:92 msgid "Notifications" msgstr "Notificacións" diff -Nru kdeconnect-0.5/po/hu/kdeconnect-kded.po kdeconnect-0.5.1/po/hu/kdeconnect-kded.po --- kdeconnect-0.5/po/hu/kdeconnect-kded.po 2014-02-19 20:20:52.000000000 +0000 +++ kdeconnect-0.5.1/po/hu/kdeconnect-kded.po 2014-03-07 23:46:51.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-17 02:14+0000\n" -"PO-Revision-Date: 2014-02-16 18:52+0100\n" +"POT-Creation-Date: 2014-03-05 01:52+0000\n" +"PO-Revision-Date: 2014-02-22 21:33+0100\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" "Language: hu\n" @@ -41,36 +41,59 @@ msgid "Error contacting device" msgstr "Hiba az eszközzel való kommunikáláskor" -#: device.cpp:196 +#: device.cpp:199 msgid "Timed out" msgstr "Időtúllépés" -#: device.cpp:295 device.cpp:347 +#: device.cpp:298 device.cpp:350 msgid "Canceled by other peer" msgstr "A másik partner megszakította" -#: device.cpp:311 +#: device.cpp:314 msgid "Received incorrect key" msgstr "Hibás kulcs fogadva" -#: device.cpp:328 +#: device.cpp:331 #, kde-format msgid "Pairing request from %1" msgstr "Párosítási kérés innen: %1" -#: device.cpp:329 +#: device.cpp:332 msgid "Accept" msgstr "Elfogadás" -#: device.cpp:329 +#: device.cpp:332 msgid "Reject" msgstr "Elutasítás" -#: device.cpp:388 +#: device.cpp:391 msgid "Canceled by the user" msgstr "Megszakítva a felhasználó által" -#: filetransferjob.cpp:107 +#: 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 "Befejezetlen fájl fogadva" @@ -170,20 +193,20 @@ msgid " min" msgstr " perc" -#: plugins/sftp/sftpplugin.cpp:170 plugins/sftp/sftpplugin.cpp:191 -#: plugins/sftp/sftpplugin.cpp:216 +#: plugins/sftp/sftpplugin.cpp:168 plugins/sftp/sftpplugin.cpp:189 +#: plugins/sftp/sftpplugin.cpp:214 #, kde-format msgid "Device %1" msgstr "Eszköz %1" -#: plugins/sftp/sftpplugin.cpp:171 +#: plugins/sftp/sftpplugin.cpp:169 #, kde-format msgid "Filesystem mounted at %1" -msgstr "" +msgstr "Fájlrendszer csatolva: %1" -#: plugins/sftp/sftpplugin.cpp:192 +#: plugins/sftp/sftpplugin.cpp:190 msgid "Filesystem unmounted" -msgstr "" +msgstr "Fájlrendszer leválasztva" #. i18n: ectx: property (title), widget (QGroupBox, groupBox) #: plugins/share/share_config.ui:23 @@ -195,11 +218,11 @@ msgid "Save files in:" msgstr "Fájlok mentése:" -#: plugins/share/shareplugin.cpp:132 +#: plugins/share/shareplugin.cpp:135 msgid "Transfer finished" msgstr "Az átvitel befejeződött" -#: plugins/share/shareplugin.cpp:134 +#: plugins/share/shareplugin.cpp:137 msgid "Open destination folder" msgstr "Célmappa megnyitása" diff -Nru kdeconnect-0.5/po/hu/plasma_applet_kdeconnect.po kdeconnect-0.5.1/po/hu/plasma_applet_kdeconnect.po --- kdeconnect-0.5/po/hu/plasma_applet_kdeconnect.po 2014-02-19 20:20:52.000000000 +0000 +++ kdeconnect-0.5.1/po/hu/plasma_applet_kdeconnect.po 2014-03-07 23:46:51.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-17 02:14+0000\n" -"PO-Revision-Date: 2014-01-22 22:44+0100\n" +"POT-Creation-Date: 2014-03-01 01:46+0000\n" +"PO-Revision-Date: 2014-02-22 21:35+0100\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" "Language: hu\n" @@ -17,33 +17,31 @@ "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Lokalize 1.5\n" -#: package/contents/ui/Battery.qml:34 -msgid "Charging, %1" -msgstr "" - -#: package/contents/ui/Battery.qml:34 -msgid "Discharging, %1" -msgstr "" +#: package/contents/ui/Battery.qml:36 +#, fuzzy +#| msgid "Charging, %1" +msgid "Charging: %1%" +msgstr "Töltés, %1" + +#: package/contents/ui/Battery.qml:36 +#, fuzzy +#| msgid "Discharging, %1" +msgid "Discharging: %1%" +msgstr "Kisülés, %1" -#: package/contents/ui/Battery.qml:34 +#: package/contents/ui/Battery.qml:36 msgid "No info" -msgstr "" +msgstr "Nincs információ" #: package/contents/ui/CompactRepresentation.qml:48 msgid "KDE Connect device notifications" -msgstr "" - -#: package/contents/ui/DeviceDelegate.qml:53 -#: package/contents/ui/DeviceDelegate.qml:59 -#: package/contents/ui/DeviceDelegate.qml:64 -msgid "Browse" -msgstr "" +msgstr "KDE csatlakozás eszközértesítések" -#: package/contents/ui/DeviceDelegate.qml:107 +#: package/contents/ui/DeviceDelegate.qml:77 msgid "Battery" msgstr "Akkumulátor" -#: package/contents/ui/DeviceDelegate.qml:122 +#: package/contents/ui/DeviceDelegate.qml:92 msgid "Notifications" msgstr "Értesítések" diff -Nru kdeconnect-0.5/po/it/kdeconnect-kded.po kdeconnect-0.5.1/po/it/kdeconnect-kded.po --- kdeconnect-0.5/po/it/kdeconnect-kded.po 2014-02-19 20:21:08.000000000 +0000 +++ kdeconnect-0.5.1/po/it/kdeconnect-kded.po 2014-03-07 23:47:14.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: kdeconnect-kded\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-17 02:14+0000\n" +"POT-Creation-Date: 2014-03-05 01:52+0000\n" "PO-Revision-Date: 2013-11-04 12:43+0100\n" "Last-Translator: Mauro Panzeri \n" "Language-Team: Italian \n" @@ -41,36 +41,59 @@ msgid "Error contacting device" msgstr "Errore durante la comunicazione con il dispositivo" -#: device.cpp:196 +#: device.cpp:199 msgid "Timed out" msgstr "Richiesta scaduta" -#: device.cpp:295 device.cpp:347 +#: device.cpp:298 device.cpp:350 msgid "Canceled by other peer" msgstr "Richiesta annullata dal dispositivo remoto" -#: device.cpp:311 +#: device.cpp:314 msgid "Received incorrect key" msgstr "Ricevuta chiave non valida" -#: device.cpp:328 +#: device.cpp:331 #, kde-format msgid "Pairing request from %1" msgstr "Richiesta associazione da %1s" -#: device.cpp:329 +#: device.cpp:332 msgid "Accept" msgstr "Accetta" -#: device.cpp:329 +#: device.cpp:332 msgid "Reject" msgstr "Rifiuta" -#: device.cpp:388 +#: device.cpp:391 msgid "Canceled by the user" msgstr "Richiesta annullata dall'utente" -#: filetransferjob.cpp:107 +#: 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 "Ricevuto file incompleto" @@ -175,18 +198,18 @@ msgid " min" msgstr "" -#: plugins/sftp/sftpplugin.cpp:170 plugins/sftp/sftpplugin.cpp:191 -#: plugins/sftp/sftpplugin.cpp:216 +#: plugins/sftp/sftpplugin.cpp:168 plugins/sftp/sftpplugin.cpp:189 +#: plugins/sftp/sftpplugin.cpp:214 #, kde-format msgid "Device %1" msgstr "" -#: plugins/sftp/sftpplugin.cpp:171 +#: plugins/sftp/sftpplugin.cpp:169 #, kde-format msgid "Filesystem mounted at %1" msgstr "" -#: plugins/sftp/sftpplugin.cpp:192 +#: plugins/sftp/sftpplugin.cpp:190 msgid "Filesystem unmounted" msgstr "" @@ -200,11 +223,11 @@ msgid "Save files in:" msgstr "" -#: plugins/share/shareplugin.cpp:132 +#: plugins/share/shareplugin.cpp:135 msgid "Transfer finished" msgstr "Trasferimento completato" -#: plugins/share/shareplugin.cpp:134 +#: plugins/share/shareplugin.cpp:137 msgid "Open destination folder" msgstr "Apri cartella di destinazione" diff -Nru kdeconnect-0.5/po/it/plasma_applet_kdeconnect.po kdeconnect-0.5.1/po/it/plasma_applet_kdeconnect.po --- kdeconnect-0.5/po/it/plasma_applet_kdeconnect.po 2014-02-19 20:21:08.000000000 +0000 +++ kdeconnect-0.5.1/po/it/plasma_applet_kdeconnect.po 2014-03-07 23:47:14.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: kdeconnect-plasmoid\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-17 02:14+0000\n" +"POT-Creation-Date: 2014-03-01 01:46+0000\n" "PO-Revision-Date: 2013-10-31 18:24+0100\n" "Last-Translator: Mauro Panzeri \n" "Language-Team: Italian \n" @@ -17,15 +17,15 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: package/contents/ui/Battery.qml:34 -msgid "Charging, %1" +#: package/contents/ui/Battery.qml:36 +msgid "Charging: %1%" msgstr "" -#: package/contents/ui/Battery.qml:34 -msgid "Discharging, %1" +#: package/contents/ui/Battery.qml:36 +msgid "Discharging: %1%" msgstr "" -#: package/contents/ui/Battery.qml:34 +#: package/contents/ui/Battery.qml:36 msgid "No info" msgstr "" @@ -33,17 +33,11 @@ msgid "KDE Connect device notifications" msgstr "" -#: package/contents/ui/DeviceDelegate.qml:53 -#: package/contents/ui/DeviceDelegate.qml:59 -#: package/contents/ui/DeviceDelegate.qml:64 -msgid "Browse" -msgstr "" - -#: package/contents/ui/DeviceDelegate.qml:107 +#: package/contents/ui/DeviceDelegate.qml:77 msgid "Battery" msgstr "" -#: package/contents/ui/DeviceDelegate.qml:122 +#: package/contents/ui/DeviceDelegate.qml:92 msgid "Notifications" msgstr "Notifiche" diff -Nru kdeconnect-0.5/po/lt/kdeconnect-kded.po kdeconnect-0.5.1/po/lt/kdeconnect-kded.po --- kdeconnect-0.5/po/lt/kdeconnect-kded.po 2014-02-19 20:21:49.000000000 +0000 +++ kdeconnect-0.5.1/po/lt/kdeconnect-kded.po 2014-03-07 23:48:46.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: l 10n\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-17 02:14+0000\n" +"POT-Creation-Date: 2014-03-05 01:52+0000\n" "PO-Revision-Date: 2014-01-17 01:48+0000\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -42,36 +42,59 @@ msgid "Error contacting device" msgstr "" -#: device.cpp:196 +#: device.cpp:199 msgid "Timed out" msgstr "" -#: device.cpp:295 device.cpp:347 +#: device.cpp:298 device.cpp:350 msgid "Canceled by other peer" msgstr "" -#: device.cpp:311 +#: device.cpp:314 msgid "Received incorrect key" msgstr "" -#: device.cpp:328 +#: device.cpp:331 #, kde-format msgid "Pairing request from %1" msgstr "" -#: device.cpp:329 +#: device.cpp:332 msgid "Accept" msgstr "" -#: device.cpp:329 +#: device.cpp:332 msgid "Reject" msgstr "" -#: device.cpp:388 +#: device.cpp:391 msgid "Canceled by the user" msgstr "" -#: filetransferjob.cpp:107 +#: 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 "" @@ -171,18 +194,18 @@ msgid " min" msgstr "" -#: plugins/sftp/sftpplugin.cpp:170 plugins/sftp/sftpplugin.cpp:191 -#: plugins/sftp/sftpplugin.cpp:216 +#: plugins/sftp/sftpplugin.cpp:168 plugins/sftp/sftpplugin.cpp:189 +#: plugins/sftp/sftpplugin.cpp:214 #, kde-format msgid "Device %1" msgstr "" -#: plugins/sftp/sftpplugin.cpp:171 +#: plugins/sftp/sftpplugin.cpp:169 #, kde-format msgid "Filesystem mounted at %1" msgstr "" -#: plugins/sftp/sftpplugin.cpp:192 +#: plugins/sftp/sftpplugin.cpp:190 msgid "Filesystem unmounted" msgstr "" @@ -196,11 +219,11 @@ msgid "Save files in:" msgstr "" -#: plugins/share/shareplugin.cpp:132 +#: plugins/share/shareplugin.cpp:135 msgid "Transfer finished" msgstr "" -#: plugins/share/shareplugin.cpp:134 +#: plugins/share/shareplugin.cpp:137 msgid "Open destination folder" msgstr "" diff -Nru kdeconnect-0.5/po/lt/plasma_applet_kdeconnect.po kdeconnect-0.5.1/po/lt/plasma_applet_kdeconnect.po --- kdeconnect-0.5/po/lt/plasma_applet_kdeconnect.po 2014-02-19 20:21:49.000000000 +0000 +++ kdeconnect-0.5.1/po/lt/plasma_applet_kdeconnect.po 2014-03-07 23:48:46.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: l 10n\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-17 02:14+0000\n" +"POT-Creation-Date: 2014-03-01 01:46+0000\n" "PO-Revision-Date: 2013-11-16 01:35+0000\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -18,15 +18,15 @@ "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" -#: package/contents/ui/Battery.qml:34 -msgid "Charging, %1" +#: package/contents/ui/Battery.qml:36 +msgid "Charging: %1%" msgstr "" -#: package/contents/ui/Battery.qml:34 -msgid "Discharging, %1" +#: package/contents/ui/Battery.qml:36 +msgid "Discharging: %1%" msgstr "" -#: package/contents/ui/Battery.qml:34 +#: package/contents/ui/Battery.qml:36 msgid "No info" msgstr "" @@ -34,17 +34,11 @@ msgid "KDE Connect device notifications" msgstr "" -#: package/contents/ui/DeviceDelegate.qml:53 -#: package/contents/ui/DeviceDelegate.qml:59 -#: package/contents/ui/DeviceDelegate.qml:64 -msgid "Browse" -msgstr "" - -#: package/contents/ui/DeviceDelegate.qml:107 +#: package/contents/ui/DeviceDelegate.qml:77 msgid "Battery" msgstr "" -#: package/contents/ui/DeviceDelegate.qml:122 +#: package/contents/ui/DeviceDelegate.qml:92 msgid "Notifications" msgstr "" diff -Nru kdeconnect-0.5/po/nl/kdeconnect-kded.po kdeconnect-0.5.1/po/nl/kdeconnect-kded.po --- kdeconnect-0.5/po/nl/kdeconnect-kded.po 2014-02-19 20:22:42.000000000 +0000 +++ kdeconnect-0.5.1/po/nl/kdeconnect-kded.po 2014-03-07 23:52:08.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-17 02:14+0000\n" +"POT-Creation-Date: 2014-03-05 01:52+0000\n" "PO-Revision-Date: 2014-02-17 21:02+0100\n" "Last-Translator: Freek de Kruijf \n" "Language-Team: Dutch \n" @@ -41,36 +41,59 @@ msgid "Error contacting device" msgstr "Fout bij het contact maken met apparaat" -#: device.cpp:196 +#: device.cpp:199 msgid "Timed out" msgstr "Tijdslimiet overschreden" -#: device.cpp:295 device.cpp:347 +#: device.cpp:298 device.cpp:350 msgid "Canceled by other peer" msgstr "Geannuleerd door andere kant" -#: device.cpp:311 +#: device.cpp:314 msgid "Received incorrect key" msgstr "Onjuiste sleutel ontvangen" -#: device.cpp:328 +#: device.cpp:331 #, kde-format msgid "Pairing request from %1" msgstr "Verzoek om een paar te maken van %1" -#: device.cpp:329 +#: device.cpp:332 msgid "Accept" msgstr "Accepteren" -#: device.cpp:329 +#: device.cpp:332 msgid "Reject" msgstr "Afwijzen" -#: device.cpp:388 +#: device.cpp:391 msgid "Canceled by the user" msgstr "Geannuleerd door de gebruiker" -#: filetransferjob.cpp:107 +#: 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 "Onvolledig bestand ontvangen" @@ -170,18 +193,18 @@ msgid " min" msgstr " min" -#: plugins/sftp/sftpplugin.cpp:170 plugins/sftp/sftpplugin.cpp:191 -#: plugins/sftp/sftpplugin.cpp:216 +#: plugins/sftp/sftpplugin.cpp:168 plugins/sftp/sftpplugin.cpp:189 +#: plugins/sftp/sftpplugin.cpp:214 #, kde-format msgid "Device %1" msgstr "Apparaat %1" -#: plugins/sftp/sftpplugin.cpp:171 +#: plugins/sftp/sftpplugin.cpp:169 #, kde-format msgid "Filesystem mounted at %1" msgstr "Bestandssysteem aangekoppeld op %1" -#: plugins/sftp/sftpplugin.cpp:192 +#: plugins/sftp/sftpplugin.cpp:190 msgid "Filesystem unmounted" msgstr "Bestandssysteem afgekoppeld" @@ -195,11 +218,11 @@ msgid "Save files in:" msgstr "Bestanden opslaan in:" -#: plugins/share/shareplugin.cpp:132 +#: plugins/share/shareplugin.cpp:135 msgid "Transfer finished" msgstr "Overdracht is voltooid" -#: plugins/share/shareplugin.cpp:134 +#: plugins/share/shareplugin.cpp:137 msgid "Open destination folder" msgstr "Doelmap openen" diff -Nru kdeconnect-0.5/po/nl/plasma_applet_kdeconnect.po kdeconnect-0.5.1/po/nl/plasma_applet_kdeconnect.po --- kdeconnect-0.5/po/nl/plasma_applet_kdeconnect.po 2014-02-19 20:22:42.000000000 +0000 +++ kdeconnect-0.5.1/po/nl/plasma_applet_kdeconnect.po 2014-03-07 23:52:08.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-17 02:14+0000\n" -"PO-Revision-Date: 2014-02-15 17:01+0100\n" +"POT-Creation-Date: 2014-03-01 01:46+0000\n" +"PO-Revision-Date: 2014-03-01 09:31+0100\n" "Last-Translator: Freek de Kruijf \n" "Language-Team: Dutch \n" "Language: nl\n" @@ -17,15 +17,15 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: package/contents/ui/Battery.qml:34 -msgid "Charging, %1" -msgstr "Opladen, %1" - -#: package/contents/ui/Battery.qml:34 -msgid "Discharging, %1" -msgstr "Ontladen, %1" +#: package/contents/ui/Battery.qml:36 +msgid "Charging: %1%" +msgstr "Opladen: %1%" + +#: package/contents/ui/Battery.qml:36 +msgid "Discharging: %1%" +msgstr "Ontladen: %1%" -#: package/contents/ui/Battery.qml:34 +#: package/contents/ui/Battery.qml:36 msgid "No info" msgstr "Geen informatie" @@ -33,17 +33,11 @@ msgid "KDE Connect device notifications" msgstr "Meldingen van apparaten van KDE Connect" -#: package/contents/ui/DeviceDelegate.qml:53 -#: package/contents/ui/DeviceDelegate.qml:59 -#: package/contents/ui/DeviceDelegate.qml:64 -msgid "Browse" -msgstr "Bladeren" - -#: package/contents/ui/DeviceDelegate.qml:107 +#: package/contents/ui/DeviceDelegate.qml:77 msgid "Battery" msgstr "Batterij" -#: package/contents/ui/DeviceDelegate.qml:122 +#: package/contents/ui/DeviceDelegate.qml:92 msgid "Notifications" msgstr "Meldingen" diff -Nru kdeconnect-0.5/po/pt/kdeconnect-kded.po kdeconnect-0.5.1/po/pt/kdeconnect-kded.po --- kdeconnect-0.5/po/pt/kdeconnect-kded.po 2014-02-19 20:23:13.000000000 +0000 +++ kdeconnect-0.5.1/po/pt/kdeconnect-kded.po 2014-03-07 23:53:04.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: kdeconnect-kded\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-17 02:14+0000\n" -"PO-Revision-Date: 2014-02-17 09:44+0000\n" +"POT-Creation-Date: 2014-03-05 01:52+0000\n" +"PO-Revision-Date: 2014-03-04 11:44+0000\n" "Last-Translator: José Nuno Coelho Pires \n" "Language-Team: Portuguese \n" "Language: \n" @@ -11,7 +11,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-POFile-SpellExtra: sshfs sshfsf kdeconnect min\n" +"X-POFile-SpellExtra: sshfs sshfsf kdeconnect min Connect\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" @@ -37,36 +37,59 @@ msgid "Error contacting device" msgstr "Erro ao contactar o dispositivo" -#: device.cpp:196 +#: device.cpp:199 msgid "Timed out" msgstr "Tempo-limite expirado" -#: device.cpp:295 device.cpp:347 +#: device.cpp:298 device.cpp:350 msgid "Canceled by other peer" msgstr "Cancelado pelo outro dispositivo" -#: device.cpp:311 +#: device.cpp:314 msgid "Received incorrect key" msgstr "Chave incorrecta recebida" -#: device.cpp:328 +#: device.cpp:331 #, kde-format msgid "Pairing request from %1" msgstr "Pedido de emparelhamento de %1" -#: device.cpp:329 +#: device.cpp:332 msgid "Accept" msgstr "Aceitar" -#: device.cpp:329 +#: device.cpp:332 msgid "Reject" msgstr "Rejeitar" -#: device.cpp:388 +#: device.cpp:391 msgid "Canceled by the user" msgstr "Cancelado pelo utilizador" -#: filetransferjob.cpp:107 +#: 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 "A receber um ficheiro pelo KDE-Connect" + +#: filetransferjob.cpp:61 filetransferjob.cpp:122 +msgctxt "File transfer origin" +msgid "From" +msgstr "De" + +#: filetransferjob.cpp:68 +msgid "Incoming file exists" +msgstr "O ficheiro recebido existe" + +#: filetransferjob.cpp:124 +msgctxt "File transfer destination" +msgid "To" +msgstr "Para" + +#: filetransferjob.cpp:197 msgid "Received incomplete file" msgstr "Foi recebido um ficheiro incompleto" @@ -167,18 +190,18 @@ msgid " min" msgstr " min" -#: plugins/sftp/sftpplugin.cpp:170 plugins/sftp/sftpplugin.cpp:191 -#: plugins/sftp/sftpplugin.cpp:216 +#: plugins/sftp/sftpplugin.cpp:168 plugins/sftp/sftpplugin.cpp:189 +#: plugins/sftp/sftpplugin.cpp:214 #, kde-format msgid "Device %1" msgstr "Dispositivo %1" -#: plugins/sftp/sftpplugin.cpp:171 +#: plugins/sftp/sftpplugin.cpp:169 #, kde-format msgid "Filesystem mounted at %1" msgstr "Sistema de ficheiros montado em %1" -#: plugins/sftp/sftpplugin.cpp:192 +#: plugins/sftp/sftpplugin.cpp:190 msgid "Filesystem unmounted" msgstr "Sistema de ficheiros desmontado" @@ -192,11 +215,11 @@ msgid "Save files in:" msgstr "Gravar os ficheiros em:" -#: plugins/share/shareplugin.cpp:132 +#: plugins/share/shareplugin.cpp:135 msgid "Transfer finished" msgstr "Transferência terminada" -#: plugins/share/shareplugin.cpp:134 +#: plugins/share/shareplugin.cpp:137 msgid "Open destination folder" msgstr "Abrir a pasta de destino" diff -Nru kdeconnect-0.5/po/pt/plasma_applet_kdeconnect.po kdeconnect-0.5.1/po/pt/plasma_applet_kdeconnect.po --- kdeconnect-0.5/po/pt/plasma_applet_kdeconnect.po 2014-02-19 20:23:13.000000000 +0000 +++ kdeconnect-0.5.1/po/pt/plasma_applet_kdeconnect.po 2014-03-07 23:53:04.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: kdeconnect-plasmoid\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-17 02:14+0000\n" -"PO-Revision-Date: 2014-02-15 15:51+0000\n" +"POT-Creation-Date: 2014-03-01 01:46+0000\n" +"PO-Revision-Date: 2014-03-01 11:24+0000\n" "Last-Translator: José Nuno Coelho Pires \n" "Language-Team: Portuguese \n" "Language: \n" @@ -13,15 +13,15 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-POFile-SpellExtra: Connect\n" -#: package/contents/ui/Battery.qml:34 -msgid "Charging, %1" -msgstr "A carregar, %1" - -#: package/contents/ui/Battery.qml:34 -msgid "Discharging, %1" -msgstr "A descarregar, %1" +#: package/contents/ui/Battery.qml:36 +msgid "Charging: %1%" +msgstr "A carregar: %1%" + +#: package/contents/ui/Battery.qml:36 +msgid "Discharging: %1%" +msgstr "A descarregar: %1%" -#: package/contents/ui/Battery.qml:34 +#: package/contents/ui/Battery.qml:36 msgid "No info" msgstr "Sem informação" @@ -29,17 +29,11 @@ msgid "KDE Connect device notifications" msgstr "Notificações dos dispositivos do KDE Connect" -#: package/contents/ui/DeviceDelegate.qml:53 -#: package/contents/ui/DeviceDelegate.qml:59 -#: package/contents/ui/DeviceDelegate.qml:64 -msgid "Browse" -msgstr "Escolher" - -#: package/contents/ui/DeviceDelegate.qml:107 +#: package/contents/ui/DeviceDelegate.qml:77 msgid "Battery" msgstr "Bateria" -#: package/contents/ui/DeviceDelegate.qml:122 +#: package/contents/ui/DeviceDelegate.qml:92 msgid "Notifications" msgstr "Notificações" diff -Nru kdeconnect-0.5/po/pt_BR/kdeconnect-kded.po kdeconnect-0.5.1/po/pt_BR/kdeconnect-kded.po --- kdeconnect-0.5/po/pt_BR/kdeconnect-kded.po 2014-02-19 20:23:18.000000000 +0000 +++ kdeconnect-0.5.1/po/pt_BR/kdeconnect-kded.po 2014-03-07 23:53:16.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: kdeconnect-kded\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-17 02:14+0000\n" -"PO-Revision-Date: 2014-02-17 01:03-0300\n" +"POT-Creation-Date: 2014-03-05 01:52+0000\n" +"PO-Revision-Date: 2014-03-04 07:44-0300\n" "Last-Translator: André Marcelo Alvarenga \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" @@ -42,36 +42,59 @@ msgid "Error contacting device" msgstr "Erro ao contactar o dispositivo" -#: device.cpp:196 +#: device.cpp:199 msgid "Timed out" msgstr "Tempo limite expirou" -#: device.cpp:295 device.cpp:347 +#: device.cpp:298 device.cpp:350 msgid "Canceled by other peer" msgstr "Cancelado pelo outro dispositivo" -#: device.cpp:311 +#: device.cpp:314 msgid "Received incorrect key" msgstr "Chave incorreta recebida" -#: device.cpp:328 +#: device.cpp:331 #, kde-format msgid "Pairing request from %1" msgstr "Solicitação de emparelhamento de %1" -#: device.cpp:329 +#: device.cpp:332 msgid "Accept" msgstr "Aceitar" -#: device.cpp:329 +#: device.cpp:332 msgid "Reject" msgstr "Rejeitar" -#: device.cpp:388 +#: device.cpp:391 msgid "Canceled by the user" msgstr "Cancelada pelo usuário" -#: filetransferjob.cpp:107 +#: 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 "Recebendo arquivo através do KDE-Connect" + +#: filetransferjob.cpp:61 filetransferjob.cpp:122 +msgctxt "File transfer origin" +msgid "From" +msgstr "De" + +#: filetransferjob.cpp:68 +msgid "Incoming file exists" +msgstr "O arquivo recebido já existe" + +#: filetransferjob.cpp:124 +msgctxt "File transfer destination" +msgid "To" +msgstr "Para" + +#: filetransferjob.cpp:197 msgid "Received incomplete file" msgstr "Arquivo incompleto recebido" @@ -172,18 +195,18 @@ msgid " min" msgstr " min" -#: plugins/sftp/sftpplugin.cpp:170 plugins/sftp/sftpplugin.cpp:191 -#: plugins/sftp/sftpplugin.cpp:216 +#: plugins/sftp/sftpplugin.cpp:168 plugins/sftp/sftpplugin.cpp:189 +#: plugins/sftp/sftpplugin.cpp:214 #, kde-format msgid "Device %1" msgstr "Dispositivo %1" -#: plugins/sftp/sftpplugin.cpp:171 +#: plugins/sftp/sftpplugin.cpp:169 #, kde-format msgid "Filesystem mounted at %1" msgstr "Sistema de arquivos montado em %1" -#: plugins/sftp/sftpplugin.cpp:192 +#: plugins/sftp/sftpplugin.cpp:190 msgid "Filesystem unmounted" msgstr "Sistema de arquivos desmontado" @@ -197,11 +220,11 @@ msgid "Save files in:" msgstr "Salvar os arquivos em:" -#: plugins/share/shareplugin.cpp:132 +#: plugins/share/shareplugin.cpp:135 msgid "Transfer finished" msgstr "Transferência concluída" -#: plugins/share/shareplugin.cpp:134 +#: plugins/share/shareplugin.cpp:137 msgid "Open destination folder" msgstr "Abrir a pasta de destino" diff -Nru kdeconnect-0.5/po/pt_BR/plasma_applet_kdeconnect.po kdeconnect-0.5.1/po/pt_BR/plasma_applet_kdeconnect.po --- kdeconnect-0.5/po/pt_BR/plasma_applet_kdeconnect.po 2014-02-19 20:23:18.000000000 +0000 +++ kdeconnect-0.5.1/po/pt_BR/plasma_applet_kdeconnect.po 2014-03-07 23:53:16.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: kdeconnect-plasmoid\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-17 02:14+0000\n" -"PO-Revision-Date: 2014-02-17 01:04-0300\n" +"POT-Creation-Date: 2014-03-01 01:46+0000\n" +"PO-Revision-Date: 2014-03-01 14:59-0300\n" "Last-Translator: André Marcelo Alvarenga \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" @@ -18,15 +18,15 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 1.5\n" -#: package/contents/ui/Battery.qml:34 -msgid "Charging, %1" -msgstr "Carregando, %1" - -#: package/contents/ui/Battery.qml:34 -msgid "Discharging, %1" -msgstr "Descarregando, %1" +#: package/contents/ui/Battery.qml:36 +msgid "Charging: %1%" +msgstr "Carregando: %1%" + +#: package/contents/ui/Battery.qml:36 +msgid "Discharging: %1%" +msgstr "Descarregando: %1%" -#: package/contents/ui/Battery.qml:34 +#: package/contents/ui/Battery.qml:36 msgid "No info" msgstr "Sem informações" @@ -34,17 +34,11 @@ msgid "KDE Connect device notifications" msgstr "Notificações de dispositivos do KDE Connect" -#: package/contents/ui/DeviceDelegate.qml:53 -#: package/contents/ui/DeviceDelegate.qml:59 -#: package/contents/ui/DeviceDelegate.qml:64 -msgid "Browse" -msgstr "Navegar" - -#: package/contents/ui/DeviceDelegate.qml:107 +#: package/contents/ui/DeviceDelegate.qml:77 msgid "Battery" msgstr "Bateria" -#: package/contents/ui/DeviceDelegate.qml:122 +#: package/contents/ui/DeviceDelegate.qml:92 msgid "Notifications" msgstr "Notificações" diff -Nru kdeconnect-0.5/po/ro/kdeconnect-kded.po kdeconnect-0.5.1/po/ro/kdeconnect-kded.po --- kdeconnect-0.5/po/ro/kdeconnect-kded.po 2014-02-19 20:23:23.000000000 +0000 +++ kdeconnect-0.5.1/po/ro/kdeconnect-kded.po 2014-03-07 23:53:26.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-17 02:14+0000\n" +"POT-Creation-Date: 2014-03-05 01:52+0000\n" "PO-Revision-Date: 2013-10-24 14:20+0300\n" "Last-Translator: Sergiu Bivol \n" "Language-Team: Romanian \n" @@ -42,36 +42,59 @@ msgid "Error contacting device" msgstr "" -#: device.cpp:196 +#: device.cpp:199 msgid "Timed out" msgstr "A expirat" -#: device.cpp:295 device.cpp:347 +#: device.cpp:298 device.cpp:350 msgid "Canceled by other peer" msgstr "" -#: device.cpp:311 +#: device.cpp:314 msgid "Received incorrect key" msgstr "" -#: device.cpp:328 +#: device.cpp:331 #, kde-format msgid "Pairing request from %1" msgstr "" -#: device.cpp:329 +#: device.cpp:332 msgid "Accept" msgstr "Acceptă" -#: device.cpp:329 +#: device.cpp:332 msgid "Reject" msgstr "Refuză" -#: device.cpp:388 +#: device.cpp:391 msgid "Canceled by the user" msgstr "" -#: filetransferjob.cpp:107 +#: 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 "" @@ -174,18 +197,18 @@ msgid " min" msgstr "" -#: plugins/sftp/sftpplugin.cpp:170 plugins/sftp/sftpplugin.cpp:191 -#: plugins/sftp/sftpplugin.cpp:216 +#: plugins/sftp/sftpplugin.cpp:168 plugins/sftp/sftpplugin.cpp:189 +#: plugins/sftp/sftpplugin.cpp:214 #, kde-format msgid "Device %1" msgstr "" -#: plugins/sftp/sftpplugin.cpp:171 +#: plugins/sftp/sftpplugin.cpp:169 #, kde-format msgid "Filesystem mounted at %1" msgstr "" -#: plugins/sftp/sftpplugin.cpp:192 +#: plugins/sftp/sftpplugin.cpp:190 msgid "Filesystem unmounted" msgstr "" @@ -199,11 +222,11 @@ msgid "Save files in:" msgstr "" -#: plugins/share/shareplugin.cpp:132 +#: plugins/share/shareplugin.cpp:135 msgid "Transfer finished" msgstr "Transfer încheiat" -#: plugins/share/shareplugin.cpp:134 +#: plugins/share/shareplugin.cpp:137 msgid "Open destination folder" msgstr "Deschide dosarul destinație" diff -Nru kdeconnect-0.5/po/ro/plasma_applet_kdeconnect.po kdeconnect-0.5.1/po/ro/plasma_applet_kdeconnect.po --- kdeconnect-0.5/po/ro/plasma_applet_kdeconnect.po 2014-02-19 20:23:23.000000000 +0000 +++ kdeconnect-0.5.1/po/ro/plasma_applet_kdeconnect.po 2014-03-07 23:53:26.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-17 02:14+0000\n" +"POT-Creation-Date: 2014-03-01 01:46+0000\n" "PO-Revision-Date: 2013-10-24 14:20+0300\n" "Last-Translator: Sergiu Bivol \n" "Language-Team: Romanian \n" @@ -18,15 +18,15 @@ "20)) ? 1 : 2;\n" "X-Generator: Lokalize 1.5\n" -#: package/contents/ui/Battery.qml:34 -msgid "Charging, %1" +#: package/contents/ui/Battery.qml:36 +msgid "Charging: %1%" msgstr "" -#: package/contents/ui/Battery.qml:34 -msgid "Discharging, %1" +#: package/contents/ui/Battery.qml:36 +msgid "Discharging: %1%" msgstr "" -#: package/contents/ui/Battery.qml:34 +#: package/contents/ui/Battery.qml:36 msgid "No info" msgstr "" @@ -34,17 +34,11 @@ msgid "KDE Connect device notifications" msgstr "" -#: package/contents/ui/DeviceDelegate.qml:53 -#: package/contents/ui/DeviceDelegate.qml:59 -#: package/contents/ui/DeviceDelegate.qml:64 -msgid "Browse" -msgstr "" - -#: package/contents/ui/DeviceDelegate.qml:107 +#: package/contents/ui/DeviceDelegate.qml:77 msgid "Battery" msgstr "" -#: package/contents/ui/DeviceDelegate.qml:122 +#: package/contents/ui/DeviceDelegate.qml:92 msgid "Notifications" msgstr "Notificări" diff -Nru kdeconnect-0.5/po/ru/kdeconnect-kded.po kdeconnect-0.5.1/po/ru/kdeconnect-kded.po --- kdeconnect-0.5/po/ru/kdeconnect-kded.po 2014-02-19 20:23:28.000000000 +0000 +++ kdeconnect-0.5.1/po/ru/kdeconnect-kded.po 2014-03-07 23:53:35.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-17 02:14+0000\n" +"POT-Creation-Date: 2014-03-05 01:52+0000\n" "PO-Revision-Date: 2013-10-10 19:34+0400\n" "Last-Translator: Julia Dronova \n" "Language-Team: Russian \n" @@ -42,36 +42,59 @@ msgid "Error contacting device" msgstr "Ошибка соединения с устройством" -#: device.cpp:196 +#: device.cpp:199 msgid "Timed out" msgstr "Истекло время ожидания" -#: device.cpp:295 device.cpp:347 +#: device.cpp:298 device.cpp:350 msgid "Canceled by other peer" msgstr "Отменено другим участником" -#: device.cpp:311 +#: device.cpp:314 msgid "Received incorrect key" msgstr "Получен неверный ключ" -#: device.cpp:328 +#: device.cpp:331 #, kde-format msgid "Pairing request from %1" msgstr "Запрос на объединение в пару от %1" -#: device.cpp:329 +#: device.cpp:332 msgid "Accept" msgstr "Принять" -#: device.cpp:329 +#: device.cpp:332 msgid "Reject" msgstr "Отклонить" -#: device.cpp:388 +#: device.cpp:391 msgid "Canceled by the user" msgstr "Отменено пользователем" -#: filetransferjob.cpp:107 +#: 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 "Получен неполный файл" @@ -176,18 +199,18 @@ msgid " min" msgstr "" -#: plugins/sftp/sftpplugin.cpp:170 plugins/sftp/sftpplugin.cpp:191 -#: plugins/sftp/sftpplugin.cpp:216 +#: plugins/sftp/sftpplugin.cpp:168 plugins/sftp/sftpplugin.cpp:189 +#: plugins/sftp/sftpplugin.cpp:214 #, kde-format msgid "Device %1" msgstr "" -#: plugins/sftp/sftpplugin.cpp:171 +#: plugins/sftp/sftpplugin.cpp:169 #, kde-format msgid "Filesystem mounted at %1" msgstr "" -#: plugins/sftp/sftpplugin.cpp:192 +#: plugins/sftp/sftpplugin.cpp:190 msgid "Filesystem unmounted" msgstr "" @@ -201,11 +224,11 @@ msgid "Save files in:" msgstr "" -#: plugins/share/shareplugin.cpp:132 +#: plugins/share/shareplugin.cpp:135 msgid "Transfer finished" msgstr "Передача завершена" -#: plugins/share/shareplugin.cpp:134 +#: plugins/share/shareplugin.cpp:137 msgid "Open destination folder" msgstr "Открыть целевую папку" diff -Nru kdeconnect-0.5/po/ru/plasma_applet_kdeconnect.po kdeconnect-0.5.1/po/ru/plasma_applet_kdeconnect.po --- kdeconnect-0.5/po/ru/plasma_applet_kdeconnect.po 2014-02-19 20:23:28.000000000 +0000 +++ kdeconnect-0.5.1/po/ru/plasma_applet_kdeconnect.po 2014-03-07 23:53:35.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-17 02:14+0000\n" +"POT-Creation-Date: 2014-03-01 01:46+0000\n" "PO-Revision-Date: 2013-10-10 19:35+0400\n" "Last-Translator: Julia Dronova \n" "Language-Team: Russian \n" @@ -18,15 +18,15 @@ "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Lokalize 1.5\n" -#: package/contents/ui/Battery.qml:34 -msgid "Charging, %1" +#: package/contents/ui/Battery.qml:36 +msgid "Charging: %1%" msgstr "" -#: package/contents/ui/Battery.qml:34 -msgid "Discharging, %1" +#: package/contents/ui/Battery.qml:36 +msgid "Discharging: %1%" msgstr "" -#: package/contents/ui/Battery.qml:34 +#: package/contents/ui/Battery.qml:36 msgid "No info" msgstr "" @@ -34,17 +34,11 @@ msgid "KDE Connect device notifications" msgstr "" -#: package/contents/ui/DeviceDelegate.qml:53 -#: package/contents/ui/DeviceDelegate.qml:59 -#: package/contents/ui/DeviceDelegate.qml:64 -msgid "Browse" -msgstr "" - -#: package/contents/ui/DeviceDelegate.qml:107 +#: package/contents/ui/DeviceDelegate.qml:77 msgid "Battery" msgstr "" -#: package/contents/ui/DeviceDelegate.qml:122 +#: package/contents/ui/DeviceDelegate.qml:92 msgid "Notifications" msgstr "Уведомления" diff -Nru kdeconnect-0.5/po/sk/kdeconnect-kded.po kdeconnect-0.5.1/po/sk/kdeconnect-kded.po --- kdeconnect-0.5/po/sk/kdeconnect-kded.po 2014-02-19 20:23:44.000000000 +0000 +++ kdeconnect-0.5.1/po/sk/kdeconnect-kded.po 2014-03-07 23:54:03.000000000 +0000 @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: kdeconnect-kded\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-17 02:14+0000\n" +"POT-Creation-Date: 2014-03-05 01:52+0000\n" "PO-Revision-Date: 2014-02-18 19:56+0100\n" "Last-Translator: Roman Paholík \n" "Language-Team: Slovak \n" @@ -39,36 +39,59 @@ msgid "Error contacting device" msgstr "Chyba kontaktovania zariadenia" -#: device.cpp:196 +#: device.cpp:199 msgid "Timed out" msgstr "Časový limit" -#: device.cpp:295 device.cpp:347 +#: device.cpp:298 device.cpp:350 msgid "Canceled by other peer" msgstr "Zrušené iným klientom" -#: device.cpp:311 +#: device.cpp:314 msgid "Received incorrect key" msgstr "Získaný nesprávny kľúč" -#: device.cpp:328 +#: device.cpp:331 #, kde-format msgid "Pairing request from %1" msgstr "Požiadavka spárovania od %1" -#: device.cpp:329 +#: device.cpp:332 msgid "Accept" msgstr "Prijať" -#: device.cpp:329 +#: device.cpp:332 msgid "Reject" msgstr "Odmietnuť" -#: device.cpp:388 +#: device.cpp:391 msgid "Canceled by the user" msgstr "Zrušené používateľom" -#: filetransferjob.cpp:107 +#: 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 "Prijatý nekompletný súbor" @@ -168,18 +191,18 @@ msgid " min" msgstr " min" -#: plugins/sftp/sftpplugin.cpp:170 plugins/sftp/sftpplugin.cpp:191 -#: plugins/sftp/sftpplugin.cpp:216 +#: plugins/sftp/sftpplugin.cpp:168 plugins/sftp/sftpplugin.cpp:189 +#: plugins/sftp/sftpplugin.cpp:214 #, kde-format msgid "Device %1" msgstr "Zariadenie %1" -#: plugins/sftp/sftpplugin.cpp:171 +#: plugins/sftp/sftpplugin.cpp:169 #, kde-format msgid "Filesystem mounted at %1" msgstr "Súborový systém pripojený na %1" -#: plugins/sftp/sftpplugin.cpp:192 +#: plugins/sftp/sftpplugin.cpp:190 msgid "Filesystem unmounted" msgstr "Súborový systém odpojený" @@ -193,11 +216,11 @@ msgid "Save files in:" msgstr "Uložiť súbory v:" -#: plugins/share/shareplugin.cpp:132 +#: plugins/share/shareplugin.cpp:135 msgid "Transfer finished" msgstr "Prenos ukončený" -#: plugins/share/shareplugin.cpp:134 +#: plugins/share/shareplugin.cpp:137 msgid "Open destination folder" msgstr "Otvoriť cieľový priečinok" diff -Nru kdeconnect-0.5/po/sk/plasma_applet_kdeconnect.po kdeconnect-0.5.1/po/sk/plasma_applet_kdeconnect.po --- kdeconnect-0.5/po/sk/plasma_applet_kdeconnect.po 2014-02-19 20:23:44.000000000 +0000 +++ kdeconnect-0.5.1/po/sk/plasma_applet_kdeconnect.po 2014-03-07 23:54:03.000000000 +0000 @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: plasma_applet_kdeconnect\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-17 02:14+0000\n" -"PO-Revision-Date: 2014-02-16 19:24+0100\n" +"POT-Creation-Date: 2014-03-01 01:46+0000\n" +"PO-Revision-Date: 2014-03-01 20:28+0100\n" "Last-Translator: Roman Paholík \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -15,15 +15,15 @@ "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: package/contents/ui/Battery.qml:34 -msgid "Charging, %1" -msgstr "Nabíja sa, %1" - -#: package/contents/ui/Battery.qml:34 -msgid "Discharging, %1" -msgstr "Vybíja sa. %1" +#: package/contents/ui/Battery.qml:36 +msgid "Charging: %1%" +msgstr "Nabíja sa: %1%" + +#: package/contents/ui/Battery.qml:36 +msgid "Discharging: %1%" +msgstr "Vybíja sa: %1%" -#: package/contents/ui/Battery.qml:34 +#: package/contents/ui/Battery.qml:36 msgid "No info" msgstr "Žiadne informácie" @@ -31,17 +31,11 @@ msgid "KDE Connect device notifications" msgstr "Upozornenia zariadení KDE Connect" -#: package/contents/ui/DeviceDelegate.qml:53 -#: package/contents/ui/DeviceDelegate.qml:59 -#: package/contents/ui/DeviceDelegate.qml:64 -msgid "Browse" -msgstr "Prehľadávať" - -#: package/contents/ui/DeviceDelegate.qml:107 +#: package/contents/ui/DeviceDelegate.qml:77 msgid "Battery" msgstr "Batéria" -#: package/contents/ui/DeviceDelegate.qml:122 +#: package/contents/ui/DeviceDelegate.qml:92 msgid "Notifications" msgstr "Upozornenia" diff -Nru kdeconnect-0.5/po/sv/kdeconnect-kded.po kdeconnect-0.5.1/po/sv/kdeconnect-kded.po --- kdeconnect-0.5/po/sv/kdeconnect-kded.po 2014-02-19 20:24:20.000000000 +0000 +++ kdeconnect-0.5.1/po/sv/kdeconnect-kded.po 2014-03-07 23:54:57.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-17 02:14+0000\n" -"PO-Revision-Date: 2014-02-17 18:36+0100\n" +"POT-Creation-Date: 2014-03-05 01:52+0000\n" +"PO-Revision-Date: 2014-03-04 17:49+0100\n" "Last-Translator: Stefan Asserhäll \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -41,36 +41,59 @@ msgid "Error contacting device" msgstr "Fel vid försök att kontakta apparaten" -#: device.cpp:196 +#: device.cpp:199 msgid "Timed out" msgstr "Tidsgräns överskriden" -#: device.cpp:295 device.cpp:347 +#: device.cpp:298 device.cpp:350 msgid "Canceled by other peer" msgstr "Avbruten av motparten" -#: device.cpp:311 +#: device.cpp:314 msgid "Received incorrect key" msgstr "Mottog felaktig nyckel" -#: device.cpp:328 +#: device.cpp:331 #, kde-format msgid "Pairing request from %1" msgstr "Begäran om ihopparning från %1" -#: device.cpp:329 +#: device.cpp:332 msgid "Accept" msgstr "Acceptera" -#: device.cpp:329 +#: device.cpp:332 msgid "Reject" msgstr "Avslå" -#: device.cpp:388 +#: device.cpp:391 msgid "Canceled by the user" msgstr "Avbruten av användaren" -#: filetransferjob.cpp:107 +#: filetransferjob.cpp:41 +msgctxt "Device name that will appear on the jobs" +msgid "KDE-Connect" +msgstr "KDE-anslut" + +#: filetransferjob.cpp:60 filetransferjob.cpp:121 +msgid "Receiving file over KDE-Connect" +msgstr "Tar emot fil via KDE-anslut" + +#: filetransferjob.cpp:61 filetransferjob.cpp:122 +msgctxt "File transfer origin" +msgid "From" +msgstr "Från" + +#: filetransferjob.cpp:68 +msgid "Incoming file exists" +msgstr "Inkommande fil finns" + +#: filetransferjob.cpp:124 +msgctxt "File transfer destination" +msgid "To" +msgstr "Till" + +#: filetransferjob.cpp:197 msgid "Received incomplete file" msgstr "Mottog ofullständig fil" @@ -170,18 +193,18 @@ msgid " min" msgstr " min" -#: plugins/sftp/sftpplugin.cpp:170 plugins/sftp/sftpplugin.cpp:191 -#: plugins/sftp/sftpplugin.cpp:216 +#: plugins/sftp/sftpplugin.cpp:168 plugins/sftp/sftpplugin.cpp:189 +#: plugins/sftp/sftpplugin.cpp:214 #, kde-format msgid "Device %1" msgstr "Apparat %1" -#: plugins/sftp/sftpplugin.cpp:171 +#: plugins/sftp/sftpplugin.cpp:169 #, kde-format msgid "Filesystem mounted at %1" msgstr "Filsystem monterat som %1" -#: plugins/sftp/sftpplugin.cpp:192 +#: plugins/sftp/sftpplugin.cpp:190 msgid "Filesystem unmounted" msgstr "Filsystem avmonterat" @@ -195,11 +218,11 @@ msgid "Save files in:" msgstr "Spara filer i:" -#: plugins/share/shareplugin.cpp:132 +#: plugins/share/shareplugin.cpp:135 msgid "Transfer finished" msgstr "Överföring klar" -#: plugins/share/shareplugin.cpp:134 +#: plugins/share/shareplugin.cpp:137 msgid "Open destination folder" msgstr "Öppna målkatalog" diff -Nru kdeconnect-0.5/po/sv/plasma_applet_kdeconnect.po kdeconnect-0.5.1/po/sv/plasma_applet_kdeconnect.po --- kdeconnect-0.5/po/sv/plasma_applet_kdeconnect.po 2014-02-19 20:24:20.000000000 +0000 +++ kdeconnect-0.5.1/po/sv/plasma_applet_kdeconnect.po 2014-03-07 23:54:57.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-17 02:14+0000\n" -"PO-Revision-Date: 2014-02-15 09:01+0100\n" +"POT-Creation-Date: 2014-03-01 01:46+0000\n" +"PO-Revision-Date: 2014-03-02 13:44+0100\n" "Last-Translator: Stefan Asserhäll \n" "Language-Team: Swedish \n" "Language: sv\n" @@ -17,15 +17,15 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.4\n" -#: package/contents/ui/Battery.qml:34 -msgid "Charging, %1" -msgstr "Laddar, %1" - -#: package/contents/ui/Battery.qml:34 -msgid "Discharging, %1" -msgstr "Laddar ur, %1" +#: package/contents/ui/Battery.qml:36 +msgid "Charging: %1%" +msgstr "Laddar: %1 %" + +#: package/contents/ui/Battery.qml:36 +msgid "Discharging: %1%" +msgstr "Laddar ur: %1 %" -#: package/contents/ui/Battery.qml:34 +#: package/contents/ui/Battery.qml:36 msgid "No info" msgstr "Ingen information" @@ -33,17 +33,11 @@ msgid "KDE Connect device notifications" msgstr "KDE Anslut enhetsunderrättelser" -#: package/contents/ui/DeviceDelegate.qml:53 -#: package/contents/ui/DeviceDelegate.qml:59 -#: package/contents/ui/DeviceDelegate.qml:64 -msgid "Browse" -msgstr "Bläddra" - -#: package/contents/ui/DeviceDelegate.qml:107 +#: package/contents/ui/DeviceDelegate.qml:77 msgid "Battery" msgstr "Batteri" -#: package/contents/ui/DeviceDelegate.qml:122 +#: package/contents/ui/DeviceDelegate.qml:92 msgid "Notifications" msgstr "Notifications" diff -Nru kdeconnect-0.5/po/uk/kdeconnect-kded.po kdeconnect-0.5.1/po/uk/kdeconnect-kded.po --- kdeconnect-0.5/po/uk/kdeconnect-kded.po 2014-02-19 20:24:58.000000000 +0000 +++ kdeconnect-0.5.1/po/uk/kdeconnect-kded.po 2014-03-07 23:56:20.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-17 02:14+0000\n" -"PO-Revision-Date: 2014-02-17 08:02+0200\n" +"POT-Creation-Date: 2014-03-05 01:52+0000\n" +"PO-Revision-Date: 2014-03-04 07:41+0200\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" "Language: uk\n" @@ -42,36 +42,59 @@ msgid "Error contacting device" msgstr "Помилка під час спроби зв’язатися з пристроєм" -#: device.cpp:196 +#: device.cpp:199 msgid "Timed out" msgstr "Час очікування вичерпано" -#: device.cpp:295 device.cpp:347 +#: device.cpp:298 device.cpp:350 msgid "Canceled by other peer" msgstr "Скасовано з іншого вузла пов’язування" -#: device.cpp:311 +#: device.cpp:314 msgid "Received incorrect key" msgstr "Отримано некоректний ключ" -#: device.cpp:328 +#: device.cpp:331 #, kde-format msgid "Pairing request from %1" msgstr "Запит щодо пов’язування від %1" -#: device.cpp:329 +#: device.cpp:332 msgid "Accept" msgstr "Прийняти" -#: device.cpp:329 +#: device.cpp:332 msgid "Reject" msgstr "Відмовити" -#: device.cpp:388 +#: device.cpp:391 msgid "Canceled by the user" msgstr "Скасовано користувачем" -#: filetransferjob.cpp:107 +#: 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 "Отримуємо файл за допомогою KDE-Connect" + +#: 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 "Отримано незавершений файл" @@ -171,18 +194,18 @@ msgid " min" msgstr " хв." -#: plugins/sftp/sftpplugin.cpp:170 plugins/sftp/sftpplugin.cpp:191 -#: plugins/sftp/sftpplugin.cpp:216 +#: plugins/sftp/sftpplugin.cpp:168 plugins/sftp/sftpplugin.cpp:189 +#: plugins/sftp/sftpplugin.cpp:214 #, kde-format msgid "Device %1" msgstr "Пристрій %1" -#: plugins/sftp/sftpplugin.cpp:171 +#: plugins/sftp/sftpplugin.cpp:169 #, kde-format msgid "Filesystem mounted at %1" msgstr "Файлову систему змонтовано до %1" -#: plugins/sftp/sftpplugin.cpp:192 +#: plugins/sftp/sftpplugin.cpp:190 msgid "Filesystem unmounted" msgstr "Файлову систему демонтовано" @@ -196,11 +219,11 @@ msgid "Save files in:" msgstr "Зберігати файли до:" -#: plugins/share/shareplugin.cpp:132 +#: plugins/share/shareplugin.cpp:135 msgid "Transfer finished" msgstr "Передавання завершено" -#: plugins/share/shareplugin.cpp:134 +#: plugins/share/shareplugin.cpp:137 msgid "Open destination folder" msgstr "Відкрити теку призначення" diff -Nru kdeconnect-0.5/po/uk/plasma_applet_kdeconnect.po kdeconnect-0.5.1/po/uk/plasma_applet_kdeconnect.po --- kdeconnect-0.5/po/uk/plasma_applet_kdeconnect.po 2014-02-19 20:24:58.000000000 +0000 +++ kdeconnect-0.5.1/po/uk/plasma_applet_kdeconnect.po 2014-03-07 23:56:20.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2014-02-17 02:14+0000\n" -"PO-Revision-Date: 2014-02-15 09:09+0200\n" +"POT-Creation-Date: 2014-03-01 01:46+0000\n" +"PO-Revision-Date: 2014-03-01 07:58+0200\n" "Last-Translator: Yuri Chornoivan \n" "Language-Team: Ukrainian \n" "Language: uk\n" @@ -18,15 +18,15 @@ "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Lokalize 1.5\n" -#: package/contents/ui/Battery.qml:34 -msgid "Charging, %1" -msgstr "Заряджання, %1" - -#: package/contents/ui/Battery.qml:34 -msgid "Discharging, %1" -msgstr "Розряджання, %1" +#: package/contents/ui/Battery.qml:36 +msgid "Charging: %1%" +msgstr "Заряджання: %1%" + +#: package/contents/ui/Battery.qml:36 +msgid "Discharging: %1%" +msgstr "Розряджання: %1%" -#: package/contents/ui/Battery.qml:34 +#: package/contents/ui/Battery.qml:36 msgid "No info" msgstr "Немає даних" @@ -34,17 +34,11 @@ msgid "KDE Connect device notifications" msgstr "Сповіщення щодо з’єднання з пристроями KDE" -#: package/contents/ui/DeviceDelegate.qml:53 -#: package/contents/ui/DeviceDelegate.qml:59 -#: package/contents/ui/DeviceDelegate.qml:64 -msgid "Browse" -msgstr "Навігація" - -#: package/contents/ui/DeviceDelegate.qml:107 +#: package/contents/ui/DeviceDelegate.qml:77 msgid "Battery" msgstr "Акумулятор" -#: package/contents/ui/DeviceDelegate.qml:122 +#: package/contents/ui/DeviceDelegate.qml:92 msgid "Notifications" msgstr "Сповіщення"