diff options
| author | Nextcloud bot <bot@nextcloud.com> | 2021-12-09 06:54:43 +0300 |
|---|---|---|
| committer | Nextcloud bot <bot@nextcloud.com> | 2021-12-09 06:54:43 +0300 |
| commit | 5aadc7a62d143353c07b32eb2bcc5e281f7bfe11 (patch) | |
| tree | c2f50f1e627345b8ebe698d090994315b2e3d9d5 | |
| parent | 3c28e380890600552fe6116819a27ba0151ce6d8 (diff) | |
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
57 files changed, 5500 insertions, 3260 deletions
diff --git a/.tx/nextcloud.client-desktop/de_translation b/.tx/nextcloud.client-desktop/de_translation index 52903defb..79e8bb599 100644 --- a/.tx/nextcloud.client-desktop/de_translation +++ b/.tx/nextcloud.client-desktop/de_translation @@ -21,7 +21,7 @@ Icon=@APPLICATION_EXECUTABLE@ # Translations -Icon[de_DE]=@APPLICATION_ICON_NAME@ -Name[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisierung -Comment[de_DE]=@APPLICATION_NAME@ Client zur Desktop-Synchronisierung -GenericName[de_DE]=Ordnersynchronisierung +Icon[de]=@APPLICATION_ICON_NAME@ +Name[de]=@APPLICATION_NAME@ Desktop +Comment[de]=@APPLICATION_NAME@ Client zur Desktop-Synchronisierung +GenericName[de]=Ordner-Synchronisation diff --git a/translations/client_bg.ts b/translations/client_bg.ts index 4a2b88ccd..2cf1059d4 100644 --- a/translations/client_bg.ts +++ b/translations/client_bg.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="bg_BG" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="bg_BG"> <context> <name>ActivityActionButton</name> <message> @@ -891,33 +891,38 @@ This action will abort any currently running synchronization.</source> <translation>Файлът е премахнат (стартиране на качване) % 1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Локален файл е променен по време на синхронизирането. Ще бъде възобновен.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation>Локален файл е променен по време на синхронизирането.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation>Грешка при актуализиране на метаданни: %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation>Файлът %1 в момента се използва</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation>Локален файл е премахнат по време на синхронизирането.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation>; Възстановяването е Неуспешно: % 1</translation> </message> @@ -925,7 +930,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Възника грешка при запис на метаданните в базата данни</translation> </message> @@ -3441,52 +3446,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Сървърът е отчел не % 1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation>Конфликт при качване на някои файлове в папка. Тези, които са в конфликт, ще се изчистят!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Конфликт при качване на папка. Ще бъде изчистен!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Конфликт при качване на файл. Ще бъде премахнат!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Игнориран заради черния списък 'изберете какво да синхронизирате'</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Не е разрешено, защото нямате право да добавяте подпапки към тази папка</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Не е разрешено, защото нямате право да добавяте файлове в тази папка</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Не е позволено да качвате този файл, тъй като той е само за четене на сървъра, възстановява се</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation>Преместено в невалидна цел, възстановява се</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation>Не е позволено да се премахва, възстановява се</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation>Грешка при четене на базата данни</translation> </message> @@ -3496,7 +3501,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Сървърът отговори с грешка при четене на директория '% 1' : % 2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>Сървърът отговори с грешка при четене на директория „%1“: %2</translation> </message> @@ -3509,12 +3514,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Грешка при записването на метаданни в базата данни</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation>Грешка при актуализиране на метаданни: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation>Файлът в момента се използва</translation> </message> @@ -3533,13 +3543,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>Файлът се е променил след откриването</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation>Файл % 1 не може да бъде изтеглен поради сблъсък с името на локален файл!</translation> </message> @@ -3549,22 +3559,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Файл % 1 не може да бъде изтеглен поради сблъсък с името на локален файл!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>Изтеглянето би намалило свободното място на локалния диск под ограничението</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>Свободното място на диска е по-малко от %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>Файлът беше изтрит от сървъра</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>Целият файл не може да бъде свален.</translation> </message> @@ -3574,12 +3584,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Изтегленият файл е празен, въпреки че сървърът обяви, че е трябвало да бъде % 1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation>Изтегленият файл е празен, но сървърът обяви, че е трябвало да бъде % 1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Файл % 1 не може да бъде записан поради сблъсък с името на локален файл!</translation> </message> @@ -3589,12 +3599,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Грешка при записване на метаданни в базата данни</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation>Грешка при актуализиране на метаданни: %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation>Файлът %1 в момента се използва</translation> </message> @@ -3782,38 +3798,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation> Неуспешно качване на криптиран файл.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>Файл% 1 не може да бъде качен, тъй като съществува друг файл със същото име, само че е в различено дело</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>Качването на% 1 надвишава квотата за папката</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>Файлът е премахнат (стартиране на качване) % 1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Локален файл е променен по време на синхронизирането. Ще бъде възобновен</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>Локален файл е променен по време на синхронизирането.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation>Неуспешно отключване на криптирана папка.</translation> </message> @@ -3823,12 +3845,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Грешка при записване на метаданни в базата данни</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation>Грешка при актуализиране на метаданни: %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation>Файлът %1 в момента се използва</translation> </message> @@ -3836,32 +3858,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>Локален файл е премахнат по време на синхронизирането.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>Локален файл е променен по време на синхронизирането.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation>Липсва URL адресът на анкетата</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Неочакван код за връщане от сървър (% 1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>Липсващ Идентификатор на Файл от сървъра</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>Липсващ E-Tag от сървъра</translation> </message> @@ -3869,22 +3891,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>Липсва URL адресът на анкетата</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>Локален файл е премахнат по време на синхронизирането.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>Локален файл е променен по време на синхронизирането.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>Сървърът не разпозна последният блок. (Няма e-tag )</translation> </message> @@ -5074,24 +5096,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation><p>%1 Клиент за настолен компютър</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>Версия %1. За допълнителна информация, моля щракнете <a href='%2'>тук</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation><p><small>Използване на добавка за виртуални файлове: %1</small></p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>Това издание е предоставено от % 1</p></translation> </message> @@ -5281,6 +5303,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6289,7 +6329,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>Изграден от Git редакция <a href="%1">%2</a> на %3, %4 използвайки Qt %5, %6</small></p></translation> </message> diff --git a/translations/client_br.ts b/translations/client_br.ts index b15e67b78..629903d66 100644 --- a/translations/client_br.ts +++ b/translations/client_br.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="br" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="br"> <context> <name>ActivityActionButton</name> <message> @@ -887,33 +887,38 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -921,7 +926,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>ur fazi a zo bet en ur skrivañ ar metadata er roadenn-diaz</translation> </message> @@ -3412,52 +3417,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3467,7 +3472,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -3480,12 +3485,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ur fazi a zo bet en ur skrivañ ar metadata er roadenn-diaz</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation type="unfinished"/> </message> @@ -3504,13 +3514,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>Cheñchet eo bet ar restr abaoe m'ema bet disoloet</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3520,22 +3530,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>N'eo ket posupl pellkargañ ar restr %1 abalamour d'ur stourm anv restr diabarzh !</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>Ar pellkargañ a lamo plas dieub el lenner dindan ar bevenn</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>Al lec'h dieub war al lenner a zo dindan %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>Lamet eo bet ar rest eus ar servijour</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>Ne oa ket posupl pellkargañ ar restr penn-da-benn.</translation> </message> @@ -3545,12 +3555,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ar restr pellkarget a zo goulo memes m'en doa laret ar servijour e kemerfe %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Ar restr %1 ne c'hell ket bezhañ enrollet abalamour d'ur stourm anv diabarzh !</translation> </message> @@ -3560,12 +3570,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ur fazi a zo bet en ur skrivañ ar metadata er roadenn-diaz</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3753,38 +3769,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>Ar restr %1 ne c'hell ket behañ pellkaset abalamour m'ez eus ur restr al memes anv, disheñvel nemet gant ar benlizerennoù/lizerennoù-bihañ</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>Pellkargañ %1 a za en tu all ar vevenn quota an teuliad</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>Restr lamet (kregiñ ar pellkas) %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Restr diabarzh cheñchet e pad ar gemprenn. Adkemeret e vo.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>Rest diabarzh cheñchet e pad ar gemprenn.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation type="unfinished"/> </message> @@ -3794,12 +3816,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ur fazi a zo bet en ur skrivañ ar metadata er roadenn-diaz</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3807,32 +3829,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>Ar restr diabarzh a zo bet lamet e pad ar gemprennadenn.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>Rest diabarzh cheñchet e pad ar gemprenn.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Kod distro dic'hortoz eus ar servijour (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>Un ID restr a vant er servijour</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>Un eKlav a vank evit ar servijour</translation> </message> @@ -3840,22 +3862,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>Ur sontadeg URL a vank</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>Ar restr diabarzh a zo bet lamet e pad ar gemprennadenn.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>Rest diabarzh cheñchet e pad ar gemprenn.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>N'en deus ket taolet pled ar servijour eus an tamm diveahñ. (E-klav ebet kavet)</translation> </message> @@ -5045,24 +5067,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation><p>%1 Kliant Burev</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>Stumm %1. Evit muioc'h a ditouroù, klikit <a href='%2'>amañ</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>An digoradenn-mañ a zo bet roet gant %1</p></translation> </message> @@ -5252,6 +5274,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6260,7 +6300,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>Krouet gant Git stumm<a href="%1">%2</a> war %3, %4 en ur implij Qt %5, %6</small></p></translation> </message> diff --git a/translations/client_ca.ts b/translations/client_ca.ts index 39b198ab7..6ca0bfe37 100644 --- a/translations/client_ca.ts +++ b/translations/client_ca.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="ca" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="ca"> <context> <name>ActivityActionButton</name> <message> @@ -886,33 +886,38 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -920,7 +925,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>S'ha produït un error en escriure les metadades a la base de dades</translation> </message> @@ -3401,52 +3406,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>S'ha ignorat perquè es troba a la llista de prohibicions «Trieu què voleu sincronitzar»</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>No es permet perquè no teniu permís per a afegir subcarpetes en aquesta carpeta</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>No es permet perquè no teniu permís per a afegir fitxers en aquesta carpeta</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>No es permet carregar aquest fitxer perquè és de només lectura en el servidor; s'està restaurant</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation>S'ha mogut a una destinació no vàlida; s'està restaurant</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation>No es permet suprimir; s'està restaurant</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation>Error while reading the database</translation> </message> @@ -3456,7 +3461,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>El servidor ha respost amb un error en llegir la carpeta «%1»: %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -3469,12 +3474,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>S'ha produït un error en escriure les metadades a la base de dades</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation type="unfinished"/> </message> @@ -3493,13 +3503,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>El fitxer ha canviat des del descobriment</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3509,22 +3519,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>No es pot baixar el fitxer %1 perquè hi ha un conflicte de nom amb un fitxer local.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>La baixada reduiria l'espai lliure del disc local per sota del límit</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>L'espai lliure en el disc és inferior a %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>S'ha suprimit el fitxer del servidor</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>No s'ha pogut baixar el fitxer completament.</translation> </message> @@ -3534,12 +3544,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>El fitxer baixat està buit malgrat que el servidor ha informat que tindria una mida de %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>No es pot desar el fitxer %1 perquè hi ha un conflicte de nom amb un fitxer local.</translation> </message> @@ -3549,12 +3559,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>S'ha produït un error en escriure les metadades a la base de dades</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3742,38 +3758,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>No es pot pujar el fitxer %1 perquè existeix un altre fitxer amb el mateix nom que només es distingeix per les majúscules i les minúscules</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>La pujada de %1 supera la quota de la carpeta</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>S'ha suprimit el fitxer (inicia la càrrega) %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>El fitxer local ha canviat durant la sincronització. Es reprendrà.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>El fitxer local ha canviat durant la sincronització.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation type="unfinished"/> </message> @@ -3783,12 +3805,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>S'ha produït un error en escriure les metadades a la base de dades</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3796,32 +3818,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>S'ha suprimit el fitxer local durant la sincronització.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>El fitxer local ha canviat durant la sincronització.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation>Falta l'URL de sol·licitud</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Codi de retorn inesperat del servidor (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>Falta l'ID de fitxer del servidor</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>Falta l'etiqueta d'entitat del servidor</translation> </message> @@ -3829,22 +3851,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>Falta l'URL de sol·licitud</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>S'ha suprimit el fitxer local durant la sincronització.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>El fitxer local ha canviat durant la sincronització.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>El servidor no ha reconegut el darrer fragment. (No hi havia cap etiqueta d'entitat)</translation> </message> @@ -5034,24 +5056,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation><p>Client d'escriptori del %1</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>Versió %1. Per a obtenir més informació, feu clic <a href='%2'>aquí</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>Aquesta versió ha estat proporcionada per %1</p></translation> </message> @@ -5241,6 +5263,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6249,7 +6289,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>Compilat a partir de la revisió del Git <a href="%1">%2</a> el %3 a les %4 mitjançant Qt %5, %6</small></p></translation> </message> diff --git a/translations/client_cs.ts b/translations/client_cs.ts index d2f77773d..96d4c4b62 100644 --- a/translations/client_cs.ts +++ b/translations/client_cs.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="cs_CZ" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="cs_CZ"> <context> <name>ActivityActionButton</name> <message> @@ -891,33 +891,38 @@ Současně tato akce zruší jakoukoli právě probíhající synchronizaci.</tr <translation>Soubor odebrán (zahájit nahrávání) %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Místní soubor se během synchronizace změnil. Bude zopakována.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation>Místní soubor byl změněn během synchronizace.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation>Chyba při aktualizování metadat: %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation>Soubor %1 je v tuto chvíli používán jinou aplikací</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation>Místní soubor byl odstraněn během synchronizace.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation>; Obnovení se nezdařilo: %1</translation> </message> @@ -925,7 +930,7 @@ Současně tato akce zruší jakoukoli právě probíhající synchronizaci.</tr <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Chyba zápisu metadat do databáze</translation> </message> @@ -3439,52 +3444,52 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <translation>Server nahlášen číslo %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation>Konflikt při nahrávání některých souborů do složky. Ty, které jsou v konfliktu budou vymazány!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Konflikt při nahrávání složky. Bude vymazána!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Konflikt při nahrávání souboru. Bude odebrán!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignorováno podle nastavení „vybrat co synchronizovat“</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Neumožněno, protože nemáte oprávnění přidávat podsložky do této složky</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Neumožněno, protože nemáte oprávnění přidávat soubory do této složky</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Není možné tento soubor nahrát, protože je na serveru povoleno pouze čtení – obnovuje se</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation>Přesunuto do neplatného cíle – obnovuje se</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation>Odstranění není umožněno – obnovuje se</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation>Chyba při čtení databáze</translation> </message> @@ -3494,7 +3499,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <translation>Server vrátil chybu při čtení adresáře „%1“: %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>Server vrátil chybu při čtení adresáře „%1“: %2</translation> </message> @@ -3507,12 +3512,17 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <translation>Chyba při zapisování metadat do databáze</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation>Chyba při aktualizování metadat: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation>Soubor je v tuto chvíli používán jinou aplikací</translation> </message> @@ -3531,13 +3541,13 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>Soubor se mezitím změnil</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation>Soubor %1 nemohl být stažen z důvodu kolize názvu se souborem v místním systému!</translation> </message> @@ -3547,22 +3557,22 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <translation>Soubor %1 nemohl být stažen z důvodu kolize názvu se souborem v místním systému!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>Stahování by snížilo volné místo na místním disku pod nastavený limit</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>Volného místa na úložišti je méně než %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>Soubor byl smazán ze serveru</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>Soubor nemohl být kompletně stažen.</translation> </message> @@ -3572,12 +3582,12 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <translation>Stažený soubor je prázdný, přestože server oznámil, že by měl mít velikost %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation>Stažený soubor je prázdný, ale server sdělil, že měl mít %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Soubor %1 nemohl být uložen z důvodu kolize názvu s místním souborem!</translation> </message> @@ -3587,12 +3597,18 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <translation>Chyba zápisu metadat do databáze</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation>Chyba při aktualizování metadat: %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation>Soubor %1 je v tuto chvíli používán jinou aplikací</translation> </message> @@ -3780,38 +3796,44 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation>Šifrovaný soubor se nepodařilo nahrát.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>Soubor %1 nelze nahrát, protože existuje jiný soubor se stejným názvem, lišící se pouze velikostí písmen</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>Nahrání %1 překračuje kvótu nastavenou pro složku</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>Soubor odebrán (zahájit nahrávání) %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Místní soubor se během synchronizace změnil. Bude zopakována.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>Místní soubor byl změněn během synchronizace.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation>Šifrovanou složku se nepodařilo odemknout.</translation> </message> @@ -3821,12 +3843,12 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <translation>Chyba při zápisu metadat do databáze</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation>Chyba při aktualizování metadat: %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation>Soubor %1 je v tuto chvíli používán jinou aplikací</translation> </message> @@ -3834,32 +3856,32 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>Místní soubor byl odstraněn během synchronizace.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>Místní soubor byl změněn během synchronizace.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation>Chybí adresa URL</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Neočekávaný návratový kód ze serveru (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>Chybějící identifikátor souboru ze serveru</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>Chybějící ETag ze serveru</translation> </message> @@ -3867,22 +3889,22 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>Chybí adresa URL</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>Místní soubor byl odstraněn během synchronizace.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>Místní soubor byl změněn během synchronizace.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>Server nepotvrdil poslední část dat. (Nebyl nalezen e-tag)</translation> </message> @@ -5072,24 +5094,24 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation><p>%1 klient pro počítač</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>Verze %1. Další informace získáte kliknutím <a href='%2'>sem</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation><p><small>Používá zásuvný modul pro virtuální soubory: %1</small></p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>Toto vydání bylo poskytnuto %1</p></translation> </message> @@ -5279,6 +5301,24 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6287,7 +6327,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>Sestaveno z Git revize <a href="%1">%2</a> na %3, %4 s použitím Qt %5, %6</small></p></translation> </message> diff --git a/translations/client_da.ts b/translations/client_da.ts index a4ac342c5..ee7108e5e 100644 --- a/translations/client_da.ts +++ b/translations/client_da.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="da" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="da"> <context> <name>ActivityActionButton</name> <message> @@ -891,33 +891,38 @@ Denne handling vil annullere alle i øjeblikket kørende synkroniseringer.</tran <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -925,7 +930,7 @@ Denne handling vil annullere alle i øjeblikket kørende synkroniseringer.</tran <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Fejl ved skrivning af metadata til databasen</translation> </message> @@ -3416,52 +3421,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3471,7 +3476,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -3484,12 +3489,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Fejl ved skrivning af metadata til databasen</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation type="unfinished"/> </message> @@ -3508,13 +3518,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>Fil er ændret siden opdagelse</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3524,22 +3534,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Fil %1 kan ikke hentes på grund af lokal navnekonflikt!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>Nedlagringen ville reducere ledig disk plads på lokalt lager under grænsen</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>Ledig disk plads er under %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>Fil var slettet fra server</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>Filen kunne ikke hentes helt.</translation> </message> @@ -3549,12 +3559,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Den hentede fil er tom selvom serveren annoncerede den skulle have været %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Fil %1 kan ikke gemmes på grund af lokal navnekonflikt!</translation> </message> @@ -3564,12 +3574,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Fejl ved skrivning af metadata til databasen</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3757,38 +3773,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>Fil %1 kan ikke sendes fordi en anden fil med samme navn eksisterer kun med forskel i store/små bogstaver.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>Forsendelse af %1 overskriver mappens kvota</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>Fil fjernet (start forsendelse) %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Lokal fil ændret under sync. Den vil blive genoptaget.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>Lokal fil ændret under sync.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation type="unfinished"/> </message> @@ -3798,12 +3820,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Fejl ved skrivning af metadata til databasen</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3811,32 +3833,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>Lokal fil fjernet under sync.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>Lokal fil ændret under sync.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Uventet retur kode fra server (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>Manglende fil ID fra server</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>Manglende ETag fra server</translation> </message> @@ -3844,22 +3866,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>ForespørgselsURL mangler</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>Lokal fil fjernet under sync.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>Lokal fil ændret under sync.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>Serveren godkendte ikke de seneste luns. (Ingen e-tag fundet)</translation> </message> @@ -5049,24 +5071,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation><p>%1-skrivebordsklient</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>Version %1. For mere information venligst klik <a href='%2'>her</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>Denne udgivelse blev leveret af %1</p></translation> </message> @@ -5256,6 +5278,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6264,7 +6304,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>Bygget fra Git-revision <a href="%1">%2</a> på %3, %4 med Qt %5, %6</small></p></translation> </message> diff --git a/translations/client_de.ts b/translations/client_de.ts index b35ec17bd..8389820bf 100644 --- a/translations/client_de.ts +++ b/translations/client_de.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="de_DE" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="de_DE"> <context> <name>ActivityActionButton</name> <message> @@ -891,33 +891,38 @@ Diese Aktion bricht jede derzeit laufende Synchronisierung ab.</translation> <translation>Datei entfernt (starte das Hochladen) %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Lokale Datei hat sich während der Synchronisierung geändert. Die Synchronisierung wird wieder aufgenommen.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation>Lokale Datei wurde während der Synchronisierung geändert.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation>Fehler beim Aktualisieren der Metadaten: %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation>Die Datei %1 wird aktuell verwendet</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation>Die lokale Datei wurde während der Synchronisierung gelöscht.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation>; Wiederherstellung fehlgeschlagen: %1</translation> </message> @@ -925,7 +930,7 @@ Diese Aktion bricht jede derzeit laufende Synchronisierung ab.</translation> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation> </message> @@ -3439,52 +3444,52 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <translation>Server meldet keine %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation>Konflikt beim Hochladen einiger Dateien in einen Ordner. Diejenigen, die in Konflikt stehen, werden gelöscht!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Konflikt beim Hochladen eines Ordners. Er wird gelöscht!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Konflikt beim Hochladen einer Datei. Sie wird entfernt!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignoriert wegen der "Choose what to sync"-Blacklist</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Nicht erlaubt, da Sie nicht die Berechtigung haben, Unterordner zu diesem Ordner hinzuzufügen.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Nicht erlaubt, da Sie keine Berechtigung zum Hinzufügen von Dateien in diesen Ordner haben.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Das Hochladen dieser Datei ist nicht erlaubt, da die Datei auf dem Server schreibgeschützt ist. Wiederherstellen.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation>Auf ungültiges Ziel verschoben, wiederherstellen.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation>Entfernen nicht erlaubt, wiederherstellen.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation>Fehler beim Lesen der Datenbank</translation> </message> @@ -3494,7 +3499,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <translation>Der Server hat während des Lesens des Verzeichnisses '%1' mit einem Fehler geantwortet: %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>Der Server hat während des Lesens des Verzeichnisses "%1" mit einem Fehler geantwortet: %2</translation> </message> @@ -3507,12 +3512,17 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation>Fehler beim Aktualisieren der Metadaten: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation>Datei ist aktuell in Benutzung</translation> </message> @@ -3531,13 +3541,13 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>Datei ist seit der Entdeckung geändert worden</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation>Die Datei %1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht heruntergeladen werden!</translation> </message> @@ -3547,22 +3557,22 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <translation>Die Datei %1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht herunter geladen werden!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>Das Herunterladen würde den lokalen freien Speicherplatz unter die Grenze reduzieren</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>Der freie Speicher auf der Festplatte ist weniger als %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>Die Datei wurde vom Server gelöscht</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>Die Datei konnte nicht vollständig heruntergeladen werden.</translation> </message> @@ -3572,12 +3582,12 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <translation>Die heruntergeladene Datei ist leer, obwohl der Server %1 als Größe übermittelt hat.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation>Die heruntergeladene Datei ist leer, obwohl der Server %1 als Größe übermittelt hat.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Die Datei %1 kann aufgrund eines Konflikts mit dem lokalen Dateinamen nicht gespeichert geladen werden!</translation> </message> @@ -3587,12 +3597,18 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation>Fehler beim Aktualisieren der Metadaten: %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation>Die Datei %1 ist aktuell in Benutzung</translation> </message> @@ -3780,38 +3796,44 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation>Das Hochladen der verschlüsselten Datei ist fehlgeschlagen.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>Die Datei %1 kann nicht hochgeladen werden, da eine andere Datei mit dem selben Namen, nur unterschiedlicher Groß-/Kleinschreibung, existiert</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>Das Hochladen von %1 überschreitet das Speicherkontingent des Ordners </translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>Datei entfernt (starte Hochladen) %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Lokale Datei hat sich während der Synchronisierung geändert. Die Synchronisierung wird wiederaufgenommen.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>Eine lokale Datei wurde während der Synchronisierung geändert.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation>Der verschlüsselte Ordner konnte nicht entsperrt werden.</translation> </message> @@ -3821,12 +3843,12 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation>Fehler beim Aktualisieren der Metadaten: %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation>Die Datei %1 ist aktuell in Benutzung</translation> </message> @@ -3834,32 +3856,32 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>Die lokale Datei wurde während der Synchronisierung gelöscht.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>Eine lokale Datei wurde während der Synchronisierung geändert.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation>Poll-URL fehlt</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Unerwarteter Rückgabe-Code Antwort vom Server (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>Fehlende Datei-ID vom Server</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>Fehlender ETag vom Server</translation> </message> @@ -3867,22 +3889,22 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>Poll-URL fehlt</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>Die lokale Datei wurde während der Synchronisierung gelöscht.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>Eine lokale Datei wurde während der Synchronisierung geändert.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>Der Server hat den letzten Block nicht bestätigt. (Kein E-Tag vorhanden)</translation> </message> @@ -5072,24 +5094,24 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation><p>%1 Desktop-Client</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>Version %1. Für weitere Informationen klicken Sie bitte <a href='%2'>hier</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation><p><small>Plugin für virtuelle Dateien: %1</small></p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>Diese Version wird von %1 bereitgestellt</p></translation> </message> @@ -5279,6 +5301,24 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6287,7 +6327,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>Gebaut von der git-Revision <a href="%1">%2</a> auf %3, %4 verwendet Qt %5, %6</small></p></translation> </message> diff --git a/translations/client_el.ts b/translations/client_el.ts index 342885d19..0f32433e3 100644 --- a/translations/client_el.ts +++ b/translations/client_el.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="el" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="el"> <context> <name>ActivityActionButton</name> <message> @@ -887,33 +887,38 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -921,7 +926,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation> </message> @@ -3420,52 +3425,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Αγνοήθηκε λόγω της μαύρης λίστας "επιλέξτε τι να συγχρονίσετε".</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Δεν επιτρέπεται επειδή δεν έχετε άδεια να προσθέσετε υποφακέλους σε αυτόν το φάκελο.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Δεν επιτρέπεται επειδή δεν έχετε άδεια να προσθέσετε φακέλους σε αυτόν το φάκελο.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Δεν επιτρέπεται η μεταφόρτωση αυτού του αρχείου επειδή είναι μόνο για ανάγνωση στον διακομιστή, γίνεται επαναφορά.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation>Μετακινήθηκε σε μη έγκυρο στόχο, επαναφορά.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation>Δεν επιτρέπεται η κατάργηση, επαναφορά.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation>Σφάλμα κατά την ανάγνωση της βάσης δεδομένων.</translation> </message> @@ -3475,7 +3480,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ο διακομιστής απάντησε με σφάλμα κατά την ανάγνωση της διεύθυνσης ΄%1' : %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -3488,12 +3493,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation>Το αρχείο χρησιμοποιείται αυτήν τη στιγμή</translation> </message> @@ -3512,13 +3522,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>Το αρχείο έχει αλλάξει από όταν ανακαλύφθηκε</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3528,22 +3538,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Το αρχείο %1 δεν είναι δυνατό να ληφθεί λόγω διένεξης με το όνομα ενός τοπικού αρχείου!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>Η λήψη θα μειώση τον ελεύθερο τοπικό χώρο αποθήκευσης κάτω από το όριο.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>Ο διαθέσιμος χώρος στο δίσκο είναι λιγότερος από %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>Το αρχείο διαγράφηκε από τον διακομιστή</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>Η λήψη του αρχείου δεν ολοκληρώθηκε.</translation> </message> @@ -3553,12 +3563,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Το ληφθέν αρχείο είναι άδειο, παρόλο που ο διακομιστής ανακοίνωσε ότι θα έπρεπε να ήταν% 1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Το αρχείο %1 δεν είναι δυνατό να αποθηκευτεί λόγω διένεξης με το όνομα ενός τοπικού ονόματος αρχείου!</translation> </message> @@ -3568,12 +3578,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation>Το αρχείο %1 χρησιμοποιείται αυτήν τη στιγμή</translation> </message> @@ -3761,38 +3777,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>Το αρχείο % 1 δεν μπορεί να ανέβει επειδή υπάρχει ένα άλλο αρχείο με το ίδιο όνομα, που διαφέρει μόνο στη περίπτωση,</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>Η μεταφόρτωση του %1 υπερβαίνει το όριο του φακέλου</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>Το Αρχείο Αφαιρέθηκε (έναρξη μεταφόρτωσης) %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Το τοπικό αρχείο τροποποιήθηκε κατά τη διάρκεια του συγχρονισμού. Θα συγχρονιστεί πάλι.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>Το τοπικό αρχείο τροποποιήθηκε κατά τον συγχρονισμό.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation type="unfinished"/> </message> @@ -3802,12 +3824,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation>Σφάλμα ενημέρωσης μεταδεδομένων: %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation>Το αρχείο %1 χρησιμοποιείται αυτήν τη στιγμή</translation> </message> @@ -3815,32 +3837,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>Το τοπικό αρχείο αφαιρέθηκε κατά το συγχρονισμό.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>Το τοπικό αρχείο τροποποιήθηκε κατά τον συγχρονισμό.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation>Λείπει το URL δημοσκόπησης.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Ο διακομιστής επέστρεψε απροσδόκητο κωδικό (%1) </translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>Απουσία ID αρχείου από τον διακομιστή</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>Απουσία ETag από τον διακομιστή</translation> </message> @@ -3848,22 +3870,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>Η διεύθυνση poll URL λείπει</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>Το τοπικό αρχείο αφαιρέθηκε κατά το συγχρονισμό.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>Το τοπικό αρχείο τροποποιήθηκε κατά τον συγχρονισμό.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>Ο διακομιστής δεν αναγνώρισε το τελευταίο τμήμα. (Δεν υπήρχε e-tag)</translation> </message> @@ -5053,24 +5075,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation><p>Εφαρμογή Υπολογιστή %1 </p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>Έκδοση %1. Για περισσότερες πληροφορίες δείτε <a href='%2'>εδώ</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>Η έκδοση παρέχεται από %1</p></translation> </message> @@ -5260,6 +5282,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6268,7 +6308,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>Δημιουργήθηκε από την διασκευή Git <a href="%1">%2</a> στο %3, %4 χρησιμοποιώντας Qt %5, %6</small></p></translation> </message> diff --git a/translations/client_en_GB.ts b/translations/client_en_GB.ts index 6aa4e33ff..dcc217434 100644 --- a/translations/client_en_GB.ts +++ b/translations/client_en_GB.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="en_GB" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="en_GB"> <context> <name>ActivityActionButton</name> <message> @@ -886,33 +886,38 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -920,7 +925,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Error writing metadata to the database</translation> </message> @@ -3403,52 +3408,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3458,7 +3463,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -3471,12 +3476,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Error writing metadata to the database</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation type="unfinished"/> </message> @@ -3495,13 +3505,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>File has changed since discovery</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3511,22 +3521,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>File %1 can not be downloaded because of a local file name clash!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>The download would reduce free local disk space below the limit</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>Free space on disk is less than %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>File was deleted from server</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>The file could not be downloaded completely.</translation> </message> @@ -3536,12 +3546,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>File %1 cannot be saved because of a local file name clash!</translation> </message> @@ -3551,12 +3561,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Error writing metadata to the database</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3744,38 +3760,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>Upload of %1 exceeds the quota for the folder</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>File Removed (start upload) %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Local file changed during syncing. It will be resumed.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>Local file changed during sync.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation type="unfinished"/> </message> @@ -3785,12 +3807,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Error writing metadata to the database</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3798,32 +3820,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>The local file was removed during sync.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>Local file changed during sync.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Unexpected return code from server (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>Missing File ID from server</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>Missing ETag from server</translation> </message> @@ -3831,22 +3853,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>Poll URL missing</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>The local file was removed during sync.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>Local file changed during sync.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>The server did not acknowledge the last chunk. (No e-tag was present)</translation> </message> @@ -5036,24 +5058,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>This release was supplied by %1</p></translation> </message> @@ -5243,6 +5265,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6251,7 +6291,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></translation> </message> diff --git a/translations/client_eo.ts b/translations/client_eo.ts index b75072ec6..ac16e2f35 100644 --- a/translations/client_eo.ts +++ b/translations/client_eo.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="eo" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="eo"> <context> <name>ActivityActionButton</name> <message> @@ -886,33 +886,38 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -920,7 +925,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Eraro dum konservado de pridatumoj en la datumbazo</translation> </message> @@ -3409,52 +3414,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3464,7 +3469,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -3477,12 +3482,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Eraro dum skribo de pridatumoj en la datumbazo</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation type="unfinished"/> </message> @@ -3501,13 +3511,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>Dosiero ŝanĝiĝis ekde sia malkovro</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3517,22 +3527,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Dosiero %1 ne elŝuteblis, ĉar estas konflikto kun loka dosiernomo!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>Tiu elŝuto malpligrandigus la liberan lokan diskospacon.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>Libera diskospaco estas malpli ol %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>Dosiero estis forigita el la servilo</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>La dosiero ne estis elŝutita plene.</translation> </message> @@ -3542,12 +3552,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>La elŝutita dosiero malplenas, kvankam la servilo anoncis, ke ĝi estos %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Dosiero %1 ne eblis esti konservita pro konflikto kun loka dosiernomo!</translation> </message> @@ -3557,12 +3567,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Eraro dum konservado de pridatumoj en la datumbazo</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3750,38 +3766,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>Dosiero %1 ne elŝuteblis, ĉar alia samnoma dosiero, kiu malsamas nur usklece, ekzistas.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>Alŝuto de %1 transpasas la dosierujan kvoton</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>Forigita dosiero (ekalŝuti) %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Loka dosiero ŝanĝiĝis dum sinkronigo. Ĝi rekomenciĝos.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>Loka dosiero ŝanĝiĝis dum sinkronigo.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation type="unfinished"/> </message> @@ -3791,12 +3813,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Eraro dum skribo de pridatumoj en la datumbazo</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3804,32 +3826,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>Loka dosiero estis forigita dum sinkronigo.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>Loka dosiero ŝanĝiĝis dum sinkronigo.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Neatendita elirkodo el servilo (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>Mankanta identigilo de dosiero el la servilo</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>Mankanta ETag el la servilo</translation> </message> @@ -3837,22 +3859,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>Mankanta enketilo-retadreso</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>Loka dosiero estis forigita dum sinkronigo.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>Loka dosiero ŝanĝiĝis dum sinkronigo.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>La servilo ne konfirmis la lastan pecon. (Estis neniu ETag.)</translation> </message> @@ -5041,24 +5063,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>Versio %1. Por pli da informoj, alklaku <a href='%2'>ĉi tie</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>Tiu eldono estis liverita de %1</p></translation> </message> @@ -5248,6 +5270,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6256,7 +6296,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>Konstruita el Git-a revizio <a href="%1">%2</a> je %3, %4, uzante Qt %5, %6</small></p></translation> </message> diff --git a/translations/client_es.ts b/translations/client_es.ts index e1a2783bc..367fec1e1 100644 --- a/translations/client_es.ts +++ b/translations/client_es.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="es" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="es"> <context> <name>ActivityActionButton</name> <message> @@ -891,33 +891,38 @@ Además, esta acción interrumpirá cualquier sincronización en curso.</transla <translation>Archivo eliminado (comenzar subida) %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Un archivo local ha cambiado durante la sincronización. Será subido.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation>Un archivo local ha cambiado durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation>Error al actualizar los metadatos: %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation>El archivo %1 se encuentra en uso</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation>El archivo local ha sido eliminado durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation>; Fallo al restaurar: %1</translation> </message> @@ -925,7 +930,7 @@ Además, esta acción interrumpirá cualquier sincronización en curso.</transla <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Error al escribir los metadatos en la base de datos</translation> </message> @@ -3441,52 +3446,52 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <translation>El servidor informó de no %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation>Se ha producido un conflicto al subir algunos archivos a una carpeta. ¡Se eliminarán los conflictivos!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Se ha producido un conflicto al subir una carpeta. ¡Se eliminará!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Se ha producido un conflicto al subir un archivo. ¡Se eliminará!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignorado porque se encuentra en la lista negra de «elija qué va a sincronizar»</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>No permitido porque no tienes permiso para añadir subcarpetas a esa carpeta.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>No permitido porque no tienes permiso para añadir archivos a esa carpeta.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>No está permitido subir este archivo porque es de solo lectura en el servidor, restaurando.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation>Movido a un lugar no válido, restaurando</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation>No está permitido borrar, restaurando</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation>Error mientras se leía la base de datos</translation> </message> @@ -3496,7 +3501,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <translation>El servidor contestó con un error al leer el directorio «%1» : %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>El servidor contestó con un error al leer el directorio "%1" : %2</translation> </message> @@ -3509,12 +3514,17 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <translation>Error al escribir los metadatos en la base de datos</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation>Error al actualizar los metadatos: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation>El archivo se encuentra en uso</translation> </message> @@ -3533,13 +3543,13 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>El archivo ha cambiado desde que fue descubierto</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation>¡El archivo %1 no se pudo descargar a causa de un conflicto con el nombre de un archivo local!</translation> </message> @@ -3549,22 +3559,22 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <translation>¡El archivo %1 no se puede descargar a causa de un conflicto con el nombre de un archivo local!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>La descarga reducirá el espacio libre local por debajo del límite.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>El espacio libre en el disco es inferior a %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>Se ha eliminado el archivo del servidor</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>No se ha podido descargar el archivo completamente.</translation> </message> @@ -3574,12 +3584,12 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <translation>El archivo descargado está vacío a pesar de que el servidor comunicó que debería haber sido %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation>El archivo descargado está vacío, aunque el servidor dijo que debía ocupar %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>¡El archivo %1 no puede guardarse debido a un conflicto con el nombre de otro archivo local!</translation> </message> @@ -3589,12 +3599,18 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <translation>Error al escribir los metadatos en la base de datos</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation>Error al actualizar los metadatos: %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation>El archivo %1 se encuentra en uso</translation> </message> @@ -3782,38 +3798,44 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation>Fallo al subir el archivo cifrado.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>El archivo %1 no se puede subir porque ya existe otro con el mismo nombre. Puede que sólo haya diferencias de mayúsculas/minúsculas</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>La subida %1 excede el límite de tamaño de la carpeta</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>Archivo eliminado (comenzar subida) %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Un archivo local ha cambiado durante la sincronización. Se reanudará.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>Un archivo local ha sido modificado durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation>Fallo al desbloquear la carpeta cifrada.</translation> </message> @@ -3823,12 +3845,12 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <translation>Error al escribir los metadatos en la base de datos</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation>Error al actualizar los metadatos: %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation>El archivo %1 se encuentra en uso</translation> </message> @@ -3836,32 +3858,32 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>El archivo local ha sido eliminado durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>Un archivo local fue modificado durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation>Falta la URL de la encuesta</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Respuesta inesperada del servidor (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>ID perdido del archivo del servidor</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>Perdido ETag del servidor</translation> </message> @@ -3869,22 +3891,22 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>Falta la URL de la encuesta</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>El archivo local ha sido eliminado durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>Un archivo local ha sido modificado durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>El servidor no ha reconocido la última parte. (No había una e-tag presente)</translation> </message> @@ -5074,24 +5096,24 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation><p>%1 - Cliente de escritorio</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>Versión %1. Para obtener más información, haga clic <a href='%2'> aquí </a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation><p><small>Usando el plugin de archivos virtuales: %1</small></p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>Esta versión ha sido suministrada por %1</p></translation> </message> @@ -5281,6 +5303,24 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6289,7 +6329,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>Construido desde la revisión Git <a href="%1">%2</a> en %3, %4, usando Qt %5, %6</small></p></translation> </message> diff --git a/translations/client_es_AR.ts b/translations/client_es_AR.ts index 7807757b2..95b1f6409 100644 --- a/translations/client_es_AR.ts +++ b/translations/client_es_AR.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_AR" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="es_AR"> <context> <name>ActivityActionButton</name> <message> @@ -886,33 +886,38 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -920,7 +925,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Error escribiendo metadatos a la base de datos</translation> </message> @@ -3390,52 +3395,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3445,7 +3450,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -3458,12 +3463,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Error escribiendo metadatos a la base de datos</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation type="unfinished"/> </message> @@ -3482,13 +3492,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation type="unfinished"/> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3498,22 +3508,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation type="unfinished"/> </message> @@ -3523,12 +3533,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3538,12 +3548,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Error escribiendo metadatos a la base de datos</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3731,38 +3747,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation type="unfinished"/> </message> @@ -3772,12 +3794,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Error escribiendo metadatos a la base de datos</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3785,32 +3807,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation type="unfinished"/> </message> @@ -3818,22 +3840,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation type="unfinished"/> </message> @@ -5021,24 +5043,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -5228,6 +5250,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6236,7 +6276,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_CL.ts b/translations/client_es_CL.ts index 0b4907e31..ce2363e62 100644 --- a/translations/client_es_CL.ts +++ b/translations/client_es_CL.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_CL" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="es_CL"> <context> <name>ActivityActionButton</name> <message> @@ -886,33 +886,38 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -920,7 +925,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Error al escribir metadatos a la base de datos</translation> </message> @@ -3396,52 +3401,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3451,7 +3456,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -3464,12 +3469,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Se presentó un error al escribir los metadatos a la base de datos</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation type="unfinished"/> </message> @@ -3488,13 +3498,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>El archivo ha cambiado desde que fue descubierto</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3504,22 +3514,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>¡El archivo %1 no puede ser descargado porque hay un conflicto con el nombre del archivo local!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>La descarga reduciría el espacio local disponible por debajo del límite</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>El espacio disponible en disco es menos del 1%</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>El archivo fue borrado del servidor</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>El archivo no pudo ser descargado por completo. </translation> </message> @@ -3529,12 +3539,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>¡El archivo %1 no puede ser guardado debido a un conflicto en su nombre con un archivo local!</translation> </message> @@ -3544,12 +3554,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Error al escribir los metadatos a la base de datos</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3737,38 +3753,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>El archivo %1 no puede ser cargado porque existe otro archivo con el mismo nombre, con diferencias en su uso de mayúsculas / minúsculas</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>La carga de %1 excede la cuota de la carpeta</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>El archivo local cambió durante la sincronización. Se resumirá. </translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>El archivo local cambio durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation type="unfinished"/> </message> @@ -3778,12 +3800,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Error al escribir los metadatos a la base de datos</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3791,32 +3813,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>El archivo local se eliminó durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>El archivo local cambió durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Código de retorno del servidor inesperado (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>El ID de archivo no está en el servidor</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>ETag no está en el servidor</translation> </message> @@ -3824,22 +3846,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>Falta la URL de encuesta</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>El archivo local se eliminó durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>El archivo local cambió durante la sincronización</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>El servidor no confirmó el último pedazo. (No hay una e-tag presente)</translation> </message> @@ -5029,24 +5051,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -5236,6 +5258,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6244,7 +6284,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_CO.ts b/translations/client_es_CO.ts index efbf72dae..0458e33cd 100644 --- a/translations/client_es_CO.ts +++ b/translations/client_es_CO.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_CO" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="es_CO"> <context> <name>ActivityActionButton</name> <message> @@ -886,33 +886,38 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -920,7 +925,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Error al escribir metadatos a la base de datos</translation> </message> @@ -3396,52 +3401,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3451,7 +3456,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -3464,12 +3469,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Se presentó un error al escribir los metadatos a la base de datos</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation type="unfinished"/> </message> @@ -3488,13 +3498,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>El archivo ha cambiado desde que fue descubierto</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3504,22 +3514,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>¡El archivo %1 no puede ser descargado porque hay un conflicto con el nombre del archivo local!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>La descarga reduciría el espacio local disponible por debajo del límite</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>El espacio disponible en disco es menos del 1%</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>El archivo fue borrado del servidor</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>El archivo no pudo ser descargado por completo. </translation> </message> @@ -3529,12 +3539,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>¡El archivo %1 no puede ser guardado debido a un conflicto en su nombre con un archivo local!</translation> </message> @@ -3544,12 +3554,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Error al escribir los metadatos a la base de datos</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3737,38 +3753,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>El archivo %1 no puede ser cargado porque existe otro archivo con el mismo nombre, con diferencias en su uso de mayúsculas / minúsculas</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>La carga de %1 excede la cuota de la carpeta</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>El archivo local cambió durante la sincronización. Se resumirá. </translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>El archivo local cambio durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation type="unfinished"/> </message> @@ -3778,12 +3800,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Error al escribir los metadatos a la base de datos</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3791,32 +3813,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>El archivo local se eliminó durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>El archivo local cambió durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Código de retorno del servidor inesperado (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>El ID de archivo no está en el servidor</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>ETag no está en el servidor</translation> </message> @@ -3824,22 +3846,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>Falta la URL de encuesta</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>El archivo local se eliminó durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>El archivo local cambió durante la sincronización</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>El servidor no confirmó el último pedazo. (No hay una e-tag presente)</translation> </message> @@ -5029,24 +5051,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -5236,6 +5258,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6244,7 +6284,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_CR.ts b/translations/client_es_CR.ts index ac5a3b90c..5709cd2a3 100644 --- a/translations/client_es_CR.ts +++ b/translations/client_es_CR.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_CR" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="es_CR"> <context> <name>ActivityActionButton</name> <message> @@ -886,33 +886,38 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -920,7 +925,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Error al escribir metadatos a la base de datos</translation> </message> @@ -3396,52 +3401,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3451,7 +3456,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -3464,12 +3469,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Se presentó un error al escribir los metadatos a la base de datos</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation type="unfinished"/> </message> @@ -3488,13 +3498,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>El archivo ha cambiado desde que fue descubierto</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3504,22 +3514,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>¡El archivo %1 no puede ser descargado porque hay un conflicto con el nombre del archivo local!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>La descarga reduciría el espacio local disponible por debajo del límite</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>El espacio disponible en disco es menos del 1%</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>El archivo fue borrado del servidor</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>El archivo no pudo ser descargado por completo. </translation> </message> @@ -3529,12 +3539,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>¡El archivo %1 no puede ser guardado debido a un conflicto en su nombre con un archivo local!</translation> </message> @@ -3544,12 +3554,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Error al escribir los metadatos a la base de datos</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3737,38 +3753,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>El archivo %1 no puede ser cargado porque existe otro archivo con el mismo nombre, con diferencias en su uso de mayúsculas / minúsculas</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>La carga de %1 excede la cuota de la carpeta</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>El archivo local cambió durante la sincronización. Se resumirá. </translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>El archivo local cambio durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation type="unfinished"/> </message> @@ -3778,12 +3800,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Error al escribir los metadatos a la base de datos</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3791,32 +3813,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>El archivo local se eliminó durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>El archivo local cambió durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Código de retorno del servidor inesperado (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>El ID de archivo no está en el servidor</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>ETag no está en el servidor</translation> </message> @@ -3824,22 +3846,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>Falta la URL de encuesta</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>El archivo local se eliminó durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>El archivo local cambió durante la sincronización</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>El servidor no confirmó el último pedazo. (No hay una e-tag presente)</translation> </message> @@ -5029,24 +5051,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -5236,6 +5258,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6244,7 +6284,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_DO.ts b/translations/client_es_DO.ts index c6df7223c..eb1fc3833 100644 --- a/translations/client_es_DO.ts +++ b/translations/client_es_DO.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_DO" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="es_DO"> <context> <name>ActivityActionButton</name> <message> @@ -886,33 +886,38 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -920,7 +925,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Error al escribir metadatos a la base de datos</translation> </message> @@ -3396,52 +3401,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3451,7 +3456,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -3464,12 +3469,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Se presentó un error al escribir los metadatos a la base de datos</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation type="unfinished"/> </message> @@ -3488,13 +3498,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>El archivo ha cambiado desde que fue descubierto</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3504,22 +3514,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>¡El archivo %1 no puede ser descargado porque hay un conflicto con el nombre del archivo local!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>La descarga reduciría el espacio local disponible por debajo del límite</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>El espacio disponible en disco es menos del 1%</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>El archivo fue borrado del servidor</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>El archivo no pudo ser descargado por completo. </translation> </message> @@ -3529,12 +3539,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>¡El archivo %1 no puede ser guardado debido a un conflicto en su nombre con un archivo local!</translation> </message> @@ -3544,12 +3554,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Error al escribir los metadatos a la base de datos</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3737,38 +3753,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>El archivo %1 no puede ser cargado porque existe otro archivo con el mismo nombre, con diferencias en su uso de mayúsculas / minúsculas</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>La carga de %1 excede la cuota de la carpeta</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>El archivo local cambió durante la sincronización. Se resumirá. </translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>El archivo local cambio durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation type="unfinished"/> </message> @@ -3778,12 +3800,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Error al escribir los metadatos a la base de datos</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3791,32 +3813,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>El archivo local se eliminó durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>El archivo local cambió durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Código de retorno del servidor inesperado (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>El ID de archivo no está en el servidor</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>ETag no está en el servidor</translation> </message> @@ -3824,22 +3846,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>Falta la URL de encuesta</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>El archivo local se eliminó durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>El archivo local cambió durante la sincronización</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>El servidor no confirmó el último pedazo. (No hay una e-tag presente)</translation> </message> @@ -5029,24 +5051,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -5236,6 +5258,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6244,7 +6284,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_EC.ts b/translations/client_es_EC.ts index fab9741e0..5fe14c3a9 100644 --- a/translations/client_es_EC.ts +++ b/translations/client_es_EC.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_EC" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="es_EC"> <context> <name>ActivityActionButton</name> <message> @@ -886,33 +886,38 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -920,7 +925,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Error al escribir metadatos a la base de datos</translation> </message> @@ -3396,52 +3401,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3451,7 +3456,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -3464,12 +3469,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Se presentó un error al escribir los metadatos a la base de datos</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation type="unfinished"/> </message> @@ -3488,13 +3498,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>El archivo ha cambiado desde que fue descubierto</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3504,22 +3514,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>¡El archivo %1 no puede ser descargado porque hay un conflicto con el nombre del archivo local!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>La descarga reduciría el espacio local disponible por debajo del límite</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>El espacio disponible en disco es menos del 1%</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>El archivo fue borrado del servidor</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>El archivo no pudo ser descargado por completo. </translation> </message> @@ -3529,12 +3539,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>¡El archivo %1 no puede ser guardado debido a un conflicto en su nombre con un archivo local!</translation> </message> @@ -3544,12 +3554,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Error al escribir los metadatos a la base de datos</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3737,38 +3753,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>El archivo %1 no puede ser cargado porque existe otro archivo con el mismo nombre, con diferencias en su uso de mayúsculas / minúsculas</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>La carga de %1 excede la cuota de la carpeta</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>El archivo local cambió durante la sincronización. Se resumirá. </translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>El archivo local cambio durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation type="unfinished"/> </message> @@ -3778,12 +3800,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Error al escribir los metadatos a la base de datos</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3791,32 +3813,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>El archivo local se eliminó durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>El archivo local cambió durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Código de retorno del servidor inesperado (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>El ID de archivo no está en el servidor</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>ETag no está en el servidor</translation> </message> @@ -3824,22 +3846,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>Falta la URL de encuesta</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>El archivo local se eliminó durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>El archivo local cambió durante la sincronización</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>El servidor no confirmó el último pedazo. (No hay una e-tag presente)</translation> </message> @@ -5029,24 +5051,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -5236,6 +5258,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6244,7 +6284,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_GT.ts b/translations/client_es_GT.ts index b25350de1..eccd0b9dd 100644 --- a/translations/client_es_GT.ts +++ b/translations/client_es_GT.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_GT" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="es_GT"> <context> <name>ActivityActionButton</name> <message> @@ -886,33 +886,38 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -920,7 +925,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Error al escribir metadatos a la base de datos</translation> </message> @@ -3396,52 +3401,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3451,7 +3456,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -3464,12 +3469,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Se presentó un error al escribir los metadatos a la base de datos</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation type="unfinished"/> </message> @@ -3488,13 +3498,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>El archivo ha cambiado desde que fue descubierto</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3504,22 +3514,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>¡El archivo %1 no puede ser descargado porque hay un conflicto con el nombre del archivo local!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>La descarga reduciría el espacio local disponible por debajo del límite</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>El espacio disponible en disco es menos del 1%</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>El archivo fue borrado del servidor</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>El archivo no pudo ser descargado por completo. </translation> </message> @@ -3529,12 +3539,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>¡El archivo %1 no puede ser guardado debido a un conflicto en su nombre con un archivo local!</translation> </message> @@ -3544,12 +3554,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Error al escribir los metadatos a la base de datos</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3737,38 +3753,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>El archivo %1 no puede ser cargado porque existe otro archivo con el mismo nombre, con diferencias en su uso de mayúsculas / minúsculas</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>La carga de %1 excede la cuota de la carpeta</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>El archivo local cambió durante la sincronización. Se resumirá. </translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>El archivo local cambio durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation type="unfinished"/> </message> @@ -3778,12 +3800,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Error al escribir los metadatos a la base de datos</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3791,32 +3813,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>El archivo local se eliminó durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>El archivo local cambió durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Código de retorno del servidor inesperado (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>El ID de archivo no está en el servidor</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>ETag no está en el servidor</translation> </message> @@ -3824,22 +3846,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>Falta la URL de encuesta</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>El archivo local se eliminó durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>El archivo local cambió durante la sincronización</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>El servidor no confirmó el último pedazo. (No hay una e-tag presente)</translation> </message> @@ -5029,24 +5051,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -5236,6 +5258,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6244,7 +6284,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_HN.ts b/translations/client_es_HN.ts index d6a876a24..4958ea773 100644 --- a/translations/client_es_HN.ts +++ b/translations/client_es_HN.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_HN" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="es_HN"> <context> <name>ActivityActionButton</name> <message> @@ -886,33 +886,38 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -920,7 +925,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Error al escribir metadatos a la base de datos</translation> </message> @@ -3396,52 +3401,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3451,7 +3456,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -3464,12 +3469,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Se presentó un error al escribir los metadatos a la base de datos</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation type="unfinished"/> </message> @@ -3488,13 +3498,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>El archivo ha cambiado desde que fue descubierto</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3504,22 +3514,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>¡El archivo %1 no puede ser descargado porque hay un conflicto con el nombre del archivo local!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>La descarga reduciría el espacio local disponible por debajo del límite</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>El espacio disponible en disco es menos del 1%</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>El archivo fue borrado del servidor</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>El archivo no pudo ser descargado por completo. </translation> </message> @@ -3529,12 +3539,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>¡El archivo %1 no puede ser guardado debido a un conflicto en su nombre con un archivo local!</translation> </message> @@ -3544,12 +3554,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Error al escribir los metadatos a la base de datos</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3737,38 +3753,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>El archivo %1 no puede ser cargado porque existe otro archivo con el mismo nombre, con diferencias en su uso de mayúsculas / minúsculas</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>La carga de %1 excede la cuota de la carpeta</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>El archivo local cambió durante la sincronización. Se resumirá. </translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>El archivo local cambio durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation type="unfinished"/> </message> @@ -3778,12 +3800,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Error al escribir los metadatos a la base de datos</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3791,32 +3813,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>El archivo local se eliminó durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>El archivo local cambió durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Código de retorno del servidor inesperado (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>El ID de archivo no está en el servidor</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>ETag no está en el servidor</translation> </message> @@ -3824,22 +3846,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>Falta la URL de encuesta</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>El archivo local se eliminó durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>El archivo local cambió durante la sincronización</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>El servidor no confirmó el último pedazo. (No hay una e-tag presente)</translation> </message> @@ -5029,24 +5051,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -5236,6 +5258,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6244,7 +6284,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_MX.ts b/translations/client_es_MX.ts index fb17ccfea..a6ab2d608 100644 --- a/translations/client_es_MX.ts +++ b/translations/client_es_MX.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_MX" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="es_MX"> <context> <name>ActivityActionButton</name> <message> @@ -886,33 +886,38 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -920,7 +925,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Error al escribir metadatos a la base de datos</translation> </message> @@ -3396,52 +3401,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3451,7 +3456,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -3464,12 +3469,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Se presentó un error al escribir los metadatos a la base de datos</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation type="unfinished"/> </message> @@ -3488,13 +3498,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>El archivo ha cambiado desde que fue descubierto</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3504,22 +3514,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>¡El archivo %1 no puede ser descargado porque hay un conflicto con el nombre del archivo local!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>La descarga reduciría el espacio local disponible por debajo del límite</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>El espacio disponible en disco es menos del 1%</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>El archivo fue borrado del servidor</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>El archivo no pudo ser descargado por completo. </translation> </message> @@ -3529,12 +3539,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>¡El archivo %1 no puede ser guardado debido a un conflicto en su nombre con un archivo local!</translation> </message> @@ -3544,12 +3554,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Error al escribir los metadatos a la base de datos</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3737,38 +3753,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>El archivo %1 no puede ser cargado porque existe otro archivo con el mismo nombre, con diferencias en su uso de mayúsculas / minúsculas</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>La carga de %1 excede la cuota de la carpeta</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>El archivo local cambió durante la sincronización. Se resumirá. </translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>El archivo local cambio durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation type="unfinished"/> </message> @@ -3778,12 +3800,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Error al escribir los metadatos a la base de datos</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3791,32 +3813,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>El archivo local se eliminó durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>El archivo local cambió durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Código de retorno del servidor inesperado (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>El ID de archivo no está en el servidor</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>ETag no está en el servidor</translation> </message> @@ -3824,22 +3846,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>Falta la URL de encuesta</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>El archivo local se eliminó durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>El archivo local cambió durante la sincronización</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>El servidor no confirmó el último pedazo. (No hay una e-tag presente)</translation> </message> @@ -5029,24 +5051,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -5236,6 +5258,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6244,7 +6284,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation type="unfinished"/> </message> diff --git a/translations/client_es_SV.ts b/translations/client_es_SV.ts index 6693bdef6..e5c47cea5 100644 --- a/translations/client_es_SV.ts +++ b/translations/client_es_SV.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="es_SV" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="es_SV"> <context> <name>ActivityActionButton</name> <message> @@ -886,33 +886,38 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -920,7 +925,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Error al escribir metadatos a la base de datos</translation> </message> @@ -3396,52 +3401,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3451,7 +3456,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -3464,12 +3469,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Se presentó un error al escribir los metadatos a la base de datos</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation type="unfinished"/> </message> @@ -3488,13 +3498,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>El archivo ha cambiado desde que fue descubierto</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3504,22 +3514,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>¡El archivo %1 no puede ser descargado porque hay un conflicto con el nombre del archivo local!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>La descarga reduciría el espacio local disponible por debajo del límite</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>El espacio disponible en disco es menos del 1%</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>El archivo fue borrado del servidor</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>El archivo no pudo ser descargado por completo. </translation> </message> @@ -3529,12 +3539,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>¡El archivo %1 no puede ser guardado debido a un conflicto en su nombre con un archivo local!</translation> </message> @@ -3544,12 +3554,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Error al escribir los metadatos a la base de datos</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3737,38 +3753,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>El archivo %1 no puede ser cargado porque existe otro archivo con el mismo nombre, con diferencias en su uso de mayúsculas / minúsculas</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>La carga de %1 excede la cuota de la carpeta</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>El archivo local cambió durante la sincronización. Se resumirá. </translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>El archivo local cambio durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation type="unfinished"/> </message> @@ -3778,12 +3800,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Error al escribir los metadatos a la base de datos</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3791,32 +3813,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>El archivo local se eliminó durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>El archivo local cambió durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Código de retorno del servidor inesperado (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>El ID de archivo no está en el servidor</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>ETag no está en el servidor</translation> </message> @@ -3824,22 +3846,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>Falta la URL de encuesta</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>El archivo local se eliminó durante la sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>El archivo local cambió durante la sincronización</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>El servidor no confirmó el último pedazo. (No hay una e-tag presente)</translation> </message> @@ -5029,24 +5051,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -5236,6 +5258,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6244,7 +6284,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation type="unfinished"/> </message> diff --git a/translations/client_et.ts b/translations/client_et.ts index eff9be69c..95ec2f3e6 100644 --- a/translations/client_et.ts +++ b/translations/client_et.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="et_EE" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="et_EE"> <context> <name>ActivityActionButton</name> <message> @@ -886,33 +886,38 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -920,7 +925,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation type="unfinished"/> </message> @@ -3390,52 +3395,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3445,7 +3450,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -3458,12 +3463,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation type="unfinished"/> </message> @@ -3482,13 +3492,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>Faili on pärast avastamist muudetud</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3498,22 +3508,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Faili %1 ei saa alla laadida kuna on konflikt kohaliku faili nimega.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>Fail on serverist kustutatud</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>Faili täielik allalaadimine ebaõnnestus.</translation> </message> @@ -3523,12 +3533,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Faili %1 ei saa salvestada kuna on nime konflikt kohaliku failiga!</translation> </message> @@ -3538,12 +3548,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3731,38 +3747,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Kohalik fail muutus sünkroniseeringu käigus. See taastakse.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>Kohalik fail muutus sünkroniseeringu käigus.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation type="unfinished"/> </message> @@ -3772,12 +3794,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3785,32 +3807,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>Kohalik fail on eemaldatud sünkroniseeringu käigus.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>Kohalik fail muutus sünkroniseeringu käigus.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation type="unfinished"/> </message> @@ -3818,22 +3840,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>Küsitluse URL puudub</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>Kohalik fail on eemaldatud sünkroniseeringu käigus.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>Kohalik fail muutus sünkroniseeringu käigus.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation type="unfinished"/> </message> @@ -5023,24 +5045,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -5230,6 +5252,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6238,7 +6278,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation type="unfinished"/> </message> diff --git a/translations/client_eu.ts b/translations/client_eu.ts index d9fe032a5..1035cb277 100644 --- a/translations/client_eu.ts +++ b/translations/client_eu.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="eu" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="eu"> <context> <name>ActivityActionButton</name> <message> @@ -891,33 +891,38 @@ Ekintza honek unean uneko sinkronizazioa bertan behera utziko du.</translation> <translation>Fitxategia kendu da (hasi karga) %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Fitxategi lokala aldatu egin da sinkronizazioa egin bitartean. Berrekin egingo da.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation>Fitxategi lokala aldatu da sinkronizazioan.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation>Erorrea metadatuak eguneratzen: %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation>%1 fitxategia momentu honetan erabilpean dago</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation>Fitxategi lokala ezabatu da sinkronizazioan.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation>; Berreskurapenak huts egin du: %1</translation> </message> @@ -925,7 +930,7 @@ Ekintza honek unean uneko sinkronizazioa bertan behera utziko du.</translation> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Errorea metadatuak datu-basean idaztean</translation> </message> @@ -3440,52 +3445,52 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <translation>Zerbitzariak ez du %1-rik jakinarazi</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation>Gatazka gertatu da fitxategi batzuk karpetara kargatzean. Gatazka sortu dutenak garbitu egingo dira!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Gatazka gertatu da karpeta kargatzean. Garbituko da!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Gatazka gertatu da fitxategia kargatzean. Garbituko da!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ez ikusi egin zaio, "aukeratu zer sinkronizatu" zerrenda beltzagatik.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Ez da onartu, ez daukazulako baimenik karpeta horretan azpikarpetak gehitzeko</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Ez da onartu, ez daukazulako baimenik karpeta horretan fitxategiak gehitzeko</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Ez dago baimenik fitxategi hau kargatzek zerbitzarian irakurtzeko soilik delako, leheneratzen.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation>Baliogabeko helburura mugitu da, berrezartzen</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation>Ezabatzeko baimenik gabe, berrezartzen</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation>Errorea datu-basea irakurtzean</translation> </message> @@ -3495,7 +3500,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <translation>Zerbitzariak errore batekin erantzun du irakurtzean '%1' : %2 direktorioa </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>Zerbitzariak errore batekin erantzun du "% 1" direktorioa irakurtzean:% 2</translation> </message> @@ -3508,12 +3513,17 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <translation>Errorea metadatuak datu-basean idaztean</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation>Erorrea metadatuak eguneratzen: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation>Fitxategia erabiltzen ari da</translation> </message> @@ -3532,13 +3542,13 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>Fitxategia aldatu egin da aurkitu zenetik</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation>Ezin da% 1 fitxategia deskargatu, fitxategi lokal baten izenarekin talka!</translation> </message> @@ -3548,22 +3558,22 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <translation>%1 fitxategia ezin da deskargatu, fitxategi lokal baten izenarekin gatazka!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>Deskargak disko lokaleko toki librea muga azpitik gutxituko luke</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>%1 baino toki libre gutxiago diskoan</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>Fitxategia zerbitzaritik ezabatua izan da</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>Fitxategia ezin izan da guztiz deskargatu.</translation> </message> @@ -3573,12 +3583,12 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <translation>Deskargatutako fitxategia hutsik dago zerbitzariak %1 izan beharko lituzkeela iragarri badu ere.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation>Deskargatutako fitxategia hutsik dago, baina zerbitzariak %1 izan beharko lukeela iragarri du.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>%1 fitxategia ezin da gorde, fitxategi lokal baten izenarekin gatazka!</translation> </message> @@ -3588,12 +3598,18 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <translation>Errorea metadatuak datu-basean idaztean</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation>Erorrea metadatuak eguneratzen: %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation>%1 fitxategia erabiltzen ari da</translation> </message> @@ -3781,38 +3797,44 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation>Ezin izan da enkriptatutako fitxategia kargatu.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>%1 fitxategia ezin da kargatu izen bereko beste fitxategi bat dagoelako -soilik kasuan ezberdina-</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>%1-aren kargak karpetaren kuota gainditzen du</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>Fitxategia kendu da (hasi karga) %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Fitxategi lokala aldatu egin da sinkronizazioa egin bitartean. Berrekin egingo da.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>Fitxategi lokala aldatu da sinkronizazioan.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation>Ezin izan da enkriptatutako karpeta desblokeatu.</translation> </message> @@ -3822,12 +3844,12 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <translation>Errorea metadatuak datu-basean idaztean</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation>Erorrea metadatuak eguneratzen: %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation>%1 fitxategia erabiltzen ari da</translation> </message> @@ -3835,32 +3857,32 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>Fitxategi lokala ezabatu da sinkronizazioan.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>Fitxategi lokala aldatu da sinkronizazioan.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation>Inkesta URLa falta da</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Espero ez zen erantzuna (%1) zerbitzaritik</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>Fitxategiaren IDa falta da zerbitzarian</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>ETag-a falta da zerbitzarian</translation> </message> @@ -3868,22 +3890,22 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>Galdeketa URLa falta da</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>Fitxategi lokala ezabatu da sinkronizazioan.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>Fitxategi lokala aldatu da sinkronizazioan.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>Zerbitzariak ez du adierazi azken zatia jaso denik. Ez zegoen e-etiketarik (e-tag)</translation> </message> @@ -5073,24 +5095,24 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation><p>Mahaigaineko %1 bezeroa</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>%1 bertsioa. Informazio gehiago eskuratzeko egin klik <a href='%2'>hemen</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation><p><small>Fitxategi birtualen plugina erabiltzen:% 1</small></p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>Argitalpen hau %1(e)k eman du</p></translation> </message> @@ -5280,6 +5302,24 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6288,7 +6328,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small><a href="%1">%2</a> Git berrikuspenetik eraikia %3, %4 Qt %5 erabiliz, %6</small></p></translation> </message> diff --git a/translations/client_fa.ts b/translations/client_fa.ts index 16b117d1f..4bb08a6dd 100644 --- a/translations/client_fa.ts +++ b/translations/client_fa.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="fa" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="fa"> <context> <name>ActivityActionButton</name> <message> @@ -886,33 +886,38 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -920,7 +925,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>خطا در نوشتن متادیتا در پایگاه داده</translation> </message> @@ -3394,52 +3399,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3449,7 +3454,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -3462,12 +3467,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>خطا در نوشتن متادیتا در پایگاه داده</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation type="unfinished"/> </message> @@ -3486,13 +3496,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>پرونده از زمان کشف تغییر کرده است.</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3502,22 +3512,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>پرونده 1% بخاطر یک پرونده محلی به نام برخورد دانلود نمی شود!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>دانلود فضای دیسک محلی آزاد تحت محدودیت را کاهش می دهد</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>فضای خالی دیسک کمتر از %1 است</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>فایل از روی سرور حذف شد</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>فایل به طور کامل قابل دانلود نیست.</translation> </message> @@ -3527,12 +3537,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>پرونده 1% بخاطر یک پرونده محلی به نام برخورد ذخیره نمی شود!</translation> </message> @@ -3542,12 +3552,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>خطا در نوشتن متادیتا در پایگاه داده</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3735,38 +3751,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>پرونده 1% بارگذاری نمی شود زیرا پرونده دیگری با نام مشابه، که تنها در وضعیت متفاوت است، وجود دارد</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>بارگذاری از 1% بیش از سهمیه برای پوشه است</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>پرونده محلی در طول همگام سازی تغییر کرد. این ادامه خواهد یافت.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>فایل محلی در حین همگامسازی تغییر کرده است.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation type="unfinished"/> </message> @@ -3776,12 +3798,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>خطا در نوشتن متادیتا در پایگاه داده</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3789,32 +3811,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>فایل محلی در حین همگامسازی حذف شده است.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>فایل محلی در حین همگامسازی تغییر کرده است.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>کد بازگشت غیر منتظره از سرور (1%)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>فاقد شناسه پرونده از سرور</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>فاقد ETag از سرور</translation> </message> @@ -3822,22 +3844,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>فاقد آدرس نظرسنجی</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>فایل محلی در حین همگامسازی حذف شده است.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>فایل محلی در حین همگامسازی تغییر کرده است.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>سرور آخرین تکه را تایید نکرد. (برچسب الکترونیکی وجود نداشت)</translation> </message> @@ -5026,24 +5048,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -5233,6 +5255,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6241,7 +6281,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation type="unfinished"/> </message> diff --git a/translations/client_fi.ts b/translations/client_fi.ts index 8c5dbfaf3..c4eddda79 100644 --- a/translations/client_fi.ts +++ b/translations/client_fi.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="fi_FI" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="fi_FI"> <context> <name>ActivityActionButton</name> <message> @@ -890,33 +890,38 @@ Tämä toiminto peruu kaikki tämänhetkiset synkronoinnit.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -924,7 +929,7 @@ Tämä toiminto peruu kaikki tämänhetkiset synkronoinnit.</translation> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Virhe kirjoittaessa metadataa tietokantaan</translation> </message> @@ -3404,52 +3409,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Ei sallittu, koska oikeutesi eivät riitä alikansioiden lisäämiseen kyseiseen kansioon</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Ei sallittu, koska käyttöoikeutesi eivät riitä tiedostojen lisäämiseen kyseiseen kansioon</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation>Virhe tietokantaa luettaessa</translation> </message> @@ -3459,7 +3464,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -3472,12 +3477,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Virhe kirjoittaessa metadataa tietokantaan</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation>Virhe metatietoja päivittäessä: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation>Tiedosto on tällä hetkellä käytössä</translation> </message> @@ -3496,13 +3506,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>Tiedosto on muuttunut löytymisen jälkeen</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3512,22 +3522,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>Levyllä on vapaata tilaa vähemmän kuin %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>Tiedosto poistettiin palvelimelta</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>Tiedostoa ei voitu ladata täysin.</translation> </message> @@ -3537,12 +3547,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3552,12 +3562,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Virhe kirjoittaessa metadataa tietokantaan</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation>Virhe päivittäessä metatietoja: %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation>Tiedosto %1 on tällä hetkellä käytössä</translation> </message> @@ -3745,38 +3761,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>Paikallinen tiedosto muuttui synkronoinnin aikana.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation type="unfinished"/> </message> @@ -3786,12 +3808,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Virhe kirjoittaessa metadataa tietokantaan</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation>Virhe metatietoja päivittäessä: %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation>Tiedosto %1 on tällä hetkellä käytössä</translation> </message> @@ -3799,32 +3821,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>Paikallinen tiedosto poistettiin synkronoinnin aikana.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>Paikallinen tiedosto muuttui synkronoinnin aikana.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Odottamaton paluukoodi palvelimelta (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation type="unfinished"/> </message> @@ -3832,22 +3854,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>Paikallinen tiedosto poistettiin synkronoinnin aikana.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>Paikallinen tiedosto muuttui synkronoinnin aikana.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation type="unfinished"/> </message> @@ -5037,24 +5059,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation><p>%1-työpöytäsovellus</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>Versio %1. Lisätietoja on saatavilla napsauttamalla <a href='%2'>tästä</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -5244,6 +5266,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6252,7 +6292,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation type="unfinished"/> </message> diff --git a/translations/client_fr.ts b/translations/client_fr.ts index 8e709393b..16c8d914c 100644 --- a/translations/client_fr.ts +++ b/translations/client_fr.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="fr"> <context> <name>ActivityActionButton</name> <message> @@ -889,33 +889,38 @@ Vous prenez vos propres risques.</translation> <translation>Fichier supprimé (démarrer le téléversement) %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Fichier local modifié pendant la synchronisation. La synchronisation sera reprise.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation>Fichier local modifié pendant la synchronisation.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation>Erreur à la mise à jour des méta-données : %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation>Le fichier %1 est en cours d'utilisation</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation>Le fichier local a été supprimé pendant la synchronisation.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation>; Restauration échouée : %1</translation> </message> @@ -923,7 +928,7 @@ Vous prenez vos propres risques.</translation> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Erreur à l'écriture des métadonnées dans la base de données</translation> </message> @@ -3439,52 +3444,52 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <translation>Le serveur n'a signalé aucun %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation>Conflit lors du téléversement de certains fichiers dans un dossier. Ceux conflictuels seront effacer!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Conflit lors de l'envoi d'un dossier. Il va être supprimé !</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Conflit lors de l'envoi d'un fichier. Il va être supprimé !</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignoré en raison de la liste noire "Sélectionner le contenu à synchroniser".</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Non autorisé car vous n'avez pas la permission d'ajouter des sous-dossiers dans ce dossier</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Non autorisé car vous n'avez pas la permission d'ajouter des fichiers dans ce dossier</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Non autorisé à envoyer ce fichier car il est en lecture seule sur le serveur. Restauration</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation>Déplacé vers une cible invalide, restauration</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation>Non autorisé à supprimer. Restauration</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation>Erreur de lecture de la base de données</translation> </message> @@ -3494,7 +3499,7 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <translation>Le serveur a répondu avec une erreur au moment de lire le dossier '%1' : %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>Le serveur a répondu avec une erreur lors de la lecture du dossier "%1" : %2</translation> </message> @@ -3507,12 +3512,17 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <translation>Erreur à l'écriture des métadonnées dans la base de données</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation>Erreur lors de la mise à jour des métadonnées : %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation>Le fichier est actuellement en cours d'utilisation</translation> </message> @@ -3531,13 +3541,13 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>Le fichier a changé depuis sa découverte</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation>Le fichier %1 ne peut pas être téléchargé en raison d'un conflit sur le nom de fichier local !</translation> </message> @@ -3547,22 +3557,22 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <translation>Le fichier %1 ne peut pas être téléchargé en raison d'un conflit sur le nom de fichier local. </translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>Le téléchargement réduira l'espace disque libre en dessous de la limite</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>Il y a moins de %1 d'espace libre sur le disque</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>Le fichier a été supprimé du serveur</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>Le fichier n'a pas pu être téléchargé intégralement.</translation> </message> @@ -3572,12 +3582,12 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <translation>Le fichier reçu est vide bien que le serveur indique que sa taille devrait être de %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation>Le fichier téléchargé est vide bien que le serveur indique que sa taille devrait être de %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Le fichier %1 n'a pas pu être sauvegardé en raison d'un conflit sur le nom du fichier local !</translation> </message> @@ -3587,12 +3597,18 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <translation>Erreur à l'écriture des métadonnées dans la base de données</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation>Erreur lors de la mise à jour des métadonnées : %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation>Le fichier %1 est en cours d'utilisation</translation> </message> @@ -3780,38 +3796,44 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation>Échec d'envoi du fichier chiffré.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>Impossible d'envoyer le fichier %1 car un autre fichier de même nom existe, différant seulement par la casse.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>Le téléversement de %1 amène un dépassement de quota pour le dossier</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>Fichier supprimé (début du téléchargement) %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Fichier local modifié pendant la synchronisation. Elle va reprendre. </translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>Fichier local modifié pendant la synchronisation.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation>Impossible de déverrouiller le dossier chiffré.</translation> </message> @@ -3821,12 +3843,12 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <translation>Erreur à l'écriture des métadonnées dans la base de données</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation>Erreur lors de la mise à jour des métadonnées : %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation>Le fichier %1 est en cours d'utilisation</translation> </message> @@ -3834,32 +3856,32 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>Fichier local supprimé pendant la synchronisation.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>Fichier local modifié pendant la synchronisation.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation>URL du sondage manquante</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Le serveur a retourné un code inattendu (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>L'identifiant de fichier est manquant sur le serveur</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>L'information Etag de modification de fichier est manquante sur le serveur</translation> </message> @@ -3867,22 +3889,22 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>URL de sondage manquante</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>Fichier local supprimé pendant la synchronisation.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>Fichier local modifié pendant la synchronisation.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>Le serveur n'a pas confirmé la réception du dernier morceau. (Aucun e-tag n'était présent).</translation> </message> @@ -5073,24 +5095,24 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation><p>Client de bureau %1</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>Version %1. Pour plus d’informations, veuillez cliquer <a href='%2'>ici</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation><p><small>Utilise l'extension de fichiers virtuels : %1</small></p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation>Cette version est fournie par %1.</translation> </message> @@ -5280,6 +5302,24 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6288,7 +6328,7 @@ Il s'agit d'un nouveau mode expérimental. Si vous décidez de l' <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>Généré à partir de la révision Git <a href="%1">%2</a> du %3, %4 en utilisant Qt %5, %6</small></p></translation> </message> diff --git a/translations/client_gl.ts b/translations/client_gl.ts index 5fad5b144..a83f96b74 100644 --- a/translations/client_gl.ts +++ b/translations/client_gl.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="gl" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="gl"> <context> <name>ActivityActionButton</name> <message> @@ -891,33 +891,38 @@ Esta acción interromperá calquera sincronización que estea a executarse actua <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -925,7 +930,7 @@ Esta acción interromperá calquera sincronización que estea a executarse actua <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Produciuse un erro ao escribir os metadatos na base de datos</translation> </message> @@ -3435,52 +3440,52 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignorado por mor da lista de bloqueo de «escolla que sincronizar»</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Non se lle permite porque vostede non ten permiso para engadir subcartafoles neste cartafol</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Non se lle permite porque vostede non ten permiso para engadir ficheiros neste cartafol</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Non está permitido o envío xa que o ficheiro é só de lectura no servidor, restaurando</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation>Moveuse a un destino non válido, restaurándo</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation>Non está permitido retiralo, restaurando</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation>Produciuse un erro ao ler a base de datos</translation> </message> @@ -3490,7 +3495,7 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <translation>O servidor respondeu cun erro ao ler o directorio «%1» : %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -3503,12 +3508,17 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <translation>Produciuse un erro ao escribir os metadatos na base de datos</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation type="unfinished"/> </message> @@ -3527,13 +3537,13 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>O ficheiro cambiou após ser atopado</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3543,22 +3553,22 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <translation>Non é posíbel descargar o ficheiro %1 por mor dunha colisión co nome dun ficheiro local!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>A descarga reducirá o espazo libre local por baixo do límite</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>O espazo libre no disco é inferior a %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>O ficheiro vai ser eliminado do servidor</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>Non foi posíbel descargar completamente o ficheiro.</translation> </message> @@ -3568,12 +3578,12 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <translation>O ficheiro descargado está baleiro, aínda que o servidor dí que o seu tamaño debe ser de %1. </translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Non foi posíbel gardar o ficheiro %1 por mor dunha colisión co nome dun ficheiro local!</translation> </message> @@ -3583,12 +3593,18 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <translation>Produciuse un erro ao escribir os metadatos na base de datos</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3776,38 +3792,44 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation>Produciuse un erro ao enviar un ficheiro cifrado.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>Non foi posíbel enviar o ficheiro %1 xa que existe outro co mesmo nome. Difire só nas maiusculas/minúsculas</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>O envío de %1 excede o límite de tamaño do cartafol</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>Ficheiro eliminado (iniciar o envío) %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>O ficheiro local cambiou durante a sincronización. Retomase.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>O ficheiro local cambiou durante a sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation>Produciuse un fallo ao desbloquear un cartafol cifrado.</translation> </message> @@ -3817,12 +3839,12 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <translation>Produciuse un erro ao escribir os metadatos na base de datos</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3830,32 +3852,32 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>O ficheiro local retirarase durante a sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>O ficheiro local cambiou durante a sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation>Non se atopa o URL da enquisa</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>O servidor devolveu un código non agardado (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>Falta o ID do ficheiro do servidor</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>Falta ETag do servidor</translation> </message> @@ -3863,22 +3885,22 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>Non se atopa o URL da enquisa</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>O ficheiro local retirarase durante a sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>O ficheiro local cambiou durante a sincronización.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>O servidor non recoñeceu o último bloque. (Non había unha e-tag presente)</translation> </message> @@ -5068,24 +5090,24 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation><p>Cliente de escritorio do %1</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>Versión %1. Para obter máis información prema <a href='%2'>aquí</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>Esta versión foi fornecida por %1</p></translation> </message> @@ -5275,6 +5297,24 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6283,7 +6323,7 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>Construido dende la revisión Git <a href="%1">%2</a> en %3, %4 usando Qt %5, %6</small></p></translation> </message> diff --git a/translations/client_he.ts b/translations/client_he.ts index c61fe0db8..a78124d4f 100644 --- a/translations/client_he.ts +++ b/translations/client_he.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="he" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="he"> <context> <name>ActivityActionButton</name> <message> @@ -887,33 +887,38 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -921,7 +926,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>איראה שגיאה בעת כתיבת metadata ל מסד הנתונים</translation> </message> @@ -3399,52 +3404,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3454,7 +3459,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -3467,12 +3472,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>שגיאה בכתיבת נתוני העל למסד הנתונים</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation type="unfinished"/> </message> @@ -3491,13 +3501,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>הקובץ השתנה מאז שהתגלה</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3507,22 +3517,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>לא ניתן להוריד את הקובץ %1 עקב סתירה עם שם קובץ מקומי!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>ההורדה תפחית את המקום הפנוי בכונן המקומי אל מתחת לסף</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>המקום הפנוי בכונן קטן מ־%1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>הקובץ נמחק מהשרת</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>לא ניתן להוריד את הקובץ במלואו.</translation> </message> @@ -3532,12 +3542,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>הקובץ שהתקבל ריק למרות שהשרת הכריז שגודלו אמור להיות %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>לא ניתן לשמור את הקובץ %1 עקב סתירה עם שם קובץ מקומי!</translation> </message> @@ -3547,12 +3557,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>שגיאה בכתיבת נתוני העל למסד הנתונים</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3740,38 +3756,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>לא ניתן להעלות את הקובץ %1 כיוון שקיים קובץ באותו השם, ההבדל הוא רק באותיות גדולות/קטנות</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>ההעלאה של %1 חורגת ממכסת התיקייה</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>הוקבץ הוסר (התחלת ההעלאה) %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>הקובץ המקומי השתנה במהלך הסנכרון. התהליך ימשיך.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>הקובץ המקומי השתנה במהלך הסנכרון.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation type="unfinished"/> </message> @@ -3781,12 +3803,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>אירעה שגיאה בעת כתיבת נתוני העל למסד הנתונים</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3794,32 +3816,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>הקובץ המקומי הוסר במהלך הסנכרון.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>הקובץ המקומי השתנה במהלך הסנכרון.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>קוד חזרה בלתי צפוי מהשרת (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>מזהה הקובץ חסר בשרת</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>ETag חסר בשרת</translation> </message> @@ -3827,22 +3849,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>חסרה כתובת הסקר</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>הקובץ המקומי הוסר במהלך הסנכרון.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>הקובץ המקומי השתנה במהלך הסנכרון.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>השרת לא הכיר בחלק האחרון. (לא היה e-tag)</translation> </message> @@ -5032,24 +5054,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation><p>%1 לקוח לשולחן העבודה</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>גרסה %1. למידע נוסף נא ללחוץ <a href='%2'>כאן</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>גרסה זו סופקה על ידי %1</p></translation> </message> @@ -5239,6 +5261,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6247,7 +6287,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>נבנה מהמהדורה <a href="%1">%2</a> ב־Git ב־%3, %4 באמצעות Qt %5, %6</small></p></translation> </message> diff --git a/translations/client_hr.ts b/translations/client_hr.ts index 9658154da..a4b3e17f4 100644 --- a/translations/client_hr.ts +++ b/translations/client_hr.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="hr" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="hr"> <context> <name>ActivityActionButton</name> <message> @@ -891,33 +891,38 @@ Ova će radnja prekinuti bilo koju trenutačnu sinkronizaciju.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -925,7 +930,7 @@ Ova će radnja prekinuti bilo koju trenutačnu sinkronizaciju.</translation> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Pogreška pri pisanju metapodataka u bazu podataka</translation> </message> @@ -3440,52 +3445,52 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <translation>Poslužitelj javlja da nema %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation>Došlo je do nepodudaranja pri otpremanju nekih datoteka u mapu. Nepodudarne datoteke će biti izbrisane!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Došlo je do nepodudaranja pri otpremanju mape. Nepodudarne mape će biti izbrisane!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Došlo je do nepodudaranja pri otpremanju datoteke. Nepodudarna datoteka će biti uklonjena!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Zanemareno zbog crne liste „odaberi što će se sinkronizirati”</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Nije dopušteno jer nemate dopuštenje za dodavanje podmapa u tu mapu</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Nije dopušteno jer nemate dopuštenje za dodavanje datoteka u tu mapu</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Nije dopušteno otpremiti ovu datoteku jer je dostupna samo za čitanje na poslužitelju, vraćanje</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation>Premješteno na nevažeće odredište, vraćanje</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation>Nije dopušteno uklanjanje, vraćanje</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation>Pogreška pri čitanju baze podataka</translation> </message> @@ -3495,7 +3500,7 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <translation>Poslužitelj je javio pogrešku pri čitanju direktorija '%1' : %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>Poslužitelj je javio pogrešku pri čitanju direktorija „%1” : %2</translation> </message> @@ -3508,12 +3513,17 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <translation>Pogreška pri pisanju metapodataka u bazu podataka</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation>Pogreška pri ažuriranju metapodataka: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation>Datoteka je trenutno u upotrebi</translation> </message> @@ -3532,13 +3542,13 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>Datoteka se promijenila od njenog otkrića</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation>Datoteka %1 ne može se preuzeti zbog nepodudaranja naziva lokalne datoteke!</translation> </message> @@ -3548,22 +3558,22 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <translation>Datoteka %1 ne može se preuzeti zbog nepodudaranja naziva lokalne datoteke!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>Preuzimanje bi smanjilo slobodni prostor na lokalnom disku ispod granice</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>Slobodan prostor na disku manji je od %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>Datoteka je izbrisana s poslužitelja</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>Datoteku nije moguće u potpunosti preuzeti.</translation> </message> @@ -3573,12 +3583,12 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <translation>Preuzeta datoteka je prazna, unatoč tome što je poslužitelj javio da treba iznositi %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation>Preuzeta datoteka je prazna, ali poslužitelj je javio da treba biti %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Datoteka %1 ne može se spremiti zbog nepodudaranja naziva lokalne datoteke!</translation> </message> @@ -3588,12 +3598,18 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <translation>Pogreška pri pisanju metapodataka u bazu podataka</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation>Pogreška pri ažuriranju metapodataka: %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation>Datoteka %1 je trenutno u upotrebi</translation> </message> @@ -3781,38 +3797,44 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation>Otpremanje šifrirane datoteke nije uspjelo.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>Datoteka %1 ne može se otpremiti jer postoji druga datoteka s istim nazivom koja se razlikuje samo po velikom/malom slovu</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>Otpremanje %1 premašuje kvotu za mapu</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>Datoteka je uklonjena (početak otpremanja) %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Lokalna datoteka je izmijenjena tijekom sinkronizacije. Sinkroniziranje će se nastaviti.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>Lokalna datoteka je izmijenjena tijekom sinkronizacije.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation>Nije uspjelo otključavanje šifrirane mape.</translation> </message> @@ -3822,12 +3844,12 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <translation>Pogreška pri pisanju metapodataka u bazu podataka</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation>Pogreška pri ažuriranju metapodataka: %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation>Datoteka %1 je trenutno u upotrebi</translation> </message> @@ -3835,32 +3857,32 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>Lokalna datoteka je uklonjena tijekom sinkronizacije.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>Lokalna datoteka je izmijenjena tijekom sinkronizacije.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation>Nedostaje URL ankete</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Neočekivana povratna šifra s poslužitelja (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>Nedostaje ID datoteke s poslužitelja</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>Nedostaje E-oznaka s poslužitelja</translation> </message> @@ -3868,22 +3890,22 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>Nedostaje URL ankete</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>Lokalna datoteka je uklonjena tijekom sinkronizacije.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>Lokalna datoteka je izmijenjena tijekom sinkronizacije.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>Poslužitelj nije potvrdio posljednji komad. (E-oznaka nije bila prisutna)</translation> </message> @@ -5073,24 +5095,24 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation><p>%1 Klijent za osobna računala</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>Inačica %1. Za više informacija kliknite <a href=’%2’>ovdje</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation><p><small>Upotreba dodatka za virtualne datoteke: %1</small></p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>Ovo izdanje isporučuje %1</p></translation> </message> @@ -5280,6 +5302,24 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6288,7 +6328,7 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>Izrađeno iz revizije Gita <a href="%1“>%2</a>na %3, %4 s pomoću Qt %5, %6</small></p></translation> </message> diff --git a/translations/client_hu.ts b/translations/client_hu.ts index 6b1d2f658..16b03dc0f 100644 --- a/translations/client_hu.ts +++ b/translations/client_hu.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="hu_HU" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="hu_HU"> <context> <name>ActivityActionButton</name> <message> @@ -891,33 +891,38 @@ Ez a művelet megszakítja a jelenleg futó szinkronizálást.</translation> <translation>Fájl eltávolítva (feltöltés indítása) %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>A helyi fájl megváltozott a szinkronizálás során. Folytatva lesz.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation>A helyi fájl megváltozott szinkronizálás közben.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation>Hiba a metaadatok frissítésekor: %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation>A(z) %1 fájl épp használatban van</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation>A helyi fájl el lett távolítva szinkronizálás közben.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation>; Sikertelen helyreállítás: %1</translation> </message> @@ -925,7 +930,7 @@ Ez a művelet megszakítja a jelenleg futó szinkronizálást.</translation> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Hiba a metaadatok adatbázisba írásakor</translation> </message> @@ -3440,52 +3445,52 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek <translation>Kiszolgáló jelentése: hiányzó %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation>Ütközés a fájlok mappába feltöltésekor. Az ütköző fájlok törölve lesznek!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Ütközés a mappa feltöltésekor. Törölve lesz!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Ütközés a fájl feltöltésekor. Törölve lesz!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>A „válassza ki a szinkronizálni kívánt elemeket” feketelista miatt figyelmen kívül hagyva</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Nem engedélyezett, mert nincs engedélye almappák hozzáadásához az adott a mappához</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Nem engedélyezett, mert nincs engedélye fájlok hozzáadására az adott mappában</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Ezt a fájlt nem lehet feltölteni, mert csak olvasható a kiszolgálón, helyreállítás</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation>Érvénytelen célba mozgatás, helyreállítás</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation>Az eltávolítás nem engedélyezett, helyreállítás</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation>Hiba történt az adatbázis olvasása során</translation> </message> @@ -3495,7 +3500,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek <translation>A kiszolgáló a következő hibával válaszolt a(z) „%1” könyvtár olvasása során: %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>A kiszolgáló a következő hibával válaszolt a(z) „%1” könyvtár olvasása során: %2</translation> </message> @@ -3508,12 +3513,17 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek <translation>Hiba a metaadatok adatbázisba írásakor</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation>Hiba a metaadatok frissítésekor: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation>A fájl jelenleg használatban van</translation> </message> @@ -3532,13 +3542,13 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>A fájl változott a felfedezése óta</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation>A(z) %1 fájl nem tölthető le, mert ütközik egy helyi fájl nevével.</translation> </message> @@ -3548,22 +3558,22 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek <translation>A(z) %1 fájl nem tölthető le, mert ütközik egy helyi fájl nevével.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>A letöltés a korlát alá csökkentené a szabad helyi tárterületet</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>A lemezen lévő szabad hely kevesebb mint %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>A fájl törlésre került a kiszolgálóról</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>A fájl nem tölthető le teljesen.</translation> </message> @@ -3573,12 +3583,12 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek <translation>A letöltött fájl üres, annak ellenére, hogy a kiszolgáló szerint %1 méretű kellene legyen.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation>A letöltött fájl üres, de a kiszolgáló szerint %1 méretűnek kellene lennie.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>A(z) %1 fájl nem menthető, mert ütközik egy helyi fájl nevével.</translation> </message> @@ -3588,12 +3598,18 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek <translation>Hiba a metaadatok adatbázisba írásakor</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation>Hiba a metaadatok frissítésekor: %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation>A(z) %1 fájl épp használatban van</translation> </message> @@ -3781,38 +3797,44 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation>Nem sikerült feltölteni a titkosított fájlt.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>A(z) %1 fájl nem tölthető fel, mert létezik egy fájl ugyanezzel a névvel, úgy hogy csak kis- és nagybetűkben tér el.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>A(z) %1 feltöltése túllépi a mappa kvótáját</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>Fájl eltávolítva (feltöltés indítása) %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>A helyi fájl megváltozott a szinkronizálás során. Folytatva lesz.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>A helyi fájl megváltozott szinkronizáció közben.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation>Nem sikerült feloldani a titkosított mappát.</translation> </message> @@ -3822,12 +3844,12 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek <translation>Hiba a metaadatok adatbázisba írásakor</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation>Hiba a metaadatok frissítésekor: %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation>A(z) %1 fájl épp használatban van</translation> </message> @@ -3835,32 +3857,32 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>A helyi fájl el lett távolítva szinkronizálás közben.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>A helyi fájl megváltozott szinkronizálás közben.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation>Hiányzik a szavazás URL-je</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Nem várt visszatérési érték a kiszolgálótól (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>Hiányzik a fájlazonosító a kiszolgálóról</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>Hiányzik az ETag a kiszolgálóról</translation> </message> @@ -3868,22 +3890,22 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>A lekérdezési URL hiányzik</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>A helyi fájl el lett távolítva a szinkronizálás alatt.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>A helyi fájl megváltozott szinkronizálás alatt.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>A kiszolgáló nem ismerte el az utolsó darabot. (Nem volt jelen e-tag)</translation> </message> @@ -5073,24 +5095,24 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation><p>%1 asztali kliens</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>Verzió: %1. További információkért kattintson <a href='%2'>ide</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation><p><small>Virtuális fájlok bővítmény használata: %1</small></p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>Ezt a kiadást a %1 biztosította</p></translation> </message> @@ -5280,6 +5302,24 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6288,7 +6328,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>Összeállítva a(z) <a href="%1">%2</a> Git verzióból, ekkor: %3, %4, Qt %5 (%6) használatával</small></p></translation> </message> diff --git a/translations/client_id.ts b/translations/client_id.ts index 25df33472..9e99d4544 100644 --- a/translations/client_id.ts +++ b/translations/client_id.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="id" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="id"> <context> <name>ActivityActionButton</name> <message> @@ -886,33 +886,38 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -920,7 +925,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Kesalahan saat menulis metadata ke database</translation> </message> @@ -3402,52 +3407,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3457,7 +3462,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -3470,12 +3475,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation type="unfinished"/> </message> @@ -3494,13 +3504,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation type="unfinished"/> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3510,22 +3520,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation type="unfinished"/> </message> @@ -3535,12 +3545,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3550,12 +3560,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3743,38 +3759,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation type="unfinished"/> </message> @@ -3784,12 +3806,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3797,32 +3819,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation type="unfinished"/> </message> @@ -3830,22 +3852,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation type="unfinished"/> </message> @@ -5033,24 +5055,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -5240,6 +5262,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6248,7 +6288,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation type="unfinished"/> </message> diff --git a/translations/client_is.ts b/translations/client_is.ts index 5d3c7bdbb..f19f54eb9 100644 --- a/translations/client_is.ts +++ b/translations/client_is.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="is" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="is"> <context> <name>ActivityActionButton</name> <message> @@ -892,33 +892,38 @@ gagnageymslur: </translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -926,7 +931,7 @@ gagnageymslur: </translation> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Villa við ritun lýsigagna í gagnagrunninn</translation> </message> @@ -3406,52 +3411,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3461,7 +3466,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -3474,12 +3479,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Villa við ritun lýsigagna í gagnagrunninn</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation type="unfinished"/> </message> @@ -3498,13 +3508,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>Skráin hefur breyst síðan hún fannst</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3514,22 +3524,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>Laust pláss á diski er minna en %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>Skrá var eytt af þjóninum</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>Ekki var hægt að sækja skrána að fullu.</translation> </message> @@ -3539,12 +3549,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3554,12 +3564,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Villa við ritun lýsigagna í gagnagrunninn</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3747,38 +3763,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>Innsending á %1 fer fram úr kvótanum fyrir möppuna</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Staðværu skránni var breytt við samstillingu. Henni verður haldið áfram.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>Staðværu skránni var breytt við samstillingu.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation type="unfinished"/> </message> @@ -3788,12 +3810,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Villa við ritun lýsigagna í gagnagrunninn</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3801,32 +3823,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>Staðværa skráin var fjarlægð við samstillingu.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>Staðværu skránni var breytt við samstillingu.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Óvæntur svarkóði frá þjóni (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation type="unfinished"/> </message> @@ -3834,22 +3856,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>Slóð á skoðanakönnun vantar</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>Staðværa skráin var fjarlægð við samstillingu.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>Staðværu skránni var breytt við samstillingu.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation type="unfinished"/> </message> @@ -5040,24 +5062,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation><p>%1 skjáborðsforrit</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>Þessi útgáfa var gefin út af %1</p></translation> </message> @@ -5248,6 +5270,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6259,7 +6299,7 @@ borð við 'trayer' og reyna síðan aftur.</translation> <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>Byggt með Git revision <a href="%1">%2</a> á %3, %4 með Qt %5, %6</small></p></translation> diff --git a/translations/client_it.ts b/translations/client_it.ts index 640e5a0f5..1df63cf70 100644 --- a/translations/client_it.ts +++ b/translations/client_it.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="it" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="it"> <context> <name>ActivityActionButton</name> <message> @@ -891,33 +891,38 @@ Questa azione interromperà qualsiasi sincronizzazione attualmente in esecuzione <translation>File rimosso (avvio caricamento) %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>File locale modificato durante la sincronizzazione. Verrà ricaricato.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation>File locale modificato durante la sincronizzazione.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation>Errore di aggiornamento dei metadati: %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation>Il file %1 è attualmente in uso</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation>Il file locale è stato rimosso durante la sincronizzazione.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation>; Ripristino fallito: %1</translation> </message> @@ -925,7 +930,7 @@ Questa azione interromperà qualsiasi sincronizzazione attualmente in esecuzione <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Errore durante la scrittura dei metadati nel database</translation> </message> @@ -3430,52 +3435,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Il server non ha restituito alcun %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation>Conflitto durante l'invio di alcuni file in una cartella. I file in conflitto verranno eliminati!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Conflitto durante l'invio di una cartella. Verrà svuotata!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Conflitto durante l'invio di un file. Verrà rimosso!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignorato in base alla lista nera per la scelta di cosa sincronizzare</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Non consentito perché non sei autorizzato ad aggiungere sottocartelle a quella cartella</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Non ti è consentito perché non hai i permessi per aggiungere file in quella cartella </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Non ti è permesso caricare questo file perché hai l'accesso in sola lettura sul server, ripristino</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation>Spostato su una destinazione non valida, ripristino</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation>Rimozione non consentita, ripristino</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation>Errore durante la lettura del database</translation> </message> @@ -3485,7 +3490,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Il server ha risposto con un errore durante la lettura della cartella '% 1' : %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>Il server ha risposto con un errore durante la lettura della cartella "%1" : %2</translation> </message> @@ -3498,12 +3503,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Errore durante la scrittura dei metadati nel database</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation>Errore di invio dei metadati: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation>Il file è attualmente in uso</translation> </message> @@ -3522,13 +3532,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>Il file è stato modificato dal suo rilevamento</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation>Il file %1 non può essere scaricato per un conflitto con il nome di un file locale!</translation> </message> @@ -3538,22 +3548,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Il file %1 non può essere scaricato a causa di un conflitto con un file locale.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>Lo scaricamento ridurrà lo spazio disco libero locale sotto il limite</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>Lo spazio libero su disco è inferiore a %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>Il file è stato eliminato dal server</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>Il file non può essere scaricato completamente.</translation> </message> @@ -3563,12 +3573,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Il file scaricato è vuoto nonostante il server indicasse una dimensione di %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation>Il file scaricato è vuoto, ma il server ha indicato una dimensione di %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Il file %1 non può essere salvato a causa di un conflitto con un file locale.</translation> </message> @@ -3578,12 +3588,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Errore durante la scrittura dei metadati nel database</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation>Errore di invio dei metadati: %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation>Il file %1 è attualmente in uso</translation> </message> @@ -3771,38 +3787,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation>Caricamento del file cifrato non riuscito.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>Il file %1 non può essere caricato poiché esiste un altro file con lo stesso nome, ma con differenze tra maiuscole e minuscole</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>Il caricamento di %1 supera la quota per la cartella</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>File rimosso (avvio caricamento) %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Il file locale è stato modificato durante la sincronizzazione. Sarà ripristinato.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>Un file locale è cambiato durante la sincronizzazione.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation>Sblocco della cartella cifrata non riuscito.</translation> </message> @@ -3812,12 +3834,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Errore durante la scrittura dei metadati nel database</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation>Errore di invio dei metadati: %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation>Il file %1 è attualmente in uso</translation> </message> @@ -3825,32 +3847,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>Il file locale è stato rimosso durante la sincronizzazione.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>Un file locale è cambiato durante la sincronizzazione.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation>URL del sondaggio mancante </translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Codice di uscita inatteso dal server (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>File ID mancante dal server</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>ETag mancante dal server</translation> </message> @@ -3858,22 +3880,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>URL di richiesta mancante</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>Il file locale è stato rimosso durante la sincronizzazione.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>Un file locale è cambiato durante la sincronizzazione.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>Il server non ha riconosciuto l'ultimo pezzo. (Non era presente alcun e-tag)</translation> </message> @@ -5063,24 +5085,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation><p>Client desktop di %1</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>Versione %1. Per ulteriori informazioni, fai clic <a href='%2'>qui</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation><p><small>Usato il plugin dei file virtuali: %1</small></p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>Questa versione è stata fornita da %1</p></translation> </message> @@ -5270,6 +5292,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6278,7 +6318,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>Compilato dalla revisione Git <a href="%1">%2</a> il %3, %4 utilizzando Qt %5, %6</small></p></translation> </message> diff --git a/translations/client_ja.ts b/translations/client_ja.ts index c01ba5073..34ccd0406 100644 --- a/translations/client_ja.ts +++ b/translations/client_ja.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="ja_JP" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="ja_JP"> <context> <name>ActivityActionButton</name> <message> @@ -891,33 +891,38 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -925,7 +930,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>メタデータのデータベースへの書き込みに失敗</translation> </message> @@ -3436,52 +3441,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation>一部のファイルをフォルダにアップロードするときに競合が発生しました。これらの競合はクリアされます！</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>フォルダをアップロードするときに競合したので、クリアされます！</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>フォルダをアップロードするときに競合したので、削除されます！</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>"選択されたものを同期する" のブラックリストにあるために無視されました</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>そのフォルダーにサブフォルダーを追加する権限がありません</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>そのフォルダーにファイルを追加する権限がありません</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>サーバー上で読み取り専用のため、ファイルをアップロードできません。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation>無効なターゲットに移動し、復元しました</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation>削除、復元は許可されていません</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation>データベースを読み込み中にエラーが発生しました</translation> </message> @@ -3491,7 +3496,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>サーバーがディレクトリ '%1' の読み取り中にエラーで応答しました: %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>サーバーでディレクトリ "%1" を読み取り中にエラーになりました: %2</translation> </message> @@ -3504,12 +3509,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>メタデータのデータベースへの書き込みに失敗</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation>メタデータの更新中にエラーが発生しました：%1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation>ファイルは現在使用中です</translation> </message> @@ -3528,13 +3538,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>ファイルは発見以降に変更されました</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation>ローカルファイル名が競合しているため、ファイル %1 をダウンロードできませんでした</translation> </message> @@ -3544,22 +3554,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ファイル %1 はローカルファイル名が衝突しているためダウンロードできません！</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>ダウンロードすることによりローカルディスクの空き容量が制限を下回ります。</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>ディスク空き容量が %1 よりも少なくなっています</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>ファイルはサーバーから削除されました</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>このファイルのダウンロードは完了しませんでした</translation> </message> @@ -3569,12 +3579,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>サーバーが通知しているファイルは %1 であるべきですが、ダウンロードファイルは空でした。</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation>ダウンロードしたファイルは空ですが、サーバでは %1 であるはずです。</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>%1 はローカルファイル名が衝突しているため保存できません！</translation> </message> @@ -3584,12 +3594,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>メタデータのデータベースへの書き込みに失敗</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation>メタデータの更新中にエラーが発生しました：%1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation>ファイル %1 は現在使用中です</translation> </message> @@ -3777,38 +3793,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation>暗号化されたファイルをアップロードできませんでした。</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>ファイル %1 は、大文字と小文字の区別が違う同じ名前のファイルが存在するためアップロードできません</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>%1 をアップロードするとフォルダーのクオータを超えます</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>ファイルが削除されました（アップロード開始）%1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>ローカルファイルが同期中に変更されました。再開されます。</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>ローカルのファイルが同期中に変更されました。</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation>暗号化されたフォルダーの解除に失敗しました。</translation> </message> @@ -3818,12 +3840,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>メタデータのデータベースへの書き込みに失敗</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation>メタデータの更新中にエラーが発生しました：%1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation>ファイル %1 は現在使用中です</translation> </message> @@ -3831,32 +3853,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>ローカルファイルを同期中に削除します。</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>ローカルのファイルが同期中に変更されました。</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation>ポーリングURLがありません</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>サーバー (%1) からの予期しない戻りコード</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>サーバーからファイルIDの戻りがありません</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>サーバーからETagの戻りがありません</translation> </message> @@ -3864,22 +3886,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>ポーリングURLがありません</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>ローカルファイルを同期中に削除します。</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>ローカルのファイルが同期中に変更されました。</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>サーバーは最終チャンクを認識しませんでした。(e-tag が存在しませんでした)</translation> </message> @@ -5069,24 +5091,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation><p>%1 デスクトップクライアント</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>バージョン %1. 詳細な情報は<a href='%2'>ここ</a>をクリックしてください。</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation><p><small>仮想ファイルシステムプラグインを利用：%1</small></p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>このリリースは%1によって提供されました</p></translation> </message> @@ -5276,6 +5298,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6284,7 +6324,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small><a href="%1">%2</a> %3, %4 のGitリビジョンからのビルド Qt %5, %6 を利用</small></p></translation> </message> diff --git a/translations/client_ko.ts b/translations/client_ko.ts index d89a0fc8d..a8e04abbd 100644 --- a/translations/client_ko.ts +++ b/translations/client_ko.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="ko" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="ko"> <context> <name>ActivityActionButton</name> <message> @@ -891,33 +891,38 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -925,7 +930,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>데이터베이스에 메타데이터를 쓰는 중 오류가 발생했습니다.</translation> </message> @@ -3439,52 +3444,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>"동기화 할 대상 선택" 블랙리스트로 인해 무시되었습니다.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>해당 폴더에 하위 폴더를 추가 할 수 있는 권한이 없기 때문에 허용되지 않습니다.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>해당 폴더에 파일을 추가 할 권한이 없으므로 허용되지 않습니다.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>이 파일은 서버에서 읽기 전용이므로 업로드 할 수 없습니다. 복구</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation>유효하지 않은 목적지로 옮겨짐, 복구</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation>삭제가 허용되지 않음, 복구</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation>데이터베이스를 읽는 중 오류 발생</translation> </message> @@ -3494,7 +3499,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>서버가 디렉토리 '%1'을(를) 읽는 중 오류에 대응함: %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -3507,12 +3512,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>데이터베이스에 메타데이터를 쓰는 중 오류가 발생했습니다.</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation type="unfinished"/> </message> @@ -3531,13 +3541,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>발견 이후 파일이 변경되었습니다.</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation>로컬 파일 이름 충돌로 인해 %1 파일을 다운로드 할 수 없습니다!</translation> </message> @@ -3547,22 +3557,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>로컬 파일 이름 충돌로 인해 %1 파일을 다운로드 할 수 없습니다!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>다운로드하면 사용 가능한 로컬 디스크 공간이 제한 밑으로 줄어 듭니다.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>디스크의 여유 공간이 %1보다 작습니다.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>파일이 서버에서 삭제되었습니다.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>파일을 완전히 다운로드 할 수 없습니다.</translation> </message> @@ -3572,12 +3582,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>서버가 %1이어야한다고 안내 했음에도 불구하고 다운로드한 파일이 비어 있습니다.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation>서버는 %1였으나 다운로드한 파일이 비어 있음.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>로컬 파일 이름 충돌로 인해 %1 파일을 저장할 수 없습니다!</translation> </message> @@ -3587,12 +3597,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>데이터베이스에 메타데이터를 쓰는 중 오류가 발생했습니다.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3780,38 +3796,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation>암호화된 파일 업로드 실패</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>경우에 따라 다른 이름을 가진 다른 파일이 존재하므로 %1 파일을 업로드 할 수 없습니다.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>%1의 업로드가 폴더의 할당량을 초과합니다.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>파일 삭제됨 (업로드 시작) %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>동기화 중 로컬 파일이 변경되었습니다. 곧 재개됩니다.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>동기화 중 로컬 파일이 변경되었습니다.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation>암호화된 폴더 해제 실패</translation> </message> @@ -3821,12 +3843,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>데이터베이스에 메타데이터를 쓰는 중 오류가 발생했습니다.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3834,32 +3856,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>동기화 중 로컬 파일이 삭제되었습니다.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>동기화 중 로컬 파일이 변경되었습니다.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>서버에서 예기지 않은 코드가 반환됨 (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>서버에서 파일 ID 누락</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>서버에서 ETag 누락</translation> </message> @@ -3867,22 +3889,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>설문조사 URL 누락</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>동기화 중 로컬 파일이 삭제되었습니다.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>동기화 중 로컬 파일이 변경되었습니다.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>서버가 마지막 청크를 승인하지 않았습니다. (E 태그 없음)</translation> </message> @@ -5072,24 +5094,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation><p>%1 데스크톱 클라이언트</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>버전 %1. 더 많은 정보를 보려면 <a href='%2'>여기</a>를 클릭하세요.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation><small><p>가상 파일 플러그인 사용: %1</small></p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>이 릴리스는 %1에 의해 제공되었습니다.</p></translation> </message> @@ -5279,6 +5301,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6287,7 +6327,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>Git 개정 <a href="%1">%2</a>에서 Qt %5, %6을 사용하여 %3, %4의 빌드</small></p></translation> </message> diff --git a/translations/client_lt_LT.ts b/translations/client_lt_LT.ts index 6d48a81ff..0b405fd3b 100644 --- a/translations/client_lt_LT.ts +++ b/translations/client_lt_LT.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="lt_LT" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="lt_LT"> <context> <name>ActivityActionButton</name> <message> @@ -886,33 +886,38 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -920,7 +925,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Klaida rašant metaduomenis į duomenų bazę</translation> </message> @@ -3411,52 +3416,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation>Klaida skaitant duomenų bazę</translation> </message> @@ -3466,7 +3471,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -3479,12 +3484,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Klaida rašant metaduomenis į duomenų bazę</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation type="unfinished"/> </message> @@ -3503,13 +3513,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>Aptikus failą, jis buvo pakeistas</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3519,22 +3529,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Failo %1 nepavyko atsisiųsti dėl kompiuterio failo nesuderinamumo!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>Atsisiuntimas sumažins laisvos vietos diske žemiau leistinos ribos</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>Laisvos vietos diske yra mažiau nei %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>Failas buvo ištrintas iš serverio</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>Nepavyko pilnai atsisiųsti failo.</translation> </message> @@ -3544,12 +3554,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Atsisiųstas failas yra tuščias nepaisant to, kad serveris paskelbė, jog failas turėjo būti %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Failo %1 nepavyko išsaugoti dėl kompiuterio failo nesuderinamumo!</translation> </message> @@ -3559,12 +3569,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Klaida rašant metaduomenis į duomenų bazę</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3752,38 +3768,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>Failo %1 įkelti nepavyko, nes yra kitas failas, besiskiriantis didžiosiomis ir mažosiomis raidėmis</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>%1 įkėlimui reikalinga vieta viršija aplankui skirtą kvotą</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>Failas pašalintas (pradėkite įkėlimas) %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Failas kompiuteryje sinchronizavimo metu buvo pakeistas. Bus tęsiama.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>Failas kompiuteryje sinchronizavimo metu buvo pakeistas.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation type="unfinished"/> </message> @@ -3793,12 +3815,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Klaida rašant metaduomenis į duomenų bazę</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3806,32 +3828,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>Vietinis failas sinchronizavimo metu buvo pašalintas.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>Failas kompiuteryje sinchronizavimo metu buvo pakeistas.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Nežinomas atsakymo kodas iš serverio (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>Nėra File ID iš serverio</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>Nėra ETag iš serverio</translation> </message> @@ -3839,22 +3861,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>Nėra apklausos URL adreso</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>Vietinis failas sinchronizavimo metu buvo pašalintas.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>Failas kompiuteryje sinchronizavimo metu buvo pakeistas.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>Serveris nepatvirtino paskutinio segmento. (Nėra e-tag)</translation> </message> @@ -5044,24 +5066,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation><p>%1 darbalaukio kliento programa</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>Versija %1. Išsamesnei informacijai, spustelėkite <a href='%2'>čia</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>Šį išleidimą pateikė %1</p></translation> </message> @@ -5251,6 +5273,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6259,7 +6299,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>Pagaminta pagal Git redakciją <a href="%1">%2</a>išleistą %3, %4 naudojant Qt %5, %6</small></p></translation> </message> diff --git a/translations/client_lv.ts b/translations/client_lv.ts index e175777d2..5c87cc11a 100644 --- a/translations/client_lv.ts +++ b/translations/client_lv.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="lv" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="lv"> <context> <name>ActivityActionButton</name> <message> @@ -886,33 +886,38 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -920,7 +925,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Kļūda rakstot metadatus datubāzē</translation> </message> @@ -3392,52 +3397,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3447,7 +3452,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -3460,12 +3465,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation type="unfinished"/> </message> @@ -3484,13 +3494,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation type="unfinished"/> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3500,22 +3510,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation type="unfinished"/> </message> @@ -3525,12 +3535,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3540,12 +3550,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3733,38 +3749,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation type="unfinished"/> </message> @@ -3774,12 +3796,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3787,32 +3809,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation type="unfinished"/> </message> @@ -3820,22 +3842,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation type="unfinished"/> </message> @@ -5023,24 +5045,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>Šo izlaidumu piegādāja %1</p></translation> </message> @@ -5230,6 +5252,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6238,7 +6278,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>Būvēta no Git revīzijas <a href="%1">%2</a> uz %3, %4 izmantojot Qt %5, %6</small></p></translation> </message> diff --git a/translations/client_mk.ts b/translations/client_mk.ts index beb44ba4b..2525d683b 100644 --- a/translations/client_mk.ts +++ b/translations/client_mk.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="mk" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="mk"> <context> <name>ActivityActionButton</name> <message> @@ -886,33 +886,38 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -920,7 +925,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Грешка при запишување на метаподатоци во базата со податоци</translation> </message> @@ -3401,52 +3406,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Не е дозволено бидејќи немате дозвола да додавате потпапки во оваа папка</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Не е дозволено бидејќи немате дозвола да додавате датотеки во оваа папка</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Не е дозволено да ја прикачите оваа датотека бидејќи е само за читање на серверот, враќање</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation>Не е дозволено бришење, враќање</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation>Грешка при вчитување на податоци од датабазата</translation> </message> @@ -3456,7 +3461,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Серверот одговори со грешка при читање на папката '%1' : %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -3469,12 +3474,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Грешка при запишување на метаподатоци во базата со податоци</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation type="unfinished"/> </message> @@ -3493,13 +3503,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation type="unfinished"/> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3509,22 +3519,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>Слободниот простор на дискот е помалку од %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>Датотеката е избришана од серверот</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation type="unfinished"/> </message> @@ -3534,12 +3544,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3549,12 +3559,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Грешка при запишување на метаподатоци во базата со податоци</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3742,38 +3758,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>Избришана датотека (започнува прикачување) %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>Локална датотека е променета додека траеше синхронизацијата.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation type="unfinished"/> </message> @@ -3783,12 +3805,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Грешка при запишување на метаподатоци во базата со податоци</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3796,32 +3818,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>Локална датотека е избришана додека траеше синхронизацијата.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>Локална датотека е променета додека траеше синхронизацијата.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Неочекуван повратен код од серверот (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>Недостасува ID на датотека од серверот</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>Недостасува ETag од серверот</translation> </message> @@ -3829,22 +3851,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>Локална датотека е избришана додека траеше синхронизацијата.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>Локална датотека е променета додека траеше синхронизацијата.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation type="unfinished"/> </message> @@ -5034,24 +5056,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation><p>%1 Клиент за компјутер</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>Верзија %1. За повеќе информации кликнете <a href='%2'>тука</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>Ова издание е обезбедено од %1</p></translation> </message> @@ -5241,6 +5263,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6249,7 +6289,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>Изграден од Git ревизија <a href="%1">%2</a> на %3, %4 со користење на Qt %5, %6</small></p></translation> </message> diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts index 4f89b9adf..eeb1e83f8 100644 --- a/translations/client_nb_NO.ts +++ b/translations/client_nb_NO.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="nb_NO" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="nb_NO"> <context> <name>ActivityActionButton</name> <message> @@ -891,33 +891,38 @@ Denne handlingen vil avbryte enhver synkronisering som kjører.</translation> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -925,7 +930,7 @@ Denne handlingen vil avbryte enhver synkronisering som kjører.</translation> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Feil ved skriving av metadata til databasen</translation> </message> @@ -3403,52 +3408,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3458,7 +3463,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -3471,12 +3476,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Feil ved skriving av metadata til databasen</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation type="unfinished"/> </message> @@ -3495,13 +3505,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>Filen er endret siden den ble oppdaget</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3511,22 +3521,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Fil %1 kan ikke lastes ned på grunn av lokalt sammenfall av filnavn!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>Nedlastingen ville redusert ledig lokal diskplass til under grensen</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>Ledig plass på disk er mindre enn %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>Filen ble slettet fra serveren</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>Hele filen kunne ikke lastes ned.</translation> </message> @@ -3536,12 +3546,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Fil %1 kan ikke lagres på grunn av lokal konflikt med filnavn.</translation> </message> @@ -3551,12 +3561,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Feil ved skriving av metadata til databasen</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3744,38 +3760,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>Fil %1 kan ikke lastes opp fordi en annen fil eksisterer med samme navn, bare med forskjellige store og små bokstaver i navnet.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>Opplastingen av %1 overstiger kvoten for mappen</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>Fil fjernet (start opplasting) %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Lokal fil endret under synkronisering. Den vil gjenopptas.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>Lokal fil endret under synkronisering.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation type="unfinished"/> </message> @@ -3785,12 +3807,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Feil ved skriving av metadata til databasen</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3798,32 +3820,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>Den lokale filen ble fjernet under synkronisering.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>Lokal fil endret under synkronisering.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Uventet returkode fra serveren (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>Mangler File ID fra server</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>Mangler ETag fra server</translation> </message> @@ -3831,22 +3853,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>Forespørsels-URL mangler</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>Den lokale filen ble fjernet under synkronisering.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>Lokal fil endret under synkronisering.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>Serveren godtok ikke den siste deloverføringen. (Ingen e-tag var tilstede)</translation> </message> @@ -5036,24 +5058,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -5243,6 +5265,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6251,7 +6291,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation type="unfinished"/> </message> diff --git a/translations/client_nl.ts b/translations/client_nl.ts index a1c8a2e5a..3805744a5 100644 --- a/translations/client_nl.ts +++ b/translations/client_nl.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="nl"> <context> <name>ActivityActionButton</name> <message> @@ -890,33 +890,38 @@ Dit zal alle synchronisaties, die op dit moment bezig zijn, afbreken.</translati <translation>Bestand verwijderd (start upload) %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Lokaal bestand gewijzigd gedurende sync. Wordt opnieuw meegenomen.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation>Lokaal bestand gewijzigd tijdens sync.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation>Fout bij bijwerken metadata: %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation>Bestand %1 is al in gebruik</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation>Het lokale bestand werd verwijderd tijdens sync.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation>; Herstellen mislukt: %1</translation> </message> @@ -924,7 +929,7 @@ Dit zal alle synchronisaties, die op dit moment bezig zijn, afbreken.</translati <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Fout bij schrijven van Metadata naar de database</translation> </message> @@ -3442,52 +3447,52 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen <translation>Server rapporteerde nr %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation>Conflict bij het uploaden van sommige bestanden naar een map. Die betreffende conflicterende bestanden zullen worden gewist!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Conflict bij het uploaden van een map. Het wordt opgeruimd!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Conflict bij het uploaden van een bestand. Het wordt verwijderd!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Genegeerd vanwege de "wat synchroniseren" negeerlijst</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Niet toegestaan, omdat je geen machtiging hebt om submappen aan die map toe te voegen</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Niet toegestaan omdat je geen machtiging hebt om bestanden in die map toe te voegen</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Niet toegestaan om dit bestand te uploaden, omdat het alleen-lezen is op de server, herstellen</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation>Verplaatst naar ongeldig doel, herstellen</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation>Niet toegestaan om te verwijderen, herstellen</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation>Fout bij lezen database</translation> </message> @@ -3497,7 +3502,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen <translation>Server gaf een foutmelding bij lezen directory '%1' : %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>Server gaf een foutmelding bij lezen directory "%1'": %2</translation> </message> @@ -3510,12 +3515,17 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen <translation>Fout bij schrijven van Metadata naar de database</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation>Fout bij bijwerken metadata: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation>Bestand is al in gebruik</translation> </message> @@ -3534,13 +3544,13 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>Het bestand is gewijzigd sinds het is gevonden</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation>Bestand %1 kan niet worden gedownload, omdat de naam conflicteert met een lokaal bestand</translation> </message> @@ -3550,22 +3560,22 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen <translation>Bestand %1 kan niet worden gedownload, omdat de naam conflicteert met een lokaal bestand</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>De download zou de vrije lokale schijfruimte beperken tot onder de limiet</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>Vrije schijfruimte is minder dan %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>Bestand was verwijderd van de server</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>Het bestand kon niet volledig worden gedownload.</translation> </message> @@ -3575,12 +3585,12 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen <translation>Het gedownloade bestand is leeg, hoewel de server meldde dat het %1 zou moeten zijn.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation>Het gedownloade bestand is leeg, maar de server meldde dat het %1 zou moeten zijn.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Bestand %1 kan niet worden opgeslagen wegens een lokaal bestandsnaam conflict!</translation> </message> @@ -3590,12 +3600,18 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen <translation>Fout bij schrijven van Metadata naar de database</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation>Fout bij bijwerken metadata: %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation>Bestand %1 is al in gebruik</translation> </message> @@ -3783,38 +3799,44 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation>Kon versleuteld bestand niet uploaden.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>Bestand %1 kan niet worden geüpload omdat er al een ander bestand met dezelfde naam bestaat, al verschillen hoofd/kleine letters</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>Upload van %1 overschrijdt het quotum voor de map</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>Bestand verwijderd (start upload) %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Lokaal bestand gewijzigd gedurende sync. Wordt opnieuw meegenomen.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>Lokaal bestand gewijzigd tijdens sync.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation>Kon versleutelde map niet ontgrendelen.</translation> </message> @@ -3824,12 +3846,12 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen <translation>Fout bij schrijven van Metadata naar de database</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation>Fout bij bijwerken metadata: %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation>Bestand %1 is al in gebruik</translation> </message> @@ -3837,32 +3859,32 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>Het lokale bestand werd verwijderd tijdens sync.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>Lokaal bestand gewijzigd tijdens sync.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation>Peilingen-URL ontbreekt</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Onverwachte reactie van server (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>Ontbrekende File ID van de server</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>Ontbrekende ETag van de server</translation> </message> @@ -3870,22 +3892,22 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>URL opvraag ontbreekt</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>Het lokale bestand werd verwijderd tijdens sync.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>Lokaal bestand gewijzigd tijdens sync.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>De server heeft het laatste deel niet bevestigd (er was geen e-tag aanwezig)</translation> </message> @@ -5075,24 +5097,24 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation><p>%1 Desktop Client</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>Versie %1. Voor meer informatie klik <a href='%2'>hier</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation><p><small>Gebruik makend van virtuele bestanden plugin: %1</small></p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>Deze release is geleverd door %1</p></translation> </message> @@ -5282,6 +5304,24 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6290,7 +6330,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>Gebouwd vanaf Git revisie <a href="%1">%2</a> op %3, %4 gebruik makend van Qt %5, %6</small></p></translation> </message> diff --git a/translations/client_oc.ts b/translations/client_oc.ts index a9605dd27..5bd9dc128 100644 --- a/translations/client_oc.ts +++ b/translations/client_oc.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="oc" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="oc"> <context> <name>ActivityActionButton</name> <message> @@ -886,33 +886,38 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -920,7 +925,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Error en escrivent las metadonadas dins la basa de donadas</translation> </message> @@ -3390,52 +3395,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3445,7 +3450,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -3458,12 +3463,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation type="unfinished"/> </message> @@ -3482,13 +3492,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation type="unfinished"/> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3498,22 +3508,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation type="unfinished"/> </message> @@ -3523,12 +3533,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3538,12 +3548,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Error en escrivent las metadonadas dins la basa de donadas</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3731,38 +3747,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation type="unfinished"/> </message> @@ -3772,12 +3794,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3785,32 +3807,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation type="unfinished"/> </message> @@ -3818,22 +3840,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation type="unfinished"/> </message> @@ -5023,24 +5045,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation><p>Client de burèu %1</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>Version %1. Per mai d’informacion clicatz <a href='%2'>aquí</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation><p><small>Usatge extension pels fichièrs virtuals : %1</small></p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>Aquesta version es provesida per %1</p></translation> </message> @@ -5230,6 +5252,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6238,7 +6278,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>Construit de la revision Git <a href="%1">%2</a> sus %3, %4 using Qt %5, %6</small></p></translation> </message> diff --git a/translations/client_pl.ts b/translations/client_pl.ts index 48e0dff43..4d2130320 100644 --- a/translations/client_pl.ts +++ b/translations/client_pl.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="pl"> <context> <name>ActivityActionButton</name> <message> @@ -891,33 +891,38 @@ Ta czynność spowoduje przerwanie aktualnie uruchomionej synchronizacji.</trans <translation>Plik usunięty (rozpocznij wysyłanie) %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Plik lokalny zmieniony podczas synchronizacji. Zostanie wznowiony.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation>Plik lokalny zmieniony podczas synchronizacji.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation>Błąd podczas aktualizowania metadanych: %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation>Plik %1 jest aktualnie używany</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation>Plik lokalny został usunięty podczas synchronizacji.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation>; Przywracanie nie powiodło się: %1</translation> </message> @@ -925,7 +930,7 @@ Ta czynność spowoduje przerwanie aktualnie uruchomionej synchronizacji.</trans <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Błąd zapisu metadanych do bazy danych</translation> </message> @@ -3440,52 +3445,52 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <translation>Serwer zgłosił brak %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation>Konflikt podczas wysyłania niektórych plików do katalogu. Konfliktowe zostaną wyjaśnione!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Konflikt podczas wysyłania katalogu. To się wyjaśni!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Konflikt podczas wysyłania pliku. Zostanie usunięty!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignorowane z powodu czarnej listy "Wybierz co synchronizować"</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Niedozwolone, ponieważ nie masz uprawnień do dodawania podkatalogów do tego katalogu</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Niedozwolone, ponieważ nie masz uprawnień do dodawania plików w tym katalogu</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Przesyłanie niedozwolone, ponieważ plik jest "tylko do odczytu" na serwerze, przywracanie</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation>Przeniesiono do nieprawidłowego obiektu, przywracanie</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation>Brak uprawnień by usunąć, przywracanie</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation>Błąd podczas odczytu bazy danych</translation> </message> @@ -3495,7 +3500,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <translation>Serwer odpowiedział z błędem podczas odczytu katalogu '%1' : %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>Serwer odpowiedział z błędem podczas odczytu katalogu "%1" : %2</translation> </message> @@ -3508,12 +3513,17 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <translation>Błąd podczas zapisu metadanych do bazy danych</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation>Błąd podczas aktualizowania metadanych: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation>Plik jest aktualnie używany</translation> </message> @@ -3532,13 +3542,13 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>W trakcie wyszukiwania plik uległ zmianie</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation>Nie można pobrać pliku %1 z powodu konfliktu nazwy pliku lokalnego!</translation> </message> @@ -3548,22 +3558,22 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <translation>Nie można pobrać pliku %1 ze względu na konflikt nazwy pliku lokalnego!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>Pobranie zmniejszyłoby wolne miejsce na dysku lokalnym poniżej limitu</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>Wolne miejsce na dysku jest mniejsze niż %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>Plik został usunięty z serwera</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>Plik nie mógł być całkowicie pobrany.</translation> </message> @@ -3573,12 +3583,12 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <translation>Pobrany plik jest pusty, mimo że serwer stwierdził, że powinien być %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation>Pobrany plik jest pusty, ale serwer odpowiedział, że powinien mieć %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Nie można zapisać pliku %1 z powodu lokalnego konfliktu nazwy pliku!</translation> </message> @@ -3588,12 +3598,18 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <translation>Błąd podczas zapisu metadanych do bazy danych</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation>Błąd podczas aktualizowania metadanych: %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation>Plik %1 jest aktualnie używany</translation> </message> @@ -3781,38 +3797,44 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation>Nie udało się wysłać zaszyfrowanego pliku.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>Plik %1 nie może zostać wysłany, ponieważ istnieje inny plik o tej samej nazwie.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>Wysłanie %1 przekracza limit dla katalogu</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>Plik usunięto (rozpoczęto wysyłanie) %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Plik lokalny zmieniony podczas synchronizacji. Zostanie wznowiony.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>Plik lokalny zmieniony podczas synchronizacji.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation>Nie udało się odblokować zaszyfrowanego katalogu.</translation> </message> @@ -3822,12 +3844,12 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <translation>Błąd zapisu metadanych do bazy danych</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation>Błąd podczas aktualizowania metadanych: %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation>Plik %1 jest aktualnie używany</translation> </message> @@ -3835,32 +3857,32 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>Pliki lokalny został usunięty podczas synchronizacji.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>Plik lokalny zmieniony podczas synchronizacji.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation>Brak adresu URL sondy</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Nieoczekiwana odpowiedź z serwera (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>Brak pliku ID z serwera</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>Brak ETag z serwera</translation> </message> @@ -3868,22 +3890,22 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>Brak adresu URL ankiety</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>Pliki lokalny został usunięty podczas synchronizacji.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>Plik lokalny zmieniony podczas synchronizacji.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>Serwer nie potwierdził ostatniego fragmentu. (Nie odnaleziono e-tag)</translation> </message> @@ -5073,24 +5095,24 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation><p>%1 Desktop Client</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>Wersja %1. Aby uzyskać więcej informacji, kliknij <a href='%2'>tutaj</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation><p><small>Używanie wtyczki plików wirtualnych: %1</small></p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>To wydanie zostało dostarczone przez %1</p></translation> </message> @@ -5280,6 +5302,24 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6288,7 +6328,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>Zbudowany na podstawie wersji Git <a href="%1">%2</a> na %3, %4 przy użyciu Qt %5, %6</small></p></translation> </message> diff --git a/translations/client_pt.ts b/translations/client_pt.ts index b5c3210de..5c52bb78b 100644 --- a/translations/client_pt.ts +++ b/translations/client_pt.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_PT" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="pt_PT"> <context> <name>ActivityActionButton</name> <message> @@ -886,33 +886,38 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -920,7 +925,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Erro ao gravar os metadados para a base de dados</translation> </message> @@ -3397,52 +3402,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3452,7 +3457,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -3465,12 +3470,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Erro ao escrever a meta-informação par a base de dados</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation type="unfinished"/> </message> @@ -3489,13 +3499,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>O ficheiro alterou-se desde a sua descoberta</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3505,22 +3515,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Não foi possível transferir o ficheiro %1 devido a um conflito com o nome de ficheiro local!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>A transferência iria reduzir o espaço livre local acima do limite</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>O Espaço livre no disco é inferior a %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>O ficheiro foi eliminado do servidor</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>Não foi possível transferir o ficheiro na totalidade.</translation> </message> @@ -3530,12 +3540,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Ficheiro %1 não pode ser guardado devido à existência de um ficheiro local com o mesmo nome.</translation> </message> @@ -3545,12 +3555,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Erro ao gravar os metadados para a base de dados</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3738,38 +3754,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>Não foi possível transferir o ficheiro %1 devido a existir um ficheiro com o mesmo nome, diferenciando apenas as maiúsculas ou minúsculas.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>Ficheiro Removido (iniciar upload) %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>O ficheiro local foi alterado durante a sincronização. Vai ser finalizado.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>Ficheiro local alterado durante a sincronização.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation type="unfinished"/> </message> @@ -3779,12 +3801,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Erro ao gravar os metadados para a base de dados</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3792,32 +3814,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>O arquivo local foi removido durante a sincronização.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>Ficheiro local alterado durante a sincronização.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Código de resposta inesperado do servidor (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>ID do ficheiro no servidor em falta</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>ETag do servidor em falta</translation> </message> @@ -3825,22 +3847,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>URL poll em falta</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>O arquivo local foi removido durante a sincronização.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>Ficheiro local alterado durante a sincronização.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>O servidor não reconheceu a última parte. (Nenhuma e-tag estava presente)</translation> </message> @@ -5030,24 +5052,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>Versão %1. Para mais informação por favor clique <a href='%2'>aqui</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>Esta versão foi fornecida por %1</p></translation> </message> @@ -5237,6 +5259,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6245,7 +6285,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>Construido a partir da revisão Git <a href="%1">%2</a> em %3, %4 usando Qt %5, %6</small></p></translation> </message> diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts index 7ed857c1c..380c3bb6a 100644 --- a/translations/client_pt_BR.ts +++ b/translations/client_pt_BR.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_BR" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="pt_BR"> <context> <name>ActivityActionButton</name> <message> @@ -878,54 +878,59 @@ Esta ação irá cancelar qualquer sincronização atualmente em execução.</tr <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="122"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> - <translation type="unfinished"/> + <translation>O arquivo %1 não pode ser carregado porque existe outro arquivo com o mesmo nome, diferindo apenas no caso</translation> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="271"/> <source>File removed (start upload) %1</source> - <translation type="unfinished"/> + <translation>Arquivo removido (iniciar envio) %1</translation> </message> <message> <location filename="../src/libsync/bulkpropagatorjob.cpp" line="271"/> <source>File Removed (start upload) %1</source> + <translation>Arquivo removido (iniciar envio) %1</translation> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> - <translation type="unfinished"/> + <translation>Arquivo local alterado durante a sincronização. Será retomado.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> - <translation type="unfinished"/> + <translation>Arquivo local alterado durante a sincronização.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> - <translation type="unfinished"/> + <translation>Erro ao atualizar metadados: %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> - <translation type="unfinished"/> + <translation>O arquivo %1 está atualmente em uso</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> - <translation type="unfinished"/> + <translation>O arquivo local foi removido durante a sincronização.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> - <translation type="unfinished"/> + <translation>; A restauração falhou: %1</translation> </message> </context> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Ocorreu um erro ao escrever metadados no banco de dados</translation> </message> @@ -3438,52 +3443,52 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>Servidor relatou não %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation>Conflito ao enviar alguns arquivos para uma pasta. Esses, em conflito, serão eliminados! </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Conflito ao enviar uma pasta. Vai ser limpa! </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Conflito ao enviar um arquivo. Vai ser removido! </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignorado devido à lista negra "escolher o que sincronizar" </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Não permitido porque você não tem permissão para adicionar subpastas a essa pasta</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Não permitido porque você não tem permissão para adicionar arquivos nessa pasta </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Não é permitido fazer upload deste arquivo porque ele é somente leitura no servidor, restaurando </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation>Movido para destino inválido, restaurando </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation>Não tem permissão para remover, restaurar </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation>Erro ao ler o banco de dados </translation> </message> @@ -3493,7 +3498,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>O servidor respondeu com um erro ao ler o diretório '%1' : %2 </translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>O servidor respondeu com um erro ao ler o diretório "%1" : %2</translation> </message> @@ -3506,12 +3511,17 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>Ocorreu um erro ao escrever metadados no banco de dados</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation>Erro ao atualizar metadados: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation>O arquivo está atualmente em uso </translation> </message> @@ -3530,13 +3540,13 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>O arquivo foi alterado desde a descoberta</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation>O arquivo %1 não pode ser baixado devido a um conflito local no nome do arquivo!</translation> </message> @@ -3546,22 +3556,22 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>O arquivo %1 não pode ser baixado devido a um conflito local no nome do arquivo!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>O download reduziria o espaço livre no disco local abaixo do limite</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>O espaço livre no disco é inferior a %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>O arquivo foi apagado do servidor</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>O arquivo não pôde ser baixado completamente.</translation> </message> @@ -3571,12 +3581,12 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>O arquivo baixado está vazio apesar do servidor ter anunciado que ele deveria ter %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation>O arquivo baixado está vazio, mas o servidor disse que deveria ser %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>O arquivo %1 não pôde ser salvo devido a um conflito com um nome de arquivo local!</translation> </message> @@ -3586,12 +3596,18 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>Ocorreu um erro ao escrever metadados no banco de dados</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation>Erro ao atualizar metadados: %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation>O arquivo %1 está correntemente em uso</translation> </message> @@ -3779,38 +3795,44 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation>Falha ao fazer upload do arquivo criptografado. </translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>O arquivo %1 não pôde ser enviado porque um outro arquivo com o mesmo nome, diferenciando apenas letras maiúsculas e minúsculas, existe</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>O envio de %1 excede a cota para a pasta</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>Arquivo Removido (iniciar envio) %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Arquivo local alterado durante a sincronização. Ele será retomado.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>Arquivo local modificado durante a sincronização.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation>Falha ao desbloquear a pasta criptografada. </translation> </message> @@ -3820,12 +3842,12 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <translation>Ocorreu um erro ao escrever metadados no banco de dados</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation>Erro ao atualizar metadados: %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation>O arquivo %1 está correntemente em uso</translation> </message> @@ -3833,32 +3855,32 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>O arquivo local foi removido durante a sincronização.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>O arquivo local foi modificado durante a sincronização.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation>URL de enquete ausente </translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Código de retorno inesperado do servidor (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>Falta ID do arquivo do servidor</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>Falta ETag do servidor</translation> </message> @@ -3866,22 +3888,22 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>Faltando conjunto de URL</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>O arquivo local foi removido durante a sincronização.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>O arquivo local foi modificado durante a sincronização.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>O servidor não reconheceu o último pedaço. (Nenhuma e-tag estava presente)</translation> </message> @@ -5071,24 +5093,24 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation><p>%1 Cliente Desktop</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>Versão %1. Para mais informações clique <a href='%2'>aqui</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation><p><small>Usando o plugin de arquivos virtuais: %1</small></p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>Esta versão foi fornecida por %1</p></translation> </message> @@ -5278,6 +5300,24 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6286,7 +6326,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>Construído da revisão Git <a href="%1">%2</a> em %3, %4 usando Qt %5, %6</small></p></translation> </message> diff --git a/translations/client_ro.ts b/translations/client_ro.ts index a0241b8cf..346387b0f 100644 --- a/translations/client_ro.ts +++ b/translations/client_ro.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="ro" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="ro"> <context> <name>ActivityActionButton</name> <message> @@ -891,33 +891,38 @@ Această acțiune va opri toate sincronizările în derulare din acest moment.</ <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -925,7 +930,7 @@ Această acțiune va opri toate sincronizările în derulare din acest moment.</ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>A apărut o eroare în timpul scrierii de metadata în baza de date</translation> </message> @@ -3410,52 +3415,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3465,7 +3470,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -3478,12 +3483,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation type="unfinished"/> </message> @@ -3502,13 +3512,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation type="unfinished"/> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3518,22 +3528,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation type="unfinished"/> </message> @@ -3543,12 +3553,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3558,12 +3568,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3751,38 +3767,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation type="unfinished"/> </message> @@ -3792,12 +3814,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3805,32 +3827,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation type="unfinished"/> </message> @@ -3838,22 +3860,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation type="unfinished"/> </message> @@ -5041,24 +5063,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -5248,6 +5270,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6256,7 +6296,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation type="unfinished"/> </message> diff --git a/translations/client_ru.ts b/translations/client_ru.ts index 473fa965d..baaa0e3c4 100644 --- a/translations/client_ru.ts +++ b/translations/client_ru.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="ru" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="ru"> <context> <name>ActivityActionButton</name> <message> @@ -890,33 +890,38 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -924,7 +929,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Ошибка записи метаданных в базу данных</translation> </message> @@ -3436,52 +3441,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Сервер сообщил об отсутствии % 1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation>Передача файлов в папку на сервере привела к конфликту версий. Файлы, вызвавшие конфликт версий, будут удалены.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Передача папки на сервер привела к конфликту версии. Папка, вызвавшая конфликт версии, будет удалена.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Передача файла на сервер привела к конфликту версии. Файл, вызвавший конфликт версии, будет удалён.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Игнорируется из-за совпадения с записью в списке исключений из синхронизации</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Недостаточно прав для создания вложенных папок</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Недостаточно прав для создания файлов в этой папке</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Передача этого файла на сервер не разрешена, т.к. он доступен только для чтения, выполняется восстановление</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation>Перемещено в некорректное расположение, выполняется восстановление</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation>Удаление недопустимо, выполняется восстановление</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation>Ошибка чтения базы данных</translation> </message> @@ -3491,7 +3496,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ошибка сервера при попытке прочитать каталог «%1»: %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>Ошибка сервера при попытке прочитать каталог «%1»: %2</translation> </message> @@ -3504,12 +3509,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ошибка записи метаданных в базу данных</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation>Ошибка обновления метаданных: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation>Файл используется</translation> </message> @@ -3528,13 +3538,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>После обнаружения файл был изменен</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation>Файл %1 не может быть загружен из-за локального конфликта имён.</translation> </message> @@ -3544,22 +3554,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Файл «%1» не может быть загружен из-за локального конфликта имён.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>Загрузка файлов с сервера уменьшит доступное пространство на локальном диске ниже допустимого предела</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>Свободного места на диске меньше чем %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>Файл удалён с сервера</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>Невозможно полностью загрузить файл.</translation> </message> @@ -3569,12 +3579,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Скачанный файл пуст, хотя сервер сообщил, что его размер должен составлять %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation>Скачанный файл пуст, хотя сервер сообщил, что его размер должен составлять %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Файл «%1» не может быть сохранён по причине локального конфликта имён.</translation> </message> @@ -3584,12 +3594,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ошибка записи метаданных в базу данных</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation>Ошибка обновления метаданных: %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation>Файл «%1» используется</translation> </message> @@ -3777,38 +3793,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation>Не удалось передать на сервер зашифрованный файл.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>Невозможно загрузить файл «%1», так как уже существует файл с тем же именем, но отличающимся регистром символов</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>При передаче «%1» на сервер будет превышена квота, установленная для папки</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>Файл удалён (начало передачи) %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Локальный файл изменился в процессе синхронизации. Операция будет возобновлена.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>Локальный файл был изменён во время синхронизации.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation>Не удалось разблокировать зашифрованную папку.</translation> </message> @@ -3818,12 +3840,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Ошибка записи метаданных в базу данных</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation>Ошибка обновления метаданных: %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation>Файл «%1» используется</translation> </message> @@ -3831,32 +3853,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>Локальный файл был удалён в процессе синхронизации.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>Локальный файл изменился в процессе синхронизации.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation>Не хватает сформированного URL</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Неожиданный код завершения от сервера (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>Отсутствует код файла от сервера</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>Отсутствует ETag с сервера</translation> </message> @@ -3864,22 +3886,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>Не хватает сформированного URL</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>Локальный файл был удалён в процессе синхронизации.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>Локальный файл изменился в процессе синхронизации.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>Сервер не смог подтвердить последнюю часть данных.(Отсутствовали теги e-tag)</translation> </message> @@ -5069,24 +5091,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation><p>%1 клиент для ПК</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>Версия %1. Для получения дополнительной информации нажмите <a href='%2'>сюда</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation><p><small>Используемый модуль поддержки виртуальных файлов: %1</small></p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>Этот выпуск подготовлен %1</p></translation> </message> @@ -5276,6 +5298,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6285,7 +6325,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>Собрано из исходников Git версии <a href="%1">%2</a> на %3, %4 с использованием библиотек Qt %5, %6</small></p></translation> </message> diff --git a/translations/client_sc.ts b/translations/client_sc.ts index 11eb9878f..d58d09796 100644 --- a/translations/client_sc.ts +++ b/translations/client_sc.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="sc" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="sc"> <context> <name>ActivityActionButton</name> <message> @@ -891,33 +891,38 @@ Custa atzione at a firmare cale si siat sincronizatzione immoe in esecutzione.</ <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -925,7 +930,7 @@ Custa atzione at a firmare cale si siat sincronizatzione immoe in esecutzione.</ <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>DDoe at àpidu un'errore iscriende metadatos in sa base de datos</translation> </message> @@ -3439,52 +3444,52 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation>B'at un'iscòrriu carrighende unos archìvios a sa cartella. Cussos in iscòrriu ant a èssere cantzellados!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Iscòrriu carrighende una cartella. Custa s'at a cantzellare!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Iscòrriu carrighende un'archìviu. Custu s'at a cantzellare!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignoradu ca in sa lista niedda de is cosas de no sincronizare</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Non podes ca non tenes su permissu pro agiùnghere sutacartellas a custas cartellas</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation> Non podes ca non tenes su permissu pro agiùnghere archìvios a custa cartella</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Non podes carrigare custu archìviu ca in su serbidore podes isceti lèghere, riprìstinu</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation>Tramudadu a un'indiritzu non bàlidu, riprìstinu</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation>Non ddu podes bogare, riprìstinu</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation>Errore leghende sa base de datos</translation> </message> @@ -3494,7 +3499,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <translation>Su serbidore at dadu errore leghende sa cartella '%1' : %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>Su serbidore nd'at torradu un'errore leghende sa cartella "%1" : %2</translation> </message> @@ -3507,12 +3512,17 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <translation>Errore iscriende metadatos in sa base de datos</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation>Errore agiornende is metadatos: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation>S'archìviu est giai impreadu</translation> </message> @@ -3531,13 +3541,13 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>Archìviu cambiadu in pessu rilevadu</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation>S'archìviu %1 nn faghet a dd'iscarrigare pro unu cunflitu cun su nùmene de s'archìviu locale!</translation> </message> @@ -3547,22 +3557,22 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <translation> S'archìviu %1 non podet èssere iscarrigadu pro unu cunflitu cun un'archìviu locale!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>S'iscarrigamentu at a torrare a suta de su lìmite su logu lìberu in su discu locale </translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>Su logu lìberu in su discu est prus pagu de %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>S'archìviu est cantzelladu dae su serbidore</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>No at fatu a iscarrigare s'archìviu de su totu</translation> </message> @@ -3572,12 +3582,12 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <translation> S'archìviu iscarrigadu est bòidu mancari su serbidore indicaret una mannària de %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation> S'archìviu iscarrigadu est bòidu, ma su serbidore at indicadu una mannària de %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>S'archìviu %1 non podet èssere sarvadu pro unu cunflitu in unu'archìviu locale!</translation> </message> @@ -3587,12 +3597,18 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <translation>Errore iscriende is metadatos in su base de datos</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation>Errore agiornende is metadatos: %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation>S'archìviu %1 est giai impreadu</translation> </message> @@ -3780,38 +3796,44 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation>Carrigamentu de s'archìviu criptadu faddidu</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>S'archìviu %1 non podet èssere carrigadu ca ddo est un'àteru archìviu cun su pròpiu nùmene, ma cun diferèntzias intre maiùsculas e minùsculas</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation> Su carrigamentu de %1 sùperat sa cuota a cartella</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>Archìviu bogadu (aviu de su carrigamentu) %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation> S'archìviu locale est istadu modificadu durante sa sincronizatzione. At a èssere ripristinadu.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>Archìviu locale cambiadu durante sa sincronizatzione.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation>Isblocu de sa cartella criptada faddidu.</translation> </message> @@ -3821,12 +3843,12 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <translation>Errore iscriende is metadatos in sa base de datos</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation>Errore agiornende is metadatos: %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation>S'archìviu %1 est giai impreadu</translation> </message> @@ -3834,32 +3856,32 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>S'archìviu locale est istadu bogadu durante sa sincronizatzione.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>Archìviu locale cambiadu durante sa sincronizatzione.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation>Mancat su URL de su sondàgiu </translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Còdighe de essida inatesu dae su serbidore (%1) </translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>Archìviu ID mancante dae su serbidore</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation> Eeticheta chi mancat dae su serbidore</translation> </message> @@ -3867,22 +3889,22 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>Mancat su URL de su sondàgiu </translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>S'archìviu locale est bogadu durante sa sincronizatzione.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>Archìviu locale cambiadu durante sa sincronizatzione.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>Su serbidore no at reconnotu s'ùrtimu cantu. (Non bi fiat peruna eticheta eletrònica)</translation> </message> @@ -5072,24 +5094,24 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation><p>%1 Cliente de iscrivania</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>Versione %1. Pro àteras informatziones incarca <a href='%2'>inoghe</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation><p><small>Impreende s'estensione de archìvios virtuales: %1</small></p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>Custa versione est dispensada dae %1</p></translation> </message> @@ -5279,6 +5301,24 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6287,7 +6327,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>Cumpiladu dae sa versione Git <a href="%1">%2</a> on %3, %4 impreende Qt %5, %6</small></p></translation> </message> diff --git a/translations/client_sk.ts b/translations/client_sk.ts index 8f24d7c2a..3d68f7b16 100644 --- a/translations/client_sk.ts +++ b/translations/client_sk.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="sk_SK" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="sk_SK"> <context> <name>ActivityActionButton</name> <message> @@ -891,33 +891,38 @@ Táto akcia zruší všetky prebiehajúce synchronizácie.</translation> <translation>Súbor odobratý (spustiť nahrávanie) %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Lokálny súbor bol zmenený počas synchronizácie. Nahrávanie bude obnovené.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation>Lokálny súbor bol zmenený počas synchronizácie.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation>Chyba pri aktualizácii metadát: %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation>Súbor %1 sa v súčasnosti používa</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation>Lokálny súbor bol odstránený počas synchronizácie.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation>; Obnovenie zlyhalo: %1</translation> </message> @@ -925,7 +930,7 @@ Táto akcia zruší všetky prebiehajúce synchronizácie.</translation> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Chyba pri zápise metadát do databázy</translation> </message> @@ -3439,52 +3444,52 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <translation>Server nevrátil žiadne %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation>Konflikt pri nahrávaní niektorých súborov do priečinka. Konfliktné súbory budú odstránené!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Konflikt pri nahrávaní priečinka. Bude odstránený!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Konflikt pri nahrávaní súboru. Bude odstránený!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Ignorované podľa nastavenia "vybrať čo synchronizovať"</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Nie je dovolené, lebo nemáte oprávnenie pridávať podpriečinky do tohto priečinka</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Nie je možné, pretože nemáte oprávnenie pridávať súbory do tohto priečinka</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Nie je dovolené tento súbor nahrať, pretože je na serveri iba na čítanie, obnovujem</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation>Presunuté do neplatného cieľa, obnovujem</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation>Nie je dovolené odstrániť, obnovujem</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation>Chyba pri čítaní z databáze</translation> </message> @@ -3494,7 +3499,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <translation>Server odpovedal chybne počas čítania adresára '%1' : %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>Server odpovedal chybne počas načítania priečinka "%1" : %2</translation> </message> @@ -3507,12 +3512,17 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <translation>Chyba pri zápise metadát do databázy</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation>Chyba pri aktualizácii metadát: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation>Súbor sa v súčasnosti používa</translation> </message> @@ -3531,13 +3541,13 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>Súbor sa medzitým zmenil</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation>Súbor %1 nie je možné stiahnuť, pretože súbor s rovnakým menom už existuje!</translation> </message> @@ -3547,22 +3557,22 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <translation>Súbor %1 nie je možné stiahnuť, pretože súbor s rovnakým menom už existuje!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>Sťahovanie by znížilo miesto na lokálnom disku pod nastavený limit </translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>Voľné miesto na disku je menej ako %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>Súbor bol vymazaný zo servera</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>Súbor sa nedá stiahnuť úplne.</translation> </message> @@ -3572,12 +3582,12 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <translation>Prebratý súbor je prázdny napriek tomu, že server oznámil, že mal mať %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation>Prebratý súbor je prázdny napriek tomu, že server oznámil, že mal mať %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Súbor %1 nie je možné uložiť, pretože jeho názov koliduje s názvom lokálneho súboru!</translation> </message> @@ -3587,12 +3597,18 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <translation>Chyba pri zápise metadát do databázy</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation>Chyba pri aktualizácii metadát: %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation>Súbor %1 sa v súčasnosti používa</translation> </message> @@ -3780,38 +3796,44 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation>Zlyhalo nahrávanie šifrovaného súboru.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>Súbor %1 nie je možné nahrať, pretože existuje iný súbor s rovnakým názvom, ktorý sa líši len veľkostou písmen</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>Nahranie %1 prekračuje kvótu, ktorá je pre priečinok nastavená</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>Súbor odobratý (spustiť nahrávanie) %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Lokálny súbor bol zmenený počas synchronizácie. Bude obnovený.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>Lokálny súbor bol zmenený počas synchronizácie.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation>Zlyhalo odomykanie zamknutého adresára.</translation> </message> @@ -3821,12 +3843,12 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <translation>Chyba pri zápise metadát do databázy</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation>Chyba pri aktualizácii metadát: %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation>Súbor %1 sa v súčasnosti používa</translation> </message> @@ -3834,32 +3856,32 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>Lokálny súbor bol odstránený počas synchronizácie.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>Lokálny súbor bol zmenený počas synchronizácie.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation>Chýba Poll URL</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Neočakávaný návratový kód zo servera (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>Chýba ID (identifikátor) súboru zo servera</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>Chýba ETag zo servera</translation> </message> @@ -3867,22 +3889,22 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>Chýba URL adresa</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>Lokálny súbor bol odstránený počas synchronizácie.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>Lokálny súbor bol zmenený počas synchronizácie.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>Server nepotvrdil poslednú časť dát (nenašiel sa e-tag).</translation> </message> @@ -5072,24 +5094,24 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation><p>%1 Klient pre počítač</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>Verzia %1. Viac informácií získate <a href='%2'>kliknutím sem</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation><p><small>Používa zásuvný modul virtuálnych súborov: %1</small></p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>Toto vydanie bolo poskytnuté %1</p></translation> </message> @@ -5279,6 +5301,24 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6287,7 +6327,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>Zostavené z Git revízie <a href="%1">%2</a> na %3, %4 s použitím Qt %5, %6</small></p></translation> </message> diff --git a/translations/client_sl.ts b/translations/client_sl.ts index 7cb1d2ee2..99a497414 100644 --- a/translations/client_sl.ts +++ b/translations/client_sl.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="sl" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="sl"> <context> <name>ActivityActionButton</name> <message> @@ -891,33 +891,38 @@ S tem dejanjem prav tako prekinete vsa trenutna usklajevanja v izvajanju.</trans <translation>Datoteka je odstranjena (začni pošiljanje) %1.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Krajevna datoteka je bila med usklajevanjem spremenjena. Usklajena bo, ko bo shranjena.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation>Krajevna datoteka je bila med usklajevanjem spremenjena.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation>Prišlo je do napake posodabljanja metapodatkov: %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation>Datoteka %1 je trenutno v uporabi.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation>Krajevna datoteka je bila med usklajevanjem odstranjena.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation>Obnovitev je spodletela: %1</translation> </message> @@ -925,7 +930,7 @@ S tem dejanjem prav tako prekinete vsa trenutna usklajevanja v izvajanju.</trans <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Napaka zapisovanja metapodatkov v podatkovno zbirko</translation> </message> @@ -3438,52 +3443,52 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <translation>Prejet je odziv strežnika %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation>Zaznan je spor pri nalaganju nekaterih datotek v mapo. Spori bodo samodejno počiščeni!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Zaznan je spor pri pošiljanju mape. Mapa bo počiščena!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Zaznan je spor pri pošiljanju datoteke. Datoteka bo odstranjena!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>Predmet ni usklajevan, ker je na »črnem seznamu datotek« za usklajevanje</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Dejanje ni dovoljeno! Ni ustreznih dovoljenj za dodajanje podmap v to mapo.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Dejanje ni dovoljeno, ker ni ustreznih dovoljenj za dodajanje datotek v to mapo</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Te datoteke ni dovoljeno poslati, ker ima določena dovoljenja le za branje. Datoteka bo obnovljena na izvorno različico.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation>Predmet je premaknjen na neveljaven cilj, vsebina bo obnovljena.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation>Odstranjevanje ni dovoljeno, vsebina bo obnovljena.</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation>Napaka branja podatkovne zbirke</translation> </message> @@ -3493,7 +3498,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <translation>Odziv strežnika vključuje napako med branjem mape »%1«: %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>Odziv strežnika vključuje napako med branjem mape »%1«: %2</translation> </message> @@ -3506,12 +3511,17 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <translation>Napaka zapisovanja metapodatkov v podatkovno zbirko</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation>Prišlo je do napake posodabljanja metapodatkov: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation>Datoteka je trenutno v uporabi.</translation> </message> @@ -3530,13 +3540,13 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>Datoteka je bila spremenjena po usklajevanju seznama datotek</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation>Datoteke %1 ni mogoče prejeti zaradi neskladja z imenom krajevne datoteke!</translation> </message> @@ -3546,22 +3556,22 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <translation>Datoteke %1 ni mogoče prejeti zaradi neskladja z imenom krajevne datoteke!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>Prejem predmetov bi zmanjšal prostor na krajevnem disku pod določeno omejitev.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>Na disku je prostora manj kot %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>Datoteka je izbrisana s strežnika</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>Datoteke ni mogoče prejeti v celoti.</translation> </message> @@ -3571,12 +3581,12 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <translation>Prejeta datoteka je prazna, čeprav je s strešnika javljena velikost %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation>Prejeta datoteka je prazna, čeprav je na strežniku velikosti %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Datoteke %1 ni mogoče shraniti zaradi neskladja z imenom obstoječe datoteke!</translation> </message> @@ -3586,12 +3596,18 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <translation>Napaka zapisovanja metapodatkov v podatkovno zbirko</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation>Prišlo je do napake posodabljanja metapodatkov: %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation>Datoteka %1 je trenutno v uporabi.</translation> </message> @@ -3779,38 +3795,44 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation>Pošiljanje šifrirane datoteke je spodletelo.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>Datoteke %1 ni mogoče naložiti, saj obstaja druga, istoimenska datoteka, ki se od nje razlikuje le po velikih črkah v imenu.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>Pošiljanje %1 preseže omejitev, določeno za mapo.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>Datoteka je odstranjena (začni pošiljanje) %1.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Krajevna datoteka je bila med usklajevanjem spremenjena. Usklajena bo, ko bo shranjena.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>Krajevna datoteka je bila med usklajevanjem spremenjena.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation>Odklepanje šifrirane mape je spodletelo.</translation> </message> @@ -3820,12 +3842,12 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <translation>Napaka zapisovanja metapodatkov v podatkovno zbirko</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation>Prišlo je do napake posodabljanja metapodatkov: %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation>Datoteka %1 je trenutno v uporabi.</translation> </message> @@ -3833,32 +3855,32 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>Krajevna datoteka je bila med usklajevanjem odstranjena.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>Krajevna datoteka je bila med usklajevanjem spremenjena.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation>Preveri manjkajoči naslov URL</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Napaka: nepričakovan odziv s strežnika (%1).</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>Na strežniku manjka ID datoteke</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>Na strežniku manjka datoteka ETag</translation> </message> @@ -3866,22 +3888,22 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>Preveri manjkajoči naslov URL</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>Krajevna datoteka je bila med usklajevanjem odstranjena.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>Krajevna datoteka je bila med usklajevanjem spremenjena.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>Strežnik ne sprejme zadnjega paketa (ni navedene e-oznake)</translation> </message> @@ -5071,24 +5093,24 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation><p>Namizni program %1</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>Nameščena je različica %1. Več podrobnosti je zabeleženih v <a href='%2'>priročniku Nextcloud</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation><p><small>Uporablja vstavek navideznih datotek: %1</small></p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>Objavo je omogočila skupina %1</p></translation> </message> @@ -5278,6 +5300,24 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6286,7 +6326,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>Izgradnje iz predelave Git <a href="%1">%2</a> na %3, %4 z uporabo Qt %5, %6</small></p></translation> </message> diff --git a/translations/client_sr.ts b/translations/client_sr.ts index 53a6c7897..f81ca8c37 100644 --- a/translations/client_sr.ts +++ b/translations/client_sr.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="sr" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="sr"> <context> <name>ActivityActionButton</name> <message> @@ -887,33 +887,38 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -921,7 +926,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Грешка приликом уписивања метаподатака у базу</translation> </message> @@ -3413,52 +3418,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3468,7 +3473,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -3481,12 +3486,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Грешка при упису мета података у базу</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation type="unfinished"/> </message> @@ -3505,13 +3515,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>Фајл је измењен у међувремену</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3521,22 +3531,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Фајл %1 се не може преузети јер се судара са називом локалног фајла!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>Преузимање ће смањити слободно место на диску испод границе</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>Слободан простор на диску је мањи од %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>Фајл је обрисан са сервера</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>Фајл није могао бити преузет у потпуности.</translation> </message> @@ -3546,12 +3556,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Преузети фајл је празан иако је сервер рекао да треба да је %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Фајл %1 се не може сачувати јер се судара са називом локалног фајла!</translation> </message> @@ -3561,12 +3571,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Грешка при упису мета података у базу</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3754,38 +3770,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>Фајл %1 се не може отпремити јер постоји други фајл, чије се име разликује само у великим и малим словима</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>Отпремање %1 премашује квоту фасцикле</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>Фајл уклоњен (започето отпремање) %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Локални фајл је измењен током синхронизације. Биће настављена.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>Локални фајл измењен током синхронизације.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation type="unfinished"/> </message> @@ -3795,12 +3817,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Грешка приликом уписа метаподатака у базу података</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3808,32 +3830,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>Локални фајл је уклоњен током синхронизације.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>Локални фајл измењен током синхронизације.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Неочекивани повратни код са сервера (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>ID фајла недостаје са сервера</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>ETag фајла недостаје са сервера</translation> </message> @@ -3841,22 +3863,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>Адреса упита недостаје</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>Локални фајл је уклоњен током синхронизације.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>Локални фајл измењен током синхронизације.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>Сервер није потврдио пријем последњег комада. (нема e-tag-а)</translation> </message> @@ -5046,24 +5068,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation><p>%1 десктоп клијент</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>Верзија %1. За више информација кликните <a href='%2'>овде</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>Ово издање је обезбедио %1</p></translation> </message> @@ -5253,6 +5275,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6261,7 +6301,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>Направљено од ГИТ ревизије <a href="%1">%2</a> %3, %4 користећи QT %5, %6</small></p></translation> </message> diff --git a/translations/client_sv.ts b/translations/client_sv.ts index 5545da03a..c69ce39b8 100644 --- a/translations/client_sv.ts +++ b/translations/client_sv.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="sv" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="sv"> <context> <name>ActivityActionButton</name> <message> @@ -887,33 +887,38 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -921,7 +926,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Fel vid skrivning av metadata till databasen</translation> </message> @@ -3415,52 +3420,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Servern svarade inte %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation>Borttagning tillåts ej, återställer</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation>Fel uppstod när databasen skulle läsas</translation> </message> @@ -3470,7 +3475,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -3483,12 +3488,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Fel vid skrivning av metadata till databasen</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation>Ett fel uppstod när metadata skulle uppdateras: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation>Filen används</translation> </message> @@ -3507,13 +3517,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>Filen har ändrats sedan upptäckten</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3523,22 +3533,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Filen %1 kan inte hämtas på grund av namnkonflikt med en lokal fil!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>Hämtningen skulle reducera det fria diskutrymmet under gränsen</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>Ledigt utrymme är under %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>Filen har tagits bort från servern</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>Filen kunde inte hämtas fullständigt.</translation> </message> @@ -3548,12 +3558,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Den hämtade filen är tom trots att servern meddelade att den borde ha varit %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Fil %1 kan inte sparas eftersom namnet krockar med en lokal fil!</translation> </message> @@ -3563,12 +3573,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Fel vid skrivning av metadata till databasen</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation>Filen %1 används för tillfället</translation> </message> @@ -3756,38 +3772,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation>Kunde inte ladda upp krypterad fil.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>Fil %1 kan inte laddas upp eftersom en annan fil med samma namn, där endast stora/små bokstäver skiljer sig, existerar</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>Uppladdningen av %1 överstiger kvoten för mappen</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>Filen borttagen (starta uppladdning) %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Lokal fil ändrades under synkronisering. Den kommer återupptas.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>Lokal fil ändrades under synkronisering.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation>Kunde inte låsa upp krypterad mapp.</translation> </message> @@ -3797,12 +3819,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Fel vid skrivning av metadata till databasen</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation>Filen %1 används för tillfället</translation> </message> @@ -3810,32 +3832,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>Den lokala filen togs bort under synkronisering.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>Lokal fil ändrades under synkronisering.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Oväntad svarskod från servern (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>Saknar Fil-ID från servern</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>Saknar ETag från servern</translation> </message> @@ -3843,22 +3865,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>Hämtningswebbadress saknas</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>Den lokala filen togs bort under synkronisering.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>Lokal fil ändrades under synkronisering.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>Servern bekräftade inte senaste leveransen. (Ingen e-tagg fanns)</translation> </message> @@ -5048,24 +5070,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation><p>%1 Skrivbordsklient</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>Version %1. För mer information klicka <a href='%2'>här</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>Denna release levererades av %1</p></translation> </message> @@ -5255,6 +5277,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6263,7 +6303,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>Byggd från Git revision <a href="%1">%2</a> den %3, %4 med Qt %5, %6</small></p></translation> </message> diff --git a/translations/client_th.ts b/translations/client_th.ts index 008cdb2b7..c5b632581 100644 --- a/translations/client_th.ts +++ b/translations/client_th.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="th_TH" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="th_TH"> <context> <name>ActivityActionButton</name> <message> @@ -886,33 +886,38 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -920,7 +925,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>ข้อผิดพลาดในการเขียนข้อมูลเมตาไปยังฐานข้อมูล</translation> </message> @@ -3398,52 +3403,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3453,7 +3458,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -3466,12 +3471,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ข้อผิดพลาดในการเขียนข้อมูลเมตาไปยังฐานข้อมูล</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation type="unfinished"/> </message> @@ -3490,13 +3500,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>ไฟล์มีการเปลี่ยนแปลงตั้งแต่ถูกพบ</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3506,22 +3516,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ไฟล์ %1 ไม่สามารถดาวน์โหลดได้เพราะชื่อไฟล์ต้นทางเหมือนกัน!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>การดาวน์โหลดจะช่วยลดพืนที่จัดเก็บภายในเครื่องที่ต่ำกว่าขีดจำกัด</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>พื้นที่ว่างในดิสก์น้อยกว่า %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>ไฟล์ถูกลบออกจากเซิร์ฟเวอร์</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>ดาวน์โหลดไฟล์ไม่สำเร็จ</translation> </message> @@ -3531,12 +3541,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>ไฟล์ %1 ไม่สามารถบันทึกได้เพราะชื่อไฟล์ต้นทางเหมือนกัน!</translation> </message> @@ -3546,12 +3556,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ข้อผิดพลาดในการเขียนข้อมูลเมตาไปยังฐานข้อมูล</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3739,38 +3755,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>ไม่สามารถอัพโหลดไฟล์ %1 เนื่องจากมีไฟล์อื่นที่มีชื่อเดียวกันอยู่แล้ว</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>การอัพโหลด %1 เกินโควต้าของโฟลเดอร์</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>ไฟล์ต้นทางถูกเปลี่ยนแปลงในระหว่างการซิงค์ มันจะกลับมา</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>ไฟล์ต้นทางถูกเปลี่ยนแปลงขณะกำลังประสานข้อมูล</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation type="unfinished"/> </message> @@ -3780,12 +3802,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>ข้อผิดพลาดในการเขียนข้อมูลเมตาไปยังฐานข้อมูล</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3793,32 +3815,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>ไฟล์ต้นทางถูกลบออกในระหว่างการประสานข้อมูล</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>ไฟล์ต้นทางถูกเปลี่ยนแปลงขณะกำลังประสานข้อมูล</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>มีรหัสข้อผิดพลาดตอบกลับมาจากเซิร์ฟเวอร์ (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>ไฟล์ไอดีได้หายไปจากเซิร์ฟเวอร์</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>ETag ได้หายไปจากเซิร์ฟเวอร์</translation> </message> @@ -3826,22 +3848,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>URL แบบสำรวจความคิดเห็นหายไป</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>ไฟล์ต้นทางถูกลบออกในระหว่างการประสานข้อมูล</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>ไฟล์ต้นทางถูกเปลี่ยนแปลงขณะกำลังประสานข้อมูล</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>เซิร์ฟเวอร์ไม่ยอมรับส่วนสุดท้าย (ไม่มี e-tag ในปัจจุบัน)</translation> </message> @@ -5030,24 +5052,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation type="unfinished"/> </message> @@ -5237,6 +5259,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6245,7 +6285,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation type="unfinished"/> </message> diff --git a/translations/client_tr.ts b/translations/client_tr.ts index 93f4eccf8..70d8f528f 100644 --- a/translations/client_tr.ts +++ b/translations/client_tr.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="tr" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="tr"> <context> <name>ActivityActionButton</name> <message> @@ -891,33 +891,38 @@ Bu işlem şu anda yürütülmekte olan eşitleme işlemlerini durdurur.</transl <translation>Dosya kaldırıldı (yüklemeyi başlat) %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Yerel dosya eşitleme sırasında değişmiş. Sürdürülecek.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation>Yerel dosya eşitleme sırasında değişmiş.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation>Üst veriler güncellenirken sorun çıktı: %1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation>%1 dosyası şu anda kullanılıyor</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation>Yerel dosya eşitleme sırasında silinmiş.</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation>; Geri yüklenemedi: %1</translation> </message> @@ -925,7 +930,7 @@ Bu işlem şu anda yürütülmekte olan eşitleme işlemlerini durdurur.</transl <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Üst veri veritabanına yazılırken sorun çıktı</translation> </message> @@ -3440,52 +3445,52 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <translation>Sunucunun bildirilen numarası %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation>Bazı dosyalar bir klasöre yüklenirken çalışma oldu. Çakışmalar temizlenecek!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>Bir klasör yüklenirken çakışma oldu. Çakışma temizlenecek!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>Bir dosya yüklenirken çakışma oldu. Çakışma temizlenecek!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>"Eşitlenecek ögeleri seçin" kara listesinde olduğundan yok sayıldı</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>Bu klasöre alt klasör ekleme izniniz olmadığından izin verilmedi</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>Bu klasöre dosya ekleme izniniz olmadığından izin verilmedi</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>Sunucu üzerinde salt okunur olduğundan, bu dosya yüklenemedi, geri yükleniyor</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation>Geçersiz bir hedefe taşındı, geri yükleniyor</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation>Silmeye izin verilmedi, geri yükleniyor</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation>Veritabanı okunurken sorun çıktı</translation> </message> @@ -3495,7 +3500,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <translation>!%1' klasörü okunurken sunucu bir hata yanıtı verdi: %2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>"%1" klasörü okunurken sunucu bir hata yanıtı verdi: %2</translation> </message> @@ -3508,12 +3513,17 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <translation>Üst veri veritabanına yazılırken sorun çıktı</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation>Üst veriler güncellenirken sorun çıktı: %1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation>Dosya şu anda kullanılıyor</translation> </message> @@ -3532,13 +3542,13 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>Dosya taramadan sonra değiştirilmiş</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation>%1 dosyası, adının yerel bir dosya ile çakışması nedeniyle indirilemedi!</translation> </message> @@ -3548,22 +3558,22 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <translation>%1 dosyası, adının yerel bir dosya ile çakışması nedeniyle indirilemedi!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>İndirme sonucunda boş yerel disk alanı sınırın altına inebilir</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>Boş disk alanı %1 değerinin altında</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>Dosya sunucudan silindi</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>Dosya tam olarak indirilemedi.</translation> </message> @@ -3573,12 +3583,12 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <translation>Sunucu tarafından boyutu %1 olarak bildirilmesine rağmen indirilen dosya boş.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation>İndirilen dosya boş. Ancak sunucu tarafından dosya boyutu %1 olarak bildirildi.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>%1 dosyası, adının yerel bir dosya ile çakışması nedeniyle kaydedilemedi!</translation> </message> @@ -3588,12 +3598,18 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <translation>Üst veri veritabanına yazılırken sorun çıktı</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation>Üst veriler güncellenirken sorun çıktı: %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation>%1 dosyası şu anda kullanılıyor</translation> </message> @@ -3781,38 +3797,44 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation>Şifreli dosya yüklenemedi.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>%1 dosyası, adının başka bir dosya ile çakışması nedeniyle yüklenemedi, dosya adları arasında yalnız büyük küçük harf farkı var</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>%1 yüklemesi klasörün kotasını aşıyor</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>Dosya kaldırıldı (yüklemeyi başlat) %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Yerel dosya eşitleme sırasında değişmiş. Sürdürülecek.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>Yerel dosya eşitleme sırasında değişti.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation>Şifreli klasörün kilidi açılamadı.</translation> </message> @@ -3822,12 +3844,12 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <translation>Üst veri veritabanına yazılırken sorun çıktı</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation>Üst veriler güncellenirken sorun çıktı: %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation>%1 dosyası şu anda kullanılıyor</translation> </message> @@ -3835,32 +3857,32 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>Yerel dosya eşitleme sırasında silinmiş.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>Yerel dosya eşitleme sırasında değişmiş.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation>Anket adresi eksik</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Sunucudan bilinmeyen bir yanıt kodu alındı (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>Sunucudan Dosya Kodu alınamadı</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>Sunucudan E-Tag alınamadı</translation> </message> @@ -3868,22 +3890,22 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>Sorgu adresi eksik</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>Yerel dosya eşitleme sırasında silinmiş.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>Yerel dosya eşitleme sırasında değişmiş.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>Sunucu son yığını onaylamadı. (Herhangi bir e-tag bulunamadı)</translation> </message> @@ -5073,24 +5095,24 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation><p>%1 Masaüstü istemcisi</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>%1. sürüm. Ayrıntılı bilgi almak için <a href='%2'>buraya tıklayabilirsiniz</a>.</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation><p><small>Sanal dosyalar eklentisi kullanılarak: %1</small></p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>Bu sürüm %1 tarafından hazırlanmıştır</p></translation> </message> @@ -5280,6 +5302,24 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6288,7 +6328,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>Git sürümü <a href="%1">%2</a> ile %3 zamanında, %4 Qt %5 kullanılarak, %6 hazırlandı</small></p></translation> </message> diff --git a/translations/client_uk.ts b/translations/client_uk.ts index 592bfee66..c0f14f27e 100644 --- a/translations/client_uk.ts +++ b/translations/client_uk.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="uk" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="uk"> <context> <name>ActivityActionButton</name> <message> @@ -887,33 +887,38 @@ This action will abort any currently running synchronization.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation type="unfinished"/> </message> @@ -921,7 +926,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>Помилка із записом метаданих до бази даних</translation> </message> @@ -3396,52 +3401,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation type="unfinished"/> </message> @@ -3451,7 +3456,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation type="unfinished"/> </message> @@ -3464,12 +3469,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Помилка із записом метаданих до бази даних</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation type="unfinished"/> </message> @@ -3488,13 +3498,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>Файл змінився з моменту знаходження</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation type="unfinished"/> </message> @@ -3504,22 +3514,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Файл %1 не може бути завантажено через локальний конфлікт назви файлу! </translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>Це звантаження зменшить розмір вільного місця на локальному диску нижче встановленого обмеження.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>На диску залишилося менше %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>Файл вилучено з сервера</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>Файл не може бути завантажений повністю.</translation> </message> @@ -3529,12 +3539,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Звантажений файл є порожнім незважаючи на те, що сервер повідомив, що файл мав бути %1.</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>Файл %1 не збережено через локальний конфлікт назви файлу! </translation> </message> @@ -3544,12 +3554,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Помилка із записом метаданих до бази даних</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3737,38 +3753,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>Файл %1 неможливо завантажити, оскільки існує інший файл з таким же ім'ям, але в іншому регістрі</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>Завантаження %1 перевищує квоту цієї теки</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>Файл вилучено (почніть завантаження) %1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>Локальний файл змінився під час синхронізації. Його буде відновлено.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>Локальний файл змінився під час синхронізації.</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation type="unfinished"/> </message> @@ -3778,12 +3800,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>Помилка із записом метаданих до бази даних</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation type="unfinished"/> </message> @@ -3791,32 +3813,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>Локальний файл було вилучено під час синхронізації.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>Локальний файл змінився під час синхронізації.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>Неочікуваний код повернення від сервера (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>Відсутній ідентифікатор файлу на сервері</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation type="unfinished"/> </message> @@ -3824,22 +3846,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>Не вистачає сформованого URL</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>Локальний файл було вилучено під час синхронізації.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>Локальний файл змінився під час синхронізації.</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation type="unfinished"/> </message> @@ -5029,24 +5051,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation><p>%1 клієнт для робочої істанції</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation type="unfinished"/> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>Цю збірку поставлено %1</p></translation> </message> @@ -5236,6 +5258,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6244,7 +6284,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation type="unfinished"/> </message> diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts index 4cac0203c..60272dec8 100644 --- a/translations/client_zh_CN.ts +++ b/translations/client_zh_CN.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_CN" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="zh_CN"> <context> <name>ActivityActionButton</name> <message> @@ -887,33 +887,38 @@ This action will abort any currently running synchronization.</source> <translation>文件已删除（开始上传）%1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>本地文件在同步时发生变化。将重新开始同步。</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation>本地文件在同步时发生变化。</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation>更新元数据出错：%1 </translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation>文件 %1 在使用中</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation>本地文件在同步时被删除</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation>; 还原失败：%1</translation> </message> @@ -921,7 +926,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>向数据库写入元数据错误</translation> </message> @@ -3422,52 +3427,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>服务器报告无 %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation>上传文件到文件夹时发生冲突。那些冲突的会被清除!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>上传文件夹时发生冲突。它会被清除!</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>上传时发生冲突。它将被移除！</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>因“选择要同步的内容”黑名单而被忽略</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>不被允许，因为您没有向该文件夹添加子文件夹的权限。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>不被允许，因为您没有在该文件夹中添加文件的权限。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>不允许上传这个文件，因为它在这台服务器上是只读的，恢复中。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation>移动到无效目标，恢复中。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation>不允许移除，恢复中。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation>读取数据库时出错</translation> </message> @@ -3477,7 +3482,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>服务器在读取目录 '%1' 时回复了一个错误：%2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>服务器在读取目录 "%1" 时返回了一个错误: %2 </translation> </message> @@ -3490,12 +3495,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>向数据库写入元数据错误</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation>更新元数据出错：%1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation>文件在使用中</translation> </message> @@ -3514,13 +3524,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>自从发现文件以来，它已经被修改了</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation>文件 %1 无法被下载，因为一个本地文件名冲突！</translation> </message> @@ -3530,22 +3540,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>由于本地文件名冲突，文件 %1 无法下载。</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>下载将减少低于限制的空闲本地磁盘空间</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>空闲磁盘空间少于 %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>已从服务器删除文件</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>文件无法完整下载。</translation> </message> @@ -3555,12 +3565,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>虽然服务器宣称已完成 %1，但实际下载文件为空。</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation>已下载的文件为空，但是服务器说它应该是 %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>由于本地文件名冲突，文件 %1 无法保存。</translation> </message> @@ -3570,12 +3580,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>向数据库写入元数据错误</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation>更新元数据出错：%1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation>文件 %1 在使用中</translation> </message> @@ -3763,38 +3779,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation>上传加密文件失败</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>文件 %1 无法上传，因为存在同名文件，文件名仅有大小写不同。</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>上传 %1 超过文件夹的限额</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>文件已删除（开始上传）%1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>本地文件在同步时已修改，完成后会再次同步</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>本地文件在同步时已修改。</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation>解锁加密文件夹失败</translation> </message> @@ -3804,12 +3826,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>向数据库写入元数据错误</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation>更新元数据出错：%1 </translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation>文件 %1 在使用中 </translation> </message> @@ -3817,32 +3839,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>本地文件在同步时已删除。</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>本地文件在同步时已修改。</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation>投票 URL 缺失</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>从服务器得到了意外的返回值（%1）</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>服务器端文件 ID 缺失</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>服务器端 ETag 缺失</translation> </message> @@ -3850,22 +3872,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>缺少轮询 URL</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>本地文件在同步时已删除。</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>本地文件在同步时已修改。</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>服务器未确认上一分块。（找不到 E-tag）</translation> </message> @@ -5055,24 +5077,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation><p>%1 桌面客户端</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>版本 %1。详情请点击<a href='%2'>这里</a>。</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation><p><small>正使用虚拟文件插件：%1</small></p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>该版本由 %1 提供</p></translation> </message> @@ -5262,6 +5284,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6270,7 +6310,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>使用Qt %5, %6，从 %3, %4 上的Git版本<a href="%1">%2</a>构建</small></p></translation> </message> diff --git a/translations/client_zh_HK.ts b/translations/client_zh_HK.ts index 131d8b48e..258158455 100644 --- a/translations/client_zh_HK.ts +++ b/translations/client_zh_HK.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_HK" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="zh_HK"> <context> <name>ActivityActionButton</name> <message> @@ -892,33 +892,38 @@ This action will abort any currently running synchronization.</source> <translation>檔案已移除（開始上傳）%1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>近端端的檔案在同步的過程中被更改。同步將會重新開始。</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation>近端端的檔案在同步過程中被更改。</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation>更新元數據時出錯：%1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation>檔案 %1 正在使用中</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation>近端的檔案在同步過程中被刪除。</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation>；復原失敗 %1</translation> </message> @@ -926,7 +931,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>寫入後設資料（metadata）時發生錯誤</translation> </message> @@ -3439,52 +3444,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>伺服器報告沒有 %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation>將某些檔案上傳到資料夾時發生衝突。那些有衝突的檔案將被清除！</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>上傳資料夾時發生衝突。將被清除！</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>上傳檔案時發生衝突。將被清除！</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>被忽略，因為它在“選擇要同步的內容”黑名單中</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>拒絕此操作，您沒有在此新增子資料夾的權限。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>拒絕此操作，您沒有新增檔案在此資料夾的權限。</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>不允許上傳此檔案，因為它在伺服器上是唯讀的，正在還原</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation>已移至無效目標，正在還原</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation>不允許刪除，還原</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation>讀取數據庫時發生錯誤。</translation> </message> @@ -3494,7 +3499,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>伺服器讀取目錄 '%1' 時發生錯誤：%2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>伺服器在讀取目錄「%1」回覆錯誤：%2</translation> </message> @@ -3507,12 +3512,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>寫入後設資料（metadata）時發生錯誤</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation>更新元數據時出錯：%1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation>檔案正在使用中</translation> </message> @@ -3531,13 +3541,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>尋找的過程中檔案已經被更改</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation>檔案 %1 無法被下載，因為近端端的檔案名稱已毀損!</translation> </message> @@ -3547,22 +3557,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>檔案 %1 無法被下載，因為近端端的檔案名稱已毀損!</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>此項下載將會使剩餘的近端儲存空間降到低於限值</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>可用的硬碟空間已經少於 %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>檔案已從伺服器被刪除</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>檔案下載無法完成。</translation> </message> @@ -3572,12 +3582,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>已下載的檔案為空，儘管伺服器所宣佈的檔案大小為%1。</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation>已下載的檔案為空，儘管伺服器說檔案大小為%1。</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>檔案 %1 無法存檔，因為近端端的檔案名稱已毀損!</translation> </message> @@ -3587,12 +3597,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>寫入後設資料（metadata）時發生錯誤</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation>更新元數據時出錯：%1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation>檔案 %1 正在使用中</translation> </message> @@ -3780,38 +3796,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation>上傳加密檔案失敗。</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>%1檔案未能上傳，因為另一個同名（僅大小寫不同）的檔案已經存在</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>上傳%1將會超過資料夾的大小限制</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>移除檔案（開始上傳）%1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>近端端的檔案在同步的過程中被更改，此檔案將會被還原。</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>近端端的檔案在同步過程中被更改。</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation>無法解鎖加密資料夾。</translation> </message> @@ -3821,12 +3843,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>寫入後設資料（metadata）時發生錯誤</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation>更新元數據時出錯：%1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation>檔案 %1 正在使用中</translation> </message> @@ -3834,32 +3856,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>近端端的檔案在同步過程中被刪除。</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>近端端的檔案在同步過程中被更改。</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation>遺失投票網址</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>伺服器回傳未知的錯誤碼（%1）</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>伺服器遺失檔案ID</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>伺服器遺失 ETag</translation> </message> @@ -3867,22 +3889,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>缺少輪詢的超連結</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>近端端的檔案在同步過程中被刪除。</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>近端端的檔案在同步過程中被更改。</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>伺服器不承認檔案的最後一個分割檔。（e-tag不存在）</translation> </message> @@ -5072,24 +5094,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation><p>%1 桌面版用戶端</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>版本為%1。詳細資訊請<a href='%2'>點擊此處</a>。</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation><p><small>使用虛擬文件插件：%1</small></p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation>此版本由%1發佈。</translation> </message> @@ -5279,6 +5301,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6287,7 +6327,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>根據Git版本號<a href="%1">%2</a>在 %3， %4建置 使用了Qt %5，%6</small></p></translation> </message> diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts index 9c49adebd..2ec585089 100644 --- a/translations/client_zh_TW.ts +++ b/translations/client_zh_TW.ts @@ -1,4 +1,4 @@ -<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_TW" version="2.1"> +<?xml version="1.0" ?><!DOCTYPE TS><TS version="2.1" language="zh_TW"> <context> <name>ActivityActionButton</name> <message> @@ -891,33 +891,38 @@ This action will abort any currently running synchronization.</source> <translation>已移除檔案（開始上傳）%1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="281"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="279"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="284"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>本機檔案在同步的過程中被修改。其將會被復原。</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="292"/> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="618"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="295"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="621"/> <source>Local file changed during sync.</source> <translation>本機檔案在同步的過程中被修改。</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="422"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> <source>Error updating metadata: %1</source> <translation>更新詮釋資料時發生錯誤：%1</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="425"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="428"/> <source>The file %1 is currently in use</source> <translation>檔案 %1 目前使用中</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="601"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="604"/> <source>The local file was removed during sync.</source> <translation>本機檔案在同步的過程中被移除。</translation> </message> <message> - <location filename="../src/libsync/bulkpropagatorjob.cpp" line="648"/> + <location filename="../src/libsync/bulkpropagatorjob.cpp" line="651"/> <source>; Restoration Failed: %1</source> <translation>；復原失敗：%1</translation> </message> @@ -925,7 +930,7 @@ This action will abort any currently running synchronization.</source> <context> <name>OCC::CleanupPollsJob</name> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1305"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1312"/> <source>Error writing metadata to the database</source> <translation>將詮釋資料寫入到資料庫時發生錯誤</translation> </message> @@ -3440,52 +3445,52 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>伺服器回報沒有 %1</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1044"/> + <location filename="../src/libsync/discovery.cpp" line="1057"/> <source>Conflict when uploading some files to a folder. Those, conflicted, are going to get cleared!</source> <translation>將某些檔案上傳到資料夾時發生錯誤。衝突的檔案將會被清除！</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1063"/> + <location filename="../src/libsync/discovery.cpp" line="1076"/> <source>Conflict when uploading a folder. It's going to get cleared!</source> <translation>上傳資料夾時發生衝突。將會被清除！</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1066"/> + <location filename="../src/libsync/discovery.cpp" line="1079"/> <source>Conflict when uploading a file. It's going to get removed!</source> <translation>上傳檔案時發生衝突。其將會被移除！</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1396"/> + <location filename="../src/libsync/discovery.cpp" line="1409"/> <source>Ignored because of the "choose what to sync" blacklist</source> <translation>由於「選擇要同步的內容」黑名單而被忽略</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1429"/> + <location filename="../src/libsync/discovery.cpp" line="1442"/> <source>Not allowed because you don't have permission to add subfolders to that folder</source> <translation>不允許，因為您無權新增子資料夾到該資料夾</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1434"/> + <location filename="../src/libsync/discovery.cpp" line="1447"/> <source>Not allowed because you don't have permission to add files in that folder</source> <translation>不允許，因為您無權新增檔案到該資料夾</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1447"/> + <location filename="../src/libsync/discovery.cpp" line="1460"/> <source>Not allowed to upload this file because it is read-only on the server, restoring</source> <translation>不允許上傳此檔案，因為這在伺服器上是唯讀，正在復原</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1469"/> + <location filename="../src/libsync/discovery.cpp" line="1482"/> <source>Moved to invalid target, restoring</source> <translation>移動至無效目標，正在復原</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1482"/> + <location filename="../src/libsync/discovery.cpp" line="1495"/> <source>Not allowed to remove, restoring</source> <translation>不允許刪除，正在復原</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1591"/> + <location filename="../src/libsync/discovery.cpp" line="1604"/> <source>Error while reading the database</source> <translation>讀取資料庫時發生錯誤</translation> </message> @@ -3495,7 +3500,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>伺服器在讀取目錄「%1」回覆錯誤：%2</translation> </message> <message> - <location filename="../src/libsync/discovery.cpp" line="1652"/> + <location filename="../src/libsync/discovery.cpp" line="1665"/> <source>Server replied with an error while reading directory "%1" : %2</source> <translation>伺服器在讀取目錄「%1」回覆錯誤：%2</translation> </message> @@ -3508,12 +3513,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>將詮釋資料寫入到資料庫時發生錯誤</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1141"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1132"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1148"/> <source>Error updating metadata: %1</source> <translation>更新詮釋資料時發生錯誤：%1</translation> </message> <message> - <location filename="../src/libsync/owncloudpropagator.cpp" line="1145"/> + <location filename="../src/libsync/owncloudpropagator.cpp" line="1152"/> <source>File is currently in use</source> <translation>檔案目前正在使用中</translation> </message> @@ -3532,13 +3542,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="496"/> - <location filename="../src/libsync/propagatedownload.cpp" line="1112"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1145"/> <source>File has changed since discovery</source> <translation>尋找的過程中檔案已經被更改</translation> </message> <message> <location filename="../src/libsync/propagatedownload.cpp" line="522"/> - <location filename="../src/libsync/propagatedownload.cpp" line="613"/> + <location filename="../src/libsync/propagatedownload.cpp" line="626"/> <source>File %1 cannot be downloaded because of a local file name clash!</source> <translation>檔案 %1 無法被下載，因為本機檔案名稱有衝突！</translation> </message> @@ -3548,22 +3558,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>檔案 %1 無法被下載，因為本機檔案名稱有衝突！</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="665"/> + <location filename="../src/libsync/propagatedownload.cpp" line="678"/> <source>The download would reduce free local disk space below the limit</source> <translation>下載將會減少剩餘的本機磁碟空間，使其低於限制</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="669"/> + <location filename="../src/libsync/propagatedownload.cpp" line="682"/> <source>Free space on disk is less than %1</source> <translation>可用的磁碟空間已經少於 %1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="790"/> + <location filename="../src/libsync/propagatedownload.cpp" line="803"/> <source>File was deleted from server</source> <translation>檔案已從伺服器刪除</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="859"/> + <location filename="../src/libsync/propagatedownload.cpp" line="876"/> <source>The file could not be downloaded completely.</source> <translation>檔案下載無法完成。</translation> </message> @@ -3573,12 +3583,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>儘管伺服器宣告其應為 %1，但下載的檔案為空。</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="866"/> + <location filename="../src/libsync/propagatedownload.cpp" line="883"/> <source>The downloaded file is empty, but the server said it should have been %1.</source> <translation>已下載的檔案為空，但伺服器表示其應為 %1。</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1057"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1074"/> <source>File %1 cannot be saved because of a local file name clash!</source> <translation>檔案 %1 無法儲存，因為本機檔案名稱有衝突！</translation> </message> @@ -3588,12 +3598,18 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>將詮釋資料寫入到資料庫時發生錯誤</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1183"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1079"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1091"/> + <source>File %1 has invalid modified time reported by server. Do not save it.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagatedownload.cpp" line="1216"/> <source>Error updating metadata: %1</source> <translation>更新詮釋資料時發生錯誤：%1</translation> </message> <message> - <location filename="../src/libsync/propagatedownload.cpp" line="1186"/> + <location filename="../src/libsync/propagatedownload.cpp" line="1219"/> <source>The file %1 is currently in use</source> <translation>檔案 %1 目前正在使用中</translation> </message> @@ -3781,38 +3797,44 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileCommon</name> <message> - <location filename="../src/libsync/propagateupload.cpp" line="237"/> + <location filename="../src/libsync/propagateupload.cpp" line="241"/> <source>Failed to upload encrypted file.</source> <translation>上傳已加密的檔案失敗。</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="268"/> + <location filename="../src/libsync/propagateupload.cpp" line="272"/> <source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source> <translation>無法上傳 %1 檔案，因為另一個僅有大小寫不同的相同名稱檔案已存在</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="279"/> - <location filename="../src/libsync/propagateupload.cpp" line="673"/> + <location filename="../src/libsync/propagateupload.cpp" line="283"/> + <location filename="../src/libsync/propagateupload.cpp" line="701"/> <source>Upload of %1 exceeds the quota for the folder</source> <translation>上傳 %1 將會超過資料夾的大小限制</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="384"/> + <location filename="../src/libsync/propagateupload.cpp" line="392"/> <source>File Removed (start upload) %1</source> <translation>檔案已移除（開始上傳）%1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="394"/> + <location filename="../src/libsync/propagateupload.cpp" line="396"/> + <location filename="../src/libsync/propagateupload.cpp" line="409"/> + <source>Local file has invalid modified time. Do not upload to the server.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../src/libsync/propagateupload.cpp" line="418"/> <source>Local file changed during syncing. It will be resumed.</source> <translation>本機檔案在同步的過程中被修改。其將會被復原。</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="405"/> + <location filename="../src/libsync/propagateupload.cpp" line="429"/> <source>Local file changed during sync.</source> <translation>本機檔案在同步的過程中被修改。</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="415"/> + <location filename="../src/libsync/propagateupload.cpp" line="439"/> <source>Failed to unlock encrypted folder.</source> <translation>解鎖已加密的資料夾失敗。</translation> </message> @@ -3822,12 +3844,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss <translation>將詮釋資料寫入到資料庫時發生錯誤</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="765"/> + <location filename="../src/libsync/propagateupload.cpp" line="797"/> <source>Error updating metadata: %1</source> <translation>更新詮釋資料時發生錯誤：%1</translation> </message> <message> - <location filename="../src/libsync/propagateupload.cpp" line="768"/> + <location filename="../src/libsync/propagateupload.cpp" line="800"/> <source>The file %1 is currently in use</source> <translation>檔案 %1 目前正在使用中</translation> </message> @@ -3835,32 +3857,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileNG</name> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="418"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="430"/> <source>The local file was removed during sync.</source> <translation>本機檔案在同步的過程中被移除。</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="429"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="445"/> <source>Local file changed during sync.</source> <translation>本機檔案在同步的過程中被修改。</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="468"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> <source>Poll URL missing</source> <translation>缺少輪詢的超連結</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="477"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="493"/> <source>Unexpected return code from server (%1)</source> <translation>伺服器回傳未知的錯誤碼 (%1)</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="484"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="500"/> <source>Missing File ID from server</source> <translation>伺服器遺失檔案 ID</translation> </message> <message> - <location filename="../src/libsync/propagateuploadng.cpp" line="498"/> + <location filename="../src/libsync/propagateuploadng.cpp" line="514"/> <source>Missing ETag from server</source> <translation>伺服器遺失 ETag</translation> </message> @@ -3868,22 +3890,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::PropagateUploadFileV1</name> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="216"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="228"/> <source>Poll URL missing</source> <translation>缺少輪詢的超連結</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="240"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="252"/> <source>The local file was removed during sync.</source> <translation>本機檔案在同步的過程中被移除。</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="251"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="267"/> <source>Local file changed during sync.</source> <translation>本機檔案在同步的過程中被修改。</translation> </message> <message> - <location filename="../src/libsync/propagateuploadv1.cpp" line="265"/> + <location filename="../src/libsync/propagateuploadv1.cpp" line="281"/> <source>The server did not acknowledge the last chunk. (No e-tag was present)</source> <translation>伺服器不承認檔案的最後一個分割檔。（e-tag不存在）</translation> </message> @@ -5073,24 +5095,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>OCC::Theme</name> <message> - <location filename="../src/libsync/theme.cpp" line="517"/> + <location filename="../src/libsync/theme.cpp" line="508"/> <source><p>%1 Desktop Client</p></source> <extracomment>Example text: "<p>Nextcloud Desktop Client</p>" (%1 is the application name)</extracomment> <translation><p>%1 桌面版客戶端</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="520"/> - <location filename="../src/libsync/theme.cpp" line="535"/> + <location filename="../src/libsync/theme.cpp" line="511"/> + <location filename="../src/libsync/theme.cpp" line="526"/> <source><p>Version %1. For more information please click <a href='%2'>here</a>.</p></source> <translation><p>版本為 %1。詳細資訊請點擊<a href='%2'>此處</a>。</p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="524"/> + <location filename="../src/libsync/theme.cpp" line="515"/> <source><p><small>Using virtual files plugin: %1</small></p></source> <translation><p><small>正在使用虛擬檔案外掛程式：%1</small></p></translation> </message> <message> - <location filename="../src/libsync/theme.cpp" line="539"/> + <location filename="../src/libsync/theme.cpp" line="530"/> <source><p>This release was supplied by %1</p></source> <translation><p>此版本由 %1 提供</p></translation> </message> @@ -5280,6 +5302,24 @@ This is a new, experimental mode. If you decide to use it, please report any iss </message> </context> <context> + <name>OCC::VfsSuffix</name> + <message> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="72"/> + <location filename="../src/libsync/vfs/suffix/vfs_suffix.cpp" line="82"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> + <name>OCC::VfsXAttr</name> + <message> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="73"/> + <location filename="../src/libsync/vfs/xattr/vfs_xattr.cpp" line="83"/> + <source>Error updating metadata due to invalid modified time</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>OCC::WebEnginePage</name> <message> <location filename="../src/gui/wizard/webview.cpp" line="210"/> @@ -6288,7 +6328,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss <context> <name>nextcloudTheme::about()</name> <message> - <location filename="../src/libsync/theme.cpp" line="496"/> + <location filename="../src/libsync/theme.cpp" line="487"/> <source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source> <translation><p><small>從 Git 修訂版本 <a href="%1">%2</a> 在 %3 上建置，%4 使用 Qt %5，%6</small></p></translation> </message> |