From 3e3ca14b4c58fd4567834065e8f05dce3e611939 Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Thu, 20 Nov 2014 13:46:44 +0100 Subject: [PATCH 1/5] Print ssl library version only on Qt >=5.0.0. --- src/mirall/syncengine.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/mirall/syncengine.cpp b/src/mirall/syncengine.cpp index 971140143..373c7867e 100644 --- a/src/mirall/syncengine.cpp +++ b/src/mirall/syncengine.cpp @@ -544,7 +544,11 @@ void SyncEngine::startSync() qDebug() << "=====sync with existing DB"; } - qDebug() << "=====Using Qt" << qVersion() << "with" << QSslSocket::sslLibraryVersionString().toUtf8().data(); + qDebug() << "=====Using Qt" << qVersion(); +#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) + qDebug() << "=====Using SSL library version" + << QSslSocket::sslLibraryVersionString().toUtf8().data(); +#endif // Note that this seems to output the OpenSSL build version not runtime version: qDebug() << "=====Using" << ne_version_string(); From 65a307970bd9987b90d9b2087affc9c6c3deaf93 Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Thu, 20 Nov 2014 18:49:34 +0100 Subject: [PATCH 2/5] Propagator: Compare the actual file size with the request content length The values must match. Otherwise the request did succeed, but the file was not downloaded completely. This fixes https://github.com/owncloud/mirall/issues/2528 --- src/mirall/propagator_qnam.cpp | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/mirall/propagator_qnam.cpp b/src/mirall/propagator_qnam.cpp index 199a65047..639104ecf 100644 --- a/src/mirall/propagator_qnam.cpp +++ b/src/mirall/propagator_qnam.cpp @@ -742,6 +742,21 @@ void PropagateDownloadFileQNAM::slotGetFinished() _tmpFile.close(); _tmpFile.flush(); + + /* Check that the size of the GET reply matches the file size. There have been cases + * reported that if a server breaks behind a proxy, the GET is still a 200 but is + * truncated, as described here: https://github.com/owncloud/mirall/issues/2528 + */ + const QByteArray sizeHeader("Content-Length"); + qint64 bodySize = job->reply()->rawHeader(sizeHeader).toLongLong(); + + if( bodySize != _tmpFile.size() ) { + _propagator->_journal->setDownloadInfo(_item._file, SyncJournalDb::DownloadInfo()); + _tmpFile.remove(); + done(SyncFileItem::SoftError, tr("The file could not be downloaded completely.")); + return; + } + downloadFinished(); } From e3b07f569a1934b37b48dc083e5f9f352be8e073 Mon Sep 17 00:00:00 2001 From: Christian Kamm Date: Fri, 21 Nov 2014 08:20:54 +0100 Subject: [PATCH 3/5] FolderWatcherTest: Use Utility::usleep. --- test/testfolderwatcher.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/test/testfolderwatcher.h b/test/testfolderwatcher.h index cc0584673..afde0d158 100644 --- a/test/testfolderwatcher.h +++ b/test/testfolderwatcher.h @@ -15,11 +15,6 @@ using namespace Mirall; -class FriendlyThread : public QThread -{ - friend class TestFolderWatcher; -}; - class TestFolderWatcher : public QObject { Q_OBJECT @@ -51,7 +46,7 @@ private: void processAndWait() { _loop.processEvents(); - FriendlyThread::msleep(200); + Utility::usleep(200000); _loop.processEvents(); } From dba2efe367efcf8b29f23f2d4f7a8763d1151582 Mon Sep 17 00:00:00 2001 From: Jenkins for ownCloud Date: Fri, 21 Nov 2014 02:52:45 -0500 Subject: [PATCH 4/5] [tx-robot] updated from transifex --- translations/mirall_ca.ts | 37 ++++++++++++++++------------- translations/mirall_cs.ts | 37 ++++++++++++++++------------- translations/mirall_de.ts | 37 ++++++++++++++++------------- translations/mirall_el.ts | 37 ++++++++++++++++------------- translations/mirall_en.ts | 37 ++++++++++++++++------------- translations/mirall_es.ts | 39 +++++++++++++++++-------------- translations/mirall_es_AR.ts | 37 ++++++++++++++++------------- translations/mirall_et.ts | 37 ++++++++++++++++------------- translations/mirall_eu.ts | 37 ++++++++++++++++------------- translations/mirall_fa.ts | 37 ++++++++++++++++------------- translations/mirall_fi.ts | 37 ++++++++++++++++------------- translations/mirall_fr.ts | 37 ++++++++++++++++------------- translations/mirall_gl.ts | 37 ++++++++++++++++------------- translations/mirall_hu.ts | 37 ++++++++++++++++------------- translations/mirall_it.ts | 37 ++++++++++++++++------------- translations/mirall_ja.ts | 37 ++++++++++++++++------------- translations/mirall_nl.ts | 37 ++++++++++++++++------------- translations/mirall_pl.ts | 37 ++++++++++++++++------------- translations/mirall_pt.ts | 37 ++++++++++++++++------------- translations/mirall_pt_BR.ts | 45 +++++++++++++++++++++--------------- translations/mirall_ru.ts | 37 ++++++++++++++++------------- translations/mirall_sk.ts | 37 ++++++++++++++++------------- translations/mirall_sl.ts | 37 ++++++++++++++++------------- translations/mirall_sv.ts | 37 ++++++++++++++++------------- translations/mirall_th.ts | 37 ++++++++++++++++------------- translations/mirall_tr.ts | 37 ++++++++++++++++------------- translations/mirall_uk.ts | 37 ++++++++++++++++------------- translations/mirall_zh_CN.ts | 37 ++++++++++++++++------------- translations/mirall_zh_TW.ts | 37 ++++++++++++++++------------- 29 files changed, 616 insertions(+), 467 deletions(-) diff --git a/translations/mirall_ca.ts b/translations/mirall_ca.ts index 3744e19b7..2b6648d79 100644 --- a/translations/mirall_ca.ts +++ b/translations/mirall_ca.ts @@ -1343,7 +1343,12 @@ Do you want to connect unencrypted instead (not recommended)? El fitxer %1 no es pot baixar perquè hi ha un xoc amb el nom d'un fitxer local! - + + The file could not be downloaded completely. + + + + File %1 cannot be saved because of a local file name clash! @@ -2062,69 +2067,69 @@ Do you want to connect unencrypted instead (not recommended)? El fitxer conté caràcters no vàlids que no es poden sincronitzar entre plataformes. - + Unable to initialize a sync journal. No es pot inicialitzar un periòdic de sincronització - + Cannot open the sync journal No es pot obrir el diari de sincronització - - + + Ignored because of the "choose what to sync" blacklist - + Not allowed because you don't have permission to add sub-directories in that directory No es permet perquè no teniu permisos per afegir subcarpetes en aquesta carpeta - + Not allowed because you don't have permission to add parent directory No es permet perquè no teniu permisos per afegir una carpeta inferior - + Not allowed because you don't have permission to add files in that directory No es permet perquè no teniu permisos per afegir fitxers en aquesta carpeta - + Not allowed to upload this file because it is read-only on the server, restoring No es permet pujar aquest fitxer perquè només és de lectura en el servidor, es restaura - - + + Not allowed to remove, restoring No es permet l'eliminació, es restaura - + Local files and share folder removed. Fitxers locals i carpeta compartida esborrats. - + Move not allowed, item restored No es permet moure'l, l'element es restaura - + Move not allowed because %1 is read-only No es permet moure perquè %1 només és de lectura - + the destination el destí - + the source l'origen diff --git a/translations/mirall_cs.ts b/translations/mirall_cs.ts index c173e97a7..3857ddb69 100644 --- a/translations/mirall_cs.ts +++ b/translations/mirall_cs.ts @@ -1347,7 +1347,12 @@ Chcete se místo toho připojit nezabezpečeně (nedoporučuje se)?Soubor %1 nemohl být stažen z důvodu kolize názvu se souborem v místním systému! - + + The file could not be downloaded completely. + + + + 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! @@ -2072,69 +2077,69 @@ Chcete se místo toho připojit nezabezpečeně (nedoporučuje se)?Soubor obsahuje alespoň jeden neplatný znak, který narušuje synchronizaci v prostředí více platforem. - + Unable to initialize a sync journal. Nemohu inicializovat synchronizační žurnál. - + Cannot open the sync journal Nelze otevřít synchronizační žurnál - - + + Ignored because of the "choose what to sync" blacklist Ignorováno podle nastavení "vybrat co synchronizovat" - + Not allowed because you don't have permission to add sub-directories in that directory Není povoleno, protože nemáte oprávnění vytvářet podadresáře v tomto adresáři. - + Not allowed because you don't have permission to add parent directory Není povoleno, protože nemáte oprávnění vytvořit rodičovský adresář - + Not allowed because you don't have permission to add files in that directory Není povoleno, protože nemáte oprávnění přidávat soubory do tohoto adresáře - + Not allowed to upload this file because it is read-only on the server, restoring Není povoleno nahrát tento soubor, protože je na serveru uložen pouze pro čtení, obnovuji - - + + Not allowed to remove, restoring Odstranění není povoleno, obnovuji - + Local files and share folder removed. Místní soubory a sdílený adresář byly odstraněny. - + Move not allowed, item restored Přesun není povolen, položka obnovena - + Move not allowed because %1 is read-only Přesun není povolen, protože %1 je pouze pro čtení - + the destination cílové umístění - + the source zdroj diff --git a/translations/mirall_de.ts b/translations/mirall_de.ts index af945f38a..08e825525 100644 --- a/translations/mirall_de.ts +++ b/translations/mirall_de.ts @@ -1348,7 +1348,12 @@ Möchten Sie stattdessen unverschlüsselt verbinden (nicht empfohlen)?Die Datei %1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht herunter geladen werden! - + + The file could not be downloaded completely. + + + + 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! @@ -2069,69 +2074,69 @@ Möchten Sie stattdessen unverschlüsselt verbinden (nicht empfohlen)?Die Datei beinhaltet ungültige Zeichen und kann nicht plattformübergreifend synchronisiert werden. - + Unable to initialize a sync journal. Synchronisationsbericht konnte nicht initialisiert werden. - + Cannot open the sync journal Synchronisationsbericht kann nicht geöffnet werden - - + + Ignored because of the "choose what to sync" blacklist Aufgrund der »Zu synchronisierende Elemente auswählen«-Sperrliste ignoriert - + Not allowed because you don't have permission to add sub-directories in that directory Nicht erlaubt, da Sie keine Rechte zur Erstellung von Unterordnern haben - + Not allowed because you don't have permission to add parent directory Nicht erlaubt, da Sie keine Rechte zur Erstellung von Hauptordnern haben - + Not allowed because you don't have permission to add files in that directory Nicht erlaubt, da Sie keine Rechte zum Hinzufügen von Dateien in diesen Ordner haben - + Not allowed to upload this file because it is read-only on the server, restoring Das Hochladen dieser Datei ist nicht erlaubt, da die Datei auf dem Server schreibgeschützt ist, Wiederherstellung - - + + Not allowed to remove, restoring Löschen nicht erlaubt, Wiederherstellung - + Local files and share folder removed. Lokale Dateien und Freigabeordner wurden entfernt. - + Move not allowed, item restored Verschieben nicht erlaubt, Element wiederhergestellt - + Move not allowed because %1 is read-only Verschieben nicht erlaubt, da %1 schreibgeschützt ist - + the destination Das Ziel - + the source Die Quelle diff --git a/translations/mirall_el.ts b/translations/mirall_el.ts index 323d458c5..603136605 100644 --- a/translations/mirall_el.ts +++ b/translations/mirall_el.ts @@ -1344,7 +1344,12 @@ Do you want to connect unencrypted instead (not recommended)? Το αρχείο %1 δεν είναι δυνατό να ληφθεί λόγω διένεξης με το όνομα ενός τοπικού αρχείου! - + + The file could not be downloaded completely. + + + + File %1 cannot be saved because of a local file name clash! @@ -2063,69 +2068,69 @@ Do you want to connect unencrypted instead (not recommended)? Το αρχείο περιέχει άκυρους χαρακτήρες που δεν μπορούν να συγχρονιστούν σε όλα τα συστήματα. - + Unable to initialize a sync journal. Αδυναμία προετοιμασίας αρχείου συγχρονισμού. - + Cannot open the sync journal Αδυναμία ανοίγματος του αρχείου συγχρονισμού - - + + Ignored because of the "choose what to sync" blacklist Αγνοήθηκε εξαιτίας της μαύρης λίστας "διάλεξε τι να συγχρονιστεί" - + Not allowed because you don't have permission to add sub-directories in that directory Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε υπο-καταλόγους σε αυτό τον κατάλογο - + Not allowed because you don't have permission to add parent directory Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε στο γονεϊκό κατάλογο - + Not allowed because you don't have permission to add files in that directory Δεν επιτρέπεται επειδή δεν έχεται δικαιώματα να προσθέσετε αρχεία σε αυτόν τον κατάλογο - + Not allowed to upload this file because it is read-only on the server, restoring Δεν επιτρέπεται να μεταφορτώσετε αυτό το αρχείο επειδή είναι μόνο για ανάγνωση στο διακομιστή, αποκατάσταση σε εξέλιξη - - + + Not allowed to remove, restoring Δεν επιτρέπεται η αφαίρεση, αποκατάσταση σε εξέλιξη - + Local files and share folder removed. Οι τοπικοί φάκελοι και ο φάκελος κοινής χρήσης αφαιρέθηκαν. - + Move not allowed, item restored Η μετακίνηση δεν επιτρέπεται, το αντικείμενο αποκαταστάθηκε - + Move not allowed because %1 is read-only Η μετακίνηση δεν επιτρέπεται επειδή το %1 είναι μόνο για ανάγνωση - + the destination ο προορισμός - + the source η προέλευση diff --git a/translations/mirall_en.ts b/translations/mirall_en.ts index 33074ee90..f630de085 100644 --- a/translations/mirall_en.ts +++ b/translations/mirall_en.ts @@ -1338,7 +1338,12 @@ Do you want to connect unencrypted instead (not recommended)? - + + The file could not be downloaded completely. + + + + File %1 cannot be saved because of a local file name clash! @@ -2061,69 +2066,69 @@ Do you want to connect unencrypted instead (not recommended)? - + Unable to initialize a sync journal. - + Cannot open the sync journal - - + + Ignored because of the "choose what to sync" blacklist - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Local files and share folder removed. - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source diff --git a/translations/mirall_es.ts b/translations/mirall_es.ts index 2a71deb45..29e58b001 100644 --- a/translations/mirall_es.ts +++ b/translations/mirall_es.ts @@ -1347,7 +1347,12 @@ Desea conectar a cambio sin encriptación (no recomendado)? ¡El fichero %1 no puede ser descargado debido al nombre de la clase de un fichero local! - + + The file could not be downloaded completely. + + + + File %1 cannot be saved because of a local file name clash! ¡ El fichero %1 no puede guardar debido a un conflicto con el nombre de otro fichero local ! @@ -2070,69 +2075,69 @@ Desea conectar a cambio sin encriptación (no recomendado)? El fichero contiene caracteres inválidos que no pueden ser sincronizados con la plataforma. - + Unable to initialize a sync journal. No se pudo inicializar un registro (journal) de sincronización. - + Cannot open the sync journal No es posible abrir el diario de sincronización - - + + Ignored because of the "choose what to sync" blacklist Ignorado por que se encuentra en la lista negra de "elige que vas a sincronizar" - + Not allowed because you don't have permission to add sub-directories in that directory No está permitido, porque no tiene permisos para añadir subcarpetas en este directorio. - + Not allowed because you don't have permission to add parent directory No está permitido porque no tiene permisos para añadir un directorio - + Not allowed because you don't have permission to add files in that directory No está permitido, porque no tiene permisos para crear archivos en este directorio - + Not allowed to upload this file because it is read-only on the server, restoring No está permitido subir este archivo porque es de solo lectura en el servidor, restaurando. - - + + Not allowed to remove, restoring No está permitido borrar, restaurando. - + Local files and share folder removed. Se eliminaron los archivos locales y la carpeta compartida. - + Move not allowed, item restored No está permitido mover, elemento restaurado. - + Move not allowed because %1 is read-only No está permitido mover, porque %1 es solo lectura. - + the destination destino - + the source origen @@ -2338,7 +2343,7 @@ Desea conectar a cambio sin encriptación (no recomendado)? &Start a clean sync (Erases the local folder!) - &Iniciar una sincronización limpia(Borra la carpeta local!) + &Iniciar una sincronización limpia (borra la carpeta local) diff --git a/translations/mirall_es_AR.ts b/translations/mirall_es_AR.ts index cd98566a6..cf27c174f 100644 --- a/translations/mirall_es_AR.ts +++ b/translations/mirall_es_AR.ts @@ -1340,7 +1340,12 @@ Do you want to connect unencrypted instead (not recommended)? - + + The file could not be downloaded completely. + + + + File %1 cannot be saved because of a local file name clash! @@ -2057,69 +2062,69 @@ Do you want to connect unencrypted instead (not recommended)? El archivo contiene caracteres inválidos que no pueden ser sincronizados entre plataforma. - + Unable to initialize a sync journal. Imposible inicializar un diario de sincronización. - + Cannot open the sync journal - - + + Ignored because of the "choose what to sync" blacklist - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Local files and share folder removed. - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source diff --git a/translations/mirall_et.ts b/translations/mirall_et.ts index 1b34035ee..98bca5808 100644 --- a/translations/mirall_et.ts +++ b/translations/mirall_et.ts @@ -1343,7 +1343,12 @@ Do you want to connect unencrypted instead (not recommended)? Faili %1 ei saa alla laadida kuna on konflikt kohaliku faili nimega. - + + The file could not be downloaded completely. + + + + File %1 cannot be saved because of a local file name clash! Faili %1 ei saa salvestada kuna on nime konflikt kohaliku failiga! @@ -2065,69 +2070,69 @@ Do you want to connect unencrypted instead (not recommended)? Fail sisaldab sobimatuid sümboleid, mida ei saa sünkroniseerida erinevate platvormide vahel. - + Unable to initialize a sync journal. Ei suuda lähtestada sünkroniseeringu zurnaali. - + Cannot open the sync journal Ei suuda avada sünkroniseeringu zurnaali - - + + Ignored because of the "choose what to sync" blacklist "Vali, mida sünkroniseerida" musta nimekirja tõttu vahele jäetud - + Not allowed because you don't have permission to add sub-directories in that directory Pole lubatud, kuna sul puuduvad õigused lisada sellesse kataloogi lisada alam-kataloogi - + Not allowed because you don't have permission to add parent directory Pole lubatud, kuna sul puuduvad õigused lisada ülemkataloog - + Not allowed because you don't have permission to add files in that directory Pole lubatud, kuna sul puuduvad õigused sellesse kataloogi faile lisada - + Not allowed to upload this file because it is read-only on the server, restoring Pole lubatud üles laadida, kuna tegemist on ainult-loetava serveriga, taastan - - + + Not allowed to remove, restoring Eemaldamine pole lubatud, taastan - + Local files and share folder removed. Kohalikud failid ja jagatud kaustad eemaldatud. - + Move not allowed, item restored Liigutamine pole lubatud, üksus taastatud - + Move not allowed because %1 is read-only Liigutamien pole võimalik kuna %1 on ainult lugemiseks - + the destination sihtkoht - + the source allikas diff --git a/translations/mirall_eu.ts b/translations/mirall_eu.ts index 3aa369202..467894175 100644 --- a/translations/mirall_eu.ts +++ b/translations/mirall_eu.ts @@ -1343,7 +1343,12 @@ Do you want to connect unencrypted instead (not recommended)? - + + The file could not be downloaded completely. + + + + File %1 cannot be saved because of a local file name clash! @@ -2060,69 +2065,69 @@ Do you want to connect unencrypted instead (not recommended)? - + Unable to initialize a sync journal. Ezin izan da sinkronizazio egunerokoa hasieratu. - + Cannot open the sync journal - - + + Ignored because of the "choose what to sync" blacklist - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring Ezabatzeko baimenik gabe, berrezartzen - + Local files and share folder removed. - + Move not allowed, item restored Mugitzea ez dago baimenduta, elementua berrezarri da - + Move not allowed because %1 is read-only Mugitzea ez dago baimenduta %1 irakurtzeko bakarrik delako - + the destination helburua - + the source jatorria diff --git a/translations/mirall_fa.ts b/translations/mirall_fa.ts index 6a7864467..7d55e82b9 100644 --- a/translations/mirall_fa.ts +++ b/translations/mirall_fa.ts @@ -1336,7 +1336,12 @@ Do you want to connect unencrypted instead (not recommended)? - + + The file could not be downloaded completely. + + + + File %1 cannot be saved because of a local file name clash! @@ -2053,69 +2058,69 @@ Do you want to connect unencrypted instead (not recommended)? - + Unable to initialize a sync journal. - + Cannot open the sync journal - - + + Ignored because of the "choose what to sync" blacklist - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Local files and share folder removed. - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source diff --git a/translations/mirall_fi.ts b/translations/mirall_fi.ts index 1bd0c0de5..542cd729d 100644 --- a/translations/mirall_fi.ts +++ b/translations/mirall_fi.ts @@ -1339,7 +1339,12 @@ Do you want to connect unencrypted instead (not recommended)? - + + The file could not be downloaded completely. + + + + File %1 cannot be saved because of a local file name clash! @@ -2058,69 +2063,69 @@ Do you want to connect unencrypted instead (not recommended)? Tiedosto sisältää virheellisiä merkkejä, joiden vuoksi sitä voi synkronoida eri käyttöjärjestelmien välillä. - + Unable to initialize a sync journal. - + Cannot open the sync journal - - + + Ignored because of the "choose what to sync" blacklist - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory Ei sallittu, koska sinulla ei ole oikeutta lisätä tiedostoja kyseiseen kansioon - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring Poistaminen ei ole sallittua, palautetaan - + Local files and share folder removed. Paikalliset tiedostot ja jakokansio poistettu. - + Move not allowed, item restored Siirtäminen ei ole sallittua, kohde palautettu - + Move not allowed because %1 is read-only Siirto ei ole sallittu, koska %1 on "vain luku"-tilassa - + the destination kohde - + the source lähde diff --git a/translations/mirall_fr.ts b/translations/mirall_fr.ts index 0ddb52915..2b2d2ab74 100644 --- a/translations/mirall_fr.ts +++ b/translations/mirall_fr.ts @@ -1347,7 +1347,12 @@ Voulez-vous vous connecter sans chiffrement à la place (non recommandé) ?Le fichier %1 ne peut pas être téléchargé en raison d'un conflit sur le nom du fichier local. - + + The file could not be downloaded completely. + + + + 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 ! @@ -2070,69 +2075,69 @@ Voulez-vous vous connecter sans chiffrement à la place (non recommandé) ?Le fichier contient des caractères non valides qui ne peuvent être synchronisés entre plate-formes. - + Unable to initialize a sync journal. Impossible d'initialiser un journal de synchronisation. - + Cannot open the sync journal Impossible d'ouvrir le journal de synchronisation - - + + Ignored because of the "choose what to sync" blacklist Ignoré à cause de la liste noire du contenu à synchroniser. - + Not allowed because you don't have permission to add sub-directories in that directory Non autorisé car vous n'avez pas la permission d'ajouter des sous-dossiers dans ce dossier - + Not allowed because you don't have permission to add parent directory Non autorisé car vous n'avez pas la permission d'ajouter des dossiers parents - + Not allowed because you don't have permission to add files in that directory Non autorisé car vous n'avez pas la permission d'ajouter des fichiers dans ce dossier - + Not allowed to upload this file because it is read-only on the server, restoring Non autorisé à envoyer ce fichier car il est en lecture seule sur le serveur. Restauration - - + + Not allowed to remove, restoring Non autorisé à supprimer. Restauration - + Local files and share folder removed. Fichiers locaux et répertoire de partage supprimés. - + Move not allowed, item restored Déplacement non autorisé, élément restauré - + Move not allowed because %1 is read-only Déplacement non autorisé car %1 est en mode lecture seule - + the destination la destination - + the source la source diff --git a/translations/mirall_gl.ts b/translations/mirall_gl.ts index 4873e91ca..cbdf18dfc 100644 --- a/translations/mirall_gl.ts +++ b/translations/mirall_gl.ts @@ -1343,7 +1343,12 @@ Do you want to connect unencrypted instead (not recommended)? Non é posíbel descargar o ficheiro %1 por mor dunha colisión co nome dun ficheiro local! - + + The file could not be downloaded completely. + + + + File %1 cannot be saved because of a local file name clash! O ficheiro %1 non se gardou debido a unha colisión co nome dun ficheiro local! @@ -2062,69 +2067,69 @@ Do you want to connect unencrypted instead (not recommended)? O ficheiro conten caracteres incorrectos que non poden sincronizarse entre distintas plataformas. - + Unable to initialize a sync journal. Non é posíbel iniciar un rexistro de sincronización. - + Cannot open the sync journal Non foi posíbel abrir o rexistro de sincronización - - + + Ignored because of the "choose what to sync" blacklist Ignorado debido a lista negra de "escolla qué sincronizar" - + Not allowed because you don't have permission to add sub-directories in that directory Non está permitido xa que non ten permiso para engadir subdirectorios nese directorio - + Not allowed because you don't have permission to add parent directory Non está permitido xa que non ten permiso para engadir un directorio pai - + Not allowed because you don't have permission to add files in that directory Non está permitido xa que non ten permiso para engadir ficheiros nese directorio - + Not allowed to upload this file because it is read-only on the server, restoring Non está permitido o envío xa que o ficheiro é só de lectura no servidor, restaurando - - + + Not allowed to remove, restoring Non está permitido retiralo, restaurando - + Local files and share folder removed. Ficheiros locáis e cartafol compartido eliminados. - + Move not allowed, item restored Nos está permitido movelo, elemento restaurado - + Move not allowed because %1 is read-only Bon está permitido movelo xa que %1 é só de lectura - + the destination o destino - + the source a orixe diff --git a/translations/mirall_hu.ts b/translations/mirall_hu.ts index 649c5e6b7..258c6eb30 100644 --- a/translations/mirall_hu.ts +++ b/translations/mirall_hu.ts @@ -1336,7 +1336,12 @@ Do you want to connect unencrypted instead (not recommended)? - + + The file could not be downloaded completely. + + + + File %1 cannot be saved because of a local file name clash! @@ -2053,69 +2058,69 @@ Do you want to connect unencrypted instead (not recommended)? - + Unable to initialize a sync journal. - + Cannot open the sync journal - - + + Ignored because of the "choose what to sync" blacklist - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Local files and share folder removed. - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source diff --git a/translations/mirall_it.ts b/translations/mirall_it.ts index cd01431c8..886e41be3 100644 --- a/translations/mirall_it.ts +++ b/translations/mirall_it.ts @@ -1346,7 +1346,12 @@ Vuoi invece connetterti senza cifratura (non consigliato)? Il file %1 non può essere scaricato a causa di un conflitto con un file locale. - + + The file could not be downloaded completely. + + + + 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. @@ -2069,69 +2074,69 @@ Vuoi invece connetterti senza cifratura (non consigliato)? Il file contiene caratteri non validi che non possono essere sincronizzati su diverse piattaforme. - + Unable to initialize a sync journal. Impossibile inizializzare il registro di sincronizzazione. - + Cannot open the sync journal Impossibile aprire il registro di sincronizzazione - - + + Ignored because of the "choose what to sync" blacklist Ignorato in base alla lista nera per la scelta di cosa sincronizzare - + Not allowed because you don't have permission to add sub-directories in that directory Non consentito poiché non disponi dei permessi per aggiungere sottocartelle in quella cartella - + Not allowed because you don't have permission to add parent directory Non consentito poiché non disponi dei permessi per aggiungere la cartella superiore - + Not allowed because you don't have permission to add files in that directory Non consentito poiché non disponi dei permessi per aggiungere file in quella cartella - + Not allowed to upload this file because it is read-only on the server, restoring Il caricamento di questo file non è consentito poiché è in sola lettura sul server, ripristino - - + + Not allowed to remove, restoring Rimozione non consentita, ripristino - + Local files and share folder removed. I file locali e la cartella condivisa sono stati rimossi. - + Move not allowed, item restored Spostamento non consentito, elemento ripristinato - + Move not allowed because %1 is read-only Spostamento non consentito poiché %1 è in sola lettura - + the destination la destinazione - + the source l'origine diff --git a/translations/mirall_ja.ts b/translations/mirall_ja.ts index fdf8bd673..76aee5f04 100644 --- a/translations/mirall_ja.ts +++ b/translations/mirall_ja.ts @@ -1345,7 +1345,12 @@ Do you want to connect unencrypted instead (not recommended)? ファイル %1 はローカルファイル名が衝突しているためダウンロードできません！ - + + The file could not be downloaded completely. + + + + File %1 cannot be saved because of a local file name clash! %1 はローカルファイル名が衝突しているため保存できません！ @@ -2066,69 +2071,69 @@ Do you want to connect unencrypted instead (not recommended)? ファイルに無効な文字が含まれているため、クロスプラットフォーム環境での同期ができません。 - + Unable to initialize a sync journal. 同期ジャーナルの初期化ができません。 - + Cannot open the sync journal 同期ジャーナルを開くことができません - - + + Ignored because of the "choose what to sync" blacklist "同期対象先" ブラックリストにより無視されました。 - + Not allowed because you don't have permission to add sub-directories in that directory そのディレクトリにサブディレクトリを追加する権限がありません - + Not allowed because you don't have permission to add parent directory 親ディレクトリを追加する権限がありません - + Not allowed because you don't have permission to add files in that directory そのディレクトリにファイルを追加する権限がありません - + Not allowed to upload this file because it is read-only on the server, restoring サーバーでは読み取り専用となっているため、このファイルをアップロードすることはできません、復元しています - - + + Not allowed to remove, restoring 削除できません、復元しています - + Local files and share folder removed. ローカルファイルと共有フォルダが削除されました。 - + Move not allowed, item restored 移動できません、項目を復元しました - + Move not allowed because %1 is read-only %1 は読み取り専用のため移動できません - + the destination 移動先 - + the source 移動元 diff --git a/translations/mirall_nl.ts b/translations/mirall_nl.ts index e1b09d9ee..ce7f3244c 100644 --- a/translations/mirall_nl.ts +++ b/translations/mirall_nl.ts @@ -1347,7 +1347,12 @@ Wilt u een onversleutelde verbinding maken (niet aanbevolen)? Bestand %1 kan niet worden gedownload omdat de naam conflicteert met een lokaal bestand - + + The file could not be downloaded completely. + + + + File %1 cannot be saved because of a local file name clash! Bestand %1 kan niet worden opgeslagen wegens een lokaal bestandsnaam conflict! @@ -2069,69 +2074,69 @@ Wilt u een onversleutelde verbinding maken (niet aanbevolen)? Bestand bevat ongeldige karakters die niet tussen platformen gesynchroniseerd kunnen worden. - + Unable to initialize a sync journal. Niet in staat om een synchronisatie transactielog te starten. - + Cannot open the sync journal Kan het sync transactielog niet openen - - + + Ignored because of the "choose what to sync" blacklist Genegeerd vanwege de "kies wat te synchen" zwarte lijst - + Not allowed because you don't have permission to add sub-directories in that directory Niet toegestaan, omdat u geen rechten hebt om sub-directories aan te maken in die directory - + Not allowed because you don't have permission to add parent directory Niet toegestaan, omdat u geen rechten hebt om een bovenliggende directories toe te voegen - + Not allowed because you don't have permission to add files in that directory Niet toegestaan, omdat u geen rechten hebt om bestanden in die directory toe te voegen - + Not allowed to upload this file because it is read-only on the server, restoring Niet toegestaan om dit bestand te uploaden, omdat het alleen-lezen is op de server, herstellen - - + + Not allowed to remove, restoring Niet toegestaan te verwijderen, herstellen - + Local files and share folder removed. Lokale bestanden en share-map verwijderd. - + Move not allowed, item restored Verplaatsen niet toegestaan, object hersteld - + Move not allowed because %1 is read-only Verplaatsen niet toegestaan omdat %1 alleen-lezen is - + the destination bestemming - + the source bron diff --git a/translations/mirall_pl.ts b/translations/mirall_pl.ts index e661f874d..4db0911e5 100644 --- a/translations/mirall_pl.ts +++ b/translations/mirall_pl.ts @@ -1343,7 +1343,12 @@ Do you want to connect unencrypted instead (not recommended)? Nie można pobrać pliku %1 ze względu na konflikt nazwy pliku lokalnego! - + + The file could not be downloaded completely. + + + + File %1 cannot be saved because of a local file name clash! @@ -2062,69 +2067,69 @@ Do you want to connect unencrypted instead (not recommended)? Plik zawiera nieprawidłowe znaki, które nie mogą być synchronizowane wieloplatformowo. - + Unable to initialize a sync journal. Nie można zainicjować synchronizacji dziennika. - + Cannot open the sync journal Nie można otworzyć dziennika synchronizacji - - + + Ignored because of the "choose what to sync" blacklist - + Not allowed because you don't have permission to add sub-directories in that directory Nie masz uprawnień do dodawania podkatalogów w tym katalogu. - + Not allowed because you don't have permission to add parent directory Nie masz uprawnień by dodać katalog nadrzędny - + Not allowed because you don't have permission to add files in that directory Nie masz uprawnień by dodać pliki w tym katalogu - + Not allowed to upload this file because it is read-only on the server, restoring Wgrywanie niedozwolone, ponieważ plik jest tylko do odczytu na serwerze, przywracanie - - + + Not allowed to remove, restoring Brak uprawnień by usunąć, przywracanie - + Local files and share folder removed. - + Move not allowed, item restored Przenoszenie niedozwolone, obiekt przywrócony - + Move not allowed because %1 is read-only Przenoszenie niedozwolone, ponieważ %1 jest tylko do odczytu - + the destination docelowy - + the source źródło diff --git a/translations/mirall_pt.ts b/translations/mirall_pt.ts index 019c30cef..3fb2d0df4 100644 --- a/translations/mirall_pt.ts +++ b/translations/mirall_pt.ts @@ -1344,7 +1344,12 @@ Em vez disso deseja utilizar uma ligação não codificada (não recomendado)?O ficheiro %1 não pode ser descarregado devido a conflito com um nome de ficheiro local! - + + The file could not be downloaded completely. + + + + 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. @@ -2068,69 +2073,69 @@ Por favor utilize um servidor de sincronização horária (NTP), no servidor e n O ficheiro contém caracteres inválidos que não podem ser sincronizados pelas várias plataformas. - + Unable to initialize a sync journal. Impossível inicializar sincronização 'journal'. - + Cannot open the sync journal Impossível abrir o jornal de sincronismo - - + + Ignored because of the "choose what to sync" blacklist Ignorado devido à blacklist de escolha para sincronização - + Not allowed because you don't have permission to add sub-directories in that directory Não permitido, porque não tem permissão para adicionar sub-directórios ao directório - + Not allowed because you don't have permission to add parent directory Não permitido, porque não tem permissão para adicionar o directório principal - + Not allowed because you don't have permission to add files in that directory Não permitido, porque não tem permissão para adicionar ficheiros no directório - + Not allowed to upload this file because it is read-only on the server, restoring Não é permitido fazer o envio deste ficheiro porque é só de leitura no servidor, restaurando - - + + Not allowed to remove, restoring Não autorizado para remoção, restaurando - + Local files and share folder removed. Ficheiros locais e pasta partilhada removidos. - + Move not allowed, item restored Mover não foi permitido, item restaurado - + Move not allowed because %1 is read-only Mover não foi autorizado porque %1 é só de leitura - + the destination o destino - + the source a origem diff --git a/translations/mirall_pt_BR.ts b/translations/mirall_pt_BR.ts index 547693d0a..be43f3715 100644 --- a/translations/mirall_pt_BR.ts +++ b/translations/mirall_pt_BR.ts @@ -1345,7 +1345,12 @@ Você deseja se conectar sem criptografia (não recomendado)? O arquivo %1 não pode ser baixado por causa de um confronto local no nome do arquivo! - + + The file could not be downloaded completely. + + + + File %1 cannot be saved because of a local file name clash! O arquivo %1 não pode ser salvo por causa de um confronto com um nome de arquivo local! @@ -1552,13 +1557,17 @@ Você deseja se conectar sem criptografia (não recomendado)? %n files are ignored because of previous errors. - + %n arquivo foi ignorado por causa dos erros anteriores. +%n arquivos foram ignorados por causa dos erros anteriores. + %n files are partially downloaded. - + %n arquivo está parcialmente baixado. +%n arquivos estão parcialmente baixados. + @@ -2064,69 +2073,69 @@ Você deseja se conectar sem criptografia (não recomendado)? Arquivos que contém caracteres inválidos não podem ser sincronizados através de plataformas. - + Unable to initialize a sync journal. Impossibilitado de iniciar a sincronização. - + Cannot open the sync journal Não é possível abrir o arquivo de sincronização - - + + Ignored because of the "choose what to sync" blacklist Ignorado por causa da lista negra "escolher o que sincronizar" - + Not allowed because you don't have permission to add sub-directories in that directory Não permitido porque você não tem permissão de criar sub-pastas nesta pasta - + Not allowed because you don't have permission to add parent directory Não permitido porque você não tem permissão de criar pastas mãe - + Not allowed because you don't have permission to add files in that directory Não permitido porque você não tem permissão de adicionar arquivos a esta pasta - + Not allowed to upload this file because it is read-only on the server, restoring Não é permitido fazer o upload deste arquivo porque ele é somente leitura no servidor, restaurando - - + + Not allowed to remove, restoring Não é permitido remover, restaurando - + Local files and share folder removed. Arquivos locais e pasta compartilhada removida. - + Move not allowed, item restored Não é permitido mover, item restaurado - + Move not allowed because %1 is read-only Não é permitido mover porque %1 é somente para leitura - + the destination o destino - + the source a fonte diff --git a/translations/mirall_ru.ts b/translations/mirall_ru.ts index 024069fbf..75e583a88 100644 --- a/translations/mirall_ru.ts +++ b/translations/mirall_ru.ts @@ -1343,7 +1343,12 @@ Do you want to connect unencrypted instead (not recommended)? Файл %1 не может быть загружен из-за локальных конфликтов имен! - + + The file could not be downloaded completely. + + + + File %1 cannot be saved because of a local file name clash! @@ -2062,69 +2067,69 @@ Do you want to connect unencrypted instead (not recommended)? Файл содержит недопустимые символы, которые невозможно синхронизировать между платформами. - + Unable to initialize a sync journal. Не удалось инициализировать журнал синхронизации. - + Cannot open the sync journal Не удаётся открыть журнал синхронизации - - + + Ignored because of the "choose what to sync" blacklist Игнорируется из-за черного списка в "выбрать что синхронизировать" - + Not allowed because you don't have permission to add sub-directories in that directory Недопустимо из-за отсутствия у вас разрешений на добавление подпапок в этой папке - + Not allowed because you don't have permission to add parent directory Недопустимо из-за отсутствия у вас разрешений на добавление родительской папки - + Not allowed because you don't have permission to add files in that directory Недопустимо из-за отсутствия у вас разрешений на добавление файлов в эту папку - + Not allowed to upload this file because it is read-only on the server, restoring Недопустимо отправить этот файл поскольку на севрере он помечен только для чтения, восстанавливаем - - + + Not allowed to remove, restoring Недопустимо удалить, восстанавливаем - + Local files and share folder removed. Локальные файлы и папки, добавленные в общий доступ, удалены. - + Move not allowed, item restored Перемещение недопустимо, элемент восстановлен - + Move not allowed because %1 is read-only Перемещение недопустимо, поскольку %1 помечен только для чтения - + the destination Назначение - + the source Источник diff --git a/translations/mirall_sk.ts b/translations/mirall_sk.ts index be969c104..a1c57230e 100644 --- a/translations/mirall_sk.ts +++ b/translations/mirall_sk.ts @@ -1343,7 +1343,12 @@ Do you want to connect unencrypted instead (not recommended)? Súbor %1 nie je možné stiahnuť, pretože súbor s rovnakým menom už existuje! - + + The file could not be downloaded completely. + + + + File %1 cannot be saved because of a local file name clash! @@ -2062,69 +2067,69 @@ Do you want to connect unencrypted instead (not recommended)? Súbor obsahuje neplatné znaky, ktoré nemôžu byť zosynchronizované medzi platformami. - + Unable to initialize a sync journal. Nemôžem inicializovať synchronizačný žurnál. - + Cannot open the sync journal Nemožno otvoriť sync žurnál - - + + Ignored because of the "choose what to sync" blacklist - + Not allowed because you don't have permission to add sub-directories in that directory Nie je dovolené, pretože nemáte oprávnenie pridávať do tohto adresára podadresáre. - + Not allowed because you don't have permission to add parent directory Nie je dovolené, pretože nemáte oprávnenie pridať nadradený adresár. - + Not allowed because you don't have permission to add files in that directory Nie je dovolené, pretože nemáte oprávnenie pridávať do tohto adresára súbory. - + Not allowed to upload this file because it is read-only on the server, restoring Nie je dovolené tento súbor nahrať, pretože je na serveri iba na čítanie. Obnovuje sa. - - + + Not allowed to remove, restoring Nie je dovolené odstrániť. Obnovuje sa. - + Local files and share folder removed. - + Move not allowed, item restored Presunutie nie je dovolené. Položka obnovená. - + Move not allowed because %1 is read-only Presunutie nie je dovolené, pretože %1 je na serveri iba na čítanie - + the destination cieľ - + the source zdroj diff --git a/translations/mirall_sl.ts b/translations/mirall_sl.ts index 6ecec88f2..f7b61484d 100644 --- a/translations/mirall_sl.ts +++ b/translations/mirall_sl.ts @@ -1347,7 +1347,12 @@ Ali želite vzpostaviti nešifrirano povezavo (ni priporočljivo)? Datoteke %1 ni mogoče prejeti zaradi neskladja z imenom krajevne datoteke! - + + The file could not be downloaded completely. + + + + 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! @@ -2074,69 +2079,69 @@ Ali želite vzpostaviti nešifrirano povezavo (ni priporočljivo)? Ime datoteke vsebuje neveljavne znake, ki niso podprti na vseh okoljih. - + Unable to initialize a sync journal. Dnevnika usklajevanja ni mogoče začeti. - + Cannot open the sync journal Ni mogoče odpreti dnevnika usklajevanja - - + + Ignored because of the "choose what to sync" blacklist Prezrto, ker ni neizbrano za usklajevanje - + Not allowed because you don't have permission to add sub-directories in that directory Ni ustreznih dovoljenj za dodajanje podmap v izbrano mapo. - + Not allowed because you don't have permission to add parent directory Ni ustreznih dovoljenj za dodajanje nadrejene mape. - + Not allowed because you don't have permission to add files in that directory Ni ustreznih dovoljenj za dodajanje datotek v izbrano mapo. - + Not allowed to upload this file because it is read-only on the server, restoring Ni dovoljeno pošiljati te datoteke, ker ima določena dovoljenja le za branje. Datoteka bo obnovljena na izvorno različico. - - + + Not allowed to remove, restoring Odstranitev ni dovoljena, datoteka bo obnovljena. - + Local files and share folder removed. Krajevne datoteke in mape v souporabi so odstranjene. - + Move not allowed, item restored Premikanje ni dovoljeno, datoteka bo obnovljena. - + Move not allowed because %1 is read-only Premikanje ni dovoljeno, ker je nastavljeno določilo %1 le za branje. - + the destination cilj - + the source vir diff --git a/translations/mirall_sv.ts b/translations/mirall_sv.ts index 77c020007..c04f7c15f 100644 --- a/translations/mirall_sv.ts +++ b/translations/mirall_sv.ts @@ -1343,7 +1343,12 @@ Do you want to connect unencrypted instead (not recommended)? Fil %1 kan inte laddas ner på grund av namnkonflikt med en lokal fil! - + + The file could not be downloaded completely. + + + + File %1 cannot be saved because of a local file name clash! @@ -2062,69 +2067,69 @@ Do you want to connect unencrypted instead (not recommended)? Filen innehåller ogiltiga tecken som inte kan synkas oberoende av plattform. - + Unable to initialize a sync journal. Kan inte initialisera en synk journal. - + Cannot open the sync journal Kunde inte öppna synk journalen - - + + Ignored because of the "choose what to sync" blacklist Ignorerad eftersom den är svartlistad i "välj vad som ska synkas" - + Not allowed because you don't have permission to add sub-directories in that directory Går ej att genomföra då du saknar rättigheter att lägga till underkataloger i den katalogen - + Not allowed because you don't have permission to add parent directory Går ej att genomföra då du saknar rättigheter att lägga till någon moderkatalog - + Not allowed because you don't have permission to add files in that directory Går ej att genomföra då du saknar rättigheter att lägga till filer i den katalogen - + Not allowed to upload this file because it is read-only on the server, restoring Inte behörig att ladda upp denna fil då den är skrivskyddad på servern, återställer - - + + Not allowed to remove, restoring Inte behörig att radera, återställer - + Local files and share folder removed. Lokala filer och mappar som är delade är borttagna. - + Move not allowed, item restored Det gick inte att genomföra flytten, objektet återställs - + Move not allowed because %1 is read-only Det gick inte att genomföra flytten då %1 är skrivskyddad - + the destination destinationen - + the source källan diff --git a/translations/mirall_th.ts b/translations/mirall_th.ts index 509353d3d..d380f4aff 100644 --- a/translations/mirall_th.ts +++ b/translations/mirall_th.ts @@ -1336,7 +1336,12 @@ Do you want to connect unencrypted instead (not recommended)? - + + The file could not be downloaded completely. + + + + File %1 cannot be saved because of a local file name clash! @@ -2053,69 +2058,69 @@ Do you want to connect unencrypted instead (not recommended)? - + Unable to initialize a sync journal. - + Cannot open the sync journal - - + + Ignored because of the "choose what to sync" blacklist - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Local files and share folder removed. - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source diff --git a/translations/mirall_tr.ts b/translations/mirall_tr.ts index 1fcf3ab31..a5c24d28c 100644 --- a/translations/mirall_tr.ts +++ b/translations/mirall_tr.ts @@ -1347,7 +1347,12 @@ Bunun yerine şifrelenmemiş bağlantı yapmak ister misiniz (önerilmez)?%1 dosyası, yerel dosya adı çakışması nedeniyle indirilemiyor! - + + The file could not be downloaded completely. + + + + File %1 cannot be saved because of a local file name clash! Yerel bir dosya ismi ile çakıştığından, %1 dosyası kaydedilemedi! @@ -2070,69 +2075,69 @@ Bunun yerine şifrelenmemiş bağlantı yapmak ister misiniz (önerilmez)?Dosya, çapraz platform arasında eşitlenemeyecek karakterler içeriyor. - + Unable to initialize a sync journal. Bir eşitleme günlüğü başlatılamadı. - + Cannot open the sync journal Eşitleme günlüğü açılamıyor - - + + Ignored because of the "choose what to sync" blacklist "Eşitlenecekleri seçin" kara listesinde olduğundan yoksayıldı. - + Not allowed because you don't have permission to add sub-directories in that directory Bu dizine alt dizin ekleme yetkiniz olmadığından izin verilmedi - + Not allowed because you don't have permission to add parent directory Üst dizin ekleme yetkiniz olmadığından izin verilmedi - + Not allowed because you don't have permission to add files in that directory Bu dizine dosya ekleme yetkiniz olmadığından izin verilmedi - + Not allowed to upload this file because it is read-only on the server, restoring Sunucuda salt okunur olduğundan, bu dosya yüklenemedi, geri alınıyor - - + + Not allowed to remove, restoring Kaldırmaya izin verilmedi, geri alınıyor - + Local files and share folder removed. Yerel dosyalar ve paylaşım klasörü kaldırıldı. - + Move not allowed, item restored Taşımaya izin verilmedi, öge geri alındı - + Move not allowed because %1 is read-only %1 salt okunur olduğundan taşımaya izin verilmedi - + the destination hedef - + the source kaynak diff --git a/translations/mirall_uk.ts b/translations/mirall_uk.ts index fa124915e..41134b733 100644 --- a/translations/mirall_uk.ts +++ b/translations/mirall_uk.ts @@ -1347,7 +1347,12 @@ Do you want to connect unencrypted instead (not recommended)? Файл %1 не завантажено, через локальний конфлікт ім'я! - + + The file could not be downloaded completely. + + + + File %1 cannot be saved because of a local file name clash! Файл %1 не збережено, через локальний конфлікт ім'я! @@ -2072,69 +2077,69 @@ Do you want to connect unencrypted instead (not recommended)? Файл містить недопустимі символи, через це синхронізація між платформами неможлива. - + Unable to initialize a sync journal. Не вдалося ініціалізувати протокол синхронізації. - + Cannot open the sync journal Не вдається відкрити протокол синхронізації - - + + Ignored because of the "choose what to sync" blacklist Ігнорується через чорний список в "обрати що синхронізувати" - + Not allowed because you don't have permission to add sub-directories in that directory Не дозволено через відсутність прав на додавання підкаталогів в цій теці. - + Not allowed because you don't have permission to add parent directory Не дозволено через відсутність прав на додавання батьківської теки. - + Not allowed because you don't have permission to add files in that directory Не дозволено через відсутність прав на додавання файлів в цю теку. - + Not allowed to upload this file because it is read-only on the server, restoring Не дозволено завантажувати цей файл, оскільки він має дозвіл лише на перегляд, відновлюємо - - + + Not allowed to remove, restoring Не дозволено видаляти, відновлюємо - + Local files and share folder removed. Локальні файли та теки в загальному доступі було видалено. - + Move not allowed, item restored Переміщення не дозволено, елемент відновлено - + Move not allowed because %1 is read-only Переміщення не дозволено, оскільки %1 помічений тільки для перегляду - + the destination призначення - + the source джерело diff --git a/translations/mirall_zh_CN.ts b/translations/mirall_zh_CN.ts index a2e26f6b4..747a475df 100644 --- a/translations/mirall_zh_CN.ts +++ b/translations/mirall_zh_CN.ts @@ -1340,7 +1340,12 @@ Do you want to connect unencrypted instead (not recommended)? - + + The file could not be downloaded completely. + + + + File %1 cannot be saved because of a local file name clash! @@ -2059,69 +2064,69 @@ Do you want to connect unencrypted instead (not recommended)? - + Unable to initialize a sync journal. 无法初始化同步日志 - + Cannot open the sync journal 无法打开同步日志 - - + + Ignored because of the "choose what to sync" blacklist - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Local files and share folder removed. - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source diff --git a/translations/mirall_zh_TW.ts b/translations/mirall_zh_TW.ts index 4c9cbeb4a..00edbaebb 100644 --- a/translations/mirall_zh_TW.ts +++ b/translations/mirall_zh_TW.ts @@ -1336,7 +1336,12 @@ Do you want to connect unencrypted instead (not recommended)? - + + The file could not be downloaded completely. + + + + File %1 cannot be saved because of a local file name clash! @@ -2053,69 +2058,69 @@ Do you want to connect unencrypted instead (not recommended)? - + Unable to initialize a sync journal. - + Cannot open the sync journal - - + + Ignored because of the "choose what to sync" blacklist - + Not allowed because you don't have permission to add sub-directories in that directory - + Not allowed because you don't have permission to add parent directory - + Not allowed because you don't have permission to add files in that directory - + Not allowed to upload this file because it is read-only on the server, restoring - - + + Not allowed to remove, restoring - + Local files and share folder removed. - + Move not allowed, item restored - + Move not allowed because %1 is read-only - + the destination - + the source From 41568c885d6f80a1691f382c46e13964d1cdb992 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Fri, 21 Nov 2014 11:03:14 +0100 Subject: [PATCH 5/5] Propagator: only check the content-lenght if it is there If content-lenght is 0, don't chack it is the size we recieved. It can be zero when using HTTP chunk encoding. Also do not remove the temporary file so it can be re-used on the next sync and ask for a new sync immediatly to re-do the sync. Fixup the fix to task #2528 --- src/mirall/propagator_qnam.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/mirall/propagator_qnam.cpp b/src/mirall/propagator_qnam.cpp index 639104ecf..674f8163e 100644 --- a/src/mirall/propagator_qnam.cpp +++ b/src/mirall/propagator_qnam.cpp @@ -750,9 +750,8 @@ void PropagateDownloadFileQNAM::slotGetFinished() const QByteArray sizeHeader("Content-Length"); qint64 bodySize = job->reply()->rawHeader(sizeHeader).toLongLong(); - if( bodySize != _tmpFile.size() ) { - _propagator->_journal->setDownloadInfo(_item._file, SyncJournalDb::DownloadInfo()); - _tmpFile.remove(); + if(bodySize > 0 && bodySize != _tmpFile.size() ) { + _propagator->_anotherSyncNeeded = true; done(SyncFileItem::SoftError, tr("The file could not be downloaded completely.")); return; }