From 139bb8f094af5f132ecb0653b007bee317045d4f Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sat, 4 Mar 2017 02:18:29 +0100 Subject: [PATCH 01/10] [tx-robot] updated from transifex --- mirall.desktop.in | 3 +++ translations/client_pt.ts | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mirall.desktop.in b/mirall.desktop.in index c8aa6e821..f0647ac92 100644 --- a/mirall.desktop.in +++ b/mirall.desktop.in @@ -766,6 +766,9 @@ X-GNOME-Autostart-Delay=3 # Translations +# Translations + + # Translations Comment[oc]=@APPLICATION_NAME@ sincronizacion del client GenericName[oc]=Dorsièr de Sincronizacion diff --git a/translations/client_pt.ts b/translations/client_pt.ts index 4ff4816ff..02cf1e1b1 100644 --- a/translations/client_pt.ts +++ b/translations/client_pt.ts @@ -536,7 +536,7 @@ Error accessing the configuration file - + Erro a aceder ao ficheiro de configuração @@ -1831,7 +1831,7 @@ Não é aconselhada a sua utilização. Invalid URL - + URL inválido @@ -2569,7 +2569,7 @@ Não é aconselhada a sua utilização. Could not open email client - + Não foi possivel abrir o cliente de email From e7296d03d33a51bb96d14d627a734338cccc8a2b Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Sun, 5 Mar 2017 02:18:29 +0100 Subject: [PATCH 02/10] [tx-robot] updated from transifex --- mirall.desktop.in | 9 ++++++--- translations/client_fr.ts | 12 ++++++------ translations/client_th.ts | 10 ++++++++-- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/mirall.desktop.in b/mirall.desktop.in index f0647ac92..2fd5b6ab8 100644 --- a/mirall.desktop.in +++ b/mirall.desktop.in @@ -769,6 +769,9 @@ X-GNOME-Autostart-Delay=3 # Translations +# Translations + + # Translations Comment[oc]=@APPLICATION_NAME@ sincronizacion del client GenericName[oc]=Dorsièr de Sincronizacion @@ -817,9 +820,9 @@ Icon[bg_BG]=@APPLICATION_EXECUTABLE@ GenericName[fa]=همسان سازی پوشه‌ها Name[fa]=@APPLICATION_EXECUTABLE@ نسخه‌ی همسان سازی مشتری Icon[fa]=@APPLICATION_EXECUTABLE@ -Comment[fr]=@APPLICATION_NAME@ synchronisation du client -GenericName[fr]=Dossier de Synchronisation -Name[fr]=@APPLICATION_NAME@ synchronisation du client +Comment[fr]=Application de bureau pour synchroniser des dossiers avec un serveur @APPLICATION_NAME@ +GenericName[fr]=Synchronisation de dossier +Name[fr]=Client de synchronisation @APPLICATION_NAME@ Icon[fr]=@APPLICATION_EXECUTABLE@ Comment[he]=@APPLICATION_NAME@ לקוח סנכון שולחן עבודה GenericName[he]=סנכון תיקייה diff --git a/translations/client_fr.ts b/translations/client_fr.ts index bbeb17037..2b947d885 100644 --- a/translations/client_fr.ts +++ b/translations/client_fr.ts @@ -379,7 +379,7 @@ Server Activity - Activité sur le serveur + Activité serveur @@ -536,7 +536,7 @@ Error accessing the configuration file - + Erreur lors de l'accès au fichier de configuration @@ -850,7 +850,7 @@ Continuer la synchronisation comme d'habitude fera en sorte que tous les fi Last Sync was successful. - Dernière synchronisation effectuée avec succès + Dernière synchronisation réalisée avec succès @@ -1341,9 +1341,9 @@ Continuer la synchronisation comme d'habitude fera en sorte que tous les fi Files or folders matching a pattern will not be synchronized. Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data. - Les fichiers ou dossiers dont les noms correspondent à un motif ne seront pas synchronisés. + Les fichiers ou dossiers dont les noms correspondent à un motif seront exclus de la synchronisation. -Les éléments pour lesquel la suppression automatique est autorisée seront supprimés s'ils empêchent l'effacement d'un dossier. C'est utile pour les fichiers de méta-données. +L'option "Autoriser la suppression" permet de ne pas bloquer la suppression d'un dossier. C'est utile pour les fichiers de méta-données. @@ -3356,7 +3356,7 @@ Il est déconseillé de l'utiliser. Unpause all folders - Relance tous les dossiers + Relancer tous les dossiers diff --git a/translations/client_th.ts b/translations/client_th.ts index 4847aca84..aecd218c6 100644 --- a/translations/client_th.ts +++ b/translations/client_th.ts @@ -755,14 +755,20 @@ These deletes will be synchronized to your local sync folder, making such files unavailable unless you have a right to restore. If you decide to keep the files, they will be re-synced with the server if you have rights to do so. If you decide to delete the files, they will be unavailable to you, unless you are the owner. - + ไฟล์ทั้งหมดในโฟลเดอร์ '%1' ที่ประสานข้อมูลเอาไว้ในเซิฟเวอร์จะถูกลบด้วย +การลบข้อมูลนี้จะถูกประสานข้อมูลกับโฟลเดอร์ต้นทาง ทำให้ไฟล์ดังกล่าวไม่สามารถใช้งานได้จนกว่าจะถูกกู้คืน +ถ้าคุณตัดสินใจที่จะเก็บไฟล์เอาไว้ ไฟล์ของคุณก็จะถูกประสานข้อมูลใหม่อีกครั้ง +หากคุณตัดสินใจที่จะลบไฟล์ก็จะทำให้ไม่มีใครสามารถใช้งานโฟลเดอร์นี้ได้เพราะคุณเป็นเจ้าของ All the files in your local sync folder '%1' were deleted. These deletes will be synchronized with your server, making such files unavailable unless restored. Are you sure you want to sync those actions with the server? If this was an accident and you decide to keep your files, they will be re-synced from the server. - + ไฟล์ทั้งหมดในโฟลเดอร์ '%1' ที่ประสานข้อมูลเอาไว้ในเซิฟเวอร์จะถูกลบด้วย +การลบข้อมูลนี้จะถูกประสานข้อมูลกับเซิฟเวอร์ ทำให้ไฟล์ดังกล่าวไม่สามารถใช้งานได้จนกว่าจะถูกกู้คืน +คุณแน่ใจหรือว่าต้องการประสานข้อมูลการกระทำนี้กับเซิร์ฟเวอร์? +ถ้าเรื่องนี้เป็นอุบัติเหตุและคุณตัดสินใจที่จะเก็บไฟล์ของคุณ ไฟล์ของคุณก็จะถูกประสานข้อมูลใหม่อีกครั้ง From 6487bb071b53cbba12976b36ad7d5f5b102c974d Mon Sep 17 00:00:00 2001 From: Markus Goetz Date: Mon, 6 Mar 2017 15:40:10 +0100 Subject: [PATCH 03/10] NSIS: Don't display link on finish page --- cmake/modules/NSIS.template.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in index d28c90639..e281b511f 100644 --- a/cmake/modules/NSIS.template.in +++ b/cmake/modules/NSIS.template.in @@ -116,8 +116,9 @@ ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll" !define MUI_HEADERIMAGE !define MUI_HEADERIMAGE_BITMAP ${WIN_SETUP_BITMAP_PATH}/page_header.bmp !define MUI_COMPONENTSPAGE_SMALLDESC -!define MUI_FINISHPAGE_LINK "${APPLICATION_DOMAIN}" -!define MUI_FINISHPAGE_LINK_LOCATION "http://${APPLICATION_DOMAIN}" +; We removed this, h1 issue 191687 +;!define MUI_FINISHPAGE_LINK "${APPLICATION_DOMAIN}" +;!define MUI_FINISHPAGE_LINK_LOCATION "http://${APPLICATION_DOMAIN}" !define MUI_FINISHPAGE_NOREBOOTSUPPORT !ifdef OPTION_FINISHPAGE_RELEASE_NOTES !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED From f862c626a182c58c245228cf8c4fb00ab29fb869 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 6 Mar 2017 13:07:08 +0100 Subject: [PATCH 04/10] Propagator: Fix finished signal of directory being emited twice and causing crash When there is a FatalError, we ended up emiting the finished signal for the directory job several times, which would lead to crashes Issue #5578 --- src/libsync/owncloudpropagator.cpp | 11 +++++--- test/syncenginetestutils.h | 42 +++++++++++++++++++++++------- test/testsyncengine.cpp | 34 ++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 12 deletions(-) diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp index 6e73c0d5d..e2c910213 100644 --- a/src/libsync/owncloudpropagator.cpp +++ b/src/libsync/owncloudpropagator.cpp @@ -669,9 +669,11 @@ void PropagateDirectory::slotSubJobFinished(SyncFileItem::Status status) if (status == SyncFileItem::FatalError || (wasFirstJob && status != SyncFileItem::Success && status != SyncFileItem::Restoration)) { - abort(); - _state = Finished; - emit finished(status); + if (_state != Finished) { + abort(); + _state = Finished; + emit finished(status); + } return; } else if (status == SyncFileItem::NormalError || status == SyncFileItem::SoftError) { _hasError = status; @@ -688,6 +690,9 @@ void PropagateDirectory::slotSubJobFinished(SyncFileItem::Status status) void PropagateDirectory::finalize() { + if (_state == Finished) + return; + bool ok = true; if (!_item->isEmpty() && _hasError == SyncFileItem::NoStatus) { if( !_item->_renameTarget.isEmpty() ) { diff --git a/test/syncenginetestutils.h b/test/syncenginetestutils.h index 232cd419d..937bf35fd 100644 --- a/test/syncenginetestutils.h +++ b/test/syncenginetestutils.h @@ -536,6 +536,7 @@ public: const FileInfo *fileInfo; char payload; int size; + bool aborted = false; FakeGetReply(FileInfo &remoteRootFileInfo, QNetworkAccessManager::Operation op, const QNetworkRequest &request, QObject *parent) : QNetworkReply{parent} { @@ -551,6 +552,12 @@ public: } Q_INVOKABLE void respond() { + if (aborted) { + setError(OperationCanceledError, "Operation Canceled"); + emit metaDataChanged(); + emit finished(); + return; + } payload = fileInfo->contentChar; size = fileInfo->size; setHeader(QNetworkRequest::ContentLengthHeader, size); @@ -564,8 +571,14 @@ public: emit finished(); } - void abort() override { } - qint64 bytesAvailable() const override { return size + QIODevice::bytesAvailable(); } + void abort() override { + aborted = true; + } + qint64 bytesAvailable() const override { + if (aborted) + return 0; + return size + QIODevice::bytesAvailable(); + } qint64 readData(char *data, qint64 maxlen) override { qint64 len = std::min(qint64{size}, maxlen); @@ -666,8 +679,9 @@ class FakeErrorReply : public QNetworkReply { Q_OBJECT public: - FakeErrorReply(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QObject *parent) - : QNetworkReply{parent} { + FakeErrorReply(QNetworkAccessManager::Operation op, const QNetworkRequest &request, + QObject *parent, int httpErrorCode) + : QNetworkReply{parent}, _httpErrorCode(httpErrorCode) { setRequest(request); setUrl(request.url()); setOperation(op); @@ -676,7 +690,7 @@ public: } Q_INVOKABLE void respond() { - setAttribute(QNetworkRequest::HttpStatusCodeAttribute, 500); + setAttribute(QNetworkRequest::HttpStatusCodeAttribute, _httpErrorCode); setError(InternalServerError, "Internal Server Fake Error"); emit metaDataChanged(); emit finished(); @@ -684,18 +698,22 @@ public: void abort() override { } qint64 readData(char *, qint64) override { return 0; } + + int _httpErrorCode; }; class FakeQNAM : public QNetworkAccessManager { FileInfo _remoteRootFileInfo; FileInfo _uploadFileInfo; - QStringList _errorPaths; + // maps a path to an HTTP error + QHash _errorPaths; public: FakeQNAM(FileInfo initialRoot) : _remoteRootFileInfo{std::move(initialRoot)} { } FileInfo ¤tRemoteState() { return _remoteRootFileInfo; } FileInfo &uploadState() { return _uploadFileInfo; } - QStringList &errorPaths() { return _errorPaths; } + + QHash &errorPaths() { return _errorPaths; } protected: QNetworkReply *createRequest(Operation op, const QNetworkRequest &request, @@ -703,7 +721,7 @@ protected: const QString fileName = getFilePathFromUrl(request.url()); Q_ASSERT(!fileName.isNull()); if (_errorPaths.contains(fileName)) - return new FakeErrorReply{op, request, this}; + return new FakeErrorReply{op, request, this, _errorPaths[fileName]}; bool isUpload = request.url().path().startsWith(sUploadUrl.path()); FileInfo &info = isUpload ? _uploadFileInfo : _remoteRootFileInfo; @@ -798,7 +816,13 @@ public: FileInfo currentRemoteState() { return _fakeQnam->currentRemoteState(); } FileInfo &uploadState() { return _fakeQnam->uploadState(); } - QStringList &serverErrorPaths() { return _fakeQnam->errorPaths(); } + struct ErrorList { + FakeQNAM *_qnam; + void append(const QString &path, int error = 500) + { _qnam->errorPaths().insert(path, error); } + void clear() { _qnam->errorPaths().clear(); } + }; + ErrorList serverErrorPaths() { return {_fakeQnam}; } QString localPath() const { // SyncEngine wants a trailing slash diff --git a/test/testsyncengine.cpp b/test/testsyncengine.cpp index ae5296ea1..2498860c2 100644 --- a/test/testsyncengine.cpp +++ b/test/testsyncengine.cpp @@ -225,6 +225,40 @@ private slots: QCOMPARE(finishedSpy.size(), 1); QCOMPARE(finishedSpy.first().first().toBool(), false); } + + void testDirDownloadWithError() { + FakeFolder fakeFolder{FileInfo::A12_B12_C12_S12()}; + QSignalSpy completeSpy(&fakeFolder.syncEngine(), SIGNAL(itemCompleted(const SyncFileItemPtr &))); + fakeFolder.remoteModifier().mkdir("Y"); + fakeFolder.remoteModifier().mkdir("Y/Z"); + fakeFolder.remoteModifier().insert("Y/Z/d0"); + fakeFolder.remoteModifier().insert("Y/Z/d1"); + fakeFolder.remoteModifier().insert("Y/Z/d2"); + fakeFolder.remoteModifier().insert("Y/Z/d3"); + fakeFolder.remoteModifier().insert("Y/Z/d4"); + fakeFolder.remoteModifier().insert("Y/Z/d5"); + fakeFolder.remoteModifier().insert("Y/Z/d6"); + fakeFolder.remoteModifier().insert("Y/Z/d7"); + fakeFolder.remoteModifier().insert("Y/Z/d8"); + fakeFolder.remoteModifier().insert("Y/Z/d9"); + fakeFolder.serverErrorPaths().append("Y/Z/d2", 503); // 503 is a fatal error + fakeFolder.serverErrorPaths().append("Y/Z/d3", 503); // 503 is a fatal error + QVERIFY(!fakeFolder.syncOnce()); + QCoreApplication::processEvents(); // should not crash + + QSet seen; + for(const QList &args : completeSpy) { + auto item = args[0].value(); + qDebug() << item->_file << item->_isDirectory << item->_status; + QVERIFY(!seen.contains(item->_file)); // signal only sent once per item + seen.insert(item->_file); + if (item->_file == "Y/Z/d2" || item->_file == "Y/Z/d3") { + QVERIFY(item->_status == SyncFileItem::FatalError); + } + QVERIFY(item->_file != "Y/Z/d9"); // we should have aborted the sync before d9 starts + } + } + }; QTEST_GUILESS_MAIN(TestSyncEngine) From f4495c5c80c5f303b0b0542e87be23129ceba3b0 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 6 Mar 2017 16:14:09 +0100 Subject: [PATCH 05/10] ActivityListModel: fix possible crash in slotActivitiesReceived Backtrace from the crash reporter: Crash: EXCEPTION_ACCESS_VIOLATION_READ at 0x401 File "moc_activitylistmo_M5OEXJ7XGJYTWT.cpp", line 92, in OCC::ActivityListModel::qt_static_metacall File "qobject.cpp", line 3730, in QMetaObject::activate File "moc_networkjobs_7AMNCW4BBANVRK.cpp", line 1342, in OCC::JsonApiJob::jsonReceived File "networkjobs.cpp", line 714, in OCC::JsonApiJob::finished File "abstractnetworkjob.cpp", line 207, in OCC::AbstractNetworkJob::slotFinished File "moc_abstractnetwor_PFI2TXGQHRE33H.cpp", line 98, in OCC::AbstractNetworkJob::qt_static_metacall File "qobject.cpp", line 3730, in QMetaObject::activate File "moc_qnetworkreply.cpp", line 367, in QNetworkReply::finished File "qnetworkreplyhttpimpl.cpp", line 2100, in QNetworkReplyHttpImplPrivate::finished File "qnetworkreplyhttpimpl.cpp", line 279, in QNetworkReplyHttpImpl::abort My theory is that the AccountState stored in a property of the job was destroyed. before the job timed out. Therefore, the qobject_cast within the qvariant_cast would call the metaObject() virtual function on a dangling pointer. Fix it by storing a QPointer instead which will track the deletion. --- src/gui/activitylistmodel.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/gui/activitylistmodel.cpp b/src/gui/activitylistmodel.cpp index 7c83434be..f6658db00 100644 --- a/src/gui/activitylistmodel.cpp +++ b/src/gui/activitylistmodel.cpp @@ -27,6 +27,10 @@ #include "activitydata.h" #include "activitylistmodel.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0) +Q_DECLARE_METATYPE(QPointer) +#endif + namespace OCC { ActivityListModel::ActivityListModel(QWidget *parent) @@ -122,7 +126,7 @@ void ActivityListModel::startFetchJob(AccountState* s) JsonApiJob *job = new JsonApiJob(s->account(), QLatin1String("ocs/v1.php/cloud/activity"), this); QObject::connect(job, SIGNAL(jsonReceived(QVariantMap, int)), this, SLOT(slotActivitiesReceived(QVariantMap, int))); - job->setProperty("AccountStatePtr", QVariant::fromValue(s)); + job->setProperty("AccountStatePtr", QVariant::fromValue>(s)); QList< QPair > params; params.append(qMakePair(QString::fromLatin1("page"), QString::fromLatin1("0"))); @@ -139,7 +143,10 @@ void ActivityListModel::slotActivitiesReceived(const QVariantMap& json, int stat auto activities = json.value("ocs").toMap().value("data").toList(); ActivityList list; - AccountState* ast = qvariant_cast(sender()->property("AccountStatePtr")); + auto ast = qvariant_cast>(sender()->property("AccountStatePtr")); + if (!ast) + return; + _currentlyFetching.remove(ast); foreach( auto activ, activities ) { From 005c0272741f4d069989b49ea792164053fd041b Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Tue, 7 Mar 2017 01:15:15 +0100 Subject: [PATCH 06/10] [tx-robot] updated from transifex --- admin/win/nsi/l10n/Basque.nsh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/win/nsi/l10n/Basque.nsh b/admin/win/nsi/l10n/Basque.nsh index 0e02160d6..b2755202b 100644 --- a/admin/win/nsi/l10n/Basque.nsh +++ b/admin/win/nsi/l10n/Basque.nsh @@ -9,6 +9,7 @@ StrCpy $PageReinstall_NEW_Field_3 "Ez desinstalatu" StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_TITLE "Dagoeneko Instalatuta" StrCpy $PageReinstall_NEW_MUI_HEADER_TEXT_SUBTITLE "Hautatu nola nahi duzun ${APPLICATION_NAME} instalatzea." StrCpy $PageReinstall_OLD_Field_1 "${APPLICATION_NAME}ren bertsio berriago bat instalatuta dago! Ez da aholkatzen bertsio zaharrago bat instalatzea. Benetan bertsio zaharrago hau instalatu nahi baduzu, hobe da lehenengo bertsio berria desinstalatzea. Hautatu nahi duzun aukera eta sakatu Hurrengoa jarraitzeko." +StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} dagoeneko instalatuta dago.$\nHautatu zer operazio egin nahi duzu eta klikatu Hurrengoa jarraitzeko." StrCpy $PageReinstall_SAME_Field_2 "Gehitu/Berrinstalatu osagaiak" StrCpy $PageReinstall_SAME_Field_3 "Desinstalatu ${APPLICATION_NAME}" StrCpy $UNINSTALLER_APPDATA_TITLE "Desinstalatu ${APPLICATION_NAME}" @@ -40,4 +41,3 @@ StrCpy $UAC_UNINSTALLER_REQUIRE_ADMIN "Desinstalatzaile honek administratzaile b StrCpy $UAC_ERROR_LOGON_SERVICE "Saioa hasteko zerbitzua ez dago martxan, bertan behera uzten!" StrCpy $INIT_UNINSTALLER_RUNNING "Desinstalatzailea dagoeneko martxan da." StrCpy $SectionGroup_Shortcuts "Lasterbideak" -StrCpy $PageReinstall_SAME_Field_1 "${APPLICATION_NAME} ${VERSION} is already installed.$\r$\nSelect the operation you want to perform and click Next to continue." From 298684aaa07b970065b5b681f9d2b855f3824988 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Tue, 7 Mar 2017 02:18:31 +0100 Subject: [PATCH 07/10] [tx-robot] updated from transifex --- mirall.desktop.in | 15 +++++++++++---- translations/client_ca.ts | 4 ++-- translations/client_cs.ts | 4 ++-- translations/client_de.ts | 4 ++-- translations/client_el.ts | 4 ++-- translations/client_en.ts | 4 ++-- translations/client_es.ts | 4 ++-- translations/client_es_AR.ts | 4 ++-- translations/client_et.ts | 4 ++-- translations/client_eu.ts | 4 ++-- translations/client_fa.ts | 4 ++-- translations/client_fi.ts | 4 ++-- translations/client_fr.ts | 8 ++++---- translations/client_gl.ts | 4 ++-- translations/client_hu.ts | 4 ++-- translations/client_it.ts | 4 ++-- translations/client_ja.ts | 20 +++++++++++--------- translations/client_nb_NO.ts | 4 ++-- translations/client_nl.ts | 4 ++-- translations/client_pl.ts | 4 ++-- translations/client_pt.ts | 22 +++++++++++----------- translations/client_pt_BR.ts | 4 ++-- translations/client_ru.ts | 4 ++-- translations/client_sk.ts | 4 ++-- translations/client_sl.ts | 4 ++-- translations/client_sr.ts | 4 ++-- translations/client_sv.ts | 4 ++-- translations/client_th.ts | 4 ++-- translations/client_tr.ts | 4 ++-- translations/client_uk.ts | 4 ++-- translations/client_zh_CN.ts | 4 ++-- translations/client_zh_TW.ts | 4 ++-- 32 files changed, 93 insertions(+), 84 deletions(-) diff --git a/mirall.desktop.in b/mirall.desktop.in index 2fd5b6ab8..c671b941e 100644 --- a/mirall.desktop.in +++ b/mirall.desktop.in @@ -772,6 +772,9 @@ X-GNOME-Autostart-Delay=3 # Translations +# Translations + + # Translations Comment[oc]=@APPLICATION_NAME@ sincronizacion del client GenericName[oc]=Dorsièr de Sincronizacion @@ -781,6 +784,10 @@ Comment[ar]=@APPLICATION_NAME@ زبون مزامنة مكتبي GenericName[ar]=مزامنة المجلد Name[ar]=@APPLICATION_NAME@ زبون مزامنة مكتبي Icon[ar]=@APPLICATION_EXECUTABLE@ +Comment[bg_BG]=@APPLICATION_NAME@ клиент за десктоп синхронизация +GenericName[bg_BG]=Синхронизиране на папката +Name[bg_BG]=@APPLICATION_NAME@ клиент десктоп синхронизация +Icon[bg_BG]=@APPLICATION_EXECUTABLE@ Comment[ca]=Client de sincronització d'escriptori @APPLICATION_NAME@ GenericName[ca]=Sincronització de carpetes Name[ca]=Client de sincronització d'escriptori @APPLICATION_NAME@ @@ -813,10 +820,10 @@ Comment[de_DE]=@APPLICATION_NAME@ Desktop-Synchronisationsclient GenericName[de_DE]=Ordner-Synchronisation Name[de_DE]=@APPLICATION_NAME@ Desktop-Synchronisationsclient Icon[de_DE]=@APPLICATION_EXECUTABLE@ -Comment[bg_BG]=@APPLICATION_NAME@ клиент за десктоп синхронизация -GenericName[bg_BG]=Синхронизиране на папката -Name[bg_BG]=@APPLICATION_NAME@ клиент десктоп синхронизация -Icon[bg_BG]=@APPLICATION_EXECUTABLE@ +Comment[eu]=@APPLICATION_NAME@ mahaigaineko sinkronizazio bezeroa +GenericName[eu]=Karpetaren sinkronizazioa +Name[eu]=@APPLICATION_NAME@ mahaigaineko sinkronizazio bezeroa +Icon[eu]=@APPLICATION_EXECUTABLE@ GenericName[fa]=همسان سازی پوشه‌ها Name[fa]=@APPLICATION_EXECUTABLE@ نسخه‌ی همسان سازی مشتری Icon[fa]=@APPLICATION_EXECUTABLE@ diff --git a/translations/client_ca.ts b/translations/client_ca.ts index 49498f087..8e4df3bc4 100644 --- a/translations/client_ca.ts +++ b/translations/client_ca.ts @@ -575,7 +575,7 @@ OCC::CleanupPollsJob - + Error writing metadata to the database Error en escriure les metadades a la base de dades @@ -1990,7 +1990,7 @@ No és aconsellada usar-la. OCC::PropagateDirectory - + Error writing metadata to the database Error en escriure les metadades a la base de dades diff --git a/translations/client_cs.ts b/translations/client_cs.ts index 9272fa048..9ed8be93d 100644 --- a/translations/client_cs.ts +++ b/translations/client_cs.ts @@ -575,7 +575,7 @@ OCC::CleanupPollsJob - + Error writing metadata to the database Chyba zápisu metadat do databáze @@ -1988,7 +1988,7 @@ Nedoporučuje se jí používat. OCC::PropagateDirectory - + Error writing metadata to the database Chyba zápisu metadat do databáze diff --git a/translations/client_de.ts b/translations/client_de.ts index 5e71cb1e8..7deed4fe2 100644 --- a/translations/client_de.ts +++ b/translations/client_de.ts @@ -575,7 +575,7 @@ OCC::CleanupPollsJob - + Error writing metadata to the database Fehler beim Schreiben der Metadaten in die Datenbank @@ -1994,7 +1994,7 @@ Es ist nicht ratsam, diese zu benutzen. OCC::PropagateDirectory - + Error writing metadata to the database Fehler beim Schreiben der Metadaten in die Datenbank diff --git a/translations/client_el.ts b/translations/client_el.ts index 445cabec5..001d22100 100644 --- a/translations/client_el.ts +++ b/translations/client_el.ts @@ -575,7 +575,7 @@ OCC::CleanupPollsJob - + Error writing metadata to the database Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων @@ -1986,7 +1986,7 @@ It is not advisable to use it. OCC::PropagateDirectory - + Error writing metadata to the database Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων diff --git a/translations/client_en.ts b/translations/client_en.ts index b6e1bd0c3..345e1ed7b 100644 --- a/translations/client_en.ts +++ b/translations/client_en.ts @@ -583,7 +583,7 @@ OCC::CleanupPollsJob - + Error writing metadata to the database @@ -2014,7 +2014,7 @@ It is not advisable to use it. OCC::PropagateDirectory - + Error writing metadata to the database diff --git a/translations/client_es.ts b/translations/client_es.ts index 1fa1bdc6f..103694f9d 100644 --- a/translations/client_es.ts +++ b/translations/client_es.ts @@ -575,7 +575,7 @@ OCC::CleanupPollsJob - + Error writing metadata to the database Error al escribir los metadatos en la base de datos @@ -1994,7 +1994,7 @@ No se recomienda usarla. OCC::PropagateDirectory - + Error writing metadata to the database Error al escribir los metadatos en la base de datos diff --git a/translations/client_es_AR.ts b/translations/client_es_AR.ts index 1dd72e71c..a1796c7aa 100644 --- a/translations/client_es_AR.ts +++ b/translations/client_es_AR.ts @@ -575,7 +575,7 @@ OCC::CleanupPollsJob - + Error writing metadata to the database @@ -1982,7 +1982,7 @@ It is not advisable to use it. OCC::PropagateDirectory - + Error writing metadata to the database diff --git a/translations/client_et.ts b/translations/client_et.ts index a418f92a0..3f921da4c 100644 --- a/translations/client_et.ts +++ b/translations/client_et.ts @@ -575,7 +575,7 @@ OCC::CleanupPollsJob - + Error writing metadata to the database @@ -1983,7 +1983,7 @@ Selle kasutamine pole soovitatav. OCC::PropagateDirectory - + Error writing metadata to the database diff --git a/translations/client_eu.ts b/translations/client_eu.ts index 0f62d6029..b78281809 100644 --- a/translations/client_eu.ts +++ b/translations/client_eu.ts @@ -575,7 +575,7 @@ OCC::CleanupPollsJob - + Error writing metadata to the database @@ -1985,7 +1985,7 @@ Ez da gomendagarria erabltzea. OCC::PropagateDirectory - + Error writing metadata to the database diff --git a/translations/client_fa.ts b/translations/client_fa.ts index ce3ece28a..52366fcbf 100644 --- a/translations/client_fa.ts +++ b/translations/client_fa.ts @@ -575,7 +575,7 @@ OCC::CleanupPollsJob - + Error writing metadata to the database @@ -1982,7 +1982,7 @@ It is not advisable to use it. OCC::PropagateDirectory - + Error writing metadata to the database diff --git a/translations/client_fi.ts b/translations/client_fi.ts index 72db6800b..ba654a386 100644 --- a/translations/client_fi.ts +++ b/translations/client_fi.ts @@ -575,7 +575,7 @@ OCC::CleanupPollsJob - + Error writing metadata to the database Virhe kirjoittaessa metadataa tietokantaan @@ -1985,7 +1985,7 @@ Osoitteen käyttäminen ei ole suositeltavaa. OCC::PropagateDirectory - + Error writing metadata to the database Virhe kirjoittaessa metadataa tietokantaan diff --git a/translations/client_fr.ts b/translations/client_fr.ts index 2b947d885..86d65a747 100644 --- a/translations/client_fr.ts +++ b/translations/client_fr.ts @@ -575,7 +575,7 @@ OCC::CleanupPollsJob - + Error writing metadata to the database Erreur à l'écriture des métadonnées dans la base de données @@ -1329,7 +1329,7 @@ Continuer la synchronisation comme d'habitude fera en sorte que tous les fi Allow Deletion - Autoriser la suppression + Autoriser suppression @@ -1343,7 +1343,7 @@ Continuer la synchronisation comme d'habitude fera en sorte que tous les fi Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data. Les fichiers ou dossiers dont les noms correspondent à un motif seront exclus de la synchronisation. -L'option "Autoriser la suppression" permet de ne pas bloquer la suppression d'un dossier. C'est utile pour les fichiers de méta-données. +L'option "Autoriser suppression" permet de ne pas bloquer la suppression d'un dossier. C'est utile pour les fichiers de méta-données. @@ -1991,7 +1991,7 @@ Il est déconseillé de l'utiliser. OCC::PropagateDirectory - + Error writing metadata to the database Erreur à l'écriture des métadonnées dans la base de données diff --git a/translations/client_gl.ts b/translations/client_gl.ts index 6e7309256..9331bcadf 100644 --- a/translations/client_gl.ts +++ b/translations/client_gl.ts @@ -575,7 +575,7 @@ OCC::CleanupPollsJob - + Error writing metadata to the database @@ -1984,7 +1984,7 @@ Recomendámoslle que non o use. OCC::PropagateDirectory - + Error writing metadata to the database diff --git a/translations/client_hu.ts b/translations/client_hu.ts index 7390f6076..c3b9e497c 100644 --- a/translations/client_hu.ts +++ b/translations/client_hu.ts @@ -575,7 +575,7 @@ OCC::CleanupPollsJob - + Error writing metadata to the database @@ -1982,7 +1982,7 @@ It is not advisable to use it. OCC::PropagateDirectory - + Error writing metadata to the database diff --git a/translations/client_it.ts b/translations/client_it.ts index fec70d5d8..e8174bb2c 100644 --- a/translations/client_it.ts +++ b/translations/client_it.ts @@ -575,7 +575,7 @@ OCC::CleanupPollsJob - + Error writing metadata to the database Errore durante la scrittura dei metadati nel database @@ -1990,7 +1990,7 @@ Non è consigliabile utilizzarlo. OCC::PropagateDirectory - + Error writing metadata to the database Errore durante la scrittura dei metadati nel database diff --git a/translations/client_ja.ts b/translations/client_ja.ts index 13ccad2cf..d8acb8f2e 100644 --- a/translations/client_ja.ts +++ b/translations/client_ja.ts @@ -248,17 +248,17 @@ There are folders that were not synchronized because they are too big: - + 大きすぎるため同期されなかったフォルダがあります: There are folders that were not synchronized because they are external storages: - + 外部ストレージにあるため同期されなかったフォルダがあります: There are folders that were not synchronized because they are too big or external storages: - + 大きすぎたか、外部ストレージにあるため同期されなかったフォルダがあります: @@ -508,7 +508,7 @@ Certificate & Key (pkcs12) : - + 証明書と鍵 (pkcs12) : @@ -541,7 +541,7 @@ There was an error while accessing the configuration file at %1. - + 設定ファイルの %1 行目にアクセスしている時にエラーが発生しました。 @@ -575,7 +575,7 @@ OCC::CleanupPollsJob - + Error writing metadata to the database メタデータのデータベースへの書き込みに失敗 @@ -734,13 +734,15 @@ A new folder larger than %1 MB has been added: %2. - + %1 MB より大きいフォルダが新たに追加されました: %2 + A folder from an external storage has been added. - + 外部ストレージからフォルダが追加されました。 + @@ -1984,7 +1986,7 @@ It is not advisable to use it. OCC::PropagateDirectory - + Error writing metadata to the database メタデータのデータベースへの書き込みに失敗 diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts index 7fa8d4808..0b3032ba0 100644 --- a/translations/client_nb_NO.ts +++ b/translations/client_nb_NO.ts @@ -575,7 +575,7 @@ OCC::CleanupPollsJob - + Error writing metadata to the database Feil ved skriving av metadata til databasen @@ -1988,7 +1988,7 @@ Det er ikke tilrådelig å bruke den. OCC::PropagateDirectory - + Error writing metadata to the database Feil ved skriving av metadata til databasen diff --git a/translations/client_nl.ts b/translations/client_nl.ts index 95cefff38..577232052 100644 --- a/translations/client_nl.ts +++ b/translations/client_nl.ts @@ -575,7 +575,7 @@ OCC::CleanupPollsJob - + Error writing metadata to the database Fout bij schrijven van Metadata naar de database @@ -1999,7 +1999,7 @@ We adviseren deze site niet te gebruiken. OCC::PropagateDirectory - + Error writing metadata to the database Fout bij schrijven van Metadata naar de database diff --git a/translations/client_pl.ts b/translations/client_pl.ts index b60c0a84b..127a8d47c 100644 --- a/translations/client_pl.ts +++ b/translations/client_pl.ts @@ -575,7 +575,7 @@ OCC::CleanupPollsJob - + Error writing metadata to the database Błąd podczas zapisu metadanych do bazy @@ -1988,7 +1988,7 @@ Niezalecane jest jego użycie. OCC::PropagateDirectory - + Error writing metadata to the database Błąd podczas zapisu metadanych do bazy diff --git a/translations/client_pt.ts b/translations/client_pt.ts index 02cf1e1b1..f8a82af66 100644 --- a/translations/client_pt.ts +++ b/translations/client_pt.ts @@ -508,7 +508,7 @@ Certificate & Key (pkcs12) : - + Certificado e Chave (pkcs12) : @@ -546,7 +546,7 @@ Quit ownCloud - + Sair do ownCloud @@ -575,7 +575,7 @@ OCC::CleanupPollsJob - + Error writing metadata to the database Erro ao gravar os metadados para a base de dados @@ -1986,7 +1986,7 @@ Não é aconselhada a sua utilização. OCC::PropagateDirectory - + Error writing metadata to the database Erro ao escrever a meta-informação par a base de dados @@ -2210,7 +2210,7 @@ Não é aconselhada a sua utilização. Unexpected return code from server (%1) - + Código de resposta inesperado do servidor (%1) @@ -3075,7 +3075,7 @@ Não é aconselhada a sua utilização. The file name is a reserved name on this file system. - + O nome de ficheiro é um nome reservado neste sistema de ficheiros. @@ -3479,7 +3479,7 @@ Não é aconselhada a sua utilização. Ask for confirmation before synchroni&zing folders larger than - + Pedir confirmação antes de sincronizar pastas maiores que @@ -3490,7 +3490,7 @@ Não é aconselhada a sua utilização. Ask for confirmation before synchronizing e&xternal storages - + Pedir confirmação antes de sincronizar armazenamentos e&xteriores @@ -3616,7 +3616,7 @@ Não é aconselhada a sua utilização. Ser&ver Address - + Endereço do Ser&vidor @@ -3829,7 +3829,7 @@ Não é aconselhada a sua utilização. Updated local metadata - + Metadados locais atualizados @@ -3871,7 +3871,7 @@ Não é aconselhada a sua utilização. updating local metadata - + a atualizar metadados locais diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts index 0d1ca93f8..c3c027ecc 100644 --- a/translations/client_pt_BR.ts +++ b/translations/client_pt_BR.ts @@ -575,7 +575,7 @@ OCC::CleanupPollsJob - + Error writing metadata to the database Ocorreu um erro ao escrever metadados ao banco de dados @@ -1992,7 +1992,7 @@ It is not advisable to use it. OCC::PropagateDirectory - + Error writing metadata to the database Ocorreu um erro ao escrever metadados ao banco de dados diff --git a/translations/client_ru.ts b/translations/client_ru.ts index 54684fcc8..f39852f27 100644 --- a/translations/client_ru.ts +++ b/translations/client_ru.ts @@ -575,7 +575,7 @@ OCC::CleanupPollsJob - + Error writing metadata to the database Ошибка записи метаданных в базу данных @@ -1992,7 +1992,7 @@ It is not advisable to use it. OCC::PropagateDirectory - + Error writing metadata to the database Ошибка записи метаданных в базу данных diff --git a/translations/client_sk.ts b/translations/client_sk.ts index a4613d32c..cdf3d9aea 100644 --- a/translations/client_sk.ts +++ b/translations/client_sk.ts @@ -575,7 +575,7 @@ OCC::CleanupPollsJob - + Error writing metadata to the database Chyba pri zápise metadát do databázy @@ -1984,7 +1984,7 @@ Nie je vhodné ju používať. OCC::PropagateDirectory - + Error writing metadata to the database Chyba pri zápise metadát do databázy diff --git a/translations/client_sl.ts b/translations/client_sl.ts index 92f3760d0..18fc35063 100644 --- a/translations/client_sl.ts +++ b/translations/client_sl.ts @@ -575,7 +575,7 @@ OCC::CleanupPollsJob - + Error writing metadata to the database Napaka zapisovanja metapodatkov v podatkovno zbirko @@ -1995,7 +1995,7 @@ Uporaba ni priporočljiva. OCC::PropagateDirectory - + Error writing metadata to the database Napaka zapisovanja metapodatkov v podatkovno zbirko diff --git a/translations/client_sr.ts b/translations/client_sr.ts index 32f34c937..4504253d4 100644 --- a/translations/client_sr.ts +++ b/translations/client_sr.ts @@ -575,7 +575,7 @@ OCC::CleanupPollsJob - + Error writing metadata to the database @@ -1984,7 +1984,7 @@ It is not advisable to use it. OCC::PropagateDirectory - + Error writing metadata to the database diff --git a/translations/client_sv.ts b/translations/client_sv.ts index c88cc35fa..5dad0ef13 100644 --- a/translations/client_sv.ts +++ b/translations/client_sv.ts @@ -575,7 +575,7 @@ OCC::CleanupPollsJob - + Error writing metadata to the database Fel vid skrivning av metadata till databasen @@ -1988,7 +1988,7 @@ Det är inte lämpligt använda den. OCC::PropagateDirectory - + Error writing metadata to the database Fel vid skrivning av metadata till databasen diff --git a/translations/client_th.ts b/translations/client_th.ts index aecd218c6..ce5c88f47 100644 --- a/translations/client_th.ts +++ b/translations/client_th.ts @@ -575,7 +575,7 @@ OCC::CleanupPollsJob - + Error writing metadata to the database ข้อผิดพลาดในการเขียนข้อมูลเมตาไปยังฐานข้อมูล @@ -1996,7 +1996,7 @@ It is not advisable to use it. OCC::PropagateDirectory - + Error writing metadata to the database ข้อผิดพลาดในการเขียนข้อมูลเมตาไปยังฐานข้อมูล diff --git a/translations/client_tr.ts b/translations/client_tr.ts index 10da06dfe..142f58c72 100644 --- a/translations/client_tr.ts +++ b/translations/client_tr.ts @@ -575,7 +575,7 @@ OCC::CleanupPollsJob - + Error writing metadata to the database Veritabanına üstveri yazma hatası @@ -1985,7 +1985,7 @@ Kullanmanız önerilmez. OCC::PropagateDirectory - + Error writing metadata to the database Veritabanına üstveri yazma hatası diff --git a/translations/client_uk.ts b/translations/client_uk.ts index 68cbc6815..ff78161ef 100644 --- a/translations/client_uk.ts +++ b/translations/client_uk.ts @@ -575,7 +575,7 @@ OCC::CleanupPollsJob - + Error writing metadata to the database @@ -1983,7 +1983,7 @@ It is not advisable to use it. OCC::PropagateDirectory - + Error writing metadata to the database diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts index d77e4d84e..bf6ddc02c 100644 --- a/translations/client_zh_CN.ts +++ b/translations/client_zh_CN.ts @@ -575,7 +575,7 @@ OCC::CleanupPollsJob - + Error writing metadata to the database 向数据库写入元数据错误 @@ -1985,7 +1985,7 @@ It is not advisable to use it. OCC::PropagateDirectory - + Error writing metadata to the database 向数据库写入元数据错误 diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts index 4c026f372..912eeca70 100644 --- a/translations/client_zh_TW.ts +++ b/translations/client_zh_TW.ts @@ -575,7 +575,7 @@ OCC::CleanupPollsJob - + Error writing metadata to the database 寫入後設資料(metadata) 時發生錯誤 @@ -1986,7 +1986,7 @@ It is not advisable to use it. OCC::PropagateDirectory - + Error writing metadata to the database 寫入後設資料(metadata) 時發生錯誤 From 4a1a5fa0764d2dbed076cfeb17e9aee6a4b856b7 Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Fri, 3 Mar 2017 11:20:53 +0100 Subject: [PATCH 08/10] AbstractNetworkJob: Improve redirect handling #5555 * For requests: - reuse the original QNetworkRequest, so headers and attributes are the same as in the original request - determine the original http method from the reply and the request attributes - keep the original request body around such that it can be sent again in case the request is redirected * Simplify the interface that is used for creating new requests in AbstractNetworkJob. --- src/gui/notificationconfirmjob.cpp | 4 +- src/gui/ocsjob.cpp | 4 +- src/gui/owncloudsetupwizard.cpp | 7 +- src/gui/thumbnailjob.cpp | 3 +- src/libsync/abstractnetworkjob.cpp | 101 ++++++++++++++++---------- src/libsync/abstractnetworkjob.h | 47 +++++++++--- src/libsync/account.cpp | 55 +++----------- src/libsync/account.h | 12 +-- src/libsync/networkjobs.cpp | 40 ++++------ src/libsync/propagatedownload.cpp | 5 +- src/libsync/propagateremotedelete.cpp | 7 +- src/libsync/propagateremotemove.cpp | 7 +- src/libsync/propagateupload.cpp | 15 ++-- src/libsync/propagateupload.h | 12 ++- test/syncenginetestutils.h | 6 +- 15 files changed, 166 insertions(+), 159 deletions(-) diff --git a/src/gui/notificationconfirmjob.cpp b/src/gui/notificationconfirmjob.cpp index b3051827e..479c4238d 100644 --- a/src/gui/notificationconfirmjob.cpp +++ b/src/gui/notificationconfirmjob.cpp @@ -54,9 +54,7 @@ void NotificationConfirmJob::start() req.setRawHeader("Ocs-APIREQUEST", "true"); req.setRawHeader("Content-Type", "application/x-www-form-urlencoded"); - QIODevice *iodevice = 0; - setReply(davRequest(_verb, _link, req, iodevice)); - setupConnections(reply()); + sendRequest(_verb, _link, req); AbstractNetworkJob::start(); } diff --git a/src/gui/ocsjob.cpp b/src/gui/ocsjob.cpp index 8c4ca983f..b6f9f4ece 100644 --- a/src/gui/ocsjob.cpp +++ b/src/gui/ocsjob.cpp @@ -93,9 +93,7 @@ void OcsJob::start() queryItems.append(qMakePair(QByteArray("format"), QByteArray("json"))); url.setEncodedQueryItems(queryItems); - setReply(davRequest(_verb, url, req, buffer)); - setupConnections(reply()); - buffer->setParent(reply()); + sendRequest(_verb, url, req, buffer); AbstractNetworkJob::start(); } diff --git a/src/gui/owncloudsetupwizard.cpp b/src/gui/owncloudsetupwizard.cpp index 53e360e41..22ac50b0e 100644 --- a/src/gui/owncloudsetupwizard.cpp +++ b/src/gui/owncloudsetupwizard.cpp @@ -594,9 +594,7 @@ DetermineAuthTypeJob::DetermineAuthTypeJob(AccountPtr account, QObject *parent) void DetermineAuthTypeJob::start() { - QNetworkReply *reply = getRequest(account()->davPath()); - setReply(reply); - setupConnections(reply); + sendRequest("GET", account()->davUrl()); AbstractNetworkJob::start(); } @@ -613,8 +611,7 @@ bool DetermineAuthTypeJob::finished() // do a new run _redirects++; resetTimeout(); - setReply(getRequest(redirection)); - setupConnections(reply()); + sendRequest("GET", redirection); return false; // don't discard } else { #ifndef NO_SHIBBOLETH diff --git a/src/gui/thumbnailjob.cpp b/src/gui/thumbnailjob.cpp index d3e92cb42..5ffe6c291 100644 --- a/src/gui/thumbnailjob.cpp +++ b/src/gui/thumbnailjob.cpp @@ -27,8 +27,7 @@ ThumbnailJob::ThumbnailJob(const QString &path, AccountPtr account, QObject* par void ThumbnailJob::start() { - setReply(getRequest(path())); - setupConnections(reply()); + sendRequest("GET", makeAccountUrl(path())); AbstractNetworkJob::start(); } diff --git a/src/libsync/abstractnetworkjob.cpp b/src/libsync/abstractnetworkjob.cpp index eb865456b..fcd292837 100644 --- a/src/libsync/abstractnetworkjob.cpp +++ b/src/libsync/abstractnetworkjob.cpp @@ -122,40 +122,49 @@ QNetworkReply* AbstractNetworkJob::addTimer(QNetworkReply *reply) return reply; } -QNetworkReply* AbstractNetworkJob::davRequest(const QByteArray &verb, const QString &relPath, - QNetworkRequest req, QIODevice *data) +QNetworkReply *AbstractNetworkJob::sendRequest(const QByteArray &verb, const QUrl &url, + QNetworkRequest req, QIODevice *requestBody) { - return addTimer(_account->davRequest(verb, relPath, req, data)); + auto reply = _account->sendRequest(verb, url, req, requestBody); + _requestBody = requestBody; + if (_requestBody) { + _requestBody->setParent(reply); + } + addTimer(reply); + setReply(reply); + setupConnections(reply); + return reply; } -QNetworkReply *AbstractNetworkJob::davRequest(const QByteArray &verb, const QUrl &url, QNetworkRequest req, QIODevice *data) +QUrl AbstractNetworkJob::makeAccountUrl(const QString& relativePath) const { - return addTimer(_account->davRequest(verb, url, req, data)); + return Utility::concatUrlPath(_account->url(), relativePath); } -QNetworkReply* AbstractNetworkJob::getRequest(const QString &relPath) +QUrl AbstractNetworkJob::makeDavUrl(const QString& relativePath) const { - return addTimer(_account->getRequest(relPath)); + return Utility::concatUrlPath(_account->davUrl(), relativePath); } -QNetworkReply *AbstractNetworkJob::getRequest(const QUrl &url) +QByteArray AbstractNetworkJob::requestVerb(QNetworkReply* reply) { - return addTimer(_account->getRequest(url)); -} - -QNetworkReply *AbstractNetworkJob::headRequest(const QString &relPath) -{ - return addTimer(_account->headRequest(relPath)); -} - -QNetworkReply *AbstractNetworkJob::headRequest(const QUrl &url) -{ - return addTimer(_account->headRequest(url)); -} - -QNetworkReply *AbstractNetworkJob::deleteRequest(const QUrl &url) -{ - return addTimer(_account->deleteRequest(url)); + switch (reply->operation()) { + case QNetworkAccessManager::HeadOperation: + return "HEAD"; + case QNetworkAccessManager::GetOperation: + return "GET"; + case QNetworkAccessManager::PutOperation: + return "PUT"; + case QNetworkAccessManager::PostOperation: + return "POST"; + case QNetworkAccessManager::DeleteOperation: + return "DELETE"; + case QNetworkAccessManager::CustomOperation: + return reply->request().attribute(QNetworkRequest::CustomVerbAttribute).toByteArray(); + case QNetworkAccessManager::UnknownOperation: + break; + } + return QByteArray(); } void AbstractNetworkJob::slotFinished() @@ -178,24 +187,36 @@ void AbstractNetworkJob::slotFinished() // get the Date timestamp from reply _responseTimestamp = _reply->rawHeader("Date"); - if (_followRedirects) { - // ### the qWarnings here should be exported via displayErrors() so they + QUrl requestedUrl = reply()->request().url(); + QUrl redirectUrl = reply()->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl(); + if (_followRedirects && !redirectUrl.isEmpty()) { + _redirectCount++; + + // ### some of the qWarnings here should be exported via displayErrors() so they // ### can be presented to the user if the job executor has a GUI - QUrl requestedUrl = reply()->request().url(); - QUrl redirectUrl = reply()->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl(); - if (!redirectUrl.isEmpty()) { - _redirectCount++; - if (requestedUrl.scheme() == QLatin1String("https") && - redirectUrl.scheme() == QLatin1String("http")) { - qWarning() << this << "HTTPS->HTTP downgrade detected!"; - } else if (requestedUrl == redirectUrl || _redirectCount >= maxRedirects()) { - qWarning() << this << "Redirect loop detected!"; - } else { - resetTimeout(); - setReply(getRequest(redirectUrl)); - setupConnections(reply()); - return; + QByteArray verb = requestVerb(reply()); + if (requestedUrl.scheme() == QLatin1String("https") && + redirectUrl.scheme() == QLatin1String("http")) { + qWarning() << this << "HTTPS->HTTP downgrade detected!"; + } else if (requestedUrl == redirectUrl || _redirectCount >= maxRedirects()) { + qWarning() << this << "Redirect loop detected!"; + } else if (_requestBody && _requestBody->isSequential()) { + qWarning() << this << "cannot redirect request with sequential body"; + } else if (verb.isEmpty()) { + qWarning() << this << "cannot redirect request: could not detect original verb"; + } else { + // Create the redirected request and send it + qDebug() << "Redirecting" << verb << requestedUrl << redirectUrl; + resetTimeout(); + if (_requestBody) { + _requestBody->seek(0); } + sendRequest( + verb, + redirectUrl, + reply()->request(), + _requestBody); + return; } } diff --git a/src/libsync/abstractnetworkjob.h b/src/libsync/abstractnetworkjob.h index 272ee604f..a2ec226bb 100644 --- a/src/libsync/abstractnetworkjob.h +++ b/src/libsync/abstractnetworkjob.h @@ -78,17 +78,29 @@ signals: void networkActivity(); protected: void setupConnections(QNetworkReply *reply); - QNetworkReply* davRequest(const QByteArray& verb, const QString &relPath, - QNetworkRequest req = QNetworkRequest(), - QIODevice *data = 0); - QNetworkReply* davRequest(const QByteArray& verb, const QUrl &url, - QNetworkRequest req = QNetworkRequest(), - QIODevice *data = 0); - QNetworkReply* getRequest(const QString &relPath); - QNetworkReply* getRequest(const QUrl &url); - QNetworkReply* headRequest(const QString &relPath); - QNetworkReply* headRequest(const QUrl &url); - QNetworkReply* deleteRequest(const QUrl &url); + + /** Initiate a network request, returning a QNetworkReply. + * + * Calls setReply() and setupConnections() on it. + * + * Takes ownership of the requestBody (to allow redirects). + */ + QNetworkReply* sendRequest(const QByteArray& verb, const QUrl &url, + QNetworkRequest req = QNetworkRequest(), + QIODevice *requestBody = 0); + + // sendRequest does not take a relative path instead of an url, + // but the old API allowed that. We have this undefined overload + // to help catch usage errors + QNetworkReply* sendRequest(const QByteArray& verb, const QString &relativePath, + QNetworkRequest req = QNetworkRequest(), + QIODevice *requestBody = 0); + + /// Creates a url for the account from a relative path + QUrl makeAccountUrl(const QString& relativePath) const; + + /// Like makeAccountUrl() but uses the account's dav base path + QUrl makeDavUrl(const QString& relativePath) const; int maxRedirects() const { return 10; } virtual bool finished() = 0; @@ -99,12 +111,19 @@ protected: // GET requests that don't set up any HTTP body or other flags. bool _followRedirects; + /** Helper to construct the HTTP verb used in the request + * + * Returns an empty QByteArray for UnknownOperation. + */ + static QByteArray requestVerb(QNetworkReply* reply); + private slots: void slotFinished(); virtual void slotTimeout(); protected: AccountPtr _account; + private: QNetworkReply* addTimer(QNetworkReply *reply); bool _ignoreCredentialFailure; @@ -112,6 +131,12 @@ private: QString _path; QTimer _timer; int _redirectCount; + + // Set by the xyzRequest() functions and needed to be able to redirect + // requests, should it be required. + // + // Reparented to the currently running QNetworkReply. + QPointer _requestBody; }; /** diff --git a/src/libsync/account.cpp b/src/libsync/account.cpp index 8dc93aea5..2918d2a39 100644 --- a/src/libsync/account.cpp +++ b/src/libsync/account.cpp @@ -202,54 +202,23 @@ QNetworkAccessManager *Account::networkAccessManager() return _am.data(); } -QNetworkReply *Account::headRequest(const QString &relPath) -{ - return headRequest(Utility::concatUrlPath(url(), relPath)); -} - -QNetworkReply *Account::headRequest(const QUrl &url) -{ - QNetworkRequest request(url); -#if QT_VERSION > QT_VERSION_CHECK(4, 8, 4) - request.setSslConfiguration(this->getOrCreateSslConfig()); -#endif - return _am->head(request); -} - -QNetworkReply *Account::getRequest(const QString &relPath) -{ - return getRequest(Utility::concatUrlPath(url(), relPath)); -} - -QNetworkReply *Account::getRequest(const QUrl &url) -{ - QNetworkRequest request(url); -#if QT_VERSION > QT_VERSION_CHECK(4, 8, 4) - request.setSslConfiguration(this->getOrCreateSslConfig()); -#endif - return _am->get(request); -} - -QNetworkReply *Account::deleteRequest( const QUrl &url) -{ - QNetworkRequest request(url); -#if QT_VERSION > QT_VERSION_CHECK(4, 8, 4) - request.setSslConfiguration(this->getOrCreateSslConfig()); -#endif - return _am->deleteResource(request); -} - -QNetworkReply *Account::davRequest(const QByteArray &verb, const QString &relPath, QNetworkRequest req, QIODevice *data) -{ - return davRequest(verb, Utility::concatUrlPath(davUrl(), relPath), req, data); -} - -QNetworkReply *Account::davRequest(const QByteArray &verb, const QUrl &url, QNetworkRequest req, QIODevice *data) +QNetworkReply *Account::sendRequest(const QByteArray &verb, const QUrl &url, QNetworkRequest req, QIODevice *data) { req.setUrl(url); #if QT_VERSION > QT_VERSION_CHECK(4, 8, 4) req.setSslConfiguration(this->getOrCreateSslConfig()); #endif + if (verb == "HEAD" && !data) { + return _am->head(req); + } else if (verb == "GET" && !data) { + return _am->get(req); + } else if (verb == "POST") { + return _am->post(req, data); + } else if (verb == "PUT") { + return _am->put(req, data); + } else if (verb == "DELETE" && !data) { + return _am->deleteResource(req); + } return _am->sendCustomRequest(req, verb, data); } diff --git a/src/libsync/account.h b/src/libsync/account.h index 823bfa6d6..5e5ab4944 100644 --- a/src/libsync/account.h +++ b/src/libsync/account.h @@ -106,14 +106,10 @@ public: // For creating various network requests - QNetworkReply* headRequest(const QString &relPath); - QNetworkReply* headRequest(const QUrl &url); - QNetworkReply* getRequest(const QString &relPath); - QNetworkReply* getRequest(const QUrl &url); - QNetworkReply* deleteRequest( const QUrl &url); - QNetworkReply* davRequest(const QByteArray &verb, const QString &relPath, QNetworkRequest req, QIODevice *data = 0); - QNetworkReply* davRequest(const QByteArray &verb, const QUrl &url, QNetworkRequest req, QIODevice *data = 0); - + QNetworkReply* sendRequest(const QByteArray &verb, + const QUrl &url, + QNetworkRequest req = QNetworkRequest(), + QIODevice *data = 0); /** The ssl configuration during the first connection */ QSslConfiguration getOrCreateSslConfig(); diff --git a/src/libsync/networkjobs.cpp b/src/libsync/networkjobs.cpp index 4cc5801ae..b12c65a8e 100644 --- a/src/libsync/networkjobs.cpp +++ b/src/libsync/networkjobs.cpp @@ -67,9 +67,7 @@ void RequestEtagJob::start() buf->setData(xml); buf->open(QIODevice::ReadOnly); // assumes ownership - setReply(davRequest("PROPFIND", path(), req, buf)); - buf->setParent(reply()); - setupConnections(reply()); + sendRequest("PROPFIND", makeDavUrl(path()), req, buf); if( reply()->error() != QNetworkReply::NoError ) { qDebug() << "getting etag: request network error: " << reply()->errorString(); @@ -122,10 +120,11 @@ void MkColJob::start() } // assumes ownership - QNetworkReply *reply = _url.isValid() ? davRequest("MKCOL", _url, req) - : davRequest("MKCOL", path(), req); - setReply(reply); - setupConnections(reply); + if (_url.isValid()) { + sendRequest("MKCOL", _url, req); + } else { + sendRequest("MKCOL", makeDavUrl(path()), req); + } AbstractNetworkJob::start(); } @@ -322,11 +321,11 @@ void LsColJob::start() QBuffer *buf = new QBuffer(this); buf->setData(xml); buf->open(QIODevice::ReadOnly); - QNetworkReply *reply = _url.isValid() ? davRequest("PROPFIND", _url, req, buf) - : davRequest("PROPFIND", path(), req, buf); - buf->setParent(reply); - setReply(reply); - setupConnections(reply); + if (_url.isValid()) { + sendRequest("PROPFIND", _url, req, buf); + } else { + sendRequest("PROPFIND", makeDavUrl(path()), req, buf); + } AbstractNetworkJob::start(); } @@ -380,8 +379,7 @@ CheckServerJob::CheckServerJob(AccountPtr account, QObject *parent) void CheckServerJob::start() { - setReply(getRequest(path())); - setupConnections(reply()); + sendRequest("GET", makeAccountUrl(path())); connect(reply(), SIGNAL(metaDataChanged()), this, SLOT(metaDataChangedSlot())); connect(reply(), SIGNAL(encrypted()), this, SLOT(encryptedSlot())); AbstractNetworkJob::start(); @@ -529,9 +527,7 @@ void PropfindJob::start() QBuffer *buf = new QBuffer(this); buf->setData(xml); buf->open(QIODevice::ReadOnly); - setReply(davRequest("PROPFIND", path(), req, buf)); - buf->setParent(reply()); - setupConnections(reply()); + sendRequest("PROPFIND", makeDavUrl(path()), req, buf); AbstractNetworkJob::start(); } @@ -632,9 +628,7 @@ void ProppatchJob::start() QBuffer *buf = new QBuffer(this); buf->setData(xml); buf->open(QIODevice::ReadOnly); - setReply(davRequest("PROPPATCH", path(), req, buf)); - buf->setParent(reply()); - setupConnections(reply()); + sendRequest("PROPPATCH", makeDavUrl(path()), req, buf); AbstractNetworkJob::start(); } @@ -671,8 +665,7 @@ EntityExistsJob::EntityExistsJob(AccountPtr account, const QString &path, QObjec void EntityExistsJob::start() { - setReply(headRequest(path())); - setupConnections(reply()); + sendRequest("HEAD", makeAccountUrl(path())); AbstractNetworkJob::start(); } @@ -700,8 +693,7 @@ void JsonApiJob::start() QList > params = _additionalParams; params << qMakePair(QString::fromLatin1("format"), QString::fromLatin1("json")); url.setQueryItems(params); - setReply(davRequest("GET", url, req)); - setupConnections(reply()); + sendRequest("GET", url, req); AbstractNetworkJob::start(); } diff --git a/src/libsync/propagatedownload.cpp b/src/libsync/propagatedownload.cpp index 030826c0b..51a3ab319 100644 --- a/src/libsync/propagatedownload.cpp +++ b/src/libsync/propagatedownload.cpp @@ -100,12 +100,11 @@ void GETFileJob::start() { } if (_directDownloadUrl.isEmpty()) { - setReply(davRequest("GET", path(), req)); + sendRequest("GET", makeDavUrl(path()), req); } else { // Use direct URL - setReply(davRequest("GET", _directDownloadUrl, req)); + sendRequest("GET", _directDownloadUrl, req); } - setupConnections(reply()); reply()->setReadBufferSize(16 * 1024); // keep low so we can easier limit the bandwidth qDebug() << Q_FUNC_INFO << _bandwidthManager << _bandwidthChoked << _bandwidthLimited; diff --git a/src/libsync/propagateremotedelete.cpp b/src/libsync/propagateremotedelete.cpp index ff9d863eb..a85d73c28 100644 --- a/src/libsync/propagateremotedelete.cpp +++ b/src/libsync/propagateremotedelete.cpp @@ -30,8 +30,11 @@ DeleteJob::DeleteJob(AccountPtr account, const QUrl& url, QObject* parent) void DeleteJob::start() { QNetworkRequest req; - setReply(_url.isValid() ? davRequest("DELETE", _url, req) : davRequest("DELETE", path(), req)); - setupConnections(reply()); + if (_url.isValid()) { + sendRequest("DELETE", _url, req); + } else { + sendRequest("DELETE", makeDavUrl(path()), req); + } if( reply()->error() != QNetworkReply::NoError ) { qWarning() << Q_FUNC_INFO << " Network error: " << reply()->errorString(); diff --git a/src/libsync/propagateremotemove.cpp b/src/libsync/propagateremotemove.cpp index 11370d573..5a59f9124 100644 --- a/src/libsync/propagateremotemove.cpp +++ b/src/libsync/propagateremotemove.cpp @@ -43,8 +43,11 @@ void MoveJob::start() for(auto it = _extraHeaders.constBegin(); it != _extraHeaders.constEnd(); ++it) { req.setRawHeader(it.key(), it.value()); } - setReply(_url.isValid() ? davRequest("MOVE", _url, req) : davRequest("MOVE", path(), req)); - setupConnections(reply()); + if (_url.isValid()) { + sendRequest("MOVE", _url, req); + } else { + sendRequest("MOVE", makeDavUrl(path()), req); + } if( reply()->error() != QNetworkReply::NoError ) { qWarning() << Q_FUNC_INFO << " Network error: " << reply()->errorString(); diff --git a/src/libsync/propagateupload.cpp b/src/libsync/propagateupload.cpp index 2f8c544fb..0ad02c09a 100644 --- a/src/libsync/propagateupload.cpp +++ b/src/libsync/propagateupload.cpp @@ -73,9 +73,11 @@ void PUTFileJob::start() { req.setRawHeader(it.key(), it.value()); } - setReply(_url.isValid() ? davRequest("PUT", _url, req, _device.data()) - : davRequest("PUT", path(), req, _device.data())); - setupConnections(reply()); + if (_url.isValid()) { + sendRequest("PUT", _url, req, _device); + } else { + sendRequest("PUT", makeDavUrl(path()), req, _device); + } if( reply()->error() != QNetworkReply::NoError ) { qWarning() << Q_FUNC_INFO << " Network error: " << reply()->errorString(); @@ -89,10 +91,10 @@ void PUTFileJob::start() { // (workaround disabled on windows and mac because the binaries we ship have patched qt) #if QT_VERSION < QT_VERSION_CHECK(4, 8, 7) if (QLatin1String(qVersion()) < QLatin1String("4.8.7")) - connect(_device.data(), SIGNAL(wasReset()), this, SLOT(slotSoftAbort())); + connect(_device, SIGNAL(wasReset()), this, SLOT(slotSoftAbort())); #elif QT_VERSION > QT_VERSION_CHECK(5, 0, 0) && QT_VERSION < QT_VERSION_CHECK(5, 4, 2) && !defined Q_OS_WIN && !defined Q_OS_MAC if (QLatin1String(qVersion()) < QLatin1String("5.4.2")) - connect(_device.data(), SIGNAL(wasReset()), this, SLOT(slotSoftAbort())); + connect(_device, SIGNAL(wasReset()), this, SLOT(slotSoftAbort())); #endif AbstractNetworkJob::start(); @@ -119,8 +121,7 @@ void PollJob::start() QUrl accountUrl = account()->url(); QUrl finalUrl = QUrl::fromUserInput(accountUrl.scheme() + QLatin1String("://") + accountUrl.authority() + (path().startsWith('/') ? QLatin1String("") : QLatin1String("/")) + path()); - setReply(getRequest(finalUrl)); - setupConnections(reply()); + sendRequest("GET", finalUrl); connect(reply(), SIGNAL(downloadProgress(qint64,qint64)), this, SLOT(resetTimeout())); AbstractNetworkJob::start(); } diff --git a/src/libsync/propagateupload.h b/src/libsync/propagateupload.h index 31e9067d6..3a7224a70 100644 --- a/src/libsync/propagateupload.h +++ b/src/libsync/propagateupload.h @@ -86,7 +86,7 @@ class PUTFileJob : public AbstractNetworkJob { Q_OBJECT private: - QScopedPointer _device; + QIODevice* _device; QMap _headers; QString _errorString; QUrl _url; @@ -95,11 +95,17 @@ public: // Takes ownership of the device explicit PUTFileJob(AccountPtr account, const QString& path, QIODevice *device, const QMap &headers, int chunk, QObject* parent = 0) - : AbstractNetworkJob(account, path, parent), _device(device), _headers(headers), _chunk(chunk) {} + : AbstractNetworkJob(account, path, parent), _device(device), _headers(headers), _chunk(chunk) + { + _device->setParent(this); + } explicit PUTFileJob(AccountPtr account, const QUrl& url, QIODevice *device, const QMap &headers, int chunk, QObject* parent = 0) : AbstractNetworkJob(account, QString(), parent), _device(device), _headers(headers) - , _url(url), _chunk(chunk) {} + , _url(url), _chunk(chunk) + { + _device->setParent(this); + } ~PUTFileJob(); int _chunk; diff --git a/test/syncenginetestutils.h b/test/syncenginetestutils.h index 937bf35fd..64b063284 100644 --- a/test/syncenginetestutils.h +++ b/test/syncenginetestutils.h @@ -730,13 +730,13 @@ protected: if (verb == QLatin1String("PROPFIND")) // Ignore outgoingData always returning somethign good enough, works for now. return new FakePropfindReply{info, op, request, this}; - else if (verb == QLatin1String("GET")) + else if (verb == QLatin1String("GET") || op == QNetworkAccessManager::GetOperation) return new FakeGetReply{info, op, request, this}; - else if (verb == QLatin1String("PUT")) + else if (verb == QLatin1String("PUT") || op == QNetworkAccessManager::PutOperation) return new FakePutReply{info, op, request, outgoingData->readAll(), this}; else if (verb == QLatin1String("MKCOL")) return new FakeMkcolReply{info, op, request, this}; - else if (verb == QLatin1String("DELETE")) + else if (verb == QLatin1String("DELETE") || op == QNetworkAccessManager::DeleteOperation) return new FakeDeleteReply{info, op, request, this}; else if (verb == QLatin1String("MOVE") && !isUpload) return new FakeMoveReply{info, op, request, this}; From 4ab217ba0486e87e36d11d65ae64963223a6f352 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Wed, 8 Mar 2017 02:18:33 +0100 Subject: [PATCH 09/10] [tx-robot] updated from transifex --- mirall.desktop.in | 3 ++ translations/client_ca.ts | 58 ++++++++++++++++----------------- translations/client_cs.ts | 58 ++++++++++++++++----------------- translations/client_de.ts | 58 ++++++++++++++++----------------- translations/client_el.ts | 58 ++++++++++++++++----------------- translations/client_en.ts | 58 ++++++++++++++++----------------- translations/client_es.ts | 58 ++++++++++++++++----------------- translations/client_es_AR.ts | 58 ++++++++++++++++----------------- translations/client_et.ts | 58 ++++++++++++++++----------------- translations/client_eu.ts | 58 ++++++++++++++++----------------- translations/client_fa.ts | 58 ++++++++++++++++----------------- translations/client_fi.ts | 58 ++++++++++++++++----------------- translations/client_fr.ts | 62 ++++++++++++++++++------------------ translations/client_gl.ts | 58 ++++++++++++++++----------------- translations/client_hu.ts | 58 ++++++++++++++++----------------- translations/client_it.ts | 58 ++++++++++++++++----------------- translations/client_ja.ts | 60 +++++++++++++++++----------------- translations/client_nb_NO.ts | 58 ++++++++++++++++----------------- translations/client_nl.ts | 58 ++++++++++++++++----------------- translations/client_pl.ts | 58 ++++++++++++++++----------------- translations/client_pt.ts | 60 +++++++++++++++++----------------- translations/client_pt_BR.ts | 58 ++++++++++++++++----------------- translations/client_ru.ts | 58 ++++++++++++++++----------------- translations/client_sk.ts | 58 ++++++++++++++++----------------- translations/client_sl.ts | 58 ++++++++++++++++----------------- translations/client_sr.ts | 58 ++++++++++++++++----------------- translations/client_sv.ts | 58 ++++++++++++++++----------------- translations/client_th.ts | 58 ++++++++++++++++----------------- translations/client_tr.ts | 58 ++++++++++++++++----------------- translations/client_uk.ts | 58 ++++++++++++++++----------------- translations/client_zh_CN.ts | 58 ++++++++++++++++----------------- translations/client_zh_TW.ts | 58 ++++++++++++++++----------------- 32 files changed, 906 insertions(+), 903 deletions(-) diff --git a/mirall.desktop.in b/mirall.desktop.in index c671b941e..3541022f0 100644 --- a/mirall.desktop.in +++ b/mirall.desktop.in @@ -775,6 +775,9 @@ X-GNOME-Autostart-Delay=3 # Translations +# Translations + + # Translations Comment[oc]=@APPLICATION_NAME@ sincronizacion del client GenericName[oc]=Dorsièr de Sincronizacion diff --git a/translations/client_ca.ts b/translations/client_ca.ts index 8e4df3bc4..c0739e58b 100644 --- a/translations/client_ca.ts +++ b/translations/client_ca.ts @@ -616,7 +616,7 @@ OCC::DeleteJob - + Connection timed out Temps d'espera de la connexió esgotat. @@ -1170,22 +1170,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway No s'ha rebut cap E-Tag del servidor, comproveu el Proxy/Gateway - + We received a different E-Tag for resuming. Retrying next time. Hem rebut un E-Tag diferent en la represa. Es comprovarà la pròxima vegada. - + Server returned wrong content-range El servidor retorna un error de contingut o rang - + Connection Timeout Temps de connexió excedit @@ -1439,7 +1439,7 @@ Els elements que poden ser eliminats s'eliminaran si impedeixen que una car OCC::MoveJob - + Connection timed out Temps d'espera de la connexió esgotat. @@ -1974,7 +1974,7 @@ No és aconsellada usar-la. OCC::PUTFileJob - + Connection Timeout Temps de connexió excedit @@ -1982,7 +1982,7 @@ No és aconsellada usar-la. OCC::PollJob - + Invalid JSON reply from the poll URL @@ -1998,47 +1998,47 @@ No és aconsellada usar-la. OCC::PropagateDownloadFile - + File %1 can not be downloaded because of a local file name clash! El fitxer %1 no es pot baixar perquè hi ha un xoc amb el nom d'un fitxer local! - + The download would reduce free disk space below %1 La descàrrega reduïrà l'espai lliure al disc per sota de %1 - + Free space on disk is less than %1 L'espai lliure del disc dur es inferior a %1 - + File was deleted from server El fitxer s'ha esborrat del servidor - + The file could not be downloaded completely. No es pot descarregar el fitxer completament. - + The downloaded file is empty despite the server announced it should have been %1. - + File %1 cannot be saved because of a local file name clash! - + File has changed since discovery El fitxer ha canviat des de que es va descobrir - + Error writing metadata to the database Error en escriure les metadades a la base de dades @@ -2119,12 +2119,12 @@ No és aconsellada usar-la. OCC::PropagateRemoteDelete - + The file has been removed from a read only share. It was restored. El fitxer s'ha eliminat d'una compartició només de lectura. S'ha restaurat. - + Wrong HTTP code returned by server. Expected 204, but received "%1 %2". @@ -2145,28 +2145,28 @@ No és aconsellada usar-la. OCC::PropagateRemoteMove - + This folder must not be renamed. It is renamed back to its original name. No s'ha de canviar el nom d'aquesta carpeta. Es reanomena de nou amb el seu nom original. - + This folder must not be renamed. Please name it back to Shared. Aquesta carpeta no es pot reanomenar. Reanomeneu-la de nou Shared. - + The file was renamed but is part of a read only share. The original file was restored. El fitxer s'ha reanomenat però és part d'una compartició només de lectura. El fixter original s'ha restaurat. - + Wrong HTTP code returned by server. Expected 201, but received "%1 %2". - - + + Error writing metadata to the database Error en escriure les metadades a la base de dades @@ -2174,22 +2174,22 @@ No és aconsellada usar-la. OCC::PropagateUploadFileCommon - + File Removed Fitxer eliminat - + Local file changed during syncing. It will be resumed. - + Local file changed during sync. El fitxer local ha canviat durant la sincronització. - + Error writing metadata to the database Error en escriure les metadades a la base de dades diff --git a/translations/client_cs.ts b/translations/client_cs.ts index 9ed8be93d..263725c87 100644 --- a/translations/client_cs.ts +++ b/translations/client_cs.ts @@ -616,7 +616,7 @@ OCC::DeleteJob - + Connection timed out Připojení vypršelo @@ -1168,22 +1168,22 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Ze serveru nebyl obdržen E-Tag, zkontrolujte proxy/bránu - + We received a different E-Tag for resuming. Retrying next time. Obdrželi jsme jiný E-Tag pro pokračování. Zkusím znovu příště. - + Server returned wrong content-range Server odpověděl chybným rozsahem obsahu - + Connection Timeout Čas spojení vypršel @@ -1437,7 +1437,7 @@ Položky u kterých je povoleno smazání budou vymazány, pokud by bránily ods OCC::MoveJob - + Connection timed out Připojení vypršelo @@ -1972,7 +1972,7 @@ Nedoporučuje se jí používat. OCC::PUTFileJob - + Connection Timeout Čas spojení vypršel @@ -1980,7 +1980,7 @@ Nedoporučuje se jí používat. OCC::PollJob - + Invalid JSON reply from the poll URL Neplatná JSON odpověď z adresy URL @@ -1996,47 +1996,47 @@ Nedoporučuje se jí používat. OCC::PropagateDownloadFile - + File %1 can not be downloaded because of a local file name clash! Soubor %1 nemohl být stažen z důvodu kolize názvu se souborem v místním systému! - + The download would reduce free disk space below %1 Stažení by snížilo velikost volného místa na disku pod %1 - + Free space on disk is less than %1 Volné místo na disku je méně než %1 - + File was deleted from server Soubor byl smazán ze serveru - + The file could not be downloaded completely. Soubor nemohl být kompletně stažen. - + The downloaded file is empty despite the server announced it should have been %1. Stažený soubor je prázdný, přestože server oznámil, že měl být %1. - + File %1 cannot be saved because of a local file name clash! Soubor %1 nemohl být uložen z důvodu kolize názvu se souborem v místním systému! - + File has changed since discovery Soubor se mezitím změnil - + Error writing metadata to the database Chyba zápisu metadat do databáze @@ -2117,12 +2117,12 @@ Nedoporučuje se jí používat. OCC::PropagateRemoteDelete - + The file has been removed from a read only share. It was restored. Soubor byl odebrán ze sdílení pouze pro čtení. Soubor byl obnoven. - + Wrong HTTP code returned by server. Expected 204, but received "%1 %2". Server vrátil neplatný HTTP kód. Očekáván 204, ale obdržen "%1 %2". @@ -2143,28 +2143,28 @@ Nedoporučuje se jí používat. OCC::PropagateRemoteMove - + This folder must not be renamed. It is renamed back to its original name. Tento adresář nemůže být přejmenován. Byl mu vrácen původní název. - + This folder must not be renamed. Please name it back to Shared. Tento adresář nemůže být přejmenován. Přejmenujte jej prosím zpět na Shared. - + The file was renamed but is part of a read only share. The original file was restored. Soubor byl přejmenován, ale je součástí sdílení pouze pro čtení. Původní soubor byl obnoven. - + Wrong HTTP code returned by server. Expected 201, but received "%1 %2". Server vrátil neplatný HTTP kód. Očekáván 201, ale obdržen "%1 %2". - - + + Error writing metadata to the database Chyba zápisu metadat do databáze @@ -2172,22 +2172,22 @@ Nedoporučuje se jí používat. OCC::PropagateUploadFileCommon - + File Removed Soubor odebrán - + Local file changed during syncing. It will be resumed. Místní soubor se během synchronizace změnil. - + Local file changed during sync. Místní soubor byl změněn během synchronizace. - + Error writing metadata to the database Chyba zápisu metadat do databáze diff --git a/translations/client_de.ts b/translations/client_de.ts index 7deed4fe2..842f53012 100644 --- a/translations/client_de.ts +++ b/translations/client_de.ts @@ -616,7 +616,7 @@ OCC::DeleteJob - + Connection timed out Zeitüberschreitung bei der Verbindung @@ -1175,22 +1175,22 @@ Wenn diese Synchronisation fortgesetzt wird, werden Dateien eventuell von älter OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Kein E-Tag vom Server empfangen, bitte Proxy / Gateway überprüfen - + We received a different E-Tag for resuming. Retrying next time. Es wurde ein unterschiedlicher E-Tag zum Fortfahren empfangen. Bitte beim nächsten mal nochmal versuchen. - + Server returned wrong content-range Server hat falschen Bereich für den Inhalt zurück gegeben - + Connection Timeout Zeitüberschreitung der Verbindung @@ -1444,7 +1444,7 @@ Objekte, bei denen Löschen erlaubt ist, werden gelöscht, wenn sie die Löschun OCC::MoveJob - + Connection timed out Zeitüberschreitung bei der Verbindung @@ -1978,7 +1978,7 @@ Es ist nicht ratsam, diese zu benutzen. OCC::PUTFileJob - + Connection Timeout Zeitüberschreitung der Verbindung @@ -1986,7 +1986,7 @@ Es ist nicht ratsam, diese zu benutzen. OCC::PollJob - + Invalid JSON reply from the poll URL Ungültige JSON-Antwort von der Poll-URL @@ -2002,47 +2002,47 @@ Es ist nicht ratsam, diese zu benutzen. OCC::PropagateDownloadFile - + File %1 can not be downloaded because of a local file name clash! Die Datei %1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht herunter geladen werden! - + The download would reduce free disk space below %1 Dieser Download würde den freien Speicher der Festplatte minimieren auf %1 - + Free space on disk is less than %1 Der freie Speicher auf der Festplatte ist weniger als %1 - + File was deleted from server Die Datei wurde vom Server gelöscht - + The file could not be downloaded completely. Die Datei konnte nicht vollständig herunter geladen werden. - + The downloaded file is empty despite the server announced it should have been %1. Die heruntergeladene Datei ist leer, obwohl der Server %1 als Größe übermittelt hat. - + File %1 cannot be saved because of a local file name clash! Die Datei %1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht gespeichert geladen werden! - + File has changed since discovery Datei ist seit der Entdeckung geändert worden - + Error writing metadata to the database Fehler beim Schreiben der Metadaten in die Datenbank @@ -2123,12 +2123,12 @@ Es ist nicht ratsam, diese zu benutzen. OCC::PropagateRemoteDelete - + The file has been removed from a read only share. It was restored. Die Datei wurde von einer Nur-Lese-Freigabe gelöscht. Die Datei wurde wiederhergestellt. - + Wrong HTTP code returned by server. Expected 204, but received "%1 %2". Es wurde ein falscher HTTP-Status-Code vom Server gesendet. Erwartet wurde 204, aber gesendet wurde "%1 %2". @@ -2149,28 +2149,28 @@ Es ist nicht ratsam, diese zu benutzen. OCC::PropagateRemoteMove - + This folder must not be renamed. It is renamed back to its original name. Dieser Ordner muss nicht umbenannt werden. Er wurde zurück zum Originalnamen umbenannt. - + This folder must not be renamed. Please name it back to Shared. Dieser Ordner muss nicht umbenannt werden. Bitte benennen Sie es zurück wie in der Freigabe. - + The file was renamed but is part of a read only share. The original file was restored. Die Datei wurde auf einer Nur-Lese-Freigabe umbenannt. Die Original-Datei wurde wiederhergestellt. - + Wrong HTTP code returned by server. Expected 201, but received "%1 %2". Es wurde ein falscher HTTP-Status-Code vom Server gesendet. Erwartet wurde 201, aber gesendet wurde "%1 %2". - - + + Error writing metadata to the database Fehler beim Schreiben der Metadaten in die Datenbank @@ -2178,22 +2178,22 @@ Es ist nicht ratsam, diese zu benutzen. OCC::PropagateUploadFileCommon - + File Removed Datei gelöscht - + Local file changed during syncing. It will be resumed. Lokale Datei hat sich während der Synchronisation geändert. Die Synchronisation wird wiederaufgenommen. - + Local file changed during sync. Eine lokale Datei wurde während der Synchronisation geändert. - + Error writing metadata to the database Fehler beim Schreiben der Metadaten in die Datenbank diff --git a/translations/client_el.ts b/translations/client_el.ts index 001d22100..dc981b4b5 100644 --- a/translations/client_el.ts +++ b/translations/client_el.ts @@ -616,7 +616,7 @@ OCC::DeleteJob - + Connection timed out Λήξη χρόνου σύνδεσης. @@ -1166,22 +1166,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Δεν ελήφθη E-Tag από το διακομιστή, ελέγξτε το διακομιστή μεσολάβησης/πύλη - + We received a different E-Tag for resuming. Retrying next time. Ελήφθη διαφορετικό E-Tag για συνέχιση. Επανάληψη την επόμενη φορά. - + Server returned wrong content-range Ο διακομιστής επέστρεψε εσφαλμένο πεδίο τιμών - + Connection Timeout Λήξη Χρόνου Αναμονής Σύνδεσης @@ -1435,7 +1435,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from OCC::MoveJob - + Connection timed out Η σύνδεση έληξε. @@ -1970,7 +1970,7 @@ It is not advisable to use it. OCC::PUTFileJob - + Connection Timeout Λήξη Χρόνου Αναμονής Σύνδεσης @@ -1978,7 +1978,7 @@ It is not advisable to use it. OCC::PollJob - + Invalid JSON reply from the poll URL Λανθασμένη απάντηση JSON από την ιστοσελίδα poll @@ -1994,47 +1994,47 @@ It is not advisable to use it. OCC::PropagateDownloadFile - + File %1 can not be downloaded because of a local file name clash! Το αρχείο %1 δεν είναι δυνατό να ληφθεί λόγω διένεξης με το όνομα ενός τοπικού αρχείου! - + The download would reduce free disk space below %1 Η λήψη θα μειώσει το διαθέσιμο χώρο στο δίσκο κάτω από %1 - + Free space on disk is less than %1 Ο διαθέσιμος χώρος στο δίσκο είναι λιγότερος από %1 - + File was deleted from server Το αρχείο διαγράφηκε από τον διακομιστή - + The file could not be downloaded completely. Η λήψη του αρχείου δεν ολοκληρώθηκε. - + The downloaded file is empty despite the server announced it should have been %1. - + File %1 cannot be saved because of a local file name clash! Το αρχείο %1 δεν είναι δυνατό να αποθηκευτεί λόγω διένεξης με το όνομα ενός τοπικού ονόματος αρχείου! - + File has changed since discovery Το αρχείο έχει αλλάξει από όταν ανακαλύφθηκε - + Error writing metadata to the database Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων @@ -2115,12 +2115,12 @@ It is not advisable to use it. OCC::PropagateRemoteDelete - + The file has been removed from a read only share. It was restored. Το αρχείο αφαιρέθηκε από ένα διαμοιρασμένο κατάλογο μόνο για ανάγνωση. Το αρχείο επαναφέρθηκε. - + Wrong HTTP code returned by server. Expected 204, but received "%1 %2". Ο διακομιστής επέστρεψε εσφαλμένο κωδικό HTTP. Αναμενόταν 204, αλλά ελήφθη "%1 %2". @@ -2141,28 +2141,28 @@ It is not advisable to use it. OCC::PropagateRemoteMove - + This folder must not be renamed. It is renamed back to its original name. Αυτός ο φάκελος δεν πρέπει να μετονομαστεί. Μετονομάζεται πίσω στο αρχικό του όνομα. - + This folder must not be renamed. Please name it back to Shared. Αυτός ο φάκελος δεν πρέπει να μετονομαστεί. Παρακαλώ ονομάστε τον ξανά Κοινόχρηστος. - + The file was renamed but is part of a read only share. The original file was restored. Το αρχείο μετονομάστηκε αλλά είναι τμήμα ενός διαμοιρασμένου καταλόγου μόνο για ανάγνωση. Το αρχικό αρχείο επαναφέρθηκε. - + Wrong HTTP code returned by server. Expected 201, but received "%1 %2". Ο διακομιστής επέστρεψε εσφαλμένο κωδικό HTTP. Αναμενόταν 201, αλλά ελήφθη "%1 %2". - - + + Error writing metadata to the database Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων @@ -2170,22 +2170,22 @@ It is not advisable to use it. OCC::PropagateUploadFileCommon - + File Removed Το αρχείο αφαιρέθηκε - + Local file changed during syncing. It will be resumed. Το τοπικό αρχείο τροποποιήθηκε κατά τη διάρκεια του συγχρονισμού. Θα συγχρονιστεί πάλι. - + Local file changed during sync. Το τοπικό αρχείο τροποποιήθηκε κατά τον συγχρονισμό. - + Error writing metadata to the database Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων diff --git a/translations/client_en.ts b/translations/client_en.ts index 345e1ed7b..5d54ade30 100644 --- a/translations/client_en.ts +++ b/translations/client_en.ts @@ -624,7 +624,7 @@ OCC::DeleteJob - + Connection timed out @@ -1198,22 +1198,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway - + We received a different E-Tag for resuming. Retrying next time. - + Server returned wrong content-range - + Connection Timeout @@ -1465,7 +1465,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from OCC::MoveJob - + Connection timed out @@ -1998,7 +1998,7 @@ It is not advisable to use it. OCC::PUTFileJob - + Connection Timeout @@ -2006,7 +2006,7 @@ It is not advisable to use it. OCC::PollJob - + Invalid JSON reply from the poll URL @@ -2022,47 +2022,47 @@ It is not advisable to use it. OCC::PropagateDownloadFile - + File %1 can not be downloaded because of a local file name clash! - + The download would reduce free disk space below %1 - + Free space on disk is less than %1 - + File was deleted from server - + The file could not be downloaded completely. - + The downloaded file is empty despite the server announced it should have been %1. - + File %1 cannot be saved because of a local file name clash! - + File has changed since discovery - + Error writing metadata to the database @@ -2143,12 +2143,12 @@ It is not advisable to use it. OCC::PropagateRemoteDelete - + The file has been removed from a read only share. It was restored. - + Wrong HTTP code returned by server. Expected 204, but received "%1 %2". @@ -2169,28 +2169,28 @@ It is not advisable to use it. OCC::PropagateRemoteMove - + This folder must not be renamed. It is renamed back to its original name. - + This folder must not be renamed. Please name it back to Shared. - + The file was renamed but is part of a read only share. The original file was restored. - + Wrong HTTP code returned by server. Expected 201, but received "%1 %2". - - + + Error writing metadata to the database @@ -2198,22 +2198,22 @@ It is not advisable to use it. OCC::PropagateUploadFileCommon - + File Removed - + Local file changed during syncing. It will be resumed. - + Local file changed during sync. - + Error writing metadata to the database diff --git a/translations/client_es.ts b/translations/client_es.ts index 103694f9d..75abaad0c 100644 --- a/translations/client_es.ts +++ b/translations/client_es.ts @@ -616,7 +616,7 @@ OCC::DeleteJob - + Connection timed out Tiempo de conexión agotado @@ -1175,22 +1175,22 @@ Si continua con la sincronización todos los archivos serán remplazados por su OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway No se ha recibido ninguna e-tag del servidor, revise el proxy/puerta de enlace - + We received a different E-Tag for resuming. Retrying next time. Se ha recibido una e-tag distinta para reanudar. Se volverá a intentar. - + Server returned wrong content-range El servidor ha devuelto un content-range erróneo - + Connection Timeout Tiempo de espera de conexión agotado @@ -1444,7 +1444,7 @@ Los elementos cuya eliminación está permitida serán eliminados si impiden que OCC::MoveJob - + Connection timed out Tiempo de conexión agotado @@ -1978,7 +1978,7 @@ No se recomienda usarla. OCC::PUTFileJob - + Connection Timeout Tiempo de espera de conexión agotado @@ -1986,7 +1986,7 @@ No se recomienda usarla. OCC::PollJob - + Invalid JSON reply from the poll URL Respuesta JSON invalida desde URL @@ -2002,47 +2002,47 @@ No se recomienda usarla. OCC::PropagateDownloadFile - + File %1 can not be downloaded because of a local file name clash! ¡El archivo %1 no se puede descargar a causa de un conflicto con el nombre de un archivo local! - + The download would reduce free disk space below %1 La descarga reduciría el espacio libre en disco por debajo de %1 - + Free space on disk is less than %1 El espacio libre en el disco es inferior a %1 - + File was deleted from server Se ha eliminado el archivo del servidor - + The file could not be downloaded completely. No se ha podido descargar el archivo completamente. - + The downloaded file is empty despite the server announced it should have been %1. El archivo descargado está vacio aunque el servidor dice que deberia haber sido %1. - + File %1 cannot be saved because of a local file name clash! ¡El fichero %1 no puede guardarse debido a un conflicto con el nombre de otro fichero local! - + File has changed since discovery El archivo ha cambiado desde que fue descubierto - + Error writing metadata to the database Error al escribir los metadatos en la base de datos @@ -2123,12 +2123,12 @@ No se recomienda usarla. OCC::PropagateRemoteDelete - + The file has been removed from a read only share. It was restored. El archvo fue eliminado de una carpeta compartida en modo de solo lectura. Ha sido recuperado. - + Wrong HTTP code returned by server. Expected 204, but received "%1 %2". El código HTTP devuelto por el servidor es erróneo. Esperado 204, pero recibido "%1 %2". @@ -2149,28 +2149,28 @@ No se recomienda usarla. OCC::PropagateRemoteMove - + This folder must not be renamed. It is renamed back to its original name. Esta carpeta no debe ser renombrada. Ha sido renombrada a su nombre original - + This folder must not be renamed. Please name it back to Shared. Esta carpeta no debe ser renombrada. Favor de renombrar a Compartida. - + The file was renamed but is part of a read only share. The original file was restored. El archivo fue renombrado, pero es parte de una carpeta compartida en modo de solo lectura. El archivo original ha sido recuperado. - + Wrong HTTP code returned by server. Expected 201, but received "%1 %2". El código HTTP devuelto por el servidor es erróneo. Esperado 201, pero recibido "%1 %2". - - + + Error writing metadata to the database Error al escribir los metadatos en la base de datos @@ -2178,22 +2178,22 @@ No se recomienda usarla. OCC::PropagateUploadFileCommon - + File Removed Archivo eliminado - + Local file changed during syncing. It will be resumed. Archivo local cambió durante la sincronización. Será actualizado. - + Local file changed during sync. Un archivo local fue modificado durante la sincronización. - + Error writing metadata to the database Error al escribir los metadatos en la base de datos diff --git a/translations/client_es_AR.ts b/translations/client_es_AR.ts index a1796c7aa..dc8eb96f3 100644 --- a/translations/client_es_AR.ts +++ b/translations/client_es_AR.ts @@ -616,7 +616,7 @@ OCC::DeleteJob - + Connection timed out Tiempo de conexión agotado @@ -1166,22 +1166,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway - + We received a different E-Tag for resuming. Retrying next time. - + Server returned wrong content-range - + Connection Timeout @@ -1433,7 +1433,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from OCC::MoveJob - + Connection timed out Tiempo de conexión agotado @@ -1966,7 +1966,7 @@ It is not advisable to use it. OCC::PUTFileJob - + Connection Timeout @@ -1974,7 +1974,7 @@ It is not advisable to use it. OCC::PollJob - + Invalid JSON reply from the poll URL @@ -1990,47 +1990,47 @@ It is not advisable to use it. OCC::PropagateDownloadFile - + File %1 can not be downloaded because of a local file name clash! - + The download would reduce free disk space below %1 - + Free space on disk is less than %1 - + File was deleted from server - + The file could not be downloaded completely. - + The downloaded file is empty despite the server announced it should have been %1. - + File %1 cannot be saved because of a local file name clash! - + File has changed since discovery - + Error writing metadata to the database @@ -2111,12 +2111,12 @@ It is not advisable to use it. OCC::PropagateRemoteDelete - + The file has been removed from a read only share. It was restored. - + Wrong HTTP code returned by server. Expected 204, but received "%1 %2". @@ -2137,28 +2137,28 @@ It is not advisable to use it. OCC::PropagateRemoteMove - + This folder must not be renamed. It is renamed back to its original name. - + This folder must not be renamed. Please name it back to Shared. - + The file was renamed but is part of a read only share. The original file was restored. - + Wrong HTTP code returned by server. Expected 201, but received "%1 %2". - - + + Error writing metadata to the database @@ -2166,22 +2166,22 @@ It is not advisable to use it. OCC::PropagateUploadFileCommon - + File Removed - + Local file changed during syncing. It will be resumed. - + Local file changed during sync. - + Error writing metadata to the database diff --git a/translations/client_et.ts b/translations/client_et.ts index 3f921da4c..13ba80582 100644 --- a/translations/client_et.ts +++ b/translations/client_et.ts @@ -616,7 +616,7 @@ OCC::DeleteJob - + Connection timed out Ühendus aegus @@ -1166,22 +1166,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Ühtegi E-Silti ei saabunud serverist, kontrolli puhverserverit/lüüsi. - + We received a different E-Tag for resuming. Retrying next time. Saime jätkamiseks erineva E-Sildi. Proovin järgmine kord uuesti. - + Server returned wrong content-range Server tagastas vale vahemiku - + Connection Timeout Ühenduse aegumine @@ -1433,7 +1433,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from OCC::MoveJob - + Connection timed out Ühendus aegus @@ -1967,7 +1967,7 @@ Selle kasutamine pole soovitatav. OCC::PUTFileJob - + Connection Timeout Ühenduse aegumine @@ -1975,7 +1975,7 @@ Selle kasutamine pole soovitatav. OCC::PollJob - + Invalid JSON reply from the poll URL @@ -1991,47 +1991,47 @@ Selle kasutamine pole soovitatav. OCC::PropagateDownloadFile - + File %1 can not be downloaded because of a local file name clash! Faili %1 ei saa alla laadida kuna on konflikt kohaliku faili nimega. - + The download would reduce free disk space below %1 - + Free space on disk is less than %1 - + File was deleted from server Fail on serverist kustutatud - + The file could not be downloaded completely. Faili täielik allalaadimine ebaõnnestus. - + The downloaded file is empty despite the server announced it should have been %1. - + File %1 cannot be saved because of a local file name clash! Faili %1 ei saa salvestada kuna on nime konflikt kohaliku failiga! - + File has changed since discovery Faili on pärast avastamist muudetud - + Error writing metadata to the database @@ -2112,12 +2112,12 @@ Selle kasutamine pole soovitatav. OCC::PropagateRemoteDelete - + The file has been removed from a read only share. It was restored. Fail oli eemaldatud kirjutamisõiguseta kataloogist. See on nüüd taastatud. - + Wrong HTTP code returned by server. Expected 204, but received "%1 %2". Server saatis vale HTTP koodi. Ootuspärane kood oli 204, aga saadeti kood "%1 %2". @@ -2138,28 +2138,28 @@ Selle kasutamine pole soovitatav. OCC::PropagateRemoteMove - + This folder must not be renamed. It is renamed back to its original name. Kausta ei tohi ümber nimetada. Kausta algne nimi taastati. - + This folder must not be renamed. Please name it back to Shared. Kausta nime ei tohi muuta. Palun pane selle nimeks tagasi Shared. - + The file was renamed but is part of a read only share. The original file was restored. Fail oli ümber nimetatud, kuid see on osa kirjutamisõiguseta jagamisest. Algne fail taastati. - + Wrong HTTP code returned by server. Expected 201, but received "%1 %2". Server saatis vale HTTP koodi. Ootuspärane kood oli 201, aga saadeti kood "%1 %2". - - + + Error writing metadata to the database @@ -2167,22 +2167,22 @@ Selle kasutamine pole soovitatav. OCC::PropagateUploadFileCommon - + File Removed Fail eemaldatud - + Local file changed during syncing. It will be resumed. Kohalik fail muutus sünkroniseeringu käigus. See taastakse. - + Local file changed during sync. Kohalik fail muutus sünkroniseeringu käigus. - + Error writing metadata to the database diff --git a/translations/client_eu.ts b/translations/client_eu.ts index b78281809..1380db51b 100644 --- a/translations/client_eu.ts +++ b/translations/client_eu.ts @@ -616,7 +616,7 @@ OCC::DeleteJob - + Connection timed out Konexioa iraungi da @@ -1166,22 +1166,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Ez da E-Tagik jaso zerbitzaritik, egiaztatu Proxy/Gateway - + We received a different E-Tag for resuming. Retrying next time. Jarraitzeko E-Tag ezberdina jaso dugu. Hurrengoan saiatuko gara berriz. - + Server returned wrong content-range Zerbitzariak eduki-hein desegokia itzuli du - + Connection Timeout Konexioa denboraz kanpo @@ -1435,7 +1435,7 @@ Ezabatzeko baimena duten itemak ezabatuko dira hauek karpeta bat ezabatzea uzten OCC::MoveJob - + Connection timed out Konexioa denboraz kanpo @@ -1969,7 +1969,7 @@ Ez da gomendagarria erabltzea. OCC::PUTFileJob - + Connection Timeout Konexioa denboraz kanpo @@ -1977,7 +1977,7 @@ Ez da gomendagarria erabltzea. OCC::PollJob - + Invalid JSON reply from the poll URL @@ -1993,47 +1993,47 @@ Ez da gomendagarria erabltzea. OCC::PropagateDownloadFile - + File %1 can not be downloaded because of a local file name clash! - + The download would reduce free disk space below %1 - + Free space on disk is less than %1 - + File was deleted from server Fitxategia zerbitzaritik ezabatua izan da - + The file could not be downloaded completely. - + The downloaded file is empty despite the server announced it should have been %1. - + File %1 cannot be saved because of a local file name clash! - + File has changed since discovery - + Error writing metadata to the database @@ -2114,12 +2114,12 @@ Ez da gomendagarria erabltzea. OCC::PropagateRemoteDelete - + The file has been removed from a read only share. It was restored. - + Wrong HTTP code returned by server. Expected 204, but received "%1 %2". @@ -2140,28 +2140,28 @@ Ez da gomendagarria erabltzea. OCC::PropagateRemoteMove - + This folder must not be renamed. It is renamed back to its original name. Karpeta hau ezin da berrizendatu. Bere jatorrizko izenera berrizendatu da. - + This folder must not be renamed. Please name it back to Shared. Karpeta hau ezin da berrizendatu. Mesedez jarri berriz Shared izena. - + The file was renamed but is part of a read only share. The original file was restored. - + Wrong HTTP code returned by server. Expected 201, but received "%1 %2". - - + + Error writing metadata to the database @@ -2169,22 +2169,22 @@ Ez da gomendagarria erabltzea. OCC::PropagateUploadFileCommon - + File Removed Fitxategia Ezabatua - + Local file changed during syncing. It will be resumed. - + Local file changed during sync. Fitxategi lokala aldatu da sinkronizazioan. - + Error writing metadata to the database diff --git a/translations/client_fa.ts b/translations/client_fa.ts index 52366fcbf..47524671e 100644 --- a/translations/client_fa.ts +++ b/translations/client_fa.ts @@ -616,7 +616,7 @@ OCC::DeleteJob - + Connection timed out @@ -1166,22 +1166,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway - + We received a different E-Tag for resuming. Retrying next time. - + Server returned wrong content-range - + Connection Timeout تایم اوت اتصال @@ -1433,7 +1433,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from OCC::MoveJob - + Connection timed out @@ -1966,7 +1966,7 @@ It is not advisable to use it. OCC::PUTFileJob - + Connection Timeout تایم اوت اتصال @@ -1974,7 +1974,7 @@ It is not advisable to use it. OCC::PollJob - + Invalid JSON reply from the poll URL @@ -1990,47 +1990,47 @@ It is not advisable to use it. OCC::PropagateDownloadFile - + File %1 can not be downloaded because of a local file name clash! - + The download would reduce free disk space below %1 - + Free space on disk is less than %1 - + File was deleted from server فایل از روی سرور حذف شد - + The file could not be downloaded completely. - + The downloaded file is empty despite the server announced it should have been %1. - + File %1 cannot be saved because of a local file name clash! - + File has changed since discovery - + Error writing metadata to the database @@ -2111,12 +2111,12 @@ It is not advisable to use it. OCC::PropagateRemoteDelete - + The file has been removed from a read only share. It was restored. - + Wrong HTTP code returned by server. Expected 204, but received "%1 %2". @@ -2137,28 +2137,28 @@ It is not advisable to use it. OCC::PropagateRemoteMove - + This folder must not be renamed. It is renamed back to its original name. - + This folder must not be renamed. Please name it back to Shared. - + The file was renamed but is part of a read only share. The original file was restored. - + Wrong HTTP code returned by server. Expected 201, but received "%1 %2". - - + + Error writing metadata to the database @@ -2166,22 +2166,22 @@ It is not advisable to use it. OCC::PropagateUploadFileCommon - + File Removed فایل حذف شد - + Local file changed during syncing. It will be resumed. - + Local file changed during sync. فایل محلی در حین همگام‌سازی تغییر کرده است. - + Error writing metadata to the database diff --git a/translations/client_fi.ts b/translations/client_fi.ts index ba654a386..f4948a793 100644 --- a/translations/client_fi.ts +++ b/translations/client_fi.ts @@ -616,7 +616,7 @@ OCC::DeleteJob - + Connection timed out Yhteys aikakatkaistiin @@ -1166,22 +1166,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway - + We received a different E-Tag for resuming. Retrying next time. - + Server returned wrong content-range - + Connection Timeout Yhteys aikakatkaistiin @@ -1435,7 +1435,7 @@ Kohteet, joiden poisto on sallittu, poistetaan, jos ne estävät kansion poistam OCC::MoveJob - + Connection timed out Yhteys aikakatkaistiin @@ -1969,7 +1969,7 @@ Osoitteen käyttäminen ei ole suositeltavaa. OCC::PUTFileJob - + Connection Timeout Yhteys aikakatkaistiin @@ -1977,7 +1977,7 @@ Osoitteen käyttäminen ei ole suositeltavaa. OCC::PollJob - + Invalid JSON reply from the poll URL @@ -1993,47 +1993,47 @@ Osoitteen käyttäminen ei ole suositeltavaa. OCC::PropagateDownloadFile - + File %1 can not be downloaded because of a local file name clash! - + The download would reduce free disk space below %1 Lataaminen laskisi vapaan levytilan määrän alle rajan %1 - + Free space on disk is less than %1 Levyllä on vapaata tilaa vähemmän kuin %1 - + File was deleted from server Tiedosto poistettiin palvelimelta - + The file could not be downloaded completely. Tiedostoa ei voitu ladata täysin. - + The downloaded file is empty despite the server announced it should have been %1. - + File %1 cannot be saved because of a local file name clash! - + File has changed since discovery Tiedosto on muuttunut löytymisen jälkeen - + Error writing metadata to the database Virhe kirjoittaessa metadataa tietokantaan @@ -2114,12 +2114,12 @@ Osoitteen käyttäminen ei ole suositeltavaa. OCC::PropagateRemoteDelete - + The file has been removed from a read only share. It was restored. - + Wrong HTTP code returned by server. Expected 204, but received "%1 %2". HTTP-palvelin palautti väärän koodin. Odotettiin koodia 204, vastaanotettiin "%1 %2". @@ -2140,28 +2140,28 @@ Osoitteen käyttäminen ei ole suositeltavaa. OCC::PropagateRemoteMove - + This folder must not be renamed. It is renamed back to its original name. Tätä kansiota ei ole tule nimetä uudelleen. Muutetaan takaisin alkuperäinen nimi. - + This folder must not be renamed. Please name it back to Shared. - + The file was renamed but is part of a read only share. The original file was restored. Tiedosto nimettiin uudelleen, mutta se on osa "vain luku"-jakoa. Alkuperäinen tiedosto palautettiin. - + Wrong HTTP code returned by server. Expected 201, but received "%1 %2". HTTP-palvelin palautti väärän koodin. Odotettiin koodia 201, vastaanotettiin "%1 %2". - - + + Error writing metadata to the database Virhe kirjoittaessa metadataa tietokantaan @@ -2169,22 +2169,22 @@ Osoitteen käyttäminen ei ole suositeltavaa. OCC::PropagateUploadFileCommon - + File Removed Tiedosto poistettu - + Local file changed during syncing. It will be resumed. - + Local file changed during sync. Paikallinen tiedosto muuttui synkronoinnin aikana. - + Error writing metadata to the database Virhe kirjoittaessa metadataa tietokantaan diff --git a/translations/client_fr.ts b/translations/client_fr.ts index 86d65a747..83b2b6593 100644 --- a/translations/client_fr.ts +++ b/translations/client_fr.ts @@ -616,7 +616,7 @@ OCC::DeleteJob - + Connection timed out Délai de connexion dépassé @@ -1171,22 +1171,22 @@ Continuer la synchronisation comme d'habitude fera en sorte que tous les fi OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Aucun E-Tag reçu du serveur, vérifiez le proxy / la passerelle - + We received a different E-Tag for resuming. Retrying next time. Nous avons reçu un E-Tag différent pour reprendre le téléchargement. Nouvel essai la prochaine fois. - + Server returned wrong content-range Le serveur a retourné une gamme de contenu erronée - + Connection Timeout Délai d'attente de connexion dépassé @@ -1440,7 +1440,7 @@ L'option "Autoriser suppression" permet de ne pas bloquer la supp OCC::MoveJob - + Connection timed out Délai de connexion dépassé @@ -1969,13 +1969,13 @@ Il est déconseillé de l'utiliser. Open %1 in Browser - Ouvrir %1 dans le navigateur + Ouvrir %1 dans le navigateur web OCC::PUTFileJob - + Connection Timeout Délai d'attente de connexion dépassé @@ -1983,7 +1983,7 @@ Il est déconseillé de l'utiliser. OCC::PollJob - + Invalid JSON reply from the poll URL L'URL interrogéé a renvoyé une réponse json non valide @@ -1999,47 +1999,47 @@ Il est déconseillé de l'utiliser. OCC::PropagateDownloadFile - + File %1 can not be downloaded because of a local file name clash! Le fichier %1 ne peut pas être téléchargé en raison d'un conflit sur le nom de fichier local. - + The download would reduce free disk space below %1 Le téléchargement réduirait l'espace libre à moins de %1 - + Free space on disk is less than %1 Il y a moins de %1 d'espace libre sur le disque - + File was deleted from server Le fichier a été supprimé du serveur - + The file could not be downloaded completely. Le fichier n'a pas pu être téléchargé intégralement. - + The downloaded file is empty despite the server announced it should have been %1. Le fichier téléchargé est vide bien que le serveur indique que sa taille devrait être de %1. - + File %1 cannot be saved because of a local file name clash! Le fichier %1 n'a pas pu être sauvegardé en raison d'un conflit sur le nom du fichier local ! - + File has changed since discovery Le fichier a changé depuis sa découverte - + Error writing metadata to the database Erreur à l'écriture des métadonnées dans la base de données @@ -2120,12 +2120,12 @@ Il est déconseillé de l'utiliser. OCC::PropagateRemoteDelete - + The file has been removed from a read only share. It was restored. Le fichier a été supprimé d'un partage en lecture seule. Il a été restauré. - + Wrong HTTP code returned by server. Expected 204, but received "%1 %2". Le code HTTP retourné par le serveur n'est pas valide. La valeur attendue est 204 mais la valeur reçue est "%1 %2". @@ -2146,28 +2146,28 @@ Il est déconseillé de l'utiliser. OCC::PropagateRemoteMove - + This folder must not be renamed. It is renamed back to its original name. Ce dossier ne doit pas être renommé. Il sera renommé avec son nom original. - + This folder must not be renamed. Please name it back to Shared. Le nom de ce dossier ne doit pas être changé. Veuillez le renommer en Shared. - + The file was renamed but is part of a read only share. The original file was restored. Le fichier a été renommé mais appartient à un partage en lecture seule. Le fichier original a été restauré. - + Wrong HTTP code returned by server. Expected 201, but received "%1 %2". Le code HTTP retourné par le serveur n'est pas valide. La valeur attendue est 201 mais la valeur reçue est "%1 %2". - - + + Error writing metadata to the database Erreur à l'écriture des métadonnées dans la base de données @@ -2175,22 +2175,22 @@ Il est déconseillé de l'utiliser. OCC::PropagateUploadFileCommon - + File Removed Fichier supprimé - + Local file changed during syncing. It will be resumed. Fichier local modifié pendant la synchronisation. Elle va reprendre. - + Local file changed during sync. Fichier local modifié pendant la synchronisation. - + Error writing metadata to the database Erreur à l'écriture des métadonnées dans la base de données @@ -3291,7 +3291,7 @@ Il est déconseillé de l'utiliser. Open folder '%1' - Ouvrir le dossier '%1' + Ouvrir le dossier local '%1' diff --git a/translations/client_gl.ts b/translations/client_gl.ts index 9331bcadf..7555bfd3c 100644 --- a/translations/client_gl.ts +++ b/translations/client_gl.ts @@ -616,7 +616,7 @@ OCC::DeleteJob - + Connection timed out Esgotouse o tempo de conexión @@ -1166,22 +1166,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Non se recibiu a «E-Tag» do servidor, comprobe o proxy e/ou a pasarela - + We received a different E-Tag for resuming. Retrying next time. Recibiuse unha «E-Tag» diferente para continuar. Tentándoo outra vez. - + Server returned wrong content-range O servidor devolveu un intervalo de contidos estragado - + Connection Timeout Esgotouse o tempo de conexión @@ -1433,7 +1433,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from OCC::MoveJob - + Connection timed out Esgotouse o tempo de conexión @@ -1968,7 +1968,7 @@ Recomendámoslle que non o use. OCC::PUTFileJob - + Connection Timeout Esgotouse o tempo de conexión @@ -1976,7 +1976,7 @@ Recomendámoslle que non o use. OCC::PollJob - + Invalid JSON reply from the poll URL O URL requirido devolveu unha resposta JSON incorrecta @@ -1992,47 +1992,47 @@ Recomendámoslle que non o use. OCC::PropagateDownloadFile - + File %1 can not be downloaded because of a local file name clash! Non é posíbel descargar o ficheiro %1 por mor dunha colisión co nome dun ficheiro local! - + The download would reduce free disk space below %1 - + Free space on disk is less than %1 - + File was deleted from server O ficheiro vai seren eliminado do servidor - + The file could not be downloaded completely. Non foi posíbel descargar completamente o ficheiro. - + The downloaded file is empty despite the server announced it should have been %1. - + File %1 cannot be saved because of a local file name clash! Non foi posíbel gardar o ficheiro %1 por mor dunha colisión co nome dun ficheiro local! - + File has changed since discovery O ficheiro cambiou após seren atopado - + Error writing metadata to the database @@ -2113,12 +2113,12 @@ Recomendámoslle que non o use. OCC::PropagateRemoteDelete - + The file has been removed from a read only share. It was restored. Foi retirado un ficheiro desde unha compartición de só lectura. Foi restaurado. - + Wrong HTTP code returned by server. Expected 204, but received "%1 %2". O servidor devolveu código HTTP incorrecto. Agardábase 204, mais recibiuse «%1 %2». @@ -2139,28 +2139,28 @@ Recomendámoslle que non o use. OCC::PropagateRemoteMove - + This folder must not be renamed. It is renamed back to its original name. Non é posíbel renomear este cartafol. Non se lle cambiou o nome, mantense o orixinal. - + This folder must not be renamed. Please name it back to Shared. Non é posíbel renomear este cartafol. Devólvalle o nome ao compartido. - + The file was renamed but is part of a read only share. The original file was restored. O ficheiro foi renomeado mais é parte dunha compartición de só lectura. O ficheiro orixinal foi restaurado. - + Wrong HTTP code returned by server. Expected 201, but received "%1 %2". O servidor devolveu código HTTP incorrecto. Agardábase 201, mais recibiuse «%1 %2». - - + + Error writing metadata to the database @@ -2168,22 +2168,22 @@ Recomendámoslle que non o use. OCC::PropagateUploadFileCommon - + File Removed Ficheiro retirado - + Local file changed during syncing. It will be resumed. O ficheiro local cambiou durante a sincronización. Retomase. - + Local file changed during sync. O ficheiro local cambiou durante a sincronización. - + Error writing metadata to the database diff --git a/translations/client_hu.ts b/translations/client_hu.ts index c3b9e497c..f8fbc310b 100644 --- a/translations/client_hu.ts +++ b/translations/client_hu.ts @@ -616,7 +616,7 @@ OCC::DeleteJob - + Connection timed out A kapcsolat időtúllépés miatt megszakadt @@ -1166,22 +1166,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway - + We received a different E-Tag for resuming. Retrying next time. - + Server returned wrong content-range - + Connection Timeout Kapcsolat időtúllépés @@ -1433,7 +1433,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from OCC::MoveJob - + Connection timed out A kapcsolat időtúllépés miatt megszakadt @@ -1966,7 +1966,7 @@ It is not advisable to use it. OCC::PUTFileJob - + Connection Timeout Kapcsolat időtúllépés @@ -1974,7 +1974,7 @@ It is not advisable to use it. OCC::PollJob - + Invalid JSON reply from the poll URL @@ -1990,47 +1990,47 @@ It is not advisable to use it. OCC::PropagateDownloadFile - + File %1 can not be downloaded because of a local file name clash! - + The download would reduce free disk space below %1 - + Free space on disk is less than %1 - + File was deleted from server A fájl törlésre került a szerverről - + The file could not be downloaded completely. - + The downloaded file is empty despite the server announced it should have been %1. - + File %1 cannot be saved because of a local file name clash! - + File has changed since discovery - + Error writing metadata to the database @@ -2111,12 +2111,12 @@ It is not advisable to use it. OCC::PropagateRemoteDelete - + The file has been removed from a read only share. It was restored. - + Wrong HTTP code returned by server. Expected 204, but received "%1 %2". @@ -2137,28 +2137,28 @@ It is not advisable to use it. OCC::PropagateRemoteMove - + This folder must not be renamed. It is renamed back to its original name. - + This folder must not be renamed. Please name it back to Shared. - + The file was renamed but is part of a read only share. The original file was restored. - + Wrong HTTP code returned by server. Expected 201, but received "%1 %2". - - + + Error writing metadata to the database @@ -2166,22 +2166,22 @@ It is not advisable to use it. OCC::PropagateUploadFileCommon - + File Removed Fájl törölve - + Local file changed during syncing. It will be resumed. - + Local file changed during sync. - + Error writing metadata to the database diff --git a/translations/client_it.ts b/translations/client_it.ts index e8174bb2c..2da12b3eb 100644 --- a/translations/client_it.ts +++ b/translations/client_it.ts @@ -616,7 +616,7 @@ OCC::DeleteJob - + Connection timed out Connessione scaduta @@ -1171,22 +1171,22 @@ Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tut OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Nessun e-tag ricevuto dal server, controlla il proxy/gateway - + We received a different E-Tag for resuming. Retrying next time. Abbiamo ricevuto un e-tag diverso per il recupero. Riprova più tardi. - + Server returned wrong content-range Il server ha restituito un content-range errato - + Connection Timeout Connessione scaduta @@ -1440,7 +1440,7 @@ Gli elementi per i quali è consentita l'eliminazione, saranno eliminati se OCC::MoveJob - + Connection timed out Connessione scaduta @@ -1974,7 +1974,7 @@ Non è consigliabile utilizzarlo. OCC::PUTFileJob - + Connection Timeout Connessione scaduta @@ -1982,7 +1982,7 @@ Non è consigliabile utilizzarlo. OCC::PollJob - + Invalid JSON reply from the poll URL Risposta JSON non valida dall'URL di richiesta @@ -1998,47 +1998,47 @@ Non è consigliabile utilizzarlo. OCC::PropagateDownloadFile - + File %1 can not be downloaded because of a local file name clash! Il file %1 non può essere scaricato a causa di un conflitto con un file locale. - + The download would reduce free disk space below %1 Lo scaricamento ridurrà lo spazio libero su disco al di sotto di %1 - + Free space on disk is less than %1 Lo spazio libero su disco è inferiore a %1 - + File was deleted from server Il file è stato eliminato dal server - + The file could not be downloaded completely. Il file non può essere scaricato completamente. - + The downloaded file is empty despite the server announced it should have been %1. Il file scaricato è vuoto nonostante il server indicasse una dimensione di %1. - + File %1 cannot be saved because of a local file name clash! Il file %1 non può essere salvato a causa di un conflitto con un file locale. - + File has changed since discovery Il file è stato modificato dal suo rilevamento - + Error writing metadata to the database Errore durante la scrittura dei metadati nel database @@ -2119,12 +2119,12 @@ Non è consigliabile utilizzarlo. OCC::PropagateRemoteDelete - + The file has been removed from a read only share. It was restored. Il file è stato rimosso da una condivisione in sola lettura. È stato ripristinato. - + Wrong HTTP code returned by server. Expected 204, but received "%1 %2". Codice HTTP errato restituito dal server. Atteso 204, ma ricevuto "%1 %2". @@ -2145,28 +2145,28 @@ Non è consigliabile utilizzarlo. OCC::PropagateRemoteMove - + This folder must not be renamed. It is renamed back to its original name. Questa cartella non può essere rinominata. Il nome originale è stato ripristinato. - + This folder must not be renamed. Please name it back to Shared. Questa cartella non può essere rinominata. Ripristina il nome Shared. - + The file was renamed but is part of a read only share. The original file was restored. Il file è stato rinominato, ma è parte di una condivisione in sola lettura. Il file originale è stato ripristinato. - + Wrong HTTP code returned by server. Expected 201, but received "%1 %2". Codice HTTP errato restituito dal server. Atteso 201, ma ricevuto "%1 %2". - - + + Error writing metadata to the database Errore durante la scrittura dei metadati nel database @@ -2174,22 +2174,22 @@ Non è consigliabile utilizzarlo. OCC::PropagateUploadFileCommon - + File Removed File rimosso - + Local file changed during syncing. It will be resumed. Il file locale è stato modificato durante la sincronizzazione. Sarà ripristinato. - + Local file changed during sync. Un file locale è cambiato durante la sincronizzazione. - + Error writing metadata to the database Errore durante la scrittura dei metadati nel database diff --git a/translations/client_ja.ts b/translations/client_ja.ts index d8acb8f2e..38f6c9fe8 100644 --- a/translations/client_ja.ts +++ b/translations/client_ja.ts @@ -616,7 +616,7 @@ OCC::DeleteJob - + Connection timed out 接続タイムアウト @@ -734,7 +734,7 @@ A new folder larger than %1 MB has been added: %2. - %1 MB より大きいフォルダが新たに追加されました: %2 + %1 MB より大きいフォルダが新たに追加されました: %2 @@ -1168,22 +1168,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway サーバーからE-Tagを受信できません。プロキシ/ゲートウェイを確認してください。 - + We received a different E-Tag for resuming. Retrying next time. 同期再開時に違う E-Tagを受信しました。次回リトライします。 - + Server returned wrong content-range サーバーが間違ったcontent-rangeを返しました - + Connection Timeout 接続タイムアウト @@ -1437,7 +1437,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from OCC::MoveJob - + Connection timed out 接続タイムアウト @@ -1970,7 +1970,7 @@ It is not advisable to use it. OCC::PUTFileJob - + Connection Timeout 接続タイムアウト @@ -1978,7 +1978,7 @@ It is not advisable to use it. OCC::PollJob - + Invalid JSON reply from the poll URL 不正なJSONがポーリングURLから返りました @@ -1994,47 +1994,47 @@ It is not advisable to use it. OCC::PropagateDownloadFile - + File %1 can not be downloaded because of a local file name clash! ファイル %1 はローカルファイル名が衝突しているためダウンロードできません！ - + The download would reduce free disk space below %1 ダウンロードすると、空き容量が %1 になります - + Free space on disk is less than %1 ディスク空き容量が %1 よりも少なくなっています - + File was deleted from server ファイルはサーバーから削除されました - + The file could not be downloaded completely. このファイルのダウンロードは完了しませんでした - + The downloaded file is empty despite the server announced it should have been %1. サーバーが通知しているファイルは %1 であるべきですが、ダウンロードファイルは空でした。 - + File %1 cannot be saved because of a local file name clash! %1 はローカルファイル名が衝突しているため保存できません！ - + File has changed since discovery ファイルは発見以降に変更されました - + Error writing metadata to the database メタデータのデータベースへの書き込みに失敗 @@ -2115,12 +2115,12 @@ It is not advisable to use it. OCC::PropagateRemoteDelete - + The file has been removed from a read only share. It was restored. ファイルが読み込み専用の共有から削除されました。ファイルは復元されました。 - + Wrong HTTP code returned by server. Expected 204, but received "%1 %2". 誤ったHTTPコードがサーバーから返されました。204のはずが、"%1 %2"が返りました。 @@ -2141,28 +2141,28 @@ It is not advisable to use it. OCC::PropagateRemoteMove - + This folder must not be renamed. It is renamed back to its original name. このフォルダー名は変更できません。元の名前に戻します。 - + This folder must not be renamed. Please name it back to Shared. このフォルダー名は変更できません。名前を Shared に戻してください。 - + The file was renamed but is part of a read only share. The original file was restored. ファイルの名前が変更されましたが、読み込み専用の共有の一部です。オリジナルのファイルが復元されました。 - + Wrong HTTP code returned by server. Expected 201, but received "%1 %2". 誤ったHTTPコードがサーバーから返されました。201のはずが、"%1 %2"が返りました。 - - + + Error writing metadata to the database メタデータのデータベースへの書き込みに失敗 @@ -2170,22 +2170,22 @@ It is not advisable to use it. OCC::PropagateUploadFileCommon - + File Removed ファイルを削除しました - + Local file changed during syncing. It will be resumed. ローカルファイルが同期中に変更されました。再開されます。 - + Local file changed during sync. ローカルのファイルが同期中に変更されました。 - + Error writing metadata to the database メタデータのデータベースへの書き込みに失敗 diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts index 0b3032ba0..3b5794692 100644 --- a/translations/client_nb_NO.ts +++ b/translations/client_nb_NO.ts @@ -616,7 +616,7 @@ OCC::DeleteJob - + Connection timed out Forbindelsen fikk tidsavbrudd @@ -1168,22 +1168,22 @@ Hvis synkroniseringen fortsetter som normalt, vil alle filene dine bli overskrev OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Ingen E-Tag mottatt fra server. Sjekk proxy/gateway. - + We received a different E-Tag for resuming. Retrying next time. Vi mottok en forskjellig E-Tag for å fortsette. Prøver igjen neste gang. - + Server returned wrong content-range Serveren returnerte feil content-range - + Connection Timeout Tidsavbrudd ved tilkobling @@ -1437,7 +1437,7 @@ Elementer hvor sletting er tillatt, vil bli slettet hvis de forhindrer fjerning OCC::MoveJob - + Connection timed out Forbindelsen fikk tidsavbrudd @@ -1972,7 +1972,7 @@ Det er ikke tilrådelig å bruke den. OCC::PUTFileJob - + Connection Timeout Tidsavbrudd ved tilkobling @@ -1980,7 +1980,7 @@ Det er ikke tilrådelig å bruke den. OCC::PollJob - + Invalid JSON reply from the poll URL Ugyldig JSON-svar fra forespørsels-URL @@ -1996,47 +1996,47 @@ Det er ikke tilrådelig å bruke den. OCC::PropagateDownloadFile - + File %1 can not be downloaded because of a local file name clash! Fil %1 kan ikke lastes ned på grunn av lokalt sammenfall av filnavn! - + The download would reduce free disk space below %1 Nedlastingen ville ha redusert ledig diskplass til under %1 - + Free space on disk is less than %1 Ledig plass på disk er mindre enn %1 - + File was deleted from server Filen ble slettet fra serveren - + The file could not be downloaded completely. Hele filen kunne ikke lastes ned. - + The downloaded file is empty despite the server announced it should have been %1. Nedlastet fil er tom, selv om serveren annonserte at den skulle være %1. - + File %1 cannot be saved because of a local file name clash! Fil %1 kan ikke lagres på grunn av lokal konflikt med filnavn. - + File has changed since discovery Filen er endret siden den ble oppdaget - + Error writing metadata to the database Feil ved skriving av metadata til databasen @@ -2117,12 +2117,12 @@ Det er ikke tilrådelig å bruke den. OCC::PropagateRemoteDelete - + The file has been removed from a read only share. It was restored. Filen er blitt fjernet fra en deling med lesetilgang. Den ble gjenopprettet. - + Wrong HTTP code returned by server. Expected 204, but received "%1 %2". Feil HTTP-kode returnert fra server. Ventet 204, men mottok "%1 %2". @@ -2143,28 +2143,28 @@ Det er ikke tilrådelig å bruke den. OCC::PropagateRemoteMove - + This folder must not be renamed. It is renamed back to its original name. Denne mappen må ikke omdøpes. Den er omdøpt tilbake til sitt opprinnelige navn. - + This folder must not be renamed. Please name it back to Shared. Denne mappen må ikke omdøpes. Vennligst omdøp den tilbake til Shared. - + The file was renamed but is part of a read only share. The original file was restored. Filen ble gitt nytt navn mer er en del av en deling med lesetilgang. Den opprinnelige filen ble gjenopprettet. - + Wrong HTTP code returned by server. Expected 201, but received "%1 %2". Feil HTTP-kode returnert fra server. Ventet 201, men mottok "%1 %2". - - + + Error writing metadata to the database Feil ved skriving av metadata til databasen @@ -2172,22 +2172,22 @@ Det er ikke tilrådelig å bruke den. OCC::PropagateUploadFileCommon - + File Removed Fil fjernet - + Local file changed during syncing. It will be resumed. Lokal fil endret under synkronisering. Den vil gjenopptas. - + Local file changed during sync. Lokal fil endret under synkronisering. - + Error writing metadata to the database Feil ved skriving av metadata til databasen diff --git a/translations/client_nl.ts b/translations/client_nl.ts index 577232052..d3c247b24 100644 --- a/translations/client_nl.ts +++ b/translations/client_nl.ts @@ -616,7 +616,7 @@ OCC::DeleteJob - + Connection timed out Time-out verbinding @@ -1175,22 +1175,22 @@ Doorgaan met deze synchronisatie overschrijft al uw bestanden door een eerdere v OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Geen E-Tag ontvangen van de server, controleer Proxy/Gateway - + We received a different E-Tag for resuming. Retrying next time. We ontvingen een afwijkende E-Tag om door te gaan. We proberen het later opnieuw. - + Server returned wrong content-range Server retourneerde verkeerde content-bandbreedte - + Connection Timeout Verbindingstime-out @@ -1448,7 +1448,7 @@ Onderdelen die gewist mogen worden worden verwijderd als ze voorkomen dat een ma OCC::MoveJob - + Connection timed out Verbinding time-out @@ -1983,7 +1983,7 @@ We adviseren deze site niet te gebruiken. OCC::PUTFileJob - + Connection Timeout Verbindingstime-out @@ -1991,7 +1991,7 @@ We adviseren deze site niet te gebruiken. OCC::PollJob - + Invalid JSON reply from the poll URL Ongeldig JSON antwoord van de opgegeven URL @@ -2007,47 +2007,47 @@ We adviseren deze site niet te gebruiken. OCC::PropagateDownloadFile - + File %1 can not be downloaded because of a local file name clash! Bestand %1 kan niet worden gedownload, omdat de naam conflicteert met een lokaal bestand - + The download would reduce free disk space below %1 De download zou de vrije schijfruimte beperken tot onder %1 - + Free space on disk is less than %1 Vrije schijfruimte is minder dan %1 - + File was deleted from server Bestand was verwijderd van de server - + The file could not be downloaded completely. Het bestand kon niet volledig worden gedownload. - + The downloaded file is empty despite the server announced it should have been %1. Het gedownloade bestand is leeg, hoewel de server meldde dat het %1 zou moeten zijn. - + File %1 cannot be saved because of a local file name clash! Bestand %1 kan niet worden opgeslagen wegens een lokaal bestandsnaam conflict! - + File has changed since discovery Het bestand is gewijzigd sinds het is gevonden - + Error writing metadata to the database Fout bij schrijven van Metadata naar de database @@ -2128,12 +2128,12 @@ We adviseren deze site niet te gebruiken. OCC::PropagateRemoteDelete - + The file has been removed from a read only share. It was restored. Het bestand is verwijderd van een alleen-lezen share. Het is teruggezet. - + Wrong HTTP code returned by server. Expected 204, but received "%1 %2". Foutieve HTTP code ontvangen van de server. Verwacht was 204, maar ontvangen "%1 %2". @@ -2154,28 +2154,28 @@ We adviseren deze site niet te gebruiken. OCC::PropagateRemoteMove - + This folder must not be renamed. It is renamed back to its original name. Deze map mag niet worden hernoemd. De naam van de map is teruggezet naar de originele naam. - + This folder must not be renamed. Please name it back to Shared. Deze map mag niet worden hernoemd. Verander de naam terug in Gedeeld. - + The file was renamed but is part of a read only share. The original file was restored. Het bestand is hernoemd, maar hoort bij een alleen-lezen share. Het originele bestand is teruggezet. - + Wrong HTTP code returned by server. Expected 201, but received "%1 %2". Foutieve HTTP code ontvangen van de server. Verwacht werd 201, maar ontvangen "%1 %2". - - + + Error writing metadata to the database Fout bij schrijven van Metadata naar de database @@ -2183,22 +2183,22 @@ We adviseren deze site niet te gebruiken. OCC::PropagateUploadFileCommon - + File Removed Bestand verwijderd - + Local file changed during syncing. It will be resumed. Lokaal bestand gewijzigd bij sync. Wordt opnieuw meengenomen. - + Local file changed during sync. Lokaal bestand gewijzigd bij sync. - + Error writing metadata to the database Fout bij schrijven van Metadata naar de database diff --git a/translations/client_pl.ts b/translations/client_pl.ts index 127a8d47c..7e49f6a7f 100644 --- a/translations/client_pl.ts +++ b/translations/client_pl.ts @@ -616,7 +616,7 @@ OCC::DeleteJob - + Connection timed out Przekroczono czas odpowiedzi @@ -1168,22 +1168,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Nie otrzymano E-Tag z serwera, sprawdź Proxy/Bramę - + We received a different E-Tag for resuming. Retrying next time. Otrzymaliśmy inny E-Tag wznowienia. Spróbuje ponownie następnym razem. - + Server returned wrong content-range Serwer zwrócił błędną zakres zawartości - + Connection Timeout Limit czasu połączenia @@ -1437,7 +1437,7 @@ Pozycje, dla których usuwanie jest dozwolone zostaną usunięte, jeżeli uprawn OCC::MoveJob - + Connection timed out Przekroczono czas odpowiedzi @@ -1972,7 +1972,7 @@ Niezalecane jest jego użycie. OCC::PUTFileJob - + Connection Timeout Limit czasu połączenia @@ -1980,7 +1980,7 @@ Niezalecane jest jego użycie. OCC::PollJob - + Invalid JSON reply from the poll URL @@ -1996,47 +1996,47 @@ Niezalecane jest jego użycie. OCC::PropagateDownloadFile - + File %1 can not be downloaded because of a local file name clash! Nie można pobrać pliku %1 ze względu na konflikt nazwy pliku lokalnego! - + The download would reduce free disk space below %1 Pobranie zmniejszy ilość wolnego miejsca poniżej %1. - + Free space on disk is less than %1 Wolne miejsce na dysku jest mniejsze niż %1 - + File was deleted from server Plik został usunięty z serwera - + The file could not be downloaded completely. Ten plik nie mógł być całkowicie pobrany. - + The downloaded file is empty despite the server announced it should have been %1. - + File %1 cannot be saved because of a local file name clash! - + File has changed since discovery - + Error writing metadata to the database Błąd podczas zapisu metadanych do bazy @@ -2117,12 +2117,12 @@ Niezalecane jest jego użycie. OCC::PropagateRemoteDelete - + The file has been removed from a read only share. It was restored. Plik został usunięty z zasobu z prawem tylko do odczytu. Został przywrócony. - + Wrong HTTP code returned by server. Expected 204, but received "%1 %2". @@ -2143,28 +2143,28 @@ Niezalecane jest jego użycie. OCC::PropagateRemoteMove - + This folder must not be renamed. It is renamed back to its original name. Folder ten nie może być zmieniony. Został zmieniony z powrotem do pierwotnej nazwy. - + This folder must not be renamed. Please name it back to Shared. Nie wolno zmieniać nazwy tego folderu. Proszę zmień nazwę z powrotem na Shared. - + The file was renamed but is part of a read only share. The original file was restored. Plik był edytowany lokalnie ale jest częścią udziału z prawem tylko do odczytu. Przywrócono oryginalny plik - + Wrong HTTP code returned by server. Expected 201, but received "%1 %2". - - + + Error writing metadata to the database Błąd podczas zapisu metadanych do bazy @@ -2172,22 +2172,22 @@ Niezalecane jest jego użycie. OCC::PropagateUploadFileCommon - + File Removed Usunięto plik - + Local file changed during syncing. It will be resumed. - + Local file changed during sync. Lokalny plik zmienił się podczas synchronizacji. - + Error writing metadata to the database Błąd podczas zapisu metadanych do bazy diff --git a/translations/client_pt.ts b/translations/client_pt.ts index f8a82af66..6b9ab5253 100644 --- a/translations/client_pt.ts +++ b/translations/client_pt.ts @@ -111,7 +111,7 @@ Synchronize none - + Sincronizar nenhum @@ -616,7 +616,7 @@ OCC::DeleteJob - + Connection timed out A ligação expirou @@ -1166,22 +1166,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Nenhum E-Tag recebida do servidor, verifique Proxy / Acesso - + We received a different E-Tag for resuming. Retrying next time. Nós recebemos uma E-Tag diferente para retomar. Tentar da próxima vez. - + Server returned wrong content-range O servidor devolveu o alcance-conteúdo errado - + Connection Timeout O tempo de ligação expirou @@ -1435,7 +1435,7 @@ Os itens onde é permitido a eliminação serão eliminados se estes impedirem a OCC::MoveJob - + Connection timed out A ligação expirou @@ -1970,7 +1970,7 @@ Não é aconselhada a sua utilização. OCC::PUTFileJob - + Connection Timeout O tempo de ligação expirou @@ -1978,7 +1978,7 @@ Não é aconselhada a sua utilização. OCC::PollJob - + Invalid JSON reply from the poll URL Resposta JSON inválida do URL poll @@ -1994,47 +1994,47 @@ Não é aconselhada a sua utilização. OCC::PropagateDownloadFile - + File %1 can not be downloaded because of a local file name clash! Não foi possível transferir o ficheiro %1 devido a um conflito com o nome de ficheiro local! - + The download would reduce free disk space below %1 A transferência poderá reduzir o espaço livre em disco para menos de %1 - + Free space on disk is less than %1 O Espaço livre no disco é inferior a %1 - + File was deleted from server O ficheiro foi eliminado do servidor - + The file could not be downloaded completely. Não foi possível transferir o ficheiro na totalidade. - + The downloaded file is empty despite the server announced it should have been %1. O ficheiro transferido está vazio, apesar do servidor indicar que este deveria ter %1. - + File %1 cannot be saved because of a local file name clash! Ficheiro %1 não pode ser guardado devido à existência de um ficheiro local com o mesmo nome. - + File has changed since discovery O ficheiro alterou-se desde a sua descoberta - + Error writing metadata to the database Erro ao gravar os metadados para a base de dados @@ -2115,12 +2115,12 @@ Não é aconselhada a sua utilização. OCC::PropagateRemoteDelete - + The file has been removed from a read only share. It was restored. O ficheiro havia sido removido de uma partilha apenas de leitura. Ficheiro restaurado. - + Wrong HTTP code returned by server. Expected 204, but received "%1 %2". Código HTTP errado devolvido pelo servidor. Esperado 204, mas foi recebido "%1 %2". @@ -2141,28 +2141,28 @@ Não é aconselhada a sua utilização. OCC::PropagateRemoteMove - + This folder must not be renamed. It is renamed back to its original name. Esta pasta não pode ser renomeada. A alterar para nome original. - + This folder must not be renamed. Please name it back to Shared. Esta pasta não pode ser renomeada. Por favor renomeie para o seu nome original: Shared. - + The file was renamed but is part of a read only share. The original file was restored. O ficheiro foi renomeado mas faz parte de uma partilha só de leitura. O ficheiro original foi restaurado. - + Wrong HTTP code returned by server. Expected 201, but received "%1 %2". Código HTTP errado devolvido pelo servidor. Esperado 201, mas foi recebido "%1 %2". - - + + Error writing metadata to the database Erro ao escrever a meta-informação par a base de dados @@ -2170,22 +2170,22 @@ Não é aconselhada a sua utilização. OCC::PropagateUploadFileCommon - + File Removed Ficheiro Eliminado - + Local file changed during syncing. It will be resumed. O ficheiro local foi alterado durante a sincronização. Vai ser finalizado. - + Local file changed during sync. Ficheiro local alterado durante a sincronização. - + Error writing metadata to the database Erro ao gravar os metadados para a base de dados diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts index c3c027ecc..70abf4f1b 100644 --- a/translations/client_pt_BR.ts +++ b/translations/client_pt_BR.ts @@ -616,7 +616,7 @@ OCC::DeleteJob - + Connection timed out Conexão expirou @@ -1173,22 +1173,22 @@ Continuar a sincronização como normal fará com que todos os seus arquivos sej OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Nenhuma E-Tag recebida do servidor, verifique Proxy / gateway - + We received a different E-Tag for resuming. Retrying next time. Recebemos um e-Tag diferente para resumir. Tente uma próxima vez. - + Server returned wrong content-range O servidor retornou erro numa série-de-conteúdo - + Connection Timeout Conexão Finalizada @@ -1443,7 +1443,7 @@ Itens onde a eliminação é permitida serão excluídos se eles evitarem que um OCC::MoveJob - + Connection timed out Conexão expirou @@ -1976,7 +1976,7 @@ It is not advisable to use it. OCC::PUTFileJob - + Connection Timeout Conexão Finalizada @@ -1984,7 +1984,7 @@ It is not advisable to use it. OCC::PollJob - + Invalid JSON reply from the poll URL Resposta JSON inválida a partir do conjunto de URL @@ -2000,47 +2000,47 @@ It is not advisable to use it. OCC::PropagateDownloadFile - + File %1 can not be downloaded because of a local file name clash! O arquivo %1 não pode ser baixado devido a um confronto local no nome do arquivo! - + The download would reduce free disk space below %1 O download reduzirá o espaço livre em disco abaixo de %1 - + Free space on disk is less than %1 O espaço livre no disco é inferior a %1 - + File was deleted from server O arquivo foi eliminado do servidor - + The file could not be downloaded completely. O arquivo não pode ser baixado completamente. - + The downloaded file is empty despite the server announced it should have been %1. O arquivo baixado está vazio apesar do servidor anunciou que deveria ter %1. - + File %1 cannot be saved because of a local file name clash! O arquivo %1 não pode ser salvo devido a um confronto com um nome de arquivo local! - + File has changed since discovery Arquivo foi alterado desde a descoberta - + Error writing metadata to the database Ocorreu um erro ao escrever metadados ao banco de dados @@ -2121,12 +2121,12 @@ It is not advisable to use it. OCC::PropagateRemoteDelete - + The file has been removed from a read only share. It was restored. O arquivo foi removido de um compartilhamento somente de leitura. Ele foi restaurado. - + Wrong HTTP code returned by server. Expected 204, but received "%1 %2". Código HTTP retornado errado pelo servidor. 204 esperado, mas recebeu "%1 %2". @@ -2147,28 +2147,28 @@ It is not advisable to use it. OCC::PropagateRemoteMove - + This folder must not be renamed. It is renamed back to its original name. Esta pasta não pode ser renomeada. Ela será renomeado de volta ao seu nome original. - + This folder must not be renamed. Please name it back to Shared. Esta pasta não pode ser renomeada. Por favor, nomeie-a de volta para Compartilhada. - + The file was renamed but is part of a read only share. The original file was restored. O arquivo foi renomeado mas faz parte de compartilhamento só de leitura. O arquivo original foi restaurado. - + Wrong HTTP code returned by server. Expected 201, but received "%1 %2". Código HTTP retornado errado pelo servidor. 201 esperado, mas recebeu "%1 %2". - - + + Error writing metadata to the database Ocorreu um erro ao escrever metadados ao banco de dados @@ -2176,22 +2176,22 @@ It is not advisable to use it. OCC::PropagateUploadFileCommon - + File Removed Arquivo Removido - + Local file changed during syncing. It will be resumed. Arquivo local alterado durante a sincronização. Ele será retomado. - + Local file changed during sync. Arquivo local modificado durante a sincronização. - + Error writing metadata to the database Ocorreu um erro ao escrever metadados ao banco de dados diff --git a/translations/client_ru.ts b/translations/client_ru.ts index f39852f27..c151a7740 100644 --- a/translations/client_ru.ts +++ b/translations/client_ru.ts @@ -616,7 +616,7 @@ OCC::DeleteJob - + Connection timed out Время ожидания соединения превышено @@ -1173,22 +1173,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway E-Tag от сервера не получен, проверьте настройки прокси/шлюза. - + We received a different E-Tag for resuming. Retrying next time. Мы получили другой E-Tag для возобновления. Повторите попытку позже. - + Server returned wrong content-range Сервер вернул неверный диапазон содержимого - + Connection Timeout Время ожидания подключения истекло @@ -1441,7 +1441,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from OCC::MoveJob - + Connection timed out Время ожидания соединения превышено @@ -1976,7 +1976,7 @@ It is not advisable to use it. OCC::PUTFileJob - + Connection Timeout Время ожидания подключения истекло @@ -1984,7 +1984,7 @@ It is not advisable to use it. OCC::PollJob - + Invalid JSON reply from the poll URL Не правильный JSON ответ на сформированный URL @@ -2000,47 +2000,47 @@ It is not advisable to use it. OCC::PropagateDownloadFile - + File %1 can not be downloaded because of a local file name clash! Файл %1 не может быть загружен из-за локального конфликта имен! - + The download would reduce free disk space below %1 Эта загрузка уменьшит свободное дисковое пространство ниже %1 - + Free space on disk is less than %1 Свободное место на диске меньше, чем %1 - + File was deleted from server Файл был удален с сервера - + The file could not be downloaded completely. Невозможно полностью загрузить файл. - + The downloaded file is empty despite the server announced it should have been %1. Скачанный файл пуст, хотя сервер заявил, что он должен быть %1. - + File %1 cannot be saved because of a local file name clash! Файл %1 не может быть сохранён из-за локального конфликта имен! - + File has changed since discovery После обнаружения файл был изменен - + Error writing metadata to the database Ошибка записи метаданных в базу данных @@ -2121,12 +2121,12 @@ It is not advisable to use it. OCC::PropagateRemoteDelete - + The file has been removed from a read only share. It was restored. Файл удалён с удаленного общего ресурса только для чтения. Файл был восстановлен. - + Wrong HTTP code returned by server. Expected 204, but received "%1 %2". Сервер ответил не правильным HTTP кодом. Ожидался 204, но получен "%1 %2". @@ -2147,28 +2147,28 @@ It is not advisable to use it. OCC::PropagateRemoteMove - + This folder must not be renamed. It is renamed back to its original name. Этот каталог не должен переименовываться. Ему будет присвоено изначальное имя. - + This folder must not be renamed. Please name it back to Shared. Этот каталог не должен переименовываться. Присвойте ему изначальное имя: Shared. - + The file was renamed but is part of a read only share. The original file was restored. Файл переименован на удаленном общем ресурсе только для чтения. Файл был восстановлен. - + Wrong HTTP code returned by server. Expected 201, but received "%1 %2". Сервер ответил не правильным HTTP кодом. Ожидался 201, но получен "%1 %2". - - + + Error writing metadata to the database Ошибка записи метаданных в базу данных @@ -2176,22 +2176,22 @@ It is not advisable to use it. OCC::PropagateUploadFileCommon - + File Removed Файл Перемещён - + Local file changed during syncing. It will be resumed. Локальный файл изменился в процессе синхронизации. Операция будет возобновлена. - + Local file changed during sync. Локальный файл изменился в процессе синхронизации. - + Error writing metadata to the database Ошибка записи метаданных в базу данных diff --git a/translations/client_sk.ts b/translations/client_sk.ts index cdf3d9aea..d78b78691 100644 --- a/translations/client_sk.ts +++ b/translations/client_sk.ts @@ -616,7 +616,7 @@ OCC::DeleteJob - + Connection timed out Pripojenie expirovalo @@ -1166,22 +1166,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Zo servera nebol prijatý E-Tag, skontrolujte proxy/bránu - + We received a different E-Tag for resuming. Retrying next time. Prijali sme iný E-Tag pre pokračovanie. Skúsim to neskôr znovu. - + Server returned wrong content-range Server vrátil nesprávnu hodnotu Content-range - + Connection Timeout Spojenie vypršalo @@ -1433,7 +1433,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from OCC::MoveJob - + Connection timed out Pripojenie expirovalo @@ -1968,7 +1968,7 @@ Nie je vhodné ju používať. OCC::PUTFileJob - + Connection Timeout Spojenie vypršalo @@ -1976,7 +1976,7 @@ Nie je vhodné ju používať. OCC::PollJob - + Invalid JSON reply from the poll URL Neplatná JSON odpoveď z URL adresy @@ -1992,47 +1992,47 @@ Nie je vhodné ju používať. OCC::PropagateDownloadFile - + File %1 can not be downloaded because of a local file name clash! Súbor %1 nie je možné stiahnuť, pretože súbor s rovnakým menom už existuje! - + The download would reduce free disk space below %1 - + Free space on disk is less than %1 - + File was deleted from server Súbor bol vymazaný zo servera - + The file could not be downloaded completely. Súbor sa nedá stiahnuť úplne. - + The downloaded file is empty despite the server announced it should have been %1. - + File %1 cannot be saved because of a local file name clash! Súbor %1 nie je možné uložiť, pretože jeho názov koliduje s názvom lokálneho súboru! - + File has changed since discovery Súbor sa medzitým zmenil - + Error writing metadata to the database Chyba pri zápise metadát do databázy @@ -2113,12 +2113,12 @@ Nie je vhodné ju používať. OCC::PropagateRemoteDelete - + The file has been removed from a read only share. It was restored. Súbor bol odobratý zo zdieľania len na čítanie. Súbor bol obnovený. - + Wrong HTTP code returned by server. Expected 204, but received "%1 %2". Server vrátil neplatný HTTP kód. Očakávaný bol 204, ale vrátený bol "%1 %2". @@ -2139,28 +2139,28 @@ Nie je vhodné ju používať. OCC::PropagateRemoteMove - + This folder must not be renamed. It is renamed back to its original name. Tento priečinok nemôže byť premenovaný. Prosím, vráťte mu pôvodné meno. - + This folder must not be renamed. Please name it back to Shared. Tento priečinok nemôže byť premenovaný. Prosím, vráťte mu meno Shared. - + The file was renamed but is part of a read only share. The original file was restored. Súbor bol premenovaný, ale je súčasťou zdieľania len na čítanie. Pôvodný súbor bol obnovený. - + Wrong HTTP code returned by server. Expected 201, but received "%1 %2". Server vrátil neplatný HTTP kód. Očakávaný bol 201, ale vrátený bol "%1 %2". - - + + Error writing metadata to the database Chyba pri zápise metadát do databázy @@ -2168,22 +2168,22 @@ Nie je vhodné ju používať. OCC::PropagateUploadFileCommon - + File Removed Súbor zmazaný - + Local file changed during syncing. It will be resumed. Lokálny súbor bol zmenený počas synchronizácie. Bude obnovený. - + Local file changed during sync. Lokálny súbor bol zmenený počas synchronizácie. - + Error writing metadata to the database Chyba pri zápise metadát do databázy diff --git a/translations/client_sl.ts b/translations/client_sl.ts index 18fc35063..4812dafa3 100644 --- a/translations/client_sl.ts +++ b/translations/client_sl.ts @@ -616,7 +616,7 @@ OCC::DeleteJob - + Connection timed out Povezava je časovno potekla @@ -1175,22 +1175,22 @@ Z nadaljevanjem usklajevanja bodo vse trenutne datoteke prepisane s starejšimi OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Ni prejete oznake s strežnika. Preveriti je treba podatke posredovalnega strežnika ali prehoda. - + We received a different E-Tag for resuming. Retrying next time. Prejeta je različna oznaka za nadaljevanje opravila. Ponovni poskus bo izveden kasneje. - + Server returned wrong content-range Odziv strežnika kaže na neveljaven obseg vsebine - + Connection Timeout Povezava je časovno potekla @@ -1444,7 +1444,7 @@ Predmeti na mestu, kjer je brisanje dovoljeno, bodo izbisani, v kolikor zaradi n OCC::MoveJob - + Connection timed out Povezava je potekla @@ -1979,7 +1979,7 @@ Uporaba ni priporočljiva. OCC::PUTFileJob - + Connection Timeout Povezava časovno pretekla @@ -1987,7 +1987,7 @@ Uporaba ni priporočljiva. OCC::PollJob - + Invalid JSON reply from the poll URL Neveljaven odziv JSON preverjanja naslova URL @@ -2003,47 +2003,47 @@ Uporaba ni priporočljiva. OCC::PropagateDownloadFile - + File %1 can not be downloaded because of a local file name clash! Datoteke %1 ni mogoče prejeti zaradi neskladja z imenom krajevne datoteke! - + The download would reduce free disk space below %1 Prejem bi zmanjšal prostor na disku pod %1 - + Free space on disk is less than %1 Na disku je prostora manj kot %1 - + File was deleted from server Datoteka je izbrisana s strežnika - + The file could not be downloaded completely. Datoteke ni mogoče prejeti v celoti. - + The downloaded file is empty despite the server announced it should have been %1. Prejeta datoteka je prazna, čeprav je na strežniku velikosti %1. - + File %1 cannot be saved because of a local file name clash! Datoteke %1 ni mogoče shraniti zaradi neskladja z imenom obstoječe datoteke! - + File has changed since discovery Datoteka je bila spremenjena po usklajevanju seznama datotek - + Error writing metadata to the database Napaka zapisovanja metapodatkov v podatkovno zbirko @@ -2124,12 +2124,12 @@ Uporaba ni priporočljiva. OCC::PropagateRemoteDelete - + The file has been removed from a read only share. It was restored. Datoteka je bila odstranjena iz mesta v souporabi, vendar je uspešno obnovljena. - + Wrong HTTP code returned by server. Expected 204, but received "%1 %2". S strežnika je vrnjen neveljaven odziv HTTP. Pričakovan je 204, prejet pa je bil "%1 %2". @@ -2150,28 +2150,28 @@ Uporaba ni priporočljiva. OCC::PropagateRemoteMove - + This folder must not be renamed. It is renamed back to its original name. Te mape ni dovoljeno preimenovati, zato bo samodejno preimenovana v izvorno ime. - + This folder must not be renamed. Please name it back to Shared. Te mape ni dovoljeno preimenovati. Preimenujte jo nazaj na privzeto vrednost. - + The file was renamed but is part of a read only share. The original file was restored. Datoteka je preimenovana, vendar je označena za souporabo le za branje. Obnovljena je izvirna datoteka. - + Wrong HTTP code returned by server. Expected 201, but received "%1 %2". S strežnika je vrnjen neveljaven odziv HTTP. Pričakovan je 201, prejet pa je bil "%1 %2". - - + + Error writing metadata to the database Napaka zapisovanja metapodatkov v podatkovno zbirko @@ -2179,22 +2179,22 @@ Uporaba ni priporočljiva. OCC::PropagateUploadFileCommon - + File Removed Datoteka je odstranjena - + Local file changed during syncing. It will be resumed. Krajevna datoteka je bila med usklajevanjem spremenjena. Usklajena bo, ko bo shranjena. - + Local file changed during sync. Krajevna datoteka je bila med usklajevanjem spremenjena. - + Error writing metadata to the database Napaka zapisovanja metapodatkov v podatkovno zbirko diff --git a/translations/client_sr.ts b/translations/client_sr.ts index 4504253d4..9f7dffc18 100644 --- a/translations/client_sr.ts +++ b/translations/client_sr.ts @@ -616,7 +616,7 @@ OCC::DeleteJob - + Connection timed out Време повезивања истекло @@ -1166,22 +1166,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Нема е-ознаке са сервера. Проверите прокси или мрежни излаз - + We received a different E-Tag for resuming. Retrying next time. Добијена је различита е-ознака за наставак преноса. Покушаћу поново следећи пут. - + Server returned wrong content-range Сервер је вратио погрешан опсег садржаја - + Connection Timeout Време за повезивање је истекло @@ -1433,7 +1433,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from OCC::MoveJob - + Connection timed out Време повезивања истекло @@ -1968,7 +1968,7 @@ It is not advisable to use it. OCC::PUTFileJob - + Connection Timeout Веза је истекла @@ -1976,7 +1976,7 @@ It is not advisable to use it. OCC::PollJob - + Invalid JSON reply from the poll URL Неисправан ЈСОН одговор са адресе упита @@ -1992,47 +1992,47 @@ It is not advisable to use it. OCC::PropagateDownloadFile - + File %1 can not be downloaded because of a local file name clash! Фајл %1 се не може преузети јер се судара са називом локалног фајла! - + The download would reduce free disk space below %1 - + Free space on disk is less than %1 - + File was deleted from server Фајл је обрисан са сервера - + The file could not be downloaded completely. Фајл није могао бити преузет у потпуности. - + The downloaded file is empty despite the server announced it should have been %1. - + File %1 cannot be saved because of a local file name clash! Фајл %1 се не може сачувати јер се судара са називом локалног фајла! - + File has changed since discovery Фајл је измењен у међувремену - + Error writing metadata to the database @@ -2113,12 +2113,12 @@ It is not advisable to use it. OCC::PropagateRemoteDelete - + The file has been removed from a read only share. It was restored. Фајл је уклоњен из дељења које је само за читање. Зато је враћен. - + Wrong HTTP code returned by server. Expected 204, but received "%1 %2". Сервер је вратио лош ХТТП код. Очекивано је 204 али је примљено „%1 %2“. @@ -2139,28 +2139,28 @@ It is not advisable to use it. OCC::PropagateRemoteMove - + This folder must not be renamed. It is renamed back to its original name. Ова фасцикла се не сме преименовати. Зато је враћен првобитни назив. - + This folder must not be renamed. Please name it back to Shared. Ова фасцикла се не сме преименовати. Молим вас вратите назив у „Shared“. - + The file was renamed but is part of a read only share. The original file was restored. Фајл је био преименован али је део дељења које је само за читање. Оригинални фајл је враћен. - + Wrong HTTP code returned by server. Expected 201, but received "%1 %2". Сервер је вратио лош ХТТП код. Очекивано је 201 али је примљено „%1 %2“. - - + + Error writing metadata to the database @@ -2168,22 +2168,22 @@ It is not advisable to use it. OCC::PropagateUploadFileCommon - + File Removed Фајл уклоњен - + Local file changed during syncing. It will be resumed. Локални фајл је измењен током синхронизације. Биће настављена. - + Local file changed during sync. Локални фајл измењен током синхронизације. - + Error writing metadata to the database diff --git a/translations/client_sv.ts b/translations/client_sv.ts index 5dad0ef13..06f567697 100644 --- a/translations/client_sv.ts +++ b/translations/client_sv.ts @@ -616,7 +616,7 @@ OCC::DeleteJob - + Connection timed out Tidsgräns för anslutningen överskreds @@ -1168,22 +1168,22 @@ Om du fortsätter synkningen kommer alla dina filer återställas med en äldre OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Ingen E-Tag mottogs från servern, kontrollera proxy/gateway - + We received a different E-Tag for resuming. Retrying next time. Vi mottog en helt annan e-tag för att återuppta. Försök igen nästa gång. - + Server returned wrong content-range Servern returnerade felaktig content-range - + Connection Timeout Anslutningen avbröts på grund av timeout @@ -1437,7 +1437,7 @@ Objekt som tillåter radering kommer tas bort om de förhindrar en mapp att tas OCC::MoveJob - + Connection timed out Tidsgräns för anslutningen överskreds @@ -1972,7 +1972,7 @@ Det är inte lämpligt använda den. OCC::PUTFileJob - + Connection Timeout Anslutningen avbröts på grund av timeout @@ -1980,7 +1980,7 @@ Det är inte lämpligt använda den. OCC::PollJob - + Invalid JSON reply from the poll URL Ogiltigt JSON-svar från hämtnings-URLen @@ -1996,47 +1996,47 @@ Det är inte lämpligt använda den. OCC::PropagateDownloadFile - + File %1 can not be downloaded because of a local file name clash! Fil %1 kan inte laddas ner på grund av namnkonflikt med en lokal fil! - + The download would reduce free disk space below %1 Nedladdningen skulle innebära ledigt utrymme understiger %1 - + Free space on disk is less than %1 Ledigt utrymme är under %1 - + File was deleted from server Filen har tagits bort från servern - + The file could not be downloaded completely. Filen kunde inte laddas ner fullständigt. - + The downloaded file is empty despite the server announced it should have been %1. Den nedladdade filen är tom men servern sa att den skulle vara %1. - + File %1 cannot be saved because of a local file name clash! Fil %1 kan inte sparas eftersom namnet krockar med en lokal fil! - + File has changed since discovery Filen har ändrats sedan upptäckten - + Error writing metadata to the database Fel vid skrivning av metadata till databasen @@ -2117,12 +2117,12 @@ Det är inte lämpligt använda den. OCC::PropagateRemoteDelete - + The file has been removed from a read only share. It was restored. Den här filen har tagits bort från en endast-läsbar delning. Den återställdes. - + Wrong HTTP code returned by server. Expected 204, but received "%1 %2". Felaktig HTTP-kod i svaret från servern. '204' förväntades, men "%1 %2" mottogs. @@ -2143,28 +2143,28 @@ Det är inte lämpligt använda den. OCC::PropagateRemoteMove - + This folder must not be renamed. It is renamed back to its original name. Denna mapp får inte byta namn. Den kommer att döpas om till sitt ursprungliga namn. - + This folder must not be renamed. Please name it back to Shared. Denna mapp får ej döpas om. Vänligen döp den till Delad igen. - + The file was renamed but is part of a read only share. The original file was restored. En fil döptes om men är en del av en endast-läsbar delning. Original filen återställdes. - + Wrong HTTP code returned by server. Expected 201, but received "%1 %2". Felaktig HTTP-kod i svaret från servern. '201' förväntades, men "%1 %2" mottogs. - - + + Error writing metadata to the database Fel vid skrivning av metadata till databasen @@ -2172,22 +2172,22 @@ Det är inte lämpligt använda den. OCC::PropagateUploadFileCommon - + File Removed Filen Raderad - + Local file changed during syncing. It will be resumed. Lokal fil ändrades under synkningen. Den kommer återupptas. - + Local file changed during sync. Lokal fil ändrades under synk. - + Error writing metadata to the database Fel vid skrivning av metadata till databasen diff --git a/translations/client_th.ts b/translations/client_th.ts index ce5c88f47..5fedf8538 100644 --- a/translations/client_th.ts +++ b/translations/client_th.ts @@ -616,7 +616,7 @@ OCC::DeleteJob - + Connection timed out หมดเวลาการเชื่อมต่อ @@ -1177,22 +1177,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway ไม่มี E-Tag ที่ได้รับจากเซิร์ฟเวอร์ กรุณาตรวจสอบ พร็อกซี่หรือเกตเวย์ - + We received a different E-Tag for resuming. Retrying next time. เราได้รับ E-Tag ที่แตกต่างกันสำหรับการทำงาน กรุณาลองอีกครั้งในเวลาถัดไป - + Server returned wrong content-range เซิร์ฟเวอร์ส่งคืนช่วงของเนื้อหาที่ผิด - + Connection Timeout หมดเวลาการเชื่อมต่อ @@ -1446,7 +1446,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from OCC::MoveJob - + Connection timed out หมดเวลาการเชื่อมต่อ @@ -1980,7 +1980,7 @@ It is not advisable to use it. OCC::PUTFileJob - + Connection Timeout หมดเวลาการเชื่อมต่อ @@ -1988,7 +1988,7 @@ It is not advisable to use it. OCC::PollJob - + Invalid JSON reply from the poll URL ตอบกลับ JSON ไม่ถูกต้องจาก URL แบบสำรวจความคิดเห็น @@ -2004,47 +2004,47 @@ It is not advisable to use it. OCC::PropagateDownloadFile - + File %1 can not be downloaded because of a local file name clash! ไฟล์ %1 ไม่สามารถดาวน์โหลดได้เพราะชื่อไฟล์ต้นทางเหมือนกัน! - + The download would reduce free disk space below %1 การดาวน์โหลดจะลดพื้นที่ว่างในดิสก์ด้านล่าง %1 - + Free space on disk is less than %1 พื้นที่ว่างในดิสก์น้อยกว่า %1 - + File was deleted from server ไฟล์ถูกลบออกจากเซิร์ฟเวอร์ - + The file could not be downloaded completely. ดาวน์โหลดไฟล์ไม่สำเร็จ - + The downloaded file is empty despite the server announced it should have been %1. ไฟล์ที่ดาวน์โหลดว่างเปล่าแม้ว่าเซิร์ฟเวอร์ประกาศว่าควรจะเป็น %1 - + File %1 cannot be saved because of a local file name clash! ไฟล์ %1 ไม่สามารถบันทึกได้เพราะชื่อไฟล์ต้นทางเหมือนกัน! - + File has changed since discovery ไฟล์มีการเปลี่ยนแปลงตั้งแต่ถูกพบ - + Error writing metadata to the database ข้อผิดพลาดในการเขียนข้อมูลเมตาไปยังฐานข้อมูล @@ -2125,12 +2125,12 @@ It is not advisable to use it. OCC::PropagateRemoteDelete - + The file has been removed from a read only share. It was restored. ไฟล์ถูกลบออกจากการแชร์เพื่ออ่านเพียงอย่างเดียว ได้รับการกู้คืน - + Wrong HTTP code returned by server. Expected 204, but received "%1 %2". รหัส HTTP ผิดพลาด โดยเซิร์ฟเวอร์คาดว่าจะได้รับรหัส 204 แต่กลับได้รับ "%1 %2" @@ -2151,28 +2151,28 @@ It is not advisable to use it. OCC::PropagateRemoteMove - + This folder must not be renamed. It is renamed back to its original name. โฟลเดอร์นี้จะต้องไม่ถูกเปลี่ยนชื่อ มันจะถูกเปลี่ยนกลับไปใช้ชื่อเดิม - + This folder must not be renamed. Please name it back to Shared. โฟลเดอร์นี้จะต้องไม่ถูกเปลี่ยนชื่อ กรุณาตั้งชื่อมันให้เหมือนตอนที่แชร์ - + The file was renamed but is part of a read only share. The original file was restored. ไฟล์ที่ถูกเปลี่ยนชื่อ แต่เป็นส่วนหนึ่งของการแชร์เพื่ออ่านเพียงอย่างเดียว ไฟล์ต้นฉบับจะถูกกู้คืน - + Wrong HTTP code returned by server. Expected 201, but received "%1 %2". รหัส HTTP ผิดพลาด โดยเซิร์ฟเวอร์คาดว่าจะได้รับรหัส 201 แต่กลับได้รับ "%1 %2" - - + + Error writing metadata to the database ข้อผิดพลาดในการเขียนข้อมูลเมตาไปยังฐานข้อมูล @@ -2180,22 +2180,22 @@ It is not advisable to use it. OCC::PropagateUploadFileCommon - + File Removed ไฟล์ถูกลบไปแล้ว - + Local file changed during syncing. It will be resumed. ไฟล์ต้นทางถูกเปลี่ยนแปลงในระหว่างการซิงค์ มันจะกลับมา - + Local file changed during sync. ไฟล์ต้นทางถูกเปลี่ยนแปลงขณะกำลังประสานข้อมูล - + Error writing metadata to the database ข้อผิดพลาดในการเขียนข้อมูลเมตาไปยังฐานข้อมูล diff --git a/translations/client_tr.ts b/translations/client_tr.ts index 142f58c72..f8ea9715a 100644 --- a/translations/client_tr.ts +++ b/translations/client_tr.ts @@ -616,7 +616,7 @@ OCC::DeleteJob - + Connection timed out Bağlantı zaman aşımına uğradı @@ -1166,22 +1166,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Sunucudan E-Tag alınamadı, Vekil Sunucu/Ağ Geçidi'ni denetleyin. - + We received a different E-Tag for resuming. Retrying next time. Devam etmek üzere farklı bir E-Etiket aldık. Sonraki işlemde yeniden denenecek. - + Server returned wrong content-range Sunucu yanlış içerik aralığı döndürdü - + Connection Timeout Bağlantı Zaman Aşımı @@ -1435,7 +1435,7 @@ Bir dizinin silinmesine engel oluyorsa silmeye izin verilen yerlerdeki ögeler s OCC::MoveJob - + Connection timed out Bağlantı zaman aşımına uğradı @@ -1969,7 +1969,7 @@ Kullanmanız önerilmez. OCC::PUTFileJob - + Connection Timeout Bağlantı Zaman Aşımı @@ -1977,7 +1977,7 @@ Kullanmanız önerilmez. OCC::PollJob - + Invalid JSON reply from the poll URL Getirme URL'sinden geçersiz JSON yanıtı @@ -1993,47 +1993,47 @@ Kullanmanız önerilmez. OCC::PropagateDownloadFile - + File %1 can not be downloaded because of a local file name clash! %1 dosyası, yerel dosya adı çakışması nedeniyle indirilemiyor! - + The download would reduce free disk space below %1 Dosya indirimi boş disk alanını %1 altına düşürecektir - + Free space on disk is less than %1 Boş disk alanı %1 altında - + File was deleted from server Dosya sunucudan silindi - + The file could not be downloaded completely. Dosya tamamıyla indirilemedi. - + The downloaded file is empty despite the server announced it should have been %1. Sunucu boyutunu %1 olarak duyurmasına rağmen indirilen dosya boş. - + File %1 cannot be saved because of a local file name clash! Yerel bir dosya ismi ile çakıştığından, %1 dosyası kaydedilemedi! - + File has changed since discovery Dosya, bulunduğundan itibaren değişmiş - + Error writing metadata to the database Veritabanına üstveri yazma hatası @@ -2114,12 +2114,12 @@ Kullanmanız önerilmez. OCC::PropagateRemoteDelete - + The file has been removed from a read only share. It was restored. Dosya salt okunur bir paylaşımdan kaldırılmıştı. Geri yüklendi. - + Wrong HTTP code returned by server. Expected 204, but received "%1 %2". Sunucudan yanlış HTTP kodu döndü. 204 bekleniyordu, ancak "%1 %2" geldi. @@ -2140,28 +2140,28 @@ Kullanmanız önerilmez. OCC::PropagateRemoteMove - + This folder must not be renamed. It is renamed back to its original name. Bu klasörün adı değiştirilmemelidir. Özgün adına geri dönüştürüldü. - + This folder must not be renamed. Please name it back to Shared. Bu klasörün adı değiştirilmemelidir. Lütfen Shared olarak geri adlandırın. - + The file was renamed but is part of a read only share. The original file was restored. Dosya adlandırıldı ancak salt okunur paylaşımın bir parçası. Özgün dosya geri yüklendi. - + Wrong HTTP code returned by server. Expected 201, but received "%1 %2". Sunucudan yanlış HTTP kodu döndü. 201 bekleniyordu, ancak "%1 %2" geldi. - - + + Error writing metadata to the database Veritabanına üstveri yazma hatası @@ -2169,22 +2169,22 @@ Kullanmanız önerilmez. OCC::PropagateUploadFileCommon - + File Removed Dosya Kaldırıldı - + Local file changed during syncing. It will be resumed. Eşitleme sırasında yerel dosya değişti. Devam edilecek. - + Local file changed during sync. Eşitleme sırasında yerel dosya değişti. - + Error writing metadata to the database Veritabanına üstveri yazma hatası diff --git a/translations/client_uk.ts b/translations/client_uk.ts index ff78161ef..f0a00969f 100644 --- a/translations/client_uk.ts +++ b/translations/client_uk.ts @@ -616,7 +616,7 @@ OCC::DeleteJob - + Connection timed out Час очікування з'єднання перевищено @@ -1166,22 +1166,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway Не отримано E-Tag від серверу, перевірте мережеві налаштування (проксі, шлюз) - + We received a different E-Tag for resuming. Retrying next time. Ми отримали інший E-Tag для відновлення. Спробуйте ще раз пізніше. - + Server returned wrong content-range Сервер повернув невірний content-range - + Connection Timeout Час з'єднання вичерпано @@ -1433,7 +1433,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from OCC::MoveJob - + Connection timed out Час очікування з'єднання вичерпано @@ -1967,7 +1967,7 @@ It is not advisable to use it. OCC::PUTFileJob - + Connection Timeout Час з'єднання вичерпано @@ -1975,7 +1975,7 @@ It is not advisable to use it. OCC::PollJob - + Invalid JSON reply from the poll URL Неправильна JSON відповідь на сформований URL @@ -1991,47 +1991,47 @@ It is not advisable to use it. OCC::PropagateDownloadFile - + File %1 can not be downloaded because of a local file name clash! Файл %1 не може бути завантажено через локальний конфлікт назви файлу! - + The download would reduce free disk space below %1 - + Free space on disk is less than %1 - + File was deleted from server Файл видалено з сервера - + The file could not be downloaded completely. Файл не може бути завантажений повністю. - + The downloaded file is empty despite the server announced it should have been %1. - + File %1 cannot be saved because of a local file name clash! Файл %1 не збережено через локальний конфлікт назви файлу! - + File has changed since discovery Файл змінився з моменту знаходження - + Error writing metadata to the database @@ -2112,12 +2112,12 @@ It is not advisable to use it. OCC::PropagateRemoteDelete - + The file has been removed from a read only share. It was restored. Файл видалено з опублікованої теки з правами тільки на перегляд. Файл відновлено. - + Wrong HTTP code returned by server. Expected 204, but received "%1 %2". Сервер відповів неправильним HTTP кодом. Очікувався 204, але отримано "%1 %2". @@ -2138,28 +2138,28 @@ It is not advisable to use it. OCC::PropagateRemoteMove - + This folder must not be renamed. It is renamed back to its original name. Цю теку не можна перейменувати. Буде використано старе ім'я. - + This folder must not be renamed. Please name it back to Shared. Цю теку не можна перейменувати. Будь ласка, поверніть їй ім'я Shared. - + The file was renamed but is part of a read only share. The original file was restored. Файл було перейменовано, але він розташований в теці з правами лише на перегляд. Відновлено оригінальний файл. - + Wrong HTTP code returned by server. Expected 201, but received "%1 %2". Сервер відповів неправильним HTTP кодом. Очікувався 201, але отримано "%1 %2". - - + + Error writing metadata to the database @@ -2167,22 +2167,22 @@ It is not advisable to use it. OCC::PropagateUploadFileCommon - + File Removed Файл видалено - + Local file changed during syncing. It will be resumed. Локальний файл змінився під час синхронізації. Його буде відновлено. - + Local file changed during sync. Локальний файл змінився під час синхронізації. - + Error writing metadata to the database diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts index bf6ddc02c..df73102a9 100644 --- a/translations/client_zh_CN.ts +++ b/translations/client_zh_CN.ts @@ -616,7 +616,7 @@ OCC::DeleteJob - + Connection timed out 连接超时 @@ -1166,22 +1166,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway 未能收到来自服务器的 E-Tag，请检查代理/网关 - + We received a different E-Tag for resuming. Retrying next time. 我们收到了不同的恢复 E-Tag，将在下次尝试。 - + Server returned wrong content-range 服务器返回了错误的内容长度 - + Connection Timeout 连接超时 @@ -1435,7 +1435,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from OCC::MoveJob - + Connection timed out 连接超时 @@ -1969,7 +1969,7 @@ It is not advisable to use it. OCC::PUTFileJob - + Connection Timeout 连接超时 @@ -1977,7 +1977,7 @@ It is not advisable to use it. OCC::PollJob - + Invalid JSON reply from the poll URL 推送 URL 传来的 JSON 无效 @@ -1993,47 +1993,47 @@ It is not advisable to use it. OCC::PropagateDownloadFile - + File %1 can not be downloaded because of a local file name clash! 由于本地文件名冲突，文件 %1 无法下载。 - + The download would reduce free disk space below %1 下载将会使用 %1 的磁盘空间 - + Free space on disk is less than %1 空闲磁盘空间少于 %1 - + File was deleted from server 已从服务器删除文件 - + The file could not be downloaded completely. 文件无法完整下载。 - + The downloaded file is empty despite the server announced it should have been %1. 虽然服务器宣称已完成 %1，但实际下载文件为空。 - + File %1 cannot be saved because of a local file name clash! 由于本地文件名冲突，文件 %1 无法保存。 - + File has changed since discovery 自从发现文件以来，它已经被改变了 - + Error writing metadata to the database 向数据库写入元数据错误 @@ -2114,12 +2114,12 @@ It is not advisable to use it. OCC::PropagateRemoteDelete - + The file has been removed from a read only share. It was restored. 文件已经移除只读共享，并已经恢复。 - + Wrong HTTP code returned by server. Expected 204, but received "%1 %2". 服务器返回的 HTTP 状态错误，应返回 204，但返回的是“%1 %2”。 @@ -2140,28 +2140,28 @@ It is not advisable to use it. OCC::PropagateRemoteMove - + This folder must not be renamed. It is renamed back to its original name. 文件无法更名，已经恢复为原文件名。 - + This folder must not be renamed. Please name it back to Shared. 文件无法更名，请改回“Shared”。 - + The file was renamed but is part of a read only share. The original file was restored. 文件已经更名，但这是某个只读分享的一部分，原文件已经恢复。 - + Wrong HTTP code returned by server. Expected 201, but received "%1 %2". 服务器返回的 HTTP 状态错误，应返回 201，但返回的是“%1 %2”。 - - + + Error writing metadata to the database 向数据库写入元数据错误 @@ -2169,22 +2169,22 @@ It is not advisable to use it. OCC::PropagateUploadFileCommon - + File Removed 已移除文件 - + Local file changed during syncing. It will be resumed. 本地文件在同步时已修改，完成后会再次同步 - + Local file changed during sync. 本地文件在同步时已修改。 - + Error writing metadata to the database 向数据库写入元数据错误 diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts index 912eeca70..a44c53813 100644 --- a/translations/client_zh_TW.ts +++ b/translations/client_zh_TW.ts @@ -616,7 +616,7 @@ OCC::DeleteJob - + Connection timed out 連線逾時 @@ -1166,22 +1166,22 @@ Continuing the sync as normal will cause all your files to be overwritten by an OCC::GETFileJob - + No E-Tag received from server, check Proxy/Gateway 沒有收到來自伺服器的 E-Tag，請檢查代理伺服器或網路閘道 - + We received a different E-Tag for resuming. Retrying next time. 在復原時收到了不同的 E-Tag，將在下一次重新嘗試取得 - + Server returned wrong content-range 伺服器回應錯誤的內容長度 - + Connection Timeout 連線逾時 @@ -1435,7 +1435,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from OCC::MoveJob - + Connection timed out 連線逾時 @@ -1970,7 +1970,7 @@ It is not advisable to use it. OCC::PUTFileJob - + Connection Timeout 連線逾時 @@ -1978,7 +1978,7 @@ It is not advisable to use it. OCC::PollJob - + Invalid JSON reply from the poll URL 不合法的JSON資訊從URL中回傳 @@ -1994,47 +1994,47 @@ It is not advisable to use it. OCC::PropagateDownloadFile - + File %1 can not be downloaded because of a local file name clash! 檔案 %1 無法被下載，因為本地端的檔案名稱已毀損! - + The download would reduce free disk space below %1 這次下載將會減少硬碟空間: %1 - + Free space on disk is less than %1 可用的硬碟空間已經少於 %1 - + File was deleted from server 檔案已從伺服器被刪除 - + The file could not be downloaded completely. 檔案下載無法完成。 - + The downloaded file is empty despite the server announced it should have been %1. - + File %1 cannot be saved because of a local file name clash! 檔案 %1 無法存檔，因為本地端的檔案名稱已毀損! - + File has changed since discovery 尋找的過程中檔案已經被更改 - + Error writing metadata to the database 寫入後設資料(metadata) 時發生錯誤 @@ -2115,12 +2115,12 @@ It is not advisable to use it. OCC::PropagateRemoteDelete - + The file has been removed from a read only share. It was restored. 已復原從只供讀取的分享中被移除檔案 - + Wrong HTTP code returned by server. Expected 204, but received "%1 %2". 從伺服器端回傳錯誤的 HTTP 代碼， 預期是 204, 但是接收到的是 "%1 %2". @@ -2141,28 +2141,28 @@ It is not advisable to use it. OCC::PropagateRemoteMove - + This folder must not be renamed. It is renamed back to its original name. 這個資料夾不應該被更名，他已經被改回原本的名稱了。 - + This folder must not be renamed. Please name it back to Shared. 這個資料夾已經被分享，不應該被更名，請改回原本的名稱。 - + The file was renamed but is part of a read only share. The original file was restored. 檔案更名完成，但這檔案是只供讀取的分享，原始檔案已被還原 - + Wrong HTTP code returned by server. Expected 201, but received "%1 %2". 從伺服器端回傳錯誤的 HTTP 代碼， 預期是 201, 但是接收到的是 "%1 %2". - - + + Error writing metadata to the database 寫入後設資料(metadata) 時發生錯誤 @@ -2170,22 +2170,22 @@ It is not advisable to use it. OCC::PropagateUploadFileCommon - + File Removed 檔案已移除 - + Local file changed during syncing. It will be resumed. 本地端的檔案在同步的過程中被更改，此檔案將會被還原。 - + Local file changed during sync. 本地端的檔案在同步過程中被更改。 - + Error writing metadata to the database 寫入後設資料(metadata) 時發生錯誤 From 1d0ef8307888f2b74d5cd76d51d3ed59881f923a Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Thu, 9 Mar 2017 02:18:30 +0100 Subject: [PATCH 10/10] [tx-robot] updated from transifex --- mirall.desktop.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mirall.desktop.in b/mirall.desktop.in index 3541022f0..747a463a2 100644 --- a/mirall.desktop.in +++ b/mirall.desktop.in @@ -778,6 +778,9 @@ X-GNOME-Autostart-Delay=3 # Translations +# Translations + + # Translations Comment[oc]=@APPLICATION_NAME@ sincronizacion del client GenericName[oc]=Dorsièr de Sincronizacion