diff --git a/.tx/nextcloud.client-desktop/de_translation b/.tx/nextcloud.client-desktop/de_translation index e3d9ad4069..09564e030d 100644 --- a/.tx/nextcloud.client-desktop/de_translation +++ b/.tx/nextcloud.client-desktop/de_translation @@ -198,7 +198,7 @@ X-GNOME-Autostart-Delay=3 # Translations -Icon[de]=@APPLICATION_ICON_NAME@ -Name[de]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation -Comment[de]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation -GenericName[de]=Synchronisationsordner +Icon[de_DE]=@APPLICATION_ICON_NAME@ +Name[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation +Comment[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisation +GenericName[de_DE]=Synchronisationsordner diff --git a/src/gui/folderwatcher.cpp b/src/gui/folderwatcher.cpp index d8136ff361..65e68cb36f 100644 --- a/src/gui/folderwatcher.cpp +++ b/src/gui/folderwatcher.cpp @@ -75,9 +75,27 @@ bool FolderWatcher::isReliable() const return _isReliable; } +void FolderWatcher::appendSubPaths(QDir dir, QStringList& subPaths) { + QStringList newSubPaths = dir.entryList(QDir::NoDotAndDotDot | QDir::Dirs | QDir::Files); + for (int i = 0; i < newSubPaths.size(); i++) { + QString path = dir.path() + "/" + newSubPaths[i]; + QFileInfo fileInfo(path); + subPaths.append(path); + if (fileInfo.isDir()) { + QDir dir(path); + appendSubPaths(dir, subPaths); + } + } +} + void FolderWatcher::changeDetected(const QString &path) { + QFileInfo fileInfo(path); QStringList paths(path); + if (fileInfo.isDir()) { + QDir dir(path); + appendSubPaths(dir, paths); + } changeDetected(paths); } diff --git a/src/gui/folderwatcher.h b/src/gui/folderwatcher.h index a6cf006e20..b07c33a100 100644 --- a/src/gui/folderwatcher.h +++ b/src/gui/folderwatcher.h @@ -26,6 +26,7 @@ #include #include #include +#include class QTimer; @@ -120,6 +121,8 @@ private: Folder *_folder; bool _isReliable = true; + void appendSubPaths(QDir dir, QStringList& subPaths); + friend class FolderWatcherPrivate; }; } diff --git a/src/libsync/configfile.cpp b/src/libsync/configfile.cpp index a2881d4a81..4a71dc9a98 100644 --- a/src/libsync/configfile.cpp +++ b/src/libsync/configfile.cpp @@ -37,7 +37,7 @@ #include #include -#define DEFAULT_REMOTE_POLL_INTERVAL 30000 // default remote poll time in milliseconds +#define DEFAULT_REMOTE_POLL_INTERVAL 5000 // default remote poll time in milliseconds #define DEFAULT_MAX_LOG_LINES 20000 namespace OCC { diff --git a/src/libsync/propagateupload.h b/src/libsync/propagateupload.h index 8dfd98d6f2..a1b4f86660 100644 --- a/src/libsync/propagateupload.h +++ b/src/libsync/propagateupload.h @@ -92,19 +92,19 @@ private: public: // Takes ownership of the device - explicit PUTFileJob(AccountPtr account, const QString &path, QIODevice *device, + explicit PUTFileJob(AccountPtr account, const QString &path, std::unique_ptr device, const QMap &headers, int chunk, QObject *parent = nullptr) : AbstractNetworkJob(account, path, parent) - , _device(device) + , _device(device.release()) , _headers(headers) , _chunk(chunk) { _device->setParent(this); } - explicit PUTFileJob(AccountPtr account, const QUrl &url, QIODevice *device, + explicit PUTFileJob(AccountPtr account, const QUrl &url, std::unique_ptr device, const QMap &headers, int chunk, QObject *parent = nullptr) : AbstractNetworkJob(account, QString(), parent) - , _device(device) + , _device(device.release()) , _headers(headers) , _url(url) , _chunk(chunk) diff --git a/src/libsync/propagateuploadng.cpp b/src/libsync/propagateuploadng.cpp index 49728a7815..7dae923cb4 100644 --- a/src/libsync/propagateuploadng.cpp +++ b/src/libsync/propagateuploadng.cpp @@ -305,7 +305,7 @@ void PropagateUploadFileNG::startNextChunk() return; } - auto device = new UploadDevice(&propagator()->_bandwidthManager); + auto device = std::make_unique(&propagator()->_bandwidthManager); const QString fileName = _fileToUpload._path; if (!device->prepareAndOpen(fileName, _sent, _currentChunkSize)) { @@ -328,13 +328,14 @@ void PropagateUploadFileNG::startNextChunk() QUrl url = chunkUrl(_currentChunk); // job takes ownership of device via a QScopedPointer. Job deletes itself when finishing - PUTFileJob *job = new PUTFileJob(propagator()->account(), url, device, headers, _currentChunk, this); + auto devicePtr = device.get(); // for connections later + PUTFileJob *job = new PUTFileJob(propagator()->account(), url, std::move(device), headers, _currentChunk, this); _jobs.append(job); connect(job, &PUTFileJob::finishedSignal, this, &PropagateUploadFileNG::slotPutFinished); connect(job, &PUTFileJob::uploadProgress, this, &PropagateUploadFileNG::slotUploadProgress); connect(job, &PUTFileJob::uploadProgress, - device, &UploadDevice::slotJobUploadProgress); + devicePtr, &UploadDevice::slotJobUploadProgress); connect(job, &QObject::destroyed, this, &PropagateUploadFileCommon::slotJobDestroyed); job->start(); propagator()->_activeJobList.append(this); diff --git a/src/libsync/propagateuploadv1.cpp b/src/libsync/propagateuploadv1.cpp index bcd31761cb..104fa9d752 100644 --- a/src/libsync/propagateuploadv1.cpp +++ b/src/libsync/propagateuploadv1.cpp @@ -89,7 +89,7 @@ void PropagateUploadFileV1::startNextChunk() QString path = _fileToUpload._file; - UploadDevice *device = new UploadDevice(&propagator()->_bandwidthManager); + auto device = std::make_unique(&propagator()->_bandwidthManager); qint64 chunkStart = 0; qint64 currentChunkSize = fileSize; bool isFinalChunk = false; @@ -134,16 +134,16 @@ void PropagateUploadFileV1::startNextChunk() } // Soft error because this is likely caused by the user modifying his files while syncing abortWithError(SyncFileItem::SoftError, device->errorString()); - delete device; return; } // job takes ownership of device via a QScopedPointer. Job deletes itself when finishing - PUTFileJob *job = new PUTFileJob(propagator()->account(), propagator()->_remoteFolder + path, device, headers, _currentChunk, this); + auto devicePtr = device.get(); // for connections later + PUTFileJob *job = new PUTFileJob(propagator()->account(), propagator()->_remoteFolder + path, std::move(device), headers, _currentChunk, this); _jobs.append(job); connect(job, &PUTFileJob::finishedSignal, this, &PropagateUploadFileV1::slotPutFinished); connect(job, &PUTFileJob::uploadProgress, this, &PropagateUploadFileV1::slotUploadProgress); - connect(job, &PUTFileJob::uploadProgress, device, &UploadDevice::slotJobUploadProgress); + connect(job, &PUTFileJob::uploadProgress, devicePtr, &UploadDevice::slotJobUploadProgress); connect(job, &QObject::destroyed, this, &PropagateUploadFileCommon::slotJobDestroyed); if (isFinalChunk) adjustLastJobTimeout(job, fileSize); diff --git a/test/testfolderwatcher.cpp b/test/testfolderwatcher.cpp index d908568282..fdd97701db 100644 --- a/test/testfolderwatcher.cpp +++ b/test/testfolderwatcher.cpp @@ -140,6 +140,17 @@ private slots: QVERIFY(waitForPathChanged(file)); } + void testMove3LevelDirWithFile() { + QString file(_rootPath + "/a0/b/c/empty.txt"); + mkdir(_rootPath + "/a0"); + mkdir(_rootPath + "/a0/b"); + mkdir(_rootPath + "/a0/b/c"); + touch(file); + mv(_rootPath + "/a0 ", _rootPath + "/a"); + QVERIFY(waitForPathChanged(_rootPath + "/a/b/c/empty.txt")); + } + + void testCreateADir() { QString file(_rootPath+"/a1/b1/new_dir"); mkdir(file); diff --git a/translations/client_bg.ts b/translations/client_bg.ts index 06587b3468..d23169ce23 100644 --- a/translations/client_bg.ts +++ b/translations/client_bg.ts @@ -2435,27 +2435,27 @@ It is not advisable to use it. OCC::PropagateUploadFileNG - + The local file was removed during sync. - + Local file changed during sync. Локален файл е променен по време на синхронизирането. - + Unexpected return code from server (%1) - + Missing File ID from server - + Missing ETag from server diff --git a/translations/client_ca.ts b/translations/client_ca.ts index 159230e9e2..af2b0ca42d 100644 --- a/translations/client_ca.ts +++ b/translations/client_ca.ts @@ -2453,27 +2453,27 @@ No és aconsellable fer-la servir. OCC::PropagateUploadFileNG - + The local file was removed during sync. El fitxer local s'ha suprimit durant la sincronització. - + Local file changed during sync. El fitxer local ha canviat durant la sincronització. - + Unexpected return code from server (%1) Codi de retorn inesperat del servidor (%1) - + Missing File ID from server Falta l'ID de fitxer del servidor - + Missing ETag from server Falta l'ETag del servidor diff --git a/translations/client_cs.ts b/translations/client_cs.ts index 34ee5c3657..433f9d809d 100644 --- a/translations/client_cs.ts +++ b/translations/client_cs.ts @@ -2292,7 +2292,7 @@ Nedoporučuje se jí používat. The downloaded file is empty despite that the server announced it should have been %1. - + Stažený soubor je prázdný, přestože soubor oznámil, že měl mít %1. @@ -2450,27 +2450,27 @@ Nedoporučuje se jí používat. OCC::PropagateUploadFileNG - + The local file was removed during sync. Místní soubor byl odstraněn během synchronizace. - + Local file changed during sync. Místní soubor byl změněn během synchronizace. - + Unexpected return code from server (%1) Neočekávaný návratový kód ze serveru (%1) - + Missing File ID from server Chybějící souborové ID ze serveru - + Missing ETag from server Chybějící ETag ze serveru diff --git a/translations/client_da.ts b/translations/client_da.ts index 73af35b20b..d2baed6df9 100644 --- a/translations/client_da.ts +++ b/translations/client_da.ts @@ -2430,27 +2430,27 @@ It is not advisable to use it. OCC::PropagateUploadFileNG - + The local file was removed during sync. - + Local file changed during sync. - + Unexpected return code from server (%1) - + Missing File ID from server - + Missing ETag from server diff --git a/translations/client_de.ts b/translations/client_de.ts index b304c08f45..40bbf69746 100644 --- a/translations/client_de.ts +++ b/translations/client_de.ts @@ -2450,27 +2450,27 @@ Es ist nicht ratsam, sie zu benutzen. OCC::PropagateUploadFileNG - + The local file was removed during sync. Die lokale Datei wurde während der Synchronisation gelöscht. - + Local file changed during sync. Eine lokale Datei wurde während der Synchronisation geändert. - + Unexpected return code from server (%1) Unerwarteter Rückgabe-Code Antwort vom Server (%1) - + Missing File ID from server Fehlende Datei-ID vom Server - + Missing ETag from server Fehlender ETag vom Server diff --git a/translations/client_el.ts b/translations/client_el.ts index 733f962ebf..c7a0b9f6a3 100644 --- a/translations/client_el.ts +++ b/translations/client_el.ts @@ -9,22 +9,22 @@ Checking for changes in '%1' - + Γίνεται έλεγχος για αλλαγές στο '%1' Syncing %1 of %2 (%3 left) - + Συγχρονισμός %1 από %2 (%3 απομένουν) Syncing %1 of %2 - + Συγχρονισμός %1 από %2 Syncing %1 (%2 left) - + Συγχρονισμός %1 (%2 απομένουν) @@ -35,7 +35,7 @@ No recently changed files - + Δεν προστέθηκαν πρόσφατα αρχεία. @@ -50,32 +50,32 @@ Open website - + Άνοιγμα ιστοσελίδας Recently changed - + Τροποποιήθηκαν πρόσφατα Pause synchronization - + Παύση συγχρονισμού Help - + Βοήθεια Settings - + Ρυθμίσεις Log out - + Αποσύνδεση @@ -359,7 +359,7 @@ Server %1 is currently in maintenance mode. - + Ο διακομιστής %1 βρίσκεται τώρα σε κατάσταση συντήρησης. @@ -369,7 +369,7 @@ Obtaining authorization from the browser. <a href='%1'>Click here</a> to re-open the browser. - + Γίνεται λήψη της εξουσιοδότησης από το πρόγραμμα περιήγησης. Κάντε κλικ <a href='%1'>εδώ</a> για να ανοίξετε πάλι το πρόγραμμα περιήγησης. @@ -489,7 +489,7 @@ Maintenance mode - + Κατάσταση συντήρησης @@ -560,12 +560,12 @@ Synced - + Συγχρονίστηκε Retry all uploads - + Επανάληψη όλων των μεταφορτώσεων @@ -621,12 +621,12 @@ There was an error while accessing the configuration file at %1. Please make sure the file can be accessed by your user. - + Υπήρξε σφάλμα κατά την πρόσβαση του αρχείου ρυθμίσεων στο %1. Παρακαλώ επαληθεύστε αν μπορείτε να προσπελάσετε το αρχείο. Quit %1 - + Κλείσιμο %1 @@ -963,7 +963,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an Sync was successful, unresolved conflicts. - + Ο συγχρονισμός ήταν επιτυχής, μη διευθετημένες διενέξεις. @@ -1031,7 +1031,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an Synchronized with local folder - + Συγχρονίστηκε με τοπικό φάκελο @@ -1127,7 +1127,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an Checking for changes in local '%1' - + Γίνεται έλεγχος για αλλαγές στο τοπικό '%1' @@ -1332,7 +1332,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an Show Server &Notifications - + Εμφάνιση των ειδοποιήσεων διακομιστή @@ -1399,7 +1399,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an Server notifications that require attention. - + Ειδοποιήσεις από τον διακομιστή που απαιτούν την προσοχή σας. @@ -1779,7 +1779,7 @@ Logs will be written to %1 Error returned from the server: <em>%1</em> - + Ο διακομιστής επέστρεψε το σφάλμα: <em>%1</em> @@ -2440,27 +2440,27 @@ It is not advisable to use it. OCC::PropagateUploadFileNG - + The local file was removed during sync. Το τοπικό αρχείο αφαιρέθηκε κατά το συγχρονισμό. - + Local file changed during sync. Το τοπικό αρχείο τροποποιήθηκε κατά τον συγχρονισμό. - + Unexpected return code from server (%1) Ο διακομιστής επέστρεψε απροσδόκητο κωδικό (%1) - + Missing File ID from server Απουσία ID αρχείου από τον διακομιστή - + Missing ETag from server Απουσία ETag από τον διακομιστή diff --git a/translations/client_en.ts b/translations/client_en.ts index e533ffe82a..8d16ed2fd4 100644 --- a/translations/client_en.ts +++ b/translations/client_en.ts @@ -2456,27 +2456,27 @@ It is not advisable to use it. OCC::PropagateUploadFileNG - + The local file was removed during sync. - + Local file changed during sync. - + Unexpected return code from server (%1) - + Missing File ID from server - + Missing ETag from server diff --git a/translations/client_en_GB.ts b/translations/client_en_GB.ts index 6d9c371273..111d80b3e1 100644 --- a/translations/client_en_GB.ts +++ b/translations/client_en_GB.ts @@ -2451,27 +2451,27 @@ It is not advisable to use it. OCC::PropagateUploadFileNG - + The local file was removed during sync. The local file was removed during sync. - + Local file changed during sync. Local file changed during sync. - + Unexpected return code from server (%1) Unexpected return code from server (%1) - + Missing File ID from server Missing File ID from server - + Missing ETag from server Missing ETag from server diff --git a/translations/client_eo.ts b/translations/client_eo.ts index 16686ba4ed..6809c2fa05 100644 --- a/translations/client_eo.ts +++ b/translations/client_eo.ts @@ -2450,27 +2450,27 @@ Uzi ĝin ne konsilindas. OCC::PropagateUploadFileNG - + The local file was removed during sync. Loka dosiero estis forigita dum sinkronigo. - + Local file changed during sync. Loka dosiero ŝanĝiĝis dum sinkronigo. - + Unexpected return code from server (%1) Neatendita elirkodo el servilo (%1) - + Missing File ID from server Mankanta identigilo de dosiero el la servilo - + Missing ETag from server Mankanta ETag el la servilo diff --git a/translations/client_es.ts b/translations/client_es.ts index 0b7935942b..cdb44fe1c9 100644 --- a/translations/client_es.ts +++ b/translations/client_es.ts @@ -2450,27 +2450,27 @@ No se recomienda usarla. OCC::PropagateUploadFileNG - + The local file was removed during sync. El archivo local ha sido eliminado durante la sincronización. - + Local file changed during sync. Un archivo local fue modificado durante la sincronización. - + Unexpected return code from server (%1) Respuesta inesperada del servidor (%1) - + Missing File ID from server ID perdido del archivo del servidor - + Missing ETag from server Perdido ETag del servidor diff --git a/translations/client_es_AR.ts b/translations/client_es_AR.ts index f7242f6e54..11a0a2b9be 100644 --- a/translations/client_es_AR.ts +++ b/translations/client_es_AR.ts @@ -2430,27 +2430,27 @@ It is not advisable to use it. OCC::PropagateUploadFileNG - + The local file was removed during sync. - + Local file changed during sync. - + Unexpected return code from server (%1) - + Missing File ID from server - + Missing ETag from server diff --git a/translations/client_es_CL.ts b/translations/client_es_CL.ts index 479715fcf5..829f5d9c1f 100644 --- a/translations/client_es_CL.ts +++ b/translations/client_es_CL.ts @@ -2441,27 +2441,27 @@ No es recomendable usarlo. OCC::PropagateUploadFileNG - + The local file was removed during sync. El archivo local se eliminó durante la sincronización. - + Local file changed during sync. El archivo local cambió durante la sincronización. - + Unexpected return code from server (%1) Código de retorno del servidor inesperado (%1) - + Missing File ID from server El ID de archivo no está en el servidor - + Missing ETag from server ETag no está en el servidor diff --git a/translations/client_es_CO.ts b/translations/client_es_CO.ts index 127ecbf997..b9d3a86418 100644 --- a/translations/client_es_CO.ts +++ b/translations/client_es_CO.ts @@ -2441,27 +2441,27 @@ No es recomendable usarlo. OCC::PropagateUploadFileNG - + The local file was removed during sync. El archivo local se eliminó durante la sincronización. - + Local file changed during sync. El archivo local cambió durante la sincronización. - + Unexpected return code from server (%1) Código de retorno del servidor inesperado (%1) - + Missing File ID from server El ID de archivo no está en el servidor - + Missing ETag from server ETag no está en el servidor diff --git a/translations/client_es_CR.ts b/translations/client_es_CR.ts index 19cb4d3545..380b9b74c2 100644 --- a/translations/client_es_CR.ts +++ b/translations/client_es_CR.ts @@ -2441,27 +2441,27 @@ No es recomendable usarlo. OCC::PropagateUploadFileNG - + The local file was removed during sync. El archivo local se eliminó durante la sincronización. - + Local file changed during sync. El archivo local cambió durante la sincronización. - + Unexpected return code from server (%1) Código de retorno del servidor inesperado (%1) - + Missing File ID from server El ID de archivo no está en el servidor - + Missing ETag from server ETag no está en el servidor diff --git a/translations/client_es_DO.ts b/translations/client_es_DO.ts index 8679215aa4..00c99f1851 100644 --- a/translations/client_es_DO.ts +++ b/translations/client_es_DO.ts @@ -2441,27 +2441,27 @@ No es recomendable usarlo. OCC::PropagateUploadFileNG - + The local file was removed during sync. El archivo local se eliminó durante la sincronización. - + Local file changed during sync. El archivo local cambió durante la sincronización. - + Unexpected return code from server (%1) Código de retorno del servidor inesperado (%1) - + Missing File ID from server El ID de archivo no está en el servidor - + Missing ETag from server ETag no está en el servidor diff --git a/translations/client_es_EC.ts b/translations/client_es_EC.ts index 038964182e..d522006707 100644 --- a/translations/client_es_EC.ts +++ b/translations/client_es_EC.ts @@ -2441,27 +2441,27 @@ No es recomendable usarlo. OCC::PropagateUploadFileNG - + The local file was removed during sync. El archivo local se eliminó durante la sincronización. - + Local file changed during sync. El archivo local cambió durante la sincronización. - + Unexpected return code from server (%1) Código de retorno del servidor inesperado (%1) - + Missing File ID from server El ID de archivo no está en el servidor - + Missing ETag from server ETag no está en el servidor diff --git a/translations/client_es_GT.ts b/translations/client_es_GT.ts index 46a6e58bf2..99776900a3 100644 --- a/translations/client_es_GT.ts +++ b/translations/client_es_GT.ts @@ -2441,27 +2441,27 @@ No es recomendable usarlo. OCC::PropagateUploadFileNG - + The local file was removed during sync. El archivo local se eliminó durante la sincronización. - + Local file changed during sync. El archivo local cambió durante la sincronización. - + Unexpected return code from server (%1) Código de retorno del servidor inesperado (%1) - + Missing File ID from server El ID de archivo no está en el servidor - + Missing ETag from server ETag no está en el servidor diff --git a/translations/client_es_HN.ts b/translations/client_es_HN.ts index 193ae492d5..7b67114cbd 100644 --- a/translations/client_es_HN.ts +++ b/translations/client_es_HN.ts @@ -2441,27 +2441,27 @@ No es recomendable usarlo. OCC::PropagateUploadFileNG - + The local file was removed during sync. El archivo local se eliminó durante la sincronización. - + Local file changed during sync. El archivo local cambió durante la sincronización. - + Unexpected return code from server (%1) Código de retorno del servidor inesperado (%1) - + Missing File ID from server El ID de archivo no está en el servidor - + Missing ETag from server ETag no está en el servidor diff --git a/translations/client_es_MX.ts b/translations/client_es_MX.ts index 98fa7d5c85..59b718740f 100644 --- a/translations/client_es_MX.ts +++ b/translations/client_es_MX.ts @@ -2441,27 +2441,27 @@ No es recomendable usarlo. OCC::PropagateUploadFileNG - + The local file was removed during sync. El archivo local se eliminó durante la sincronización. - + Local file changed during sync. El archivo local cambió durante la sincronización. - + Unexpected return code from server (%1) Código de retorno del servidor inesperado (%1) - + Missing File ID from server El ID de archivo no está en el servidor - + Missing ETag from server ETag no está en el servidor diff --git a/translations/client_es_SV.ts b/translations/client_es_SV.ts index c036be18e4..774e767059 100644 --- a/translations/client_es_SV.ts +++ b/translations/client_es_SV.ts @@ -2441,27 +2441,27 @@ No es recomendable usarlo. OCC::PropagateUploadFileNG - + The local file was removed during sync. El archivo local se eliminó durante la sincronización. - + Local file changed during sync. El archivo local cambió durante la sincronización. - + Unexpected return code from server (%1) Código de retorno del servidor inesperado (%1) - + Missing File ID from server El ID de archivo no está en el servidor - + Missing ETag from server ETag no está en el servidor diff --git a/translations/client_et.ts b/translations/client_et.ts index 1d0cc962c5..8bdbda1cfa 100644 --- a/translations/client_et.ts +++ b/translations/client_et.ts @@ -2431,27 +2431,27 @@ Selle kasutamine pole soovitatav. OCC::PropagateUploadFileNG - + The local file was removed during sync. Kohalik fail on eemaldatud sünkroniseeringu käigus. - + Local file changed during sync. Kohalik fail muutus sünkroniseeringu käigus. - + Unexpected return code from server (%1) - + Missing File ID from server - + Missing ETag from server diff --git a/translations/client_eu.ts b/translations/client_eu.ts index fd72a44b34..1506e70d12 100644 --- a/translations/client_eu.ts +++ b/translations/client_eu.ts @@ -2435,27 +2435,27 @@ Ez da gomendagarria erabltzea. OCC::PropagateUploadFileNG - + The local file was removed during sync. Fitxategi lokala ezabatu da sinkronizazioan. - + Local file changed during sync. Fitxategi lokala aldatu da sinkronizazioan. - + Unexpected return code from server (%1) - + Missing File ID from server - + Missing ETag from server diff --git a/translations/client_fa.ts b/translations/client_fa.ts index 1e086c5a4c..33cbb516b2 100644 --- a/translations/client_fa.ts +++ b/translations/client_fa.ts @@ -2438,27 +2438,27 @@ It is not advisable to use it. OCC::PropagateUploadFileNG - + The local file was removed during sync. فایل محلی در حین همگام‌سازی حذف شده است. - + Local file changed during sync. فایل محلی در حین همگام‌سازی تغییر کرده است. - + Unexpected return code from server (%1) کد بازگشت غیر منتظره از سرور (1%) - + Missing File ID from server فاقد شناسه پرونده از سرور - + Missing ETag from server فاقد ETag از سرور diff --git a/translations/client_fi.ts b/translations/client_fi.ts index 1f902462af..6902af0119 100644 --- a/translations/client_fi.ts +++ b/translations/client_fi.ts @@ -2435,27 +2435,27 @@ Osoitteen käyttäminen ei ole suositeltavaa. OCC::PropagateUploadFileNG - + The local file was removed during sync. Paikallinen tiedosto poistettiin synkronoinnin aikana. - + Local file changed during sync. Paikallinen tiedosto muuttui synkronoinnin aikana. - + Unexpected return code from server (%1) Odottamaton paluukoodi palvelimelta (%1) - + Missing File ID from server - + Missing ETag from server diff --git a/translations/client_fr.ts b/translations/client_fr.ts index 14c69c0e91..96684c6952 100644 --- a/translations/client_fr.ts +++ b/translations/client_fr.ts @@ -2453,27 +2453,27 @@ Il est déconseillé de l'utiliser. OCC::PropagateUploadFileNG - + The local file was removed during sync. Fichier local supprimé pendant la synchronisation. - + Local file changed during sync. Fichier local modifié pendant la synchronisation. - + Unexpected return code from server (%1) Le serveur a retourné un code inattendu (%1) - + Missing File ID from server L'identifiant de fichier est manquant sur le serveur - + Missing ETag from server L'information Etag de modification de fichier est manquante sur le serveur diff --git a/translations/client_gl.ts b/translations/client_gl.ts index 042d7f8795..fdfa5203d4 100644 --- a/translations/client_gl.ts +++ b/translations/client_gl.ts @@ -2452,27 +2452,27 @@ Recomendámoslle que non o use. OCC::PropagateUploadFileNG - + The local file was removed during sync. O ficheiro local retirarase durante a sincronización. - + Local file changed during sync. O ficheiro local cambiou durante a sincronización. - + Unexpected return code from server (%1) O servidor devolveu un código non agardado (%1) - + Missing File ID from server Falta o ID do ficheiro do servidor - + Missing ETag from server Falta ETag do servidor diff --git a/translations/client_he.ts b/translations/client_he.ts index 0ddd90b047..9753b69466 100644 --- a/translations/client_he.ts +++ b/translations/client_he.ts @@ -1451,7 +1451,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an Sync hidden files - + סנכרון קבצים נסתרים @@ -1498,7 +1498,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from Cannot write changes to '%1'. - + לא ניתן לכתוב שינויים אל ‚%1’. @@ -1526,7 +1526,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from Legal notice - + הצהרה משפטית @@ -1536,12 +1536,12 @@ Items where deletion is allowed will be deleted if they prevent a directory from Close - + סגירה <p>Copyright 2017-2018 Nextcloud GmbH<br />Copyright 2012-2018 ownCloud GmbH</p> - + <p>כל הזכויות שמורות 2017‏-2018 ל־Nextcloud GmbH<br />כל הזכויות שמורות 2012‏-2018 ל־ownCloud GmbH</p> @@ -1559,12 +1559,12 @@ Items where deletion is allowed will be deleted if they prevent a directory from &Search: - + &חיפוש: &Find - + &איתור: @@ -1596,27 +1596,27 @@ Logs will be written to %1 S&ave - + &שמירה Save the log file to a file on disk for debugging. - + שמירת קובץ היומן לקובץ בכונן לצורכי ניפוי שגיאות. Save log file - + שמירת קובץ יומן Error - + שגיאה Could not write to log file %1 - + לא ניתן לכתוב לקובץ היומן %1 @@ -1624,7 +1624,7 @@ Logs will be written to %1 Error - + שגיאה @@ -1647,17 +1647,17 @@ Logs will be written to %1 Skip this version - + לדלג על הגרסה הזו Skip this time - + לדלג הפעם Get update - + לקבל עדכון @@ -1670,27 +1670,27 @@ Logs will be written to %1 Proxy Settings - + הגדרות מתווך No Proxy - + אין מתווך Use system proxy - + להשתמש במתווך המערכת Specify proxy manually as - + לציין מתווך ידנית בתור Host - + מארח @@ -1700,30 +1700,30 @@ Logs will be written to %1 Proxy server requires authentication - + השרת המתווך דורש אימות Download Bandwidth - + רוחב פס הורדה Limit to - + להגביל לכדי KBytes/s - + ק״ב/ש׳ No limit - + ללא הגבלה @@ -1895,23 +1895,23 @@ for additional privileges during the process. Free space: %1 - + מקום פנוי: %1 Local Sync Folder - + תיקיית סנכרון מקומית (%1) - + (%1) There isn't enough free space in the local folder! - + אין מספיק שטח פנוי בתיקייה המקומית! @@ -1919,7 +1919,7 @@ for additional privileges during the process. Connection failed - + החיבור נכשל @@ -1929,7 +1929,7 @@ for additional privileges during the process. Select a different URL - + נא לבחור בכתובת אחרת @@ -1952,17 +1952,17 @@ for additional privileges during the process. &Email - + &דוא״ל Connect to %1 - + להתחבר אל %1 Enter user credentials - + להכניס פרטי משתמש @@ -1970,17 +1970,17 @@ for additional privileges during the process. Connect to %1 - + להתחבר אל %1 Login in your browser - + כניסה בדפדפן שלך Copy link to clipboard - + להעתיק קישור ללוח הגזירים @@ -1988,12 +1988,12 @@ for additional privileges during the process. Connect to %1 - + להתחבר אל %1 Setup %1 server - + הקמת שרת %1 @@ -2034,7 +2034,7 @@ It is not advisable to use it. Invalid URL - + כתובת שגויה @@ -2122,7 +2122,7 @@ It is not advisable to use it. Error: %1 - + שגיאה: %1 @@ -2197,12 +2197,12 @@ It is not advisable to use it. %1 Connection Wizard - + אשף החיבור אל %1 Skip folders configuration - + דילוג על הגדרות תיקיות @@ -2210,17 +2210,17 @@ It is not advisable to use it. Everything set up! - + הכול הוגדר! Open Local Folder - + פתיחת תיקייה מקומית Open %1 in Browser - + לפתוח את %1 בדפדפן @@ -2228,7 +2228,7 @@ It is not advisable to use it. Invalid JSON reply from the poll URL - + תגובת JSON שגויה מכתובת התשאול @@ -2236,7 +2236,7 @@ It is not advisable to use it. Error writing metadata to the database - + שגיאה בכתיבת נתוני העל למסד הנתונים @@ -2264,12 +2264,12 @@ It is not advisable to use it. File was deleted from server - + הקובץ נמחק מהשרת The file could not be downloaded completely. - + לא ניתן להוריד את הקובץ במלואו. @@ -2432,27 +2432,27 @@ It is not advisable to use it. OCC::PropagateUploadFileNG - + The local file was removed during sync. - + Local file changed during sync. - + Unexpected return code from server (%1) - + Missing File ID from server - + Missing ETag from server diff --git a/translations/client_hu.ts b/translations/client_hu.ts index b95a5f12c1..f80dec2447 100644 --- a/translations/client_hu.ts +++ b/translations/client_hu.ts @@ -163,7 +163,7 @@ TextLabel - TextLabel + Címke @@ -550,7 +550,7 @@ TextLabel - TextLabel + Címke @@ -1546,7 +1546,7 @@ Ahol a törlés engedélyezett, ott az elemek törölve lesznek, ha megakadályo TextLabel - TextLabel + Címke @@ -2450,27 +2450,27 @@ Használata nem ajánlott. OCC::PropagateUploadFileNG - + The local file was removed during sync. A helyi fájl el lett távolítva szinkronizálás közben. - + Local file changed during sync. A helyi fájl megváltozott szinkronizálás közben. - + Unexpected return code from server (%1) Nem várt visszatérési érték a kiszolgálótól (%1) - + Missing File ID from server Hiányzik a fájlazonosító a kiszolgálóról - + Missing ETag from server Hiányzik az ETag a kiszolgálóról @@ -2528,7 +2528,7 @@ Használata nem ajánlott. TextLabel - TextLabel + Címke @@ -2681,7 +2681,7 @@ Használata nem ajánlott. &Share link - &Megosztás hivatkozás + &Megosztási hivatkozás @@ -2696,7 +2696,7 @@ Használata nem ajánlott. TextLabel - TextLabel + Címke @@ -3499,12 +3499,12 @@ Használata nem ajánlott. Quit %1 - %1 kilépés + Kilépés a %1ból Disconnected from %1 - Kapcsolat bontva ezzel: %1 + Kapcsolat bontva a %1dal @@ -3676,7 +3676,7 @@ Használata nem ajánlott. TextLabel - TextLabel + Címke @@ -3722,7 +3722,7 @@ Használata nem ajánlott. pbSelectLocalFolder - pbSelectLocalFolder + Helyi mappa kiválasztása gomb @@ -3792,7 +3792,7 @@ Használata nem ajánlott. TextLabel - TextLabel + Címke @@ -3822,7 +3822,7 @@ Használata nem ajánlott. Error Label - Hiba címke + Hibacímke @@ -3835,7 +3835,7 @@ Használata nem ajánlott. TextLabel - TextLabel + Címke diff --git a/translations/client_is.ts b/translations/client_is.ts index d7f03e5877..7a6de83797 100644 --- a/translations/client_is.ts +++ b/translations/client_is.ts @@ -2446,27 +2446,27 @@ Ekki er mælt með því að hún sé notuð. OCC::PropagateUploadFileNG - + The local file was removed during sync. Staðværa skráin var fjarlægð við samstillingu. - + Local file changed during sync. Staðværu skránni var breytt við samstillingu. - + Unexpected return code from server (%1) Óvæntur svarkóði frá þjóni (%1) - + Missing File ID from server - + Missing ETag from server diff --git a/translations/client_it.ts b/translations/client_it.ts index 2adc52c1d5..e4c53c47f1 100644 --- a/translations/client_it.ts +++ b/translations/client_it.ts @@ -2452,27 +2452,27 @@ Non è consigliabile utilizzarlo. OCC::PropagateUploadFileNG - + The local file was removed during sync. Il file locale è stato rimosso durante la sincronizzazione. - + Local file changed during sync. Un file locale è cambiato durante la sincronizzazione. - + Unexpected return code from server (%1) Codice di uscita inatteso dal server (%1) - + Missing File ID from server File ID mancante dal server - + Missing ETag from server ETag mancante dal server diff --git a/translations/client_ja.ts b/translations/client_ja.ts index d7e830f231..3de6fb1dec 100644 --- a/translations/client_ja.ts +++ b/translations/client_ja.ts @@ -2436,27 +2436,27 @@ It is not advisable to use it. OCC::PropagateUploadFileNG - + The local file was removed during sync. ローカルファイルを同期中に削除します。 - + Local file changed during sync. ローカルのファイルが同期中に変更されました。 - + Unexpected return code from server (%1) サーバー (%1) からの予期しない戻りコード - + Missing File ID from server サーバーからファイルIDの戻りがありません - + Missing ETag from server サーバーからETagの戻りがありません diff --git a/translations/client_lt_LT.ts b/translations/client_lt_LT.ts index 7bc8e63687..7db5b73fe0 100644 --- a/translations/client_lt_LT.ts +++ b/translations/client_lt_LT.ts @@ -2446,27 +2446,27 @@ Patariama jo nenaudoti. OCC::PropagateUploadFileNG - + The local file was removed during sync. Vietinis failas sinchronizavimo metu buvo pašalintas. - + Local file changed during sync. Failas kompiuteryje sinchronizavimo metu buvo pakeistas. - + Unexpected return code from server (%1) Nežinomas atsakymo kodas iš serverio (%1) - + Missing File ID from server Nėra File ID iš serverio - + Missing ETag from server Nėra ETag iš serverio diff --git a/translations/client_lv.ts b/translations/client_lv.ts index 7e08494550..701f4692ea 100644 --- a/translations/client_lv.ts +++ b/translations/client_lv.ts @@ -2432,27 +2432,27 @@ It is not advisable to use it. OCC::PropagateUploadFileNG - + The local file was removed during sync. - + Local file changed during sync. - + Unexpected return code from server (%1) - + Missing File ID from server - + Missing ETag from server diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts index f11ee9cb30..95a3cf3bb6 100644 --- a/translations/client_nb_NO.ts +++ b/translations/client_nb_NO.ts @@ -2441,27 +2441,27 @@ Det er ikke tilrådelig å bruke den. OCC::PropagateUploadFileNG - + The local file was removed during sync. Den lokale filen ble fjernet under synkronisering. - + Local file changed during sync. Lokal fil endret under synkronisering. - + Unexpected return code from server (%1) Uventet returkode fra serveren (%1) - + Missing File ID from server Mangler File ID fra server - + Missing ETag from server Mangler ETag fra server diff --git a/translations/client_nl.ts b/translations/client_nl.ts index 2dee9bdb6c..c305b75d89 100644 --- a/translations/client_nl.ts +++ b/translations/client_nl.ts @@ -2455,27 +2455,27 @@ We adviseren deze site niet te gebruiken. OCC::PropagateUploadFileNG - + The local file was removed during sync. Het lokale bestand werd verwijderd tijdens sync. - + Local file changed during sync. Lokaal bestand gewijzigd bij sync. - + Unexpected return code from server (%1) Onverwachte reactie van server (%1) - + Missing File ID from server Ontbrekende File ID van de server - + Missing ETag from server Ontbrekende ETag van de server diff --git a/translations/client_pl.ts b/translations/client_pl.ts index 70dea17d10..977907ff09 100644 --- a/translations/client_pl.ts +++ b/translations/client_pl.ts @@ -2451,27 +2451,27 @@ Niezalecane jest jego użycie. OCC::PropagateUploadFileNG - + The local file was removed during sync. Pliki lokalny został usunięty podczas synchronizacji. - + Local file changed during sync. Lokalny plik zmienił się podczas synchronizacji. - + Unexpected return code from server (%1) Nieoczekiwana odpowiedź z serwera (%1) - + Missing File ID from server Na serwerze nie odnaleziono File ID - + Missing ETag from server Na serwerze nie odnaleziono ETag diff --git a/translations/client_pt.ts b/translations/client_pt.ts index f28b1dd4cd..c7d77adc0f 100644 --- a/translations/client_pt.ts +++ b/translations/client_pt.ts @@ -2440,27 +2440,27 @@ Não é aconselhada a sua utilização. OCC::PropagateUploadFileNG - + The local file was removed during sync. O arquivo local foi removido durante a sincronização. - + Local file changed during sync. Ficheiro local alterado durante a sincronização. - + Unexpected return code from server (%1) Código de resposta inesperado do servidor (%1) - + Missing File ID from server ID do ficheiro no servidor em falta - + Missing ETag from server ETag do servidor em falta diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts index 25da08bfe1..91306deaf0 100644 --- a/translations/client_pt_BR.ts +++ b/translations/client_pt_BR.ts @@ -2451,27 +2451,27 @@ Não é aconselhável usá-la. OCC::PropagateUploadFileNG - + The local file was removed during sync. O arquivo local foi removido durante a sincronização. - + Local file changed during sync. O arquivo local foi modificado durante a sincronização. - + Unexpected return code from server (%1) Código de retorno inesperado do servidor (%1) - + Missing File ID from server Falta ID do arquivo do servidor - + Missing ETag from server Falta ETag do servidor diff --git a/translations/client_ru.ts b/translations/client_ru.ts index d8cdc2473b..37d894f149 100644 --- a/translations/client_ru.ts +++ b/translations/client_ru.ts @@ -2445,27 +2445,27 @@ It is not advisable to use it. OCC::PropagateUploadFileNG - + The local file was removed during sync. Локальный файл был удалён в процессе синхронизации. - + Local file changed during sync. Локальный файл изменился в процессе синхронизации. - + Unexpected return code from server (%1) Неожиданный код завершения от сервера (%1) - + Missing File ID from server Отсутствует код файла от сервера - + Missing ETag from server Отсутствует ETag с сервера diff --git a/translations/client_sk.ts b/translations/client_sk.ts index 56c1be3f0b..961b293915 100644 --- a/translations/client_sk.ts +++ b/translations/client_sk.ts @@ -2440,27 +2440,27 @@ Nie je vhodné ju používať. OCC::PropagateUploadFileNG - + The local file was removed during sync. Lokálny súbor bol odstránený počas synchronizácie. - + Local file changed during sync. Lokálny súbor bol zmenený počas synchronizácie. - + Unexpected return code from server (%1) Neočakávaný návratový kód zo servera (%1) - + Missing File ID from server - + Missing ETag from server diff --git a/translations/client_sl.ts b/translations/client_sl.ts index da3aa1f8ca..7ac0fcbc32 100644 --- a/translations/client_sl.ts +++ b/translations/client_sl.ts @@ -2440,27 +2440,27 @@ Uporaba ni priporočljiva. OCC::PropagateUploadFileNG - + The local file was removed during sync. Krajevna datoteka je bila med usklajevanjem odstranjena. - + Local file changed during sync. Krajevna datoteka je bila med usklajevanjem spremenjena. - + Unexpected return code from server (%1) Napaka: nepričakovan odziv s strežnika (%1). - + Missing File ID from server Na strežniku manjka ID datoteke - + Missing ETag from server Na strežniku manjka ETag datoteke diff --git a/translations/client_sr.ts b/translations/client_sr.ts index 9cfaf3b795..02e236a430 100644 --- a/translations/client_sr.ts +++ b/translations/client_sr.ts @@ -2451,27 +2451,27 @@ It is not advisable to use it. OCC::PropagateUploadFileNG - + The local file was removed during sync. Локални фајл је уклоњен током синхронизације. - + Local file changed during sync. Локални фајл измењен током синхронизације. - + Unexpected return code from server (%1) Неочекивани повратни код са сервера (%1) - + Missing File ID from server ID фајла недостаје са сервера - + Missing ETag from server ETag фајла недостаје са сервера diff --git a/translations/client_sv.ts b/translations/client_sv.ts index 1cb122369a..3b67c3fe59 100644 --- a/translations/client_sv.ts +++ b/translations/client_sv.ts @@ -2451,27 +2451,27 @@ Det är inte lämpligt använda den. OCC::PropagateUploadFileNG - + The local file was removed during sync. Den lokala filen togs bort under synkronisering. - + Local file changed during sync. Lokal fil ändrades under synk. - + Unexpected return code from server (%1) Oväntad svarskod från servern (%1) - + Missing File ID from server Saknar Fil-ID från servern - + Missing ETag from server Saknar ETag från servern diff --git a/translations/client_th.ts b/translations/client_th.ts index 6a63f09a12..5a5a30d18e 100644 --- a/translations/client_th.ts +++ b/translations/client_th.ts @@ -2440,27 +2440,27 @@ It is not advisable to use it. OCC::PropagateUploadFileNG - + The local file was removed during sync. ไฟล์ต้นทางถูกลบออกในระหว่างการประสานข้อมูล - + Local file changed during sync. ไฟล์ต้นทางถูกเปลี่ยนแปลงขณะกำลังประสานข้อมูล - + Unexpected return code from server (%1) มีรหัสข้อผิดพลาดตอบกลับมาจากเซิร์ฟเวอร์ (%1) - + Missing File ID from server ไฟล์ไอดีได้หายไปจากเซิร์ฟเวอร์ - + Missing ETag from server ETag ได้หายไปจากเซิร์ฟเวอร์ diff --git a/translations/client_tr.ts b/translations/client_tr.ts index 2eb553c51f..21add51ba8 100644 --- a/translations/client_tr.ts +++ b/translations/client_tr.ts @@ -2450,27 +2450,27 @@ Kullanmanız önerilmez. OCC::PropagateUploadFileNG - + The local file was removed during sync. Yerel dosya eşitleme sırasında silinmiş. - + Local file changed during sync. Yerel dosya eşitleme sırasında değişmiş. - + Unexpected return code from server (%1) Sunucudan bilinmeyen bir yanıt kodu alındı (%1) - + Missing File ID from server Sunucudan Dosya Kodu alınamadı - + Missing ETag from server Sunucudan E-Tag alınamadı diff --git a/translations/client_uk.ts b/translations/client_uk.ts index 233f2074ec..0d73997dc4 100644 --- a/translations/client_uk.ts +++ b/translations/client_uk.ts @@ -2431,27 +2431,27 @@ It is not advisable to use it. OCC::PropagateUploadFileNG - + The local file was removed during sync. Локальний файл було видалено під час синхронізації. - + Local file changed during sync. Локальний файл змінився під час синхронізації. - + Unexpected return code from server (%1) - + Missing File ID from server - + Missing ETag from server diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts index ece04c76d1..0368c430ad 100644 --- a/translations/client_zh_CN.ts +++ b/translations/client_zh_CN.ts @@ -2449,27 +2449,27 @@ It is not advisable to use it. OCC::PropagateUploadFileNG - + The local file was removed during sync. 本地文件在同步时已删除。 - + Local file changed during sync. 本地文件在同步时已修改。 - + Unexpected return code from server (%1) 从服务器得到了意外的返回值（%1） - + Missing File ID from server 服务器端文件 ID 缺失 - + Missing ETag from server 服务器端 ETag 缺失 diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts index 9ff719043e..f20e27d5e6 100644 --- a/translations/client_zh_TW.ts +++ b/translations/client_zh_TW.ts @@ -2434,27 +2434,27 @@ It is not advisable to use it. OCC::PropagateUploadFileNG - + The local file was removed during sync. 本地端的檔案在同步過程中被刪除。 - + Local file changed during sync. 本地端的檔案在同步過程中被更改。 - + Unexpected return code from server (%1) - + Missing File ID from server - + Missing ETag from server