Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/desktop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNextcloud bot <bot@nextcloud.com>2022-04-09 06:59:05 +0300
committerNextcloud bot <bot@nextcloud.com>2022-04-09 06:59:05 +0300
commit26c579e28092fc4ef2a5fc03b92c3afba05759d0 (patch)
treedec5a46458cc36b3bcf05fdd49871fb5cc57e7b0 /translations
parente210a6f2f0fcef546adce6e8fdc430d7f3bdf701 (diff)
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
Diffstat (limited to 'translations')
-rw-r--r--translations/client_bg.ts56
-rw-r--r--translations/client_br.ts56
-rw-r--r--translations/client_ca.ts56
-rw-r--r--translations/client_cs.ts56
-rw-r--r--translations/client_da.ts56
-rw-r--r--translations/client_de.ts58
-rw-r--r--translations/client_el.ts56
-rw-r--r--translations/client_en_GB.ts56
-rw-r--r--translations/client_eo.ts56
-rw-r--r--translations/client_es.ts56
-rw-r--r--translations/client_es_AR.ts56
-rw-r--r--translations/client_es_CL.ts56
-rw-r--r--translations/client_es_CO.ts56
-rw-r--r--translations/client_es_CR.ts56
-rw-r--r--translations/client_es_DO.ts56
-rw-r--r--translations/client_es_EC.ts56
-rw-r--r--translations/client_es_GT.ts56
-rw-r--r--translations/client_es_HN.ts56
-rw-r--r--translations/client_es_MX.ts56
-rw-r--r--translations/client_es_SV.ts56
-rw-r--r--translations/client_et.ts56
-rw-r--r--translations/client_eu.ts56
-rw-r--r--translations/client_fa.ts56
-rw-r--r--translations/client_fi.ts56
-rw-r--r--translations/client_fr.ts72
-rw-r--r--translations/client_gl.ts56
-rw-r--r--translations/client_he.ts56
-rw-r--r--translations/client_hr.ts56
-rw-r--r--translations/client_hu.ts58
-rw-r--r--translations/client_id.ts56
-rw-r--r--translations/client_is.ts56
-rw-r--r--translations/client_it.ts56
-rw-r--r--translations/client_ja.ts158
-rw-r--r--translations/client_ko.ts56
-rw-r--r--translations/client_lt_LT.ts56
-rw-r--r--translations/client_lv.ts56
-rw-r--r--translations/client_mk.ts56
-rw-r--r--translations/client_nb_NO.ts56
-rw-r--r--translations/client_nl.ts60
-rw-r--r--translations/client_oc.ts56
-rw-r--r--translations/client_pl.ts56
-rw-r--r--translations/client_pt.ts56
-rw-r--r--translations/client_pt_BR.ts78
-rw-r--r--translations/client_ro.ts56
-rw-r--r--translations/client_ru.ts60
-rw-r--r--translations/client_sc.ts56
-rw-r--r--translations/client_sk.ts56
-rw-r--r--translations/client_sl.ts56
-rw-r--r--translations/client_sr.ts56
-rw-r--r--translations/client_sv.ts56
-rw-r--r--translations/client_th.ts56
-rw-r--r--translations/client_tr.ts56
-rw-r--r--translations/client_uk.ts56
-rw-r--r--translations/client_zh_CN.ts56
-rw-r--r--translations/client_zh_HK.ts56
-rw-r--r--translations/client_zh_TW.ts56
56 files changed, 1644 insertions, 1644 deletions
diff --git a/translations/client_bg.ts b/translations/client_bg.ts
index 5bbd91c6f..992424f94 100644
--- a/translations/client_bg.ts
+++ b/translations/client_bg.ts
@@ -3554,47 +3554,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Конфликт при качване на някои файлове в папка. Тези, които са в конфликт, ще се изчистят!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation>Конфликт при качване на папка. Ще бъде изчистен!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation>Конфликт при качване на файл. Ще бъде премахнат!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Игнориран заради черния списък &apos;изберете какво да синхронизирате&apos;</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>Не е разрешено, защото нямате право да добавяте подпапки към тази папка</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>Не е разрешено, защото нямате право да добавяте файлове в тази папка</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation>Преместено в невалидна цел, възстановява се</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation>Не е позволено да се премахва, възстановява се</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation>Грешка при четене на базата данни</translation>
</message>
@@ -3604,7 +3604,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Сървърът отговори с грешка при четене на директория &apos;% 1&apos; : % 2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>Сървърът отговори с грешка при четене на директория „%1“: %2</translation>
</message>
@@ -3850,7 +3850,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Грешен HTTP код, върнат от сървъра. Очаквани 201, но са получени „% 1% 2“.</translation>
</message>
@@ -3860,12 +3860,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation>Грешка при актуализиране на метаданните: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation>Файлът %1 в момента се използва</translation>
</message>
@@ -3906,52 +3906,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation> Неуспешно качване на криптиран файл.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>Качването на% 1 надвишава квотата за папката</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation>Файлът е премахнат (стартиране на качване) % 1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Локален файл е променен по време на синхронизирането. Ще бъде възобновен</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<source>Local file changed during sync.</source>
<translation>Локален файл е променен по време на синхронизирането.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation>Неуспешно отключване на криптирана папка.</translation>
</message>
@@ -3961,12 +3961,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation>Грешка при актуализиране на метаданни: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation>Файлът %1 в момента се използва</translation>
</message>
diff --git a/translations/client_br.ts b/translations/client_br.ts
index b298f6ba5..1b935d11b 100644
--- a/translations/client_br.ts
+++ b/translations/client_br.ts
@@ -3525,47 +3525,47 @@ 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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3575,7 +3575,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3821,7 +3821,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Kod HTTP fall roet gant ar servijour. O gortoz e oa 201, met resevet a zo ber &quot;%1 %2&quot;.</translation>
</message>
@@ -3831,12 +3831,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3877,52 +3877,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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&apos;hell ket behañ pellkaset abalamour m&apos;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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<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="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation>Restr lamet (kregiñ ar pellkas) %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<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="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<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="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation type="unfinished"/>
</message>
@@ -3932,12 +3932,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_ca.ts b/translations/client_ca.ts
index 609889b5d..ab90780e0 100644
--- a/translations/client_ca.ts
+++ b/translations/client_ca.ts
@@ -3514,47 +3514,47 @@ 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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>S&apos;ha ignorat perquè es troba a la llista de prohibicions «Trieu què voleu sincronitzar»</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;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="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;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="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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&apos;està restaurant</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation>S&apos;ha mogut a una destinació no vàlida; s&apos;està restaurant</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation>No es permet suprimir; s&apos;està restaurant</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation>Error while reading the database</translation>
</message>
@@ -3564,7 +3564,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3810,7 +3810,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>El servidor ha retornat un codi HTTP incorrecte. S&apos;esperava el codi 201, però s&apos;ha rebut «%1 %2».</translation>
</message>
@@ -3820,12 +3820,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>S&apos;ha produït un error en escriure les metadades a la base de dades</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3866,52 +3866,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<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="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation>S&apos;ha suprimit el fitxer (inicia la càrrega) %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<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="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<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="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation type="unfinished"/>
</message>
@@ -3921,12 +3921,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>S&apos;ha produït un error en escriure les metadades a la base de dades</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_cs.ts b/translations/client_cs.ts
index c16480d9a..d79580def 100644
--- a/translations/client_cs.ts
+++ b/translations/client_cs.ts
@@ -3552,47 +3552,47 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;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="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;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="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Ignorováno podle nastavení „vybrat co synchronizovat“</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;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="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;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="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<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="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<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="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation>Chyba při čtení databáze</translation>
</message>
@@ -3602,7 +3602,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>Server vrátil chybu při čtení adresáře „%1“: %2</translation>
</message>
@@ -3848,7 +3848,7 @@ Toto je nový, experimentální režim. Pokud se jej rozhodnete používat, pros
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Serverem vrácen neplatný HTTP kód. Očekáván 201, ale obdržen „%1 %2“.</translation>
</message>
@@ -3858,12 +3858,12 @@ 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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation>Chyba zápisu metadat do databáze: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation>Soubor %1 je v tuto chvíli používán jinou aplikací</translation>
</message>
@@ -3904,52 +3904,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<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="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<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="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation>Soubor %1 nemá platný čas změny. Nenahrávat na server.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>Soubor %1 nemá platný čas změny. Nenahrávat na server.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<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="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<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="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<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="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation>Šifrovanou složku se nepodařilo odemknout.</translation>
</message>
@@ -3959,12 +3959,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation>Chyba při aktualizování metadat: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation>Soubor %1 je v tuto chvíli používán jinou aplikací</translation>
</message>
diff --git a/translations/client_da.ts b/translations/client_da.ts
index b71bccfa3..50a980b12 100644
--- a/translations/client_da.ts
+++ b/translations/client_da.ts
@@ -3529,47 +3529,47 @@ 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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3579,7 +3579,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3825,7 +3825,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Forkert HTTP kode returneret fra server. Forventet 201, men modtog &quot;%1 %2&quot;.</translation>
</message>
@@ -3835,12 +3835,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3881,52 +3881,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<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="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation>Fil fjernet (start forsendelse) %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<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="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<source>Local file changed during sync.</source>
<translation>Lokal fil ændret under sync.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation type="unfinished"/>
</message>
@@ -3936,12 +3936,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_de.ts b/translations/client_de.ts
index 666058059..c1c74c2ae 100644
--- a/translations/client_de.ts
+++ b/translations/client_de.ts
@@ -3552,47 +3552,47 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;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="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;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="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Ignoriert wegen der &quot;Choose what to sync&quot;-Blacklist</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;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="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;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="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation>Auf ungültiges Ziel verschoben, wiederherstellen.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation>Entfernen nicht erlaubt, wiederherstellen.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation>Fehler beim Lesen der Datenbank</translation>
</message>
@@ -3602,7 +3602,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<translation>Der Server hat während des Lesens des Verzeichnisses &apos;%1&apos; mit einem Fehler geantwortet: %2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>Der Server hat während des Lesens des Verzeichnisses &quot;%1&quot; mit einem Fehler geantwortet: %2</translation>
</message>
@@ -3848,7 +3848,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Es wurde ein falscher HTTP-Status-Code vom Server gesendet. Erwartet wurde 201, aber gesendet wurde &quot;%1 %2&quot;.</translation>
</message>
@@ -3858,12 +3858,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation>Fehler beim Schreiben der Metadaten in die Datenbank: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation>Die Datei %1 ist aktuell in Benutzung</translation>
</message>
@@ -3904,52 +3904,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<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="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<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="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation>Die Datei %1 hat eine ungültige Änderungszeit. Nicht auf den Server hochladen.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>Die Datei %1 hat eine ungültige Änderungszeit. Nicht auf den Server hochladen.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation>Datei entfernt (starte Hochladen) %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<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="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<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="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation>Der verschlüsselte Ordner konnte nicht entsperrt werden.</translation>
</message>
@@ -3959,12 +3959,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation>Fehler beim Aktualisieren der Metadaten: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation>Die Datei %1 ist aktuell in Benutzung</translation>
</message>
@@ -4100,7 +4100,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn Sie sich entscheiden, ihn zu ver
<message>
<location filename="../src/gui/tray/notificationhandler.cpp" line="114"/>
<source>Reply</source>
- <translation type="unfinished"/>
+ <translation>Antworten</translation>
</message>
<message>
<location filename="../src/gui/tray/notificationhandler.cpp" line="137"/>
diff --git a/translations/client_el.ts b/translations/client_el.ts
index d55755651..490b6efb6 100644
--- a/translations/client_el.ts
+++ b/translations/client_el.ts
@@ -3533,47 +3533,47 @@ 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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Αγνοήθηκε λόγω της μαύρης λίστας &quot;επιλέξτε τι να συγχρονίσετε&quot;.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>Δεν επιτρέπεται επειδή δεν έχετε άδεια να προσθέσετε υποφακέλους σε αυτόν το φάκελο.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>Δεν επιτρέπεται επειδή δεν έχετε άδεια να προσθέσετε φακέλους σε αυτόν το φάκελο.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation>Μετακινήθηκε σε μη έγκυρο στόχο, επαναφορά.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation>Δεν επιτρέπεται η κατάργηση, επαναφορά.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation>Σφάλμα κατά την ανάγνωση της βάσης δεδομένων.</translation>
</message>
@@ -3583,7 +3583,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Ο διακομιστής απάντησε με σφάλμα κατά την ανάγνωση της διεύθυνσης ΄%1&apos; : %2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3829,7 +3829,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Ο διακομιστής επέστρεψε εσφαλμένο κωδικό HTTP. Αναμενόταν 201, αλλά ελήφθη &quot;%1 %2&quot;.</translation>
</message>
@@ -3839,12 +3839,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation>Σφάλμα εγγραφής μεταδεδομένων στη βάση δεδομένων: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation>Το αρχείο %1 χρησιμοποιείται αυτήν τη στιγμή</translation>
</message>
@@ -3885,52 +3885,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>Η μεταφόρτωση του %1 υπερβαίνει το όριο του φακέλου</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation>Το Αρχείο Αφαιρέθηκε (έναρξη μεταφόρτωσης) %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Το τοπικό αρχείο τροποποιήθηκε κατά τη διάρκεια του συγχρονισμού. Θα συγχρονιστεί πάλι.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<source>Local file changed during sync.</source>
<translation>Το τοπικό αρχείο τροποποιήθηκε κατά τον συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation>Το ξεκλείδωμα του κρυπτογραφημένου φακέλου απέτυχε.</translation>
</message>
@@ -3940,12 +3940,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation>Σφάλμα ενημέρωσης μεταδεδομένων: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation>Το αρχείο %1 χρησιμοποιείται αυτήν τη στιγμή</translation>
</message>
diff --git a/translations/client_en_GB.ts b/translations/client_en_GB.ts
index e07684930..b03e39863 100644
--- a/translations/client_en_GB.ts
+++ b/translations/client_en_GB.ts
@@ -3516,47 +3516,47 @@ 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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3566,7 +3566,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3812,7 +3812,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</translation>
</message>
@@ -3822,12 +3822,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3868,52 +3868,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<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="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation>File Removed (start upload) %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<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="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<source>Local file changed during sync.</source>
<translation>Local file changed during sync.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation type="unfinished"/>
</message>
@@ -3923,12 +3923,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_eo.ts b/translations/client_eo.ts
index 494578c1a..48bcda484 100644
--- a/translations/client_eo.ts
+++ b/translations/client_eo.ts
@@ -3522,47 +3522,47 @@ 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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3572,7 +3572,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3818,7 +3818,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Neĝusta HTTP-kodo ricevita de servilo. Atendita: 201, ricevita: „%1 %2“.</translation>
</message>
@@ -3828,12 +3828,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3874,52 +3874,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<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="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation>Forigita dosiero (ekalŝuti) %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<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="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<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="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation type="unfinished"/>
</message>
@@ -3929,12 +3929,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_es.ts b/translations/client_es.ts
index 3f8c7925d..b06624d3c 100644
--- a/translations/client_es.ts
+++ b/translations/client_es.ts
@@ -3554,47 +3554,47 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;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="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;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="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; 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="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;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="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;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="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<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="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation>No está permitido borrar, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation>Error mientras se leía la base de datos</translation>
</message>
@@ -3604,7 +3604,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>El servidor contestó con un error al leer el directorio &quot;%1&quot; : %2</translation>
</message>
@@ -3850,7 +3850,7 @@ Esta es un modo nuevo y experimental. Si decides usarlo, por favor, informa de c
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>El código HTTP devuelto por el servidor es erróneo. Se esperaba 201, pero se recibió &quot;%1 %2&quot;.</translation>
</message>
@@ -3860,12 +3860,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation>Error al escribir los metadatos en la base de datos: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation>El archivo %1 se encuentra en uso</translation>
</message>
@@ -3906,52 +3906,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation>Fallo al subir el archivo cifrado.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<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="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation>El archivo %1 tiene una hora de modificación no válida. No subir al servidor.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>El archivo %1 tiene una hora de modificación no válida. No subir al servidor.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation>Archivo eliminado (comenzar subida) %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<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="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<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="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation>Fallo al desbloquear la carpeta cifrada.</translation>
</message>
@@ -3961,12 +3961,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation>Error al actualizar los metadatos: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation>El archivo %1 se encuentra en uso</translation>
</message>
diff --git a/translations/client_es_AR.ts b/translations/client_es_AR.ts
index 7ff182f4a..21d42f106 100644
--- a/translations/client_es_AR.ts
+++ b/translations/client_es_AR.ts
@@ -3503,47 +3503,47 @@ 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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3553,7 +3553,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3799,7 +3799,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation type="unfinished"/>
</message>
@@ -3809,12 +3809,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3855,52 +3855,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation type="unfinished"/>
</message>
@@ -3910,12 +3910,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_es_CL.ts b/translations/client_es_CL.ts
index 4c6304c35..2cf6ade2f 100644
--- a/translations/client_es_CL.ts
+++ b/translations/client_es_CL.ts
@@ -3509,47 +3509,47 @@ 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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3559,7 +3559,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3805,7 +3805,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Código equivocado de HTTP regresado por el servidor. Se esperaba 201, pero se recibió &quot;%1 %2&quot;.</translation>
</message>
@@ -3815,12 +3815,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3861,52 +3861,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<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="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<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="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<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="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation type="unfinished"/>
</message>
@@ -3916,12 +3916,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_es_CO.ts b/translations/client_es_CO.ts
index 451c58a9e..8e14b7725 100644
--- a/translations/client_es_CO.ts
+++ b/translations/client_es_CO.ts
@@ -3509,47 +3509,47 @@ 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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3559,7 +3559,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3805,7 +3805,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Código equivocado de HTTP regresado por el servidor. Se esperaba 201, pero se recibió &quot;%1 %2&quot;.</translation>
</message>
@@ -3815,12 +3815,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3861,52 +3861,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<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="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<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="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<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="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation type="unfinished"/>
</message>
@@ -3916,12 +3916,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_es_CR.ts b/translations/client_es_CR.ts
index 8948f8346..36c122e27 100644
--- a/translations/client_es_CR.ts
+++ b/translations/client_es_CR.ts
@@ -3509,47 +3509,47 @@ 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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3559,7 +3559,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3805,7 +3805,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Código equivocado de HTTP regresado por el servidor. Se esperaba 201, pero se recibió &quot;%1 %2&quot;.</translation>
</message>
@@ -3815,12 +3815,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3861,52 +3861,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<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="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<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="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<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="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation type="unfinished"/>
</message>
@@ -3916,12 +3916,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_es_DO.ts b/translations/client_es_DO.ts
index 2dad3a3b7..a9b3e2a55 100644
--- a/translations/client_es_DO.ts
+++ b/translations/client_es_DO.ts
@@ -3509,47 +3509,47 @@ 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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3559,7 +3559,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3805,7 +3805,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Código equivocado de HTTP regresado por el servidor. Se esperaba 201, pero se recibió &quot;%1 %2&quot;.</translation>
</message>
@@ -3815,12 +3815,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3861,52 +3861,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<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="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<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="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<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="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation type="unfinished"/>
</message>
@@ -3916,12 +3916,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_es_EC.ts b/translations/client_es_EC.ts
index 0ab7fe0f9..55bd7be98 100644
--- a/translations/client_es_EC.ts
+++ b/translations/client_es_EC.ts
@@ -3509,47 +3509,47 @@ 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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3559,7 +3559,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3805,7 +3805,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Código equivocado de HTTP regresado por el servidor. Se esperaba 201, pero se recibió &quot;%1 %2&quot;.</translation>
</message>
@@ -3815,12 +3815,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3861,52 +3861,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<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="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<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="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<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="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation type="unfinished"/>
</message>
@@ -3916,12 +3916,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_es_GT.ts b/translations/client_es_GT.ts
index d2d805a6f..dc56e4816 100644
--- a/translations/client_es_GT.ts
+++ b/translations/client_es_GT.ts
@@ -3509,47 +3509,47 @@ 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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3559,7 +3559,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3805,7 +3805,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Código equivocado de HTTP regresado por el servidor. Se esperaba 201, pero se recibió &quot;%1 %2&quot;.</translation>
</message>
@@ -3815,12 +3815,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3861,52 +3861,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<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="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<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="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<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="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation type="unfinished"/>
</message>
@@ -3916,12 +3916,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_es_HN.ts b/translations/client_es_HN.ts
index 49a5866cc..70e74b301 100644
--- a/translations/client_es_HN.ts
+++ b/translations/client_es_HN.ts
@@ -3509,47 +3509,47 @@ 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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3559,7 +3559,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3805,7 +3805,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Código equivocado de HTTP regresado por el servidor. Se esperaba 201, pero se recibió &quot;%1 %2&quot;.</translation>
</message>
@@ -3815,12 +3815,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3861,52 +3861,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<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="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<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="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<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="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation type="unfinished"/>
</message>
@@ -3916,12 +3916,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_es_MX.ts b/translations/client_es_MX.ts
index 0af9c4abb..50b9a624d 100644
--- a/translations/client_es_MX.ts
+++ b/translations/client_es_MX.ts
@@ -3509,47 +3509,47 @@ 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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3559,7 +3559,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3805,7 +3805,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Código equivocado de HTTP regresado por el servidor. Se esperaba 201, pero se recibió &quot;%1 %2&quot;.</translation>
</message>
@@ -3815,12 +3815,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3861,52 +3861,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<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="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<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="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<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="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation type="unfinished"/>
</message>
@@ -3916,12 +3916,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_es_SV.ts b/translations/client_es_SV.ts
index bd12c9f91..40e2e5181 100644
--- a/translations/client_es_SV.ts
+++ b/translations/client_es_SV.ts
@@ -3509,47 +3509,47 @@ 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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3559,7 +3559,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3805,7 +3805,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Código equivocado de HTTP regresado por el servidor. Se esperaba 201, pero se recibió &quot;%1 %2&quot;.</translation>
</message>
@@ -3815,12 +3815,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3861,52 +3861,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<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="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<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="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<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="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation type="unfinished"/>
</message>
@@ -3916,12 +3916,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_et.ts b/translations/client_et.ts
index a63c91b3d..ddda3aa02 100644
--- a/translations/client_et.ts
+++ b/translations/client_et.ts
@@ -3503,47 +3503,47 @@ 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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3553,7 +3553,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3799,7 +3799,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Server saatis vale HTTP koodi. Ootuspärane kood oli 201, aga saadeti kood &quot;%1 %2&quot;.</translation>
</message>
@@ -3809,12 +3809,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3855,52 +3855,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<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="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<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="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation type="unfinished"/>
</message>
@@ -3910,12 +3910,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_eu.ts b/translations/client_eu.ts
index acf699f39..1e779596e 100644
--- a/translations/client_eu.ts
+++ b/translations/client_eu.ts
@@ -3553,47 +3553,47 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<translation>Gatazka gertatu da fitxategi batzuk karpetara kargatzean. Gatazka sortu dutenak garbitu egingo dira!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation>Gatazka gertatu da karpeta kargatzean. Garbituko da!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation>Gatazka gertatu da fitxategia kargatzean. Garbituko da!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Ez ikusi egin zaio, &quot;aukeratu zer sinkronizatu&quot; zerrenda beltzagatik.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;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="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;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="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation>Baliogabeko helburura mugitu da, berrezartzen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation>Ezabatzeko baimenik gabe, berrezartzen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation>Errorea datu-basea irakurtzean</translation>
</message>
@@ -3603,7 +3603,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<translation>Zerbitzariak errore batekin erantzun du irakurtzean &apos;%1&apos; : %2 direktorioa </translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>Zerbitzariak errore batekin erantzun du &quot;% 1&quot; direktorioa irakurtzean:% 2</translation>
</message>
@@ -3849,7 +3849,7 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>HTTP kode okerra erantzun du zerbitzariak. 201 espero zen, baina &quot;%1 %2&quot; jaso da. </translation>
</message>
@@ -3859,12 +3859,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation>Errorea metadatuak datu-basean idaztean: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation>%1 fitxategia erabiltzen ari da</translation>
</message>
@@ -3905,52 +3905,52 @@ Modu hau berria eta experimentala da. Erabiltzea erabakitzen baduzu, agertzen di
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation>Ezin izan da enkriptatutako fitxategia kargatu.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<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="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation>%1 fitxategiak aldaketa-data baliogabea du. Ez kargatu hau zerbitzarira.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>%1 fitxategiak aldaketa-data baliogabea du. Ez kargatu hau zerbitzarira.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation>Fitxategia kendu da (hasi karga) %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<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="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<source>Local file changed during sync.</source>
<translation>Fitxategi lokala aldatu da sinkronizazioan.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation>Ezin izan da enkriptatutako karpeta desblokeatu.</translation>
</message>
@@ -3960,12 +3960,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation>Erorrea metadatuak eguneratzen: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation>%1 fitxategia erabiltzen ari da</translation>
</message>
diff --git a/translations/client_fa.ts b/translations/client_fa.ts
index db18787a3..900dba968 100644
--- a/translations/client_fa.ts
+++ b/translations/client_fa.ts
@@ -3507,47 +3507,47 @@ 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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3557,7 +3557,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3803,7 +3803,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>کد HTTP اشتباه توسط سرور برگردانده شد. 201 انتظار می رفت، اما &quot;1% 2%&quot; دریافت شد.</translation>
</message>
@@ -3813,12 +3813,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3859,52 +3859,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>بارگذاری از 1% بیش از سهمیه برای پوشه است</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>پرونده محلی در طول همگام سازی تغییر کرد. این ادامه خواهد یافت.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<source>Local file changed during sync.</source>
<translation>فایل محلی در حین همگام‌سازی تغییر کرده است.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation type="unfinished"/>
</message>
@@ -3914,12 +3914,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_fi.ts b/translations/client_fi.ts
index 78546effc..3f8891f16 100644
--- a/translations/client_fi.ts
+++ b/translations/client_fi.ts
@@ -3517,47 +3517,47 @@ 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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;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="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;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="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation>Virhe tietokantaa luettaessa</translation>
</message>
@@ -3567,7 +3567,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3813,7 +3813,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>HTTP-palvelin palautti väärän koodin. Odotettiin koodia 201, vastaanotettiin &quot;%1 %2&quot;.</translation>
</message>
@@ -3823,12 +3823,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation>Virhe kirjoittaessa metatietoja tietokantaan: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation>Tiedosto %1 on tällä hetkellä käytössä</translation>
</message>
@@ -3869,52 +3869,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<source>Local file changed during sync.</source>
<translation>Paikallinen tiedosto muuttui synkronoinnin aikana.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation type="unfinished"/>
</message>
@@ -3924,12 +3924,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation>Virhe metatietoja päivittäessä: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation>Tiedosto %1 on tällä hetkellä käytössä</translation>
</message>
diff --git a/translations/client_fr.ts b/translations/client_fr.ts
index 3ae6486dc..eb8ec7498 100644
--- a/translations/client_fr.ts
+++ b/translations/client_fr.ts
@@ -3544,7 +3544,7 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<message>
<location filename="../src/libsync/discovery.cpp" line="846"/>
<source>Cannot sync due to invalid modification time</source>
- <translation type="unfinished"/>
+ <translation>Impossible de synchroniser à cause d&apos;une date de modification invalide</translation>
</message>
<message>
<location filename="../src/libsync/discovery.cpp" line="946"/>
@@ -3552,47 +3552,47 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<translation>Conflit lors de l&apos;envoi de certains fichiers dans un dossier. Ceux conflictuels seront effacés!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation>Conflit lors de l&apos;envoi d&apos;un dossier. Il va être supprimé !</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation>Conflit lors de l&apos;envoi d&apos;un fichier. Il va être supprimé !</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Ignoré en raison de la liste noire &quot;Sélectionner le contenu à synchroniser&quot;.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>Non autorisé car vous n&apos;avez pas la permission d&apos;ajouter des sous-dossiers dans ce dossier</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>Non autorisé car vous n&apos;avez pas la permission d&apos;ajouter des fichiers dans ce dossier</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<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="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation>Non autorisé à supprimer. Restauration</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation>Erreur de lecture de la base de données</translation>
</message>
@@ -3602,7 +3602,7 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<translation>Le serveur a répondu avec une erreur au moment de lire le dossier &apos;%1&apos; : %2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>Le serveur a répondu avec une erreur lors de la lecture du dossier &quot;%1&quot; : %2</translation>
</message>
@@ -3848,7 +3848,7 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Le code HTTP retourné par le serveur n&apos;est pas valide. La valeur attendue est 201 mais la valeur reçue est &quot;%1 %2&quot;.</translation>
</message>
@@ -3858,12 +3858,12 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<translation>Erreur à l&apos;écriture des métadonnées dans la base de données</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation>Erreur d&apos;écriture des métadonnées dans la base de données : %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation>Le fichier %1 est en cours d&apos;utilisation</translation>
</message>
@@ -3904,52 +3904,52 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<context>
<name>OCC::PropagateUploadFileCommon</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation>Échec d&apos;envoi du fichier chiffré.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>Impossible d&apos;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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>L&apos;envoi de %1 amène un dépassement de quota pour le dossier</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation>Le fichier %1 présente une date de modification invalide. Envoi au serveur impossible.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>Le fichier %1 présente une date de modification invalide. Envoi au serveur impossible.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<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="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<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="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<source>Local file changed during sync.</source>
<translation>Fichier local modifié pendant la synchronisation.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation>Impossible de déverrouiller le dossier chiffré.</translation>
</message>
@@ -3959,12 +3959,12 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<translation>Erreur à l&apos;écriture des métadonnées dans la base de données</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<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="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation>Le fichier %1 est en cours d&apos;utilisation</translation>
</message>
@@ -5986,27 +5986,27 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="520"/>
<source>You renamed %1</source>
- <translation type="unfinished"/>
+ <translation>Vous avez renommé %1</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="522"/>
<source>You deleted %1</source>
- <translation type="unfinished"/>
+ <translation>Vous avez supprimé %1</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="524"/>
<source>You created %1</source>
- <translation type="unfinished"/>
+ <translation>Vous avez créé %1</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="526"/>
<source>You changed %1</source>
- <translation type="unfinished"/>
+ <translation>Vous avez modifié %1</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="549"/>
<source>Synced %1</source>
- <translation type="unfinished"/>
+ <translation>%1 a été synchronisé</translation>
</message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="482"/>
@@ -6098,12 +6098,12 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<message>
<location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/>
<source>Reply to …</source>
- <translation type="unfinished"/>
+ <translation>Répondre à...</translation>
</message>
<message>
<location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/>
<source>Send reply to chat message</source>
- <translation type="unfinished"/>
+ <translation>Envoyer la réponse dans la discussion</translation>
</message>
</context>
<context>
diff --git a/translations/client_gl.ts b/translations/client_gl.ts
index 853ca79d0..40a6b39f4 100644
--- a/translations/client_gl.ts
+++ b/translations/client_gl.ts
@@ -3548,47 +3548,47 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Ignorado por mor da lista de bloqueo de «escolla que sincronizar»</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;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="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;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="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<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="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation>Non está permitido retiralo, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation>Produciuse un erro ao ler a base de datos</translation>
</message>
@@ -3598,7 +3598,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3844,7 +3844,7 @@ Este é un novo modo experimental. Se decide usalo, agradecémoslle que informe
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>O servidor devolveu código HTTP incorrecto. Agardábase 201, mais recibiuse «%1 %2».</translation>
</message>
@@ -3854,12 +3854,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3900,52 +3900,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<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="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<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="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<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="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<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="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<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="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation>Produciuse un fallo ao desbloquear un cartafol cifrado.</translation>
</message>
@@ -3955,12 +3955,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_he.ts b/translations/client_he.ts
index 0d4909036..80fe6b784 100644
--- a/translations/client_he.ts
+++ b/translations/client_he.ts
@@ -3512,47 +3512,47 @@ 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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3562,7 +3562,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3808,7 +3808,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>הוחזר קוד HTTP שגוי על ידי השרת. אמור היה להיות 201 אבל התקבל „%1 %2”.</translation>
</message>
@@ -3818,12 +3818,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3864,52 +3864,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>ההעלאה של %1 חורגת ממכסת התיקייה</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation>הוקבץ הוסר (התחלת ההעלאה) %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>הקובץ המקומי השתנה במהלך הסנכרון. התהליך ימשיך.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<source>Local file changed during sync.</source>
<translation>הקובץ המקומי השתנה במהלך הסנכרון.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation type="unfinished"/>
</message>
@@ -3919,12 +3919,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_hr.ts b/translations/client_hr.ts
index 1367594f7..4123e4a06 100644
--- a/translations/client_hr.ts
+++ b/translations/client_hr.ts
@@ -3553,47 +3553,47 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;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="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;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="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Zanemareno zbog crne liste „odaberi što će se sinkronizirati”</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;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="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;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="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<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="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation>Nije dopušteno uklanjanje, vraćanje</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation>Pogreška pri čitanju baze podataka</translation>
</message>
@@ -3603,7 +3603,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 &apos;%1&apos; : %2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>Poslužitelj je javio pogrešku pri čitanju direktorija „%1” : %2</translation>
</message>
@@ -3849,7 +3849,7 @@ Ovo je novi, eksperimentalni način rada. Ako se odlučite aktivirati ga, prijav
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Poslužitelj je vratio pogrešnu HTTP šifru. Očekivana je 201, ali je primljena „%1 %2”.</translation>
</message>
@@ -3859,12 +3859,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation>Pogreška pri pisanju metapodataka u bazu podataka: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation>Datoteka %1 je trenutno u upotrebi</translation>
</message>
@@ -3905,52 +3905,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation>Otpremanje šifrirane datoteke nije uspjelo.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<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="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<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="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<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="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<source>Local file changed during sync.</source>
<translation>Lokalna datoteka je izmijenjena tijekom sinkronizacije.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation>Nije uspjelo otključavanje šifrirane mape.</translation>
</message>
@@ -3960,12 +3960,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation>Pogreška pri ažuriranju metapodataka: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation>Datoteka %1 je trenutno u upotrebi</translation>
</message>
diff --git a/translations/client_hu.ts b/translations/client_hu.ts
index c51a5faa7..8dfabae6e 100644
--- a/translations/client_hu.ts
+++ b/translations/client_hu.ts
@@ -3553,47 +3553,47 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;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="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;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="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; 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="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;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="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;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="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<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="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<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="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation>Hiba történt az adatbázis olvasása során</translation>
</message>
@@ -3603,7 +3603,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %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>
@@ -3849,7 +3849,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>A kiszolgáló hibás HTTP kódot adott vissza. 201-es kód várt, de ez érkezett: „%1 %2”.</translation>
</message>
@@ -3859,12 +3859,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation>Hiba a metaadatok adatbázisba írásakor: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation>A(z) %1 fájl épp használatban van</translation>
</message>
@@ -3905,52 +3905,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<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="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<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="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation>A(z) %1 fájl módosítási ideje érvénytelen. Ne töltse fel a kiszolgálóra.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>A(z) %1 fájl módosítási ideje érvénytelen. Ne töltse fel a kiszolgálóra.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<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="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<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="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<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="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation>Nem sikerült feloldani a titkosított mappát.</translation>
</message>
@@ -3960,12 +3960,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation>Hiba a metaadatok frissítésekor: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation>A(z) %1 fájl épp használatban van</translation>
</message>
@@ -4101,7 +4101,7 @@ Ez egy új, kísérleti mód. Ha úgy dönt, hogy használja, akkor jelezze nek
<message>
<location filename="../src/gui/tray/notificationhandler.cpp" line="114"/>
<source>Reply</source>
- <translation type="unfinished"/>
+ <translation>Válasz</translation>
</message>
<message>
<location filename="../src/gui/tray/notificationhandler.cpp" line="137"/>
diff --git a/translations/client_id.ts b/translations/client_id.ts
index 11404c12e..e04fb6cf2 100644
--- a/translations/client_id.ts
+++ b/translations/client_id.ts
@@ -3515,47 +3515,47 @@ 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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3565,7 +3565,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3811,7 +3811,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation type="unfinished"/>
</message>
@@ -3821,12 +3821,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3867,52 +3867,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation type="unfinished"/>
</message>
@@ -3922,12 +3922,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_is.ts b/translations/client_is.ts
index ec0cf5034..ce594bb6e 100644
--- a/translations/client_is.ts
+++ b/translations/client_is.ts
@@ -3519,47 +3519,47 @@ 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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3569,7 +3569,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3815,7 +3815,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Fékk rangan HTTP-kóða frá þjóni. Átti von á 201, en fékk &quot;%1 %2&quot;.</translation>
</message>
@@ -3825,12 +3825,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3871,52 +3871,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<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="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<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="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<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="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation type="unfinished"/>
</message>
@@ -3926,12 +3926,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_it.ts b/translations/client_it.ts
index 075db44e9..5882b1471 100644
--- a/translations/client_it.ts
+++ b/translations/client_it.ts
@@ -3543,47 +3543,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Conflitto durante l&apos;invio di alcuni file in una cartella. I file in conflitto verranno eliminati!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation>Conflitto durante l&apos;invio di una cartella. Verrà svuotata!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation>Conflitto durante l&apos;invio di un file. Verrà rimosso!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; 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="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;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="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;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="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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&apos;accesso in sola lettura sul server, ripristino</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<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="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation>Rimozione non consentita, ripristino</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation>Errore durante la lettura del database</translation>
</message>
@@ -3593,7 +3593,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 &apos;% 1&apos; : %2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>Il server ha risposto con un errore durante la lettura della cartella &quot;%1&quot; : %2</translation>
</message>
@@ -3839,7 +3839,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Codice HTTP errato restituito dal server. Atteso 201, ma ricevuto &quot;%1 %2&quot;.</translation>
</message>
@@ -3849,12 +3849,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation>Errore durante la scrittura dei metadati nel database: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation>Il file %1 è attualmente in uso</translation>
</message>
@@ -3895,52 +3895,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation>Caricamento del file cifrato non riuscito.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<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="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation>Il file %1 ha un orario di modifica non valido. Non inviarlo sul server.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>Il file %1 ha un orario di modifica non valido. Non inviarlo sul server.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation>File rimosso (avvio caricamento) %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<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="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<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="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation>Sblocco della cartella cifrata non riuscito.</translation>
</message>
@@ -3950,12 +3950,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation>Errore di invio dei metadati: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation>Il file %1 è attualmente in uso</translation>
</message>
diff --git a/translations/client_ja.ts b/translations/client_ja.ts
index dfac3419a..1a7f7b936 100644
--- a/translations/client_ja.ts
+++ b/translations/client_ja.ts
@@ -9,7 +9,7 @@
<message>
<location filename="../src/gui/tray/ActivityItem.qml" line="26"/>
<source>In %1</source>
- <translation type="unfinished"/>
+ <translation>%1 内</translation>
</message>
<message>
<location filename="../src/gui/tray/ActivityItem.qml" line="194"/>
@@ -39,7 +39,7 @@
<location filename="../src/gui/tray/ActivityItemActions.qml" line="83"/>
<location filename="../src/gui/tray/ActivityItemActions.qml" line="94"/>
<source>Show more actions</source>
- <translation type="unfinished"/>
+ <translation>その他の操作を表示</translation>
</message>
</context>
<context>
@@ -48,12 +48,12 @@
<location filename="../src/gui/tray/ActivityItemContent.qml" line="175"/>
<location filename="../src/gui/tray/ActivityItemContent.qml" line="186"/>
<source>Dismiss</source>
- <translation type="unfinished"/>
+ <translation>閉じる</translation>
</message>
<message>
<location filename="../src/gui/tray/ActivityItemContent.qml" line="217"/>
<source>Open share dialog</source>
- <translation type="unfinished"/>
+ <translation>共有ダイアログを開く</translation>
</message>
</context>
<context>
@@ -344,7 +344,7 @@
<message>
<location filename="../src/gui/accountsettings.ui" line="148"/>
<source>Storage space: …</source>
- <translation>ストレージスペース : …</translation>
+ <translation>ストレージ空き容量: ...</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="256"/>
@@ -761,7 +761,7 @@ This action will abort any currently running synchronization.</source>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="414"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
- <translation>シンボリックリンクと同様に無視されるファイルは同期されません。</translation>
+ <translation>除外ファイルリスト内のファイルやシンボリックリンクは同期されません。</translation>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="611"/>
@@ -771,7 +771,7 @@ This action will abort any currently running synchronization.</source>
<message>
<location filename="../src/gui/activitylistmodel.cpp" line="241"/>
<source>Files from the ignore list as well as symbolic links are not synced. This includes:</source>
- <translation>シンボリックリンクと同様に無視されるファイルは同期されません。以下の通り:</translation>
+ <translation>除外ファイルリスト内のファイルやシンボリックリンクは同期されません。以下を含みます: </translation>
</message>
</context>
<context>
@@ -898,13 +898,13 @@ This action will abort any currently running synchronization.</source>
<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>ファイル %1 は、大文字と小文字の区別が違う同じ名前のファイルが存在するためアップロードできません</translation>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="169"/>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modified time. Do not upload to the server.</source>
- <translation type="unfinished"/>
+ <translation>ファイル %1 の更新日時が無効です。サーバにアップロードしないでください。</translation>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="294"/>
@@ -914,7 +914,7 @@ This action will abort any currently running synchronization.</source>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="305"/>
<source>File %1 has invalid modification time. Do not upload to the server.</source>
- <translation type="unfinished"/>
+ <translation>ファイル %1 の更新日時が無効です。サーバにアップロードしないでください。</translation>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="313"/>
@@ -930,12 +930,12 @@ This action will abort any currently running synchronization.</source>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/>
<source>Network error: %1</source>
- <translation type="unfinished"/>
+ <translation>ネットワークエラー: %1</translation>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="420"/>
<source>Network Error: %1</source>
- <translation type="unfinished"/>
+ <translation>ネットワークエラー: %1</translation>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="465"/>
@@ -955,12 +955,12 @@ This action will abort any currently running synchronization.</source>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/>
<source>Restoration failed: %1</source>
- <translation type="unfinished"/>
+ <translation>復元に失敗しました: %1</translation>
</message>
<message>
<location filename="../src/libsync/bulkpropagatorjob.cpp" line="676"/>
<source>; Restoration Failed: %1</source>
- <translation type="unfinished"/>
+ <translation>; 復元に失敗しました: %1</translation>
</message>
</context>
<context>
@@ -1149,22 +1149,22 @@ This action will abort any currently running synchronization.</source>
<message>
<location filename="../src/libsync/discoveryphase.cpp" line="189"/>
<source>Error while canceling deletion of a file</source>
- <translation type="unfinished"/>
+ <translation>ファイル削除をキャンセル中にエラーが発生</translation>
</message>
<message>
<location filename="../src/libsync/discoveryphase.cpp" line="189"/>
<source>Error while canceling delete of a file</source>
- <translation type="unfinished"/>
+ <translation>ファイル削除のキャンセル中にエラーが発生</translation>
</message>
<message>
<location filename="../src/libsync/discoveryphase.cpp" line="190"/>
<source>Error while canceling deletion of %1</source>
- <translation type="unfinished"/>
+ <translation>%1 の削除をキャンセル中にエラーが発生</translation>
</message>
<message>
<location filename="../src/libsync/discoveryphase.cpp" line="190"/>
<source>Error while canceling delete of %1</source>
- <translation type="unfinished"/>
+ <translation>%1 の削除をキャンセル中にエラーが発生</translation>
</message>
</context>
<context>
@@ -2405,12 +2405,12 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<message>
<location filename="../src/gui/internallinkwidget.ui" line="64"/>
<source>Internal link</source>
- <translation type="unfinished"/>
+ <translation>内部リンク</translation>
</message>
<message>
<location filename="../src/gui/internallinkwidget.ui" line="83"/>
<source>Only works for users with access to this folder</source>
- <translation type="unfinished"/>
+ <translation>このフォルダにアクセスできるユーザーに対してのみ有効です</translation>
</message>
</context>
<context>
@@ -3101,12 +3101,12 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="844"/>
<source>Impossible to get modification time for file in conflict %1</source>
- <translation type="unfinished"/>
+ <translation>競合しているファイル %1 の修正日時を取得できません</translation>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="844"/>
<source>Impossible to get modification time for file in conflict %1)</source>
- <translation type="unfinished"/>
+ <translation>競合しているファイル %1 の修正日時を取得できません</translation>
</message>
</context>
<context>
@@ -3405,12 +3405,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/gui/passwordinputdialog.ui" line="23"/>
<source>Password for share required</source>
- <translation type="unfinished"/>
+ <translation>共有用のパスワードが必要です</translation>
</message>
<message>
<location filename="../src/gui/passwordinputdialog.ui" line="35"/>
<source>Please enter a password for your share:</source>
- <translation type="unfinished"/>
+ <translation>リンク共有のパスワードを入力してください。</translation>
</message>
</context>
<context>
@@ -3541,7 +3541,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/libsync/discovery.cpp" line="846"/>
<source>Cannot sync due to invalid modification time</source>
- <translation type="unfinished"/>
+ <translation>修正日時が無効なため同期できません</translation>
</message>
<message>
<location filename="../src/libsync/discovery.cpp" line="946"/>
@@ -3549,47 +3549,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>一部のファイルをフォルダにアップロードするときに競合が発生しました。これらの競合はクリアされます!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation>フォルダをアップロードするときに競合したので、クリアされます!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation>フォルダをアップロードするときに競合したので、削除されます!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>&quot;選択されたものを同期する&quot; のブラックリストにあるために無視されました</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>そのフォルダーにサブフォルダーを追加する権限がありません</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>そのフォルダーにファイルを追加する権限がありません</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation>無効なターゲットに移動し、復元しました</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation>削除、復元は許可されていません</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation>データベースを読み込み中にエラーが発生しました</translation>
</message>
@@ -3599,7 +3599,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>サーバーがディレクトリ &apos;%1&apos; の読み取り中にエラーで応答しました: %2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>サーバーでディレクトリ &quot;%1&quot; を読み取り中にエラーになりました: %2</translation>
</message>
@@ -3614,12 +3614,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1204"/>
<source>Error updating metadata due to invalid modification time</source>
- <translation type="unfinished"/>
+ <translation>修正日時が無効なためメタデータの更新時にエラーが発生</translation>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1204"/>
<source>Error updating metadata due to invalid modified time</source>
- <translation type="unfinished"/>
+ <translation>修正日時が無効なためメタデータの更新時にエラーが発生</translation>
</message>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="1220"/>
@@ -3705,7 +3705,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<location filename="../src/libsync/propagatedownload.cpp" line="1081"/>
<location filename="../src/libsync/propagatedownload.cpp" line="1094"/>
<source>File %1 has invalid modified time reported by server. Do not save it.</source>
- <translation type="unfinished"/>
+ <translation>ファイル %1 のサーバから報告された修正日時が無効です。保存しないでください。</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="1219"/>
@@ -3845,7 +3845,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>誤ったHTTPコードがサーバーから返されました。201のはずが、&quot;%1 %2&quot;が返りました。</translation>
</message>
@@ -3855,12 +3855,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation>メタデータのデータベースへの書き込みに失敗: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation>ファイル %1 は現在使用中です</translation>
</message>
@@ -3901,52 +3901,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation>暗号化されたファイルをアップロードできませんでした。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>%1 をアップロードするとフォルダーのクオータを超えます</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
- <translation type="unfinished"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <translation>ファイル %1 の更新日時が無効です。サーバにアップロードしないでください。</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
- <translation type="unfinished"/>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <translation>ファイル %1 の更新日時が無効です。サーバにアップロードしないでください。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation>ファイルが削除されました(アップロード開始)%1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>ローカルファイルが同期中に変更されました。再開されます。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<source>Local file changed during sync.</source>
<translation>ローカルのファイルが同期中に変更されました。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation>暗号化されたフォルダーの解除に失敗しました。</translation>
</message>
@@ -3956,12 +3956,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation>メタデータの更新中にエラーが発生しました:%1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation>ファイル %1 は現在使用中です</translation>
</message>
@@ -4097,7 +4097,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/gui/tray/notificationhandler.cpp" line="114"/>
<source>Reply</source>
- <translation type="unfinished"/>
+ <translation>返信</translation>
</message>
<message>
<location filename="../src/gui/tray/notificationhandler.cpp" line="137"/>
@@ -5085,7 +5085,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/libsync/syncengine.cpp" line="1060"/>
<source>Synchronization will resume shortly.</source>
- <translation type="unfinished"/>
+ <translation>まもなく同期が再開されます。</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="1077"/>
@@ -5136,7 +5136,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/gui/tray/syncstatussummary.cpp" line="169"/>
<source>Some files could not be synced!</source>
- <translation type="unfinished"/>
+ <translation>いくつかのファイルが同期できませんでした!</translation>
</message>
<message>
<location filename="../src/gui/tray/syncstatussummary.cpp" line="170"/>
@@ -5156,7 +5156,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/gui/tray/syncstatussummary.cpp" line="227"/>
<source>Syncing file %1 of %2</source>
- <translation type="unfinished"/>
+ <translation>%2 の %1 を同期しています</translation>
</message>
</context>
<context>
@@ -5191,7 +5191,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/gui/systray.cpp" line="112"/>
<source>Help</source>
- <translation type="unfinished"/>
+ <translation>ヘルプ</translation>
</message>
<message>
<location filename="../src/gui/systray.cpp" line="111"/>
@@ -5254,12 +5254,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="419"/>
<source>Search has failed for &apos;%2&apos;.</source>
- <translation type="unfinished"/>
+ <translation>&apos;%2&apos; を検索できませんでした</translation>
</message>
<message>
<location filename="../src/gui/tray/unifiedsearchresultslistmodel.cpp" line="448"/>
<source>Search has failed for &apos;%1&apos;. Error: %2</source>
- <translation type="unfinished"/>
+ <translation>&apos;%1&apos; を検索できませんでした。エラー: %2</translation>
</message>
</context>
<context>
@@ -5429,13 +5429,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<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 modification time</source>
- <translation type="unfinished"/>
+ <translation>修正日時が無効なためメタデータの更新時にエラーが発生</translation>
</message>
<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"/>
+ <translation>修正日時が無効なためメタデータの更新時にエラーが発生</translation>
</message>
</context>
<context>
@@ -5444,13 +5444,13 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<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 modification time</source>
- <translation type="unfinished"/>
+ <translation>修正日時が無効なためメタデータの更新時にエラーが発生</translation>
</message>
<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"/>
+ <translation>修正日時が無効なためメタデータの更新時にエラーが発生</translation>
</message>
</context>
<context>
@@ -5977,32 +5977,32 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="697"/>
<source>Mark as read</source>
- <translation type="unfinished"/>
+ <translation>既読にする</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="520"/>
<source>You renamed %1</source>
- <translation type="unfinished"/>
+ <translation>%1 の名前を変更しました</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="522"/>
<source>You deleted %1</source>
- <translation type="unfinished"/>
+ <translation>%1 を削除しました</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="524"/>
<source>You created %1</source>
- <translation type="unfinished"/>
+ <translation>%1 を作成しました</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="526"/>
<source>You changed %1</source>
- <translation type="unfinished"/>
+ <translation>%1 を変更しました</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="549"/>
<source>Synced %1</source>
- <translation type="unfinished"/>
+ <translation>%1 を同期しました</translation>
</message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="482"/>
@@ -6094,12 +6094,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/>
<source>Reply to …</source>
- <translation type="unfinished"/>
+ <translation>返信...</translation>
</message>
<message>
<location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/>
<source>Send reply to chat message</source>
- <translation type="unfinished"/>
+ <translation>チャットメッセージに返信</translation>
</message>
</context>
<context>
@@ -6107,7 +6107,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/gui/tray/UnifiedSearchInputContainer.qml" line="25"/>
<source>Search files, messages, events …</source>
- <translation type="unfinished"/>
+ <translation>ファイルやメッセージ、イベントを検索</translation>
</message>
</context>
<context>
@@ -6471,7 +6471,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/gui/tray/Window.qml" line="681"/>
<source>Unified search results list</source>
- <translation type="unfinished"/>
+ <translation>統合検索結果</translation>
</message>
<message>
<location filename="../src/gui/tray/Window.qml" line="816"/>
diff --git a/translations/client_ko.ts b/translations/client_ko.ts
index 0b606700c..6a9c29171 100644
--- a/translations/client_ko.ts
+++ b/translations/client_ko.ts
@@ -3557,47 +3557,47 @@ 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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>&quot;동기화 할 대상 선택&quot; 블랙리스트로 인해 무시되었습니다.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>해당 폴더에 하위 폴더를 추가 할 수 있는 권한이 없기 때문에 허용되지 않습니다.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>해당 폴더에 파일을 추가 할 권한이 없으므로 허용되지 않습니다.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation>유효하지 않은 목적지로 옮겨짐, 복구</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation>삭제가 허용되지 않음, 복구</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation>데이터베이스를 읽는 중 오류 발생</translation>
</message>
@@ -3607,7 +3607,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>서버가 디렉토리 &apos;%1&apos;을(를) 읽는 중 오류에 대응함: %2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3853,7 +3853,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>서버에서 잘못된 HTTP 코드를 반환했습니다. 201가 받아지는 대신 &quot;1 %2&quot;을 받았습니다.</translation>
</message>
@@ -3863,12 +3863,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3909,52 +3909,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation>암호화된 파일 업로드 실패</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>%1의 업로드가 폴더의 할당량을 초과합니다.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation>파일 삭제됨 (업로드 시작) %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>동기화 중 로컬 파일이 변경되었습니다. 곧 재개됩니다.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<source>Local file changed during sync.</source>
<translation>동기화 중 로컬 파일이 변경되었습니다.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation>암호화된 폴더 해제 실패</translation>
</message>
@@ -3964,12 +3964,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_lt_LT.ts b/translations/client_lt_LT.ts
index 076663481..dc51b70c4 100644
--- a/translations/client_lt_LT.ts
+++ b/translations/client_lt_LT.ts
@@ -3524,47 +3524,47 @@ 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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation>Klaida skaitant duomenų bazę</translation>
</message>
@@ -3574,7 +3574,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3820,7 +3820,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Serveris grąžino neteisingą HTTP kodą. Buvo tikimasi 201, tačiau gauta &quot;%1 %2&quot;.</translation>
</message>
@@ -3830,12 +3830,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3876,52 +3876,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<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="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<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="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<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="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<source>Local file changed during sync.</source>
<translation>Failas kompiuteryje sinchronizavimo metu buvo pakeistas.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation type="unfinished"/>
</message>
@@ -3931,12 +3931,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_lv.ts b/translations/client_lv.ts
index 3ceee1858..0443b3449 100644
--- a/translations/client_lv.ts
+++ b/translations/client_lv.ts
@@ -3505,47 +3505,47 @@ 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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3555,7 +3555,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3801,7 +3801,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation type="unfinished"/>
</message>
@@ -3811,12 +3811,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3857,52 +3857,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation type="unfinished"/>
</message>
@@ -3912,12 +3912,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_mk.ts b/translations/client_mk.ts
index 69c544252..12fbbab63 100644
--- a/translations/client_mk.ts
+++ b/translations/client_mk.ts
@@ -3514,47 +3514,47 @@ 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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>Не е дозволено бидејќи немате дозвола да додавате потпапки во оваа папка</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>Не е дозволено бидејќи немате дозвола да додавате датотеки во оваа папка</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation>Не е дозволено бришење, враќање</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation>Грешка при вчитување на податоци од датабазата</translation>
</message>
@@ -3564,7 +3564,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Серверот одговори со грешка при читање на папката &apos;%1&apos; : %2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3810,7 +3810,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Серверот одговори со погрешен HTTP код. Очевуван одговор 201, но серверот одговори со &quot;%1 %2&quot;.</translation>
</message>
@@ -3820,12 +3820,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3866,52 +3866,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation>Избришана датотека (започнува прикачување) %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<source>Local file changed during sync.</source>
<translation>Локална датотека е променета додека траеше синхронизацијата.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation type="unfinished"/>
</message>
@@ -3921,12 +3921,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts
index 222dc00dc..9a00819e0 100644
--- a/translations/client_nb_NO.ts
+++ b/translations/client_nb_NO.ts
@@ -3516,47 +3516,47 @@ 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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3566,7 +3566,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3812,7 +3812,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Feil HTTP-kode returnert fra server. Ventet 201, men mottok &quot;%1 %2&quot;.</translation>
</message>
@@ -3822,12 +3822,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3868,52 +3868,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<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="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation>Fil fjernet (start opplasting) %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<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="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<source>Local file changed during sync.</source>
<translation>Lokal fil endret under synkronisering.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation type="unfinished"/>
</message>
@@ -3923,12 +3923,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_nl.ts b/translations/client_nl.ts
index d679b8539..9b9263083 100644
--- a/translations/client_nl.ts
+++ b/translations/client_nl.ts
@@ -3555,47 +3555,47 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;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="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;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="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Genegeerd vanwege de &quot;wat synchroniseren&quot; negeerlijst</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;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="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;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="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation>Verplaatst naar ongeldig doel, herstellen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation>Niet toegestaan om te verwijderen, herstellen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation>Fout bij lezen database</translation>
</message>
@@ -3605,7 +3605,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<translation>Server gaf een foutmelding bij lezen directory &apos;%1&apos; : %2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>Server gaf een foutmelding bij lezen directory &quot;%1&apos;&quot;: %2</translation>
</message>
@@ -3851,7 +3851,7 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Foutieve HTTP code ontvangen van de server. Verwacht was 201, maar ontvangen &quot;%1 %2&quot;.</translation>
</message>
@@ -3861,12 +3861,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation>Fout bij schrijven van metadata naar de database: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation>Bestand %1 is al in gebruik</translation>
</message>
@@ -3907,29 +3907,22 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation>Kon versleuteld bestand niet uploaden.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<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="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
- <translation>Bestand %1 heeft een ongeldige wijzigingstijd. Niet uploaden naar de server.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
@@ -3937,22 +3930,29 @@ Dit is een nieuwe, experimentele modus. Als je besluit het te gebruiken, vragen
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <translation>Bestand %1 heeft een ongeldige wijzigingstijd. Niet uploaden naar de server.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation>Bestand verwijderd (start upload) %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<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="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<source>Local file changed during sync.</source>
<translation>Lokaal bestand gewijzigd tijdens sync.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation>Kon versleutelde map niet ontgrendelen.</translation>
</message>
@@ -3962,12 +3962,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation>Fout bij bijwerken metadata: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation>Bestand %1 is al in gebruik</translation>
</message>
diff --git a/translations/client_oc.ts b/translations/client_oc.ts
index 78f054958..f589520ae 100644
--- a/translations/client_oc.ts
+++ b/translations/client_oc.ts
@@ -3503,47 +3503,47 @@ 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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3553,7 +3553,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3799,7 +3799,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation type="unfinished"/>
</message>
@@ -3809,12 +3809,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3855,52 +3855,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation type="unfinished"/>
</message>
@@ -3910,12 +3910,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_pl.ts b/translations/client_pl.ts
index 94378cc11..e57751525 100644
--- a/translations/client_pl.ts
+++ b/translations/client_pl.ts
@@ -3553,47 +3553,47 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;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="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;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="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Ignorowane z powodu czarnej listy &quot;Wybierz co synchronizować&quot;</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;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="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;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="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Wysyłanie niedozwolone, ponieważ plik jest tylko do odczytu na serwerze, przywracanie</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation>Przeniesiono do nieprawidłowego obiektu, przywracanie</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation>Brak uprawnień by usunąć, przywracanie</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation>Błąd podczas odczytu bazy danych</translation>
</message>
@@ -3603,7 +3603,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<translation>Serwer odpowiedział z błędem podczas odczytu katalogu &apos;%1&apos; : %2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>Serwer odpowiedział z błędem podczas odczytu katalogu &quot;%1&quot; : %2</translation>
</message>
@@ -3849,7 +3849,7 @@ To nowy, eksperymentalny tryb. Jeśli zdecydujesz się z niego skorzystać, zgł
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Serwer zwrócił nieprawidłowy kod HTTP. Oczekiwano 201, a otrzymano &quot;%1 %2&quot;.</translation>
</message>
@@ -3859,12 +3859,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation>Błąd zapisu metadanych do bazy danych: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation>Plik %1 jest aktualnie używany</translation>
</message>
@@ -3905,52 +3905,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<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="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<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="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation>Plik %1 ma nieprawidłowy czas modyfikacji. Nie wysyłaj na serwer.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>Plik %1 ma nieprawidłowy czas modyfikacji. Nie wysyłaj na serwer.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<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="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<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="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<source>Local file changed during sync.</source>
<translation>Plik lokalny zmieniony podczas synchronizacji.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation>Nie udało się odblokować zaszyfrowanego katalogu.</translation>
</message>
@@ -3960,12 +3960,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation>Błąd podczas aktualizowania metadanych: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation>Plik %1 jest aktualnie używany</translation>
</message>
diff --git a/translations/client_pt.ts b/translations/client_pt.ts
index 548ca2c4c..11c657f86 100644
--- a/translations/client_pt.ts
+++ b/translations/client_pt.ts
@@ -3510,47 +3510,47 @@ 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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3560,7 +3560,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3806,7 +3806,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Código HTTP errado devolvido pelo servidor. Esperado 201, mas foi recebido &quot;%1 %2&quot;.</translation>
</message>
@@ -3816,12 +3816,12 @@ 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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3862,52 +3862,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation>Ficheiro Removido (iniciar upload) %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<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="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<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="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation type="unfinished"/>
</message>
@@ -3917,12 +3917,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts
index fc4500213..9b7dab4c1 100644
--- a/translations/client_pt_BR.ts
+++ b/translations/client_pt_BR.ts
@@ -3543,7 +3543,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<message>
<location filename="../src/libsync/discovery.cpp" line="846"/>
<source>Cannot sync due to invalid modification time</source>
- <translation type="unfinished"/>
+ <translation>Não é possível sincronizar devido ao horário de modificação inválido</translation>
</message>
<message>
<location filename="../src/libsync/discovery.cpp" line="946"/>
@@ -3551,47 +3551,47 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;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="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;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="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Ignorado devido à lista negra &quot;escolher o que sincronizar&quot; </translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;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="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;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="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation>Movido para destino inválido, restaurando </translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<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="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation>Erro ao ler o banco de dados </translation>
</message>
@@ -3601,7 +3601,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 &apos;%1&apos; : %2 </translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>O servidor respondeu com um erro ao ler o diretório &quot;%1&quot; : %2</translation>
</message>
@@ -3847,7 +3847,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Código HTTP errado retornado pelo servidor. 201 esperado, mas recebeu &quot;%1 %2&quot;.</translation>
</message>
@@ -3857,12 +3857,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation>Erro ao gravar metadados no banco de dados: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation>O arquivo %1 está atualmente em uso</translation>
</message>
@@ -3903,29 +3903,22 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<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="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<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="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
- <translation>O arquivo %1 possui data/hora de modificação inválida. Não enviar ao servidor.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
@@ -3933,22 +3926,29 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>O arquivo %1 tem hora de modificação inválida. Não envie para o servidor.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <translation>O arquivo %1 possui data/hora de modificação inválida. Não enviar ao servidor.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation>Arquivo Removido (iniciar envio) %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<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="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<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="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation>Falha ao desbloquear a pasta criptografada. </translation>
</message>
@@ -3958,12 +3958,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation>Erro ao atualizar metadados: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation>O arquivo %1 está correntemente em uso</translation>
</message>
@@ -4099,7 +4099,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<message>
<location filename="../src/gui/tray/notificationhandler.cpp" line="114"/>
<source>Reply</source>
- <translation type="unfinished"/>
+ <translation>Responder</translation>
</message>
<message>
<location filename="../src/gui/tray/notificationhandler.cpp" line="137"/>
@@ -5984,27 +5984,27 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="520"/>
<source>You renamed %1</source>
- <translation type="unfinished"/>
+ <translation>Você renomeou %1</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="522"/>
<source>You deleted %1</source>
- <translation type="unfinished"/>
+ <translation>Você excluiu %1</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="524"/>
<source>You created %1</source>
- <translation type="unfinished"/>
+ <translation>Você criou %1</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="526"/>
<source>You changed %1</source>
- <translation type="unfinished"/>
+ <translation>Você modificou %1</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="549"/>
<source>Synced %1</source>
- <translation type="unfinished"/>
+ <translation>%1 sincronizado</translation>
</message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="482"/>
@@ -6096,12 +6096,12 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<message>
<location filename="../src/gui/tray/TalkReplyTextField.qml" line="31"/>
<source>Reply to …</source>
- <translation type="unfinished"/>
+ <translation>Responder a …</translation>
</message>
<message>
<location filename="../src/gui/tray/TalkReplyTextField.qml" line="65"/>
<source>Send reply to chat message</source>
- <translation type="unfinished"/>
+ <translation>Enviar resposta à mensagem de bate-papo</translation>
</message>
</context>
<context>
diff --git a/translations/client_ro.ts b/translations/client_ro.ts
index 47b0e1311..6c8b0a9d8 100644
--- a/translations/client_ro.ts
+++ b/translations/client_ro.ts
@@ -3523,47 +3523,47 @@ 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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3573,7 +3573,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3819,7 +3819,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation type="unfinished"/>
</message>
@@ -3829,12 +3829,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3875,52 +3875,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation type="unfinished"/>
</message>
@@ -3930,12 +3930,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_ru.ts b/translations/client_ru.ts
index f15846e9b..6dd5db503 100644
--- a/translations/client_ru.ts
+++ b/translations/client_ru.ts
@@ -3548,47 +3548,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Передача файлов в папку на сервере привела к конфликту версий. Файлы, вызвавшие конфликт версий, будут удалены.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation>Передача папки на сервер привела к конфликту версии. Папка, вызвавшая конфликт версии, будет удалена.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation>Передача файла на сервер привела к конфликту версии. Файл, вызвавший конфликт версии, будет удалён.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Игнорируется из-за совпадения с записью в списке исключений из синхронизации</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>Недостаточно прав для создания вложенных папок</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>Недостаточно прав для создания файлов в этой папке</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation>Перемещено в некорректное расположение, выполняется восстановление</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation>Удаление недопустимо, выполняется восстановление</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation>Ошибка чтения базы данных</translation>
</message>
@@ -3598,7 +3598,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>Ошибка сервера при попытке прочитать каталог «%1»: %2</translation>
</message>
@@ -3844,7 +3844,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Сервер ответил неправильным кодом HTTP . Ожидался 201, но получен «%1 %2».</translation>
</message>
@@ -3854,12 +3854,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation>Ошибка записи метаданных в базу данных: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation>Файл «%1» используется</translation>
</message>
@@ -3900,29 +3900,22 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation>Не удалось передать на сервер зашифрованный файл.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>При передаче «%1» на сервер будет превышена квота, установленная для папки</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
- <translation>Файл %1 имеет недопустимое время изменения. Не загружайте его на сервер.</translation>
- </message>
- <message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
@@ -3930,22 +3923,29 @@ 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/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <translation>Файл %1 имеет недопустимое время изменения. Не загружайте его на сервер.</translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation>Файл удалён (начало передачи) %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Локальный файл изменился в процессе синхронизации. Операция будет возобновлена.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<source>Local file changed during sync.</source>
<translation>Локальный файл был изменён во время синхронизации.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation>Не удалось разблокировать зашифрованную папку.</translation>
</message>
@@ -3955,12 +3955,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation>Ошибка обновления метаданных: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation>Файл «%1» используется</translation>
</message>
diff --git a/translations/client_sc.ts b/translations/client_sc.ts
index d2d745309..1288a9d28 100644
--- a/translations/client_sc.ts
+++ b/translations/client_sc.ts
@@ -3552,47 +3552,47 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<translation>B&apos;at un&apos;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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation>Iscòrriu carrighende una cartella. Custa s&apos;at a cantzellare!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation>Iscòrriu carrighende un&apos;archìviu. Custu s&apos;at a cantzellare!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; 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="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;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="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;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="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation>Tramudadu a un&apos;indiritzu non bàlidu, riprìstinu</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation>Non ddu podes bogare, riprìstinu</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation>Errore leghende sa base de datos</translation>
</message>
@@ -3602,7 +3602,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<translation>Su serbidore at dadu errore leghende sa cartella &apos;%1&apos; : %2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>Su serbidore nd&apos;at torradu un&apos;errore leghende sa cartella &quot;%1&quot; : %2</translation>
</message>
@@ -3848,7 +3848,7 @@ Custa est una modalidade noa, isperimentale. Si detzides de dda impreare, sinnal
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Còdighe HTTP isballiadu torradu dae su serbidore. Atesu 201, ma retzidu &quot;%1 %2&quot;.</translation>
</message>
@@ -3858,12 +3858,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation>Errore iscriende is metadatos in sa base de datos: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation>S&apos;archìviu %1 est giai impreadu</translation>
</message>
@@ -3904,52 +3904,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation>Carrigamentu de s&apos;archìviu criptadu faddidu</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>S&apos;archìviu %1 non podet èssere carrigadu ca ddo est un&apos;à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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<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="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<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="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation> S&apos;archìviu locale est istadu modificadu durante sa sincronizatzione. At a èssere ripristinadu.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<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="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation>Isblocu de sa cartella criptada faddidu.</translation>
</message>
@@ -3959,12 +3959,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation>Errore agiornende is metadatos: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation>S&apos;archìviu %1 est giai impreadu</translation>
</message>
diff --git a/translations/client_sk.ts b/translations/client_sk.ts
index 554d70fec..3eabe5d12 100644
--- a/translations/client_sk.ts
+++ b/translations/client_sk.ts
@@ -3552,47 +3552,47 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;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="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;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="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Ignorované podľa nastavenia &quot;vybrať čo synchronizovať&quot;</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;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="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;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="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<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="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation>Nie je dovolené odstrániť, obnovujem</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation>Chyba pri čítaní z databáze</translation>
</message>
@@ -3602,7 +3602,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 &apos;%1&apos; : %2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>Server odpovedal chybne počas načítania priečinka &quot;%1&quot; : %2</translation>
</message>
@@ -3848,7 +3848,7 @@ Toto je nový experimentálny režim. Ak sa ho rozhodnete použiť, nahláste v
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Server vrátil neplatný HTTP kód. Očakávaný bol 201, ale vrátený bol &quot;%1 %2&quot;.</translation>
</message>
@@ -3858,12 +3858,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation>Chyba pri zápise metadát do databázy: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation>Súbor %1 sa v súčasnosti používa</translation>
</message>
@@ -3904,52 +3904,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<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="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<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="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation>Súbor %1 má neplatný čas poslednej zmeny. Nenahrávajte ho na server.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>Súbor %1 má neplatný čas poslednej zmeny. Nenahrávajte ho na server.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<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="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<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="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<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="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation>Zlyhalo odomykanie zamknutého adresára.</translation>
</message>
@@ -3959,12 +3959,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation>Chyba pri aktualizácii metadát: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation>Súbor %1 sa v súčasnosti používa</translation>
</message>
diff --git a/translations/client_sl.ts b/translations/client_sl.ts
index 7106ad454..7abb29932 100644
--- a/translations/client_sl.ts
+++ b/translations/client_sl.ts
@@ -3551,47 +3551,47 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;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="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;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="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Predmet ni usklajevan, ker je na »črnem seznamu datotek« za usklajevanje</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;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="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;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="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<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="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation>Odstranjevanje ni dovoljeno, vsebina bo obnovljena.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation>Napaka branja podatkovne zbirke</translation>
</message>
@@ -3601,7 +3601,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>Odziv strežnika vključuje napako med branjem mape »%1«: %2</translation>
</message>
@@ -3847,7 +3847,7 @@ To je nov preizkusni način. Če ga boste uporabili, pošljite tudi poročila o
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>S strežnika je vrnjen neveljaven odziv HTTP. Pričakovan je 201, prejet pa je bil »%1 %2«.</translation>
</message>
@@ -3857,12 +3857,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation>Napaka zapisovanja metapodatkov v podatkovno zbirko: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation>Datoteka %1 je trenutno v uporabi.</translation>
</message>
@@ -3903,52 +3903,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation>Pošiljanje šifrirane datoteke je spodletelo.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<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="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<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="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<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="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<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="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation>Odklepanje šifrirane mape je spodletelo.</translation>
</message>
@@ -3958,12 +3958,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<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="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation>Datoteka %1 je trenutno v uporabi.</translation>
</message>
diff --git a/translations/client_sr.ts b/translations/client_sr.ts
index ddfc71972..3b64b1eec 100644
--- a/translations/client_sr.ts
+++ b/translations/client_sr.ts
@@ -3526,47 +3526,47 @@ 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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3576,7 +3576,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3822,7 +3822,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Сервер је вратио лош ХТТП код. Очекивано је 201 али је примљено „%1 %2“.</translation>
</message>
@@ -3832,12 +3832,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3878,52 +3878,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>Отпремање %1 премашује квоту фасцикле</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation>Фајл уклоњен (започето отпремање) %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Локални фајл је измењен током синхронизације. Биће настављена.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<source>Local file changed during sync.</source>
<translation>Локални фајл измењен током синхронизације.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation type="unfinished"/>
</message>
@@ -3933,12 +3933,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_sv.ts b/translations/client_sv.ts
index f34168ab6..0aeaa61e3 100644
--- a/translations/client_sv.ts
+++ b/translations/client_sv.ts
@@ -3528,47 +3528,47 @@ 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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation>Borttagning tillåts ej, återställer</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation>Fel uppstod när databasen skulle läsas</translation>
</message>
@@ -3578,7 +3578,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3824,7 +3824,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Felaktig HTTP-kod i svaret från servern. &apos;201&apos; förväntades, men &quot;%1 %2&quot; mottogs.</translation>
</message>
@@ -3834,12 +3834,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation>Filen %1 används för tillfället</translation>
</message>
@@ -3880,52 +3880,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation>Kunde inte ladda upp krypterad fil.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<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="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation>Filen borttagen (starta uppladdning) %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<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="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<source>Local file changed during sync.</source>
<translation>Lokal fil ändrades under synkronisering.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation>Kunde inte låsa upp krypterad mapp.</translation>
</message>
@@ -3935,12 +3935,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation>Filen %1 används för tillfället</translation>
</message>
diff --git a/translations/client_th.ts b/translations/client_th.ts
index 16420692f..eb261534e 100644
--- a/translations/client_th.ts
+++ b/translations/client_th.ts
@@ -3511,47 +3511,47 @@ 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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3561,7 +3561,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3807,7 +3807,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>รหัส HTTP ผิดพลาด โดยเซิร์ฟเวอร์คาดว่าจะได้รับรหัส 201 แต่กลับได้รับ &quot;%1 %2&quot;</translation>
</message>
@@ -3817,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3863,52 +3863,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>การอัพโหลด %1 เกินโควต้าของโฟลเดอร์</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>ไฟล์ต้นทางถูกเปลี่ยนแปลงในระหว่างการซิงค์ มันจะกลับมา</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<source>Local file changed during sync.</source>
<translation>ไฟล์ต้นทางถูกเปลี่ยนแปลงขณะกำลังประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation type="unfinished"/>
</message>
@@ -3918,12 +3918,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_tr.ts b/translations/client_tr.ts
index 4c6b299c2..ed1beede5 100644
--- a/translations/client_tr.ts
+++ b/translations/client_tr.ts
@@ -3553,47 +3553,47 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<translation>Bazı dosyalar bir klasöre yüklenirken çalışma oldu. Çakışmalar temizlenecek!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;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="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;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="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>&quot;Eşitlenecek ögeleri seçin&quot; kara listesinde olduğundan yok sayıldı</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;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="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;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="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<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="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation>Silmeye izin verilmedi, geri yükleniyor</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation>Veritabanı okunurken sorun çıktı</translation>
</message>
@@ -3603,7 +3603,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<translation>!%1&apos; klasörü okunurken sunucu bir hata yanıtı verdi: %2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>&quot;%1&quot; klasörü okunurken sunucu bir hata yanıtı verdi: %2</translation>
</message>
@@ -3849,7 +3849,7 @@ Bu yeni ve deneysel bir özelliktir. Kullanmaya karar verirseniz, lütfen karş
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Sunucudan alınan HTTP kodu yanlış. 201 bekleniyordu, ancak &quot;%1 %2&quot; alındı.</translation>
</message>
@@ -3859,12 +3859,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation>Üst veriler veritabanına yazılırken sorun çıktı: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation>%1 dosyası şu anda kullanılıyor</translation>
</message>
@@ -3905,52 +3905,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation>Şifreli dosya yüklenemedi.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<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="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation>%1 dosyasının değiştirilme zamanı geçersiz. Sunucuya yüklenmedi.</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>%1 dosyasının değiştirilme zamanı geçersiz. Sunucuya yüklenmedi.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<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="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<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="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<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="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation>Şifreli klasörün kilidi açılamadı.</translation>
</message>
@@ -3960,12 +3960,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation>Üst veriler güncellenirken sorun çıktı: %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation>%1 dosyası şu anda kullanılıyor</translation>
</message>
diff --git a/translations/client_uk.ts b/translations/client_uk.ts
index 578ed591c..83fb34a56 100644
--- a/translations/client_uk.ts
+++ b/translations/client_uk.ts
@@ -3509,47 +3509,47 @@ 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="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
@@ -3559,7 +3559,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation type="unfinished"/>
</message>
@@ -3805,7 +3805,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>Сервер відповів неправильним HTTP кодом. Очікувався 201, але отримано &quot;%1 %2&quot;.</translation>
</message>
@@ -3815,12 +3815,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
@@ -3861,52 +3861,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<translation>Файл %1 неможливо завантажити, оскільки існує інший файл з таким же ім&apos;ям, але в іншому регістрі</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>Завантаження %1 перевищує квоту цієї теки</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation>Файл вилучено (почніть завантаження) %1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Локальний файл змінився під час синхронізації. Його буде відновлено.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<source>Local file changed during sync.</source>
<translation>Локальний файл змінився під час синхронізації.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation type="unfinished"/>
</message>
@@ -3916,12 +3916,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts
index 9ea2545c2..9c7d9868b 100644
--- a/translations/client_zh_CN.ts
+++ b/translations/client_zh_CN.ts
@@ -3535,47 +3535,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>上传文件到文件夹时发生冲突。那些冲突的会被清除!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation>上传文件夹时发生冲突。它会被清除!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation>上传时发生冲突。它将被移除!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>因“选择要同步的内容”黑名单而被忽略</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>不被允许,因为您没有向该文件夹添加子文件夹的权限。</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>不被允许,因为您没有在该文件夹中添加文件的权限。</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation>移动到无效目标,恢复中。</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation>不允许移除,恢复中。</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation>读取数据库时出错</translation>
</message>
@@ -3585,7 +3585,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>服务器在读取目录 &apos;%1&apos; 时回复了一个错误:%2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>服务器在读取目录 &quot;%1&quot; 时返回了一个错误: %2 </translation>
</message>
@@ -3831,7 +3831,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>服务器返回的 HTTP 状态错误,应返回 201,但返回的是“%1 %2”。</translation>
</message>
@@ -3841,12 +3841,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation>将元数据写入数据库出错:%1 </translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation>文件 %1 在使用中 </translation>
</message>
@@ -3887,52 +3887,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation>上传加密文件失败</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>上传 %1 超过文件夹的限额</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation>文件 %1 修改时间无效。不要上传到服务器。</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>文件 %1 修改时间无效。不要上传到服务器。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation>文件已删除(开始上传)%1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>本地文件在同步时已修改,完成后会再次同步</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<source>Local file changed during sync.</source>
<translation>本地文件在同步时已修改。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation>解锁加密文件夹失败</translation>
</message>
@@ -3942,12 +3942,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation>更新元数据出错:%1 </translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation>文件 %1 在使用中 </translation>
</message>
diff --git a/translations/client_zh_HK.ts b/translations/client_zh_HK.ts
index 120450dbb..29ad6b06b 100644
--- a/translations/client_zh_HK.ts
+++ b/translations/client_zh_HK.ts
@@ -3552,47 +3552,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>將某些檔案上傳到資料夾時發生衝突。那些有衝突的檔案將被清除!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation>上傳資料夾時發生衝突。將被清除!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation>上傳檔案時發生衝突。將被清除!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>被忽略,因為它在“選擇要同步的內容”黑名單中</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>拒絕此操作,您沒有在此新增子資料夾的權限。</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>拒絕此操作,您沒有新增檔案在此資料夾的權限。</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation>已移至無效目標,正在還原</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation>不允許刪除,還原</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation>讀取數據庫時發生錯誤。</translation>
</message>
@@ -3602,7 +3602,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>伺服器讀取目錄 &apos;%1&apos; 時發生錯誤:%2</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>伺服器在讀取目錄「%1」回覆錯誤:%2</translation>
</message>
@@ -3848,7 +3848,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>從伺服器端回傳錯誤的 HTTP 代碼, 預期是 201, 但是接收到的是 &quot;%1 %2&quot;。</translation>
</message>
@@ -3858,12 +3858,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation>將詮釋資料寫入到資料庫時發生錯誤:%1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation>檔案 %1 正在使用中</translation>
</message>
@@ -3904,52 +3904,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation>上傳加密檔案失敗。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>上傳%1將會超過資料夾的大小限制</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation>檔案 %1 的修改時間無效。 請勿上傳到伺服器。</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>檔案 %1 的修改時間無效。 請勿上傳到伺服器。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation>移除檔案(開始上傳)%1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>近端端的檔案在同步的過程中被更改,此檔案將會被還原。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<source>Local file changed during sync.</source>
<translation>近端端的檔案在同步過程中被更改。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation>無法解鎖加密資料夾。</translation>
</message>
@@ -3959,12 +3959,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation>更新元數據時出錯:%1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation>檔案 %1 正在使用中</translation>
</message>
diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts
index ac3fe2eaa..faf076ad1 100644
--- a/translations/client_zh_TW.ts
+++ b/translations/client_zh_TW.ts
@@ -3553,47 +3553,47 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>將某些檔案上傳到資料夾時發生錯誤。衝突的檔案將會被清除!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1136"/>
+ <location filename="../src/libsync/discovery.cpp" line="1140"/>
<source>Conflict when uploading a folder. It&apos;s going to get cleared!</source>
<translation>上傳資料夾時發生衝突。將會被清除!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1139"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Conflict when uploading a file. It&apos;s going to get removed!</source>
<translation>上傳檔案時發生衝突。其將會被移除!</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1473"/>
+ <location filename="../src/libsync/discovery.cpp" line="1477"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>由於「選擇要同步的內容」黑名單而被忽略</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1506"/>
+ <location filename="../src/libsync/discovery.cpp" line="1510"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>不允許,因為您無權新增子資料夾到該資料夾</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1511"/>
+ <location filename="../src/libsync/discovery.cpp" line="1515"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>不允許,因為您無權新增檔案到該資料夾</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1524"/>
+ <location filename="../src/libsync/discovery.cpp" line="1528"/>
<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="1546"/>
+ <location filename="../src/libsync/discovery.cpp" line="1550"/>
<source>Moved to invalid target, restoring</source>
<translation>移動至無效目標,正在復原</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1560"/>
+ <location filename="../src/libsync/discovery.cpp" line="1564"/>
<source>Not allowed to remove, restoring</source>
<translation>不允許刪除,正在復原</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1698"/>
+ <location filename="../src/libsync/discovery.cpp" line="1702"/>
<source>Error while reading the database</source>
<translation>讀取資料庫時發生錯誤</translation>
</message>
@@ -3603,7 +3603,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="1759"/>
+ <location filename="../src/libsync/discovery.cpp" line="1763"/>
<source>Server replied with an error while reading directory &quot;%1&quot; : %2</source>
<translation>伺服器在讀取目錄「%1」回覆錯誤:%2</translation>
</message>
@@ -3849,7 +3849,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::PropagateRemoteMkdir</name>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="134"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="135"/>
<source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
<translation>伺服器回傳錯誤的 HTTP 代碼。預期為 201,但收到的是「%1 %2」。</translation>
</message>
@@ -3859,12 +3859,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/propagateremotemkdir.cpp" line="246"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="259"/>
<source>Error writing metadata to the database: %1</source>
<translation>將詮釋資料寫入到資料庫時發生錯誤:%1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="249"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="262"/>
<source>The file %1 is currently in use</source>
<translation>檔案 %1 目前正在使用中</translation>
</message>
@@ -3905,52 +3905,52 @@ 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="223"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="235"/>
<source>Failed to upload encrypted file.</source>
<translation>上傳已加密的檔案失敗。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="254"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="266"/>
<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="265"/>
- <location filename="../src/libsync/propagateupload.cpp" line="683"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="277"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="695"/>
<source>Upload of %1 exceeds the quota for the folder</source>
<translation>上傳 %1 將會超過資料夾的大小限制</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="302"/>
- <location filename="../src/libsync/propagateupload.cpp" line="377"/>
- <location filename="../src/libsync/propagateupload.cpp" line="390"/>
- <source>File %1 has invalid modified time. Do not upload to the server.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="314"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="389"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="402"/>
+ <source>File %1 has invalid modification time. Do not upload to the server.</source>
<translation>檔案 %1 的修改時間無效。不要上傳到伺服器。</translation>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="314"/>
<location filename="../src/libsync/propagateupload.cpp" line="389"/>
<location filename="../src/libsync/propagateupload.cpp" line="402"/>
- <source>File %1 has invalid modification time. Do not upload to the server.</source>
+ <source>File %1 has invalid modified time. Do not upload to the server.</source>
<translation>檔案 %1 的修改時間無效。不要上傳到伺服器。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="374"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="386"/>
<source>File Removed (start upload) %1</source>
<translation>檔案已移除(開始上傳)%1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="400"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="412"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>本機檔案在同步的過程中被修改。其將會被復原。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="411"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="423"/>
<source>Local file changed during sync.</source>
<translation>本機檔案在同步的過程中被修改。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="421"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="433"/>
<source>Failed to unlock encrypted folder.</source>
<translation>解鎖已加密的資料夾失敗。</translation>
</message>
@@ -3960,12 +3960,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="779"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="791"/>
<source>Error updating metadata: %1</source>
<translation>更新詮釋資料時發生錯誤:%1</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="782"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="794"/>
<source>The file %1 is currently in use</source>
<translation>檔案 %1 目前正在使用中</translation>
</message>