[Pkg-owncloud-commits] [owncloud-client] 54/121: [tx-robot] updated from transifex
Sandro Knauß
hefee-guest at moszumanska.debian.org
Thu Jul 28 15:31:57 UTC 2016
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch master
in repository owncloud-client.
commit 28d86cee17380c146e533238dadbbe54f4596475
Author: Jenkins for ownCloud <owncloud-bot at tmit.eu>
Date: Wed Jun 22 02:18:48 2016 -0400
[tx-robot] updated from transifex
---
mirall.desktop.in | 7 ++
translations/client_ca.ts | 80 +++++++++++-----------
translations/client_cs.ts | 80 +++++++++++-----------
translations/client_de.ts | 80 +++++++++++-----------
translations/client_el.ts | 80 +++++++++++-----------
translations/client_en.ts | 80 +++++++++++-----------
translations/client_es.ts | 80 +++++++++++-----------
translations/client_es_AR.ts | 80 +++++++++++-----------
translations/client_et.ts | 80 +++++++++++-----------
translations/client_eu.ts | 80 +++++++++++-----------
translations/client_fa.ts | 80 +++++++++++-----------
translations/client_fi.ts | 80 +++++++++++-----------
translations/client_fr.ts | 80 +++++++++++-----------
translations/client_gl.ts | 80 +++++++++++-----------
translations/client_hu.ts | 80 +++++++++++-----------
translations/client_it.ts | 80 +++++++++++-----------
translations/client_ja.ts | 80 +++++++++++-----------
translations/client_nb_NO.ts | 80 +++++++++++-----------
translations/client_nl.ts | 80 +++++++++++-----------
translations/client_pl.ts | 80 +++++++++++-----------
translations/client_pt.ts | 80 +++++++++++-----------
translations/client_pt_BR.ts | 80 +++++++++++-----------
translations/client_ru.ts | 80 +++++++++++-----------
translations/client_sk.ts | 80 +++++++++++-----------
translations/client_sl.ts | 80 +++++++++++-----------
translations/client_sr.ts | 80 +++++++++++-----------
translations/client_sv.ts | 154 +++++++++++++++++++++----------------------
translations/client_th.ts | 80 +++++++++++-----------
translations/client_tr.ts | 80 +++++++++++-----------
translations/client_uk.ts | 80 +++++++++++-----------
translations/client_zh_CN.ts | 80 +++++++++++-----------
translations/client_zh_TW.ts | 80 +++++++++++-----------
32 files changed, 1284 insertions(+), 1277 deletions(-)
diff --git a/mirall.desktop.in b/mirall.desktop.in
index c3e18cf..159d0f5 100644
--- a/mirall.desktop.in
+++ b/mirall.desktop.in
@@ -98,6 +98,9 @@ X-GNOME-Autostart-Delay=3
# Translations
+
+
+# Translations
Icon[oc]=@APPLICATION_EXECUTABLE@
Comment[ar]=@APPLICATION_NAME@ زبون مزامنة مكتبي
GenericName[ar]=مزامنة المجلد
@@ -212,6 +215,10 @@ Comment[pt_PT]=@APPLICATION_NAME@ - Cliente de Sincronização para PC
GenericName[pt_PT]=Sincronizar Pasta
Name[pt_PT]=@APPLICATION_NAME@ - Cliente de Sincronização para PC
Icon[pt_PT]=@APPLICATION_EXECUTABLE@
+Comment[lb]=@APPLICATION_NAME@ Desktop Synchronisatioun Client
+GenericName[lb]=Dossier Dync
+Name[lb]=@APPLICATION_NAME@ Desktop Sync Client
+Icon[lb]=@APPLICATION_EXECUTABLE@
Comment[th_TH]=@APPLICATION_NAME@ ไคลเอนต์ประสานข้อมูลเดสก์ท็อป
GenericName[th_TH]=ประสานข้อมูลโฟลเดอร์
Name[th_TH]= @APPLICATION_NAME@ ไคลเอนต์ประสานข้อมูลเดสก์ท็อป
diff --git a/translations/client_ca.ts b/translations/client_ca.ts
index a615635..4088578 100644
--- a/translations/client_ca.ts
+++ b/translations/client_ca.ts
@@ -579,160 +579,160 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="129"/>
<source>Local folder %1 does not exist.</source>
<translation>El fitxer local %1 no existeix.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="132"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 hauria de ser una carpeta, però no ho és.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>%1 is not readable.</source>
<translation>No es pot llegir %1.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="387"/>
+ <location filename="../src/gui/folder.cpp" line="381"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="497"/>
+ <location filename="../src/gui/folder.cpp" line="491"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>S'ha esborrat '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="504"/>
+ <location filename="../src/gui/folder.cpp" line="498"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>S'ha descarregat %1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="511"/>
+ <location filename="../src/gui/folder.cpp" line="505"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>S'ha actualitzat %1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="518"/>
+ <location filename="../src/gui/folder.cpp" line="512"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 s'ha reanomenat a %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="525"/>
+ <location filename="../src/gui/folder.cpp" line="519"/>
<source>%1 has been moved to %2.</source>
<translation>%1 s'ha mogut a %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="495"/>
+ <location filename="../src/gui/folder.cpp" line="489"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 i %n altre fitxer s'ha esborrat.</numerusform><numerusform>%1 i %n altres fitxers s'han esborrat.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="502"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 i %n altre fitxer s'han descarregat.</numerusform><numerusform>%1 i %n altres fitxers s'han descarregat.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="509"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 i %n altre fitxer s'han actualitzat.</numerusform><numerusform>%1 i %n altres fitxers s'han actualitzat.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="516"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 s'ha reanomenat a %2 i %n altre fitxer s'ha reanomenat.</numerusform><numerusform>%1 s'ha reanomenat a %2 i %n altres fitxers s'han reanomenat.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="523"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 s'ha mogut a %2 i %n altre fitxer s'ha mogut.</numerusform><numerusform>%1 s'ha mogut a %2 i %n altres fitxers s'han mogut.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="530"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 i %n altre fitxer tenen conflictes de sincronització</numerusform><numerusform>%1 i %n altres fitxers tenen conflictes de sincronització</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="532"/>
+ <location filename="../src/gui/folder.cpp" line="526"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 té conflictes de sincronització. Comproveu el fitxer conflictiu!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="537"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 i %n altre fitxer no s'han sincronitzat per errors.
Consulteu el registre per obtenir més informació.</numerusform><numerusform>%1 i %n altres fitxers no s'han sincronitzat per errors.
Consulteu el registre per obtenir més informació.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="533"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 no s'ha pogut sincronitzar degut a un error. Mireu el registre per més detalls.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="545"/>
+ <location filename="../src/gui/folder.cpp" line="539"/>
<source>Sync Activity</source>
<translation>Activitat de sincronització</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="755"/>
+ <location filename="../src/gui/folder.cpp" line="747"/>
<source>Could not read system exclude file</source>
<translation>No s'ha pogut llegir el fitxer d'exclusió del sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="966"/>
+ <location filename="../src/gui/folder.cpp" line="958"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>S'ha afegit una carpeta nova de més de %1 MB: %2.
Aneu a arranjament per seleccionar-la si voleu descarregar-la.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="984"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="988"/>
+ <location filename="../src/gui/folder.cpp" line="980"/>
<source>Remove All Files?</source>
<translation>Esborra tots els fitxers?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="990"/>
+ <location filename="../src/gui/folder.cpp" line="982"/>
<source>Remove all files</source>
<translation>Esborra tots els fitxers</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="991"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Keep files</source>
<translation>Mantén els fitxers</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1001"/>
<source>This sync would reset the files to an erlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1014"/>
+ <location filename="../src/gui/folder.cpp" line="1006"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1016"/>
+ <location filename="../src/gui/folder.cpp" line="1008"/>
<source>Normal Synchronisation</source>
<translation>Sincronització normal</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1017"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@@ -2098,48 +2098,48 @@ No és aconsellada usar-la.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="293"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
<translation>Fitxer eliminat</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="305"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="317"/>
- <location filename="../src/libsync/propagateupload.cpp" line="706"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="321"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="710"/>
<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="633"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="641"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="645"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>El fitxer s'ha editat localment però és part d'una compartició només de lectura. S'ha restaurat i la vostra edició és en el fitxer en conflicte.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="672"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="695"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
<translation>El fitxer local s'ha eliminat durant la sincronització.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="721"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="794"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
<translation>Error en escriure les metadades a la base de dades</translation>
</message>
@@ -3499,7 +3499,7 @@ No és aconsellada usar-la.</translation>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="593"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_cs.ts b/translations/client_cs.ts
index 0b96cd3..cec4663 100644
--- a/translations/client_cs.ts
+++ b/translations/client_cs.ts
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="129"/>
<source>Local folder %1 does not exist.</source>
<translation>Místní adresář %1 neexistuje.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="132"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 by měl být adresář, ale není.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>%1 is not readable.</source>
<translation>%1 není čitelný.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="387"/>
+ <location filename="../src/gui/folder.cpp" line="381"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="497"/>
+ <location filename="../src/gui/folder.cpp" line="491"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 byl odebrán.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="504"/>
+ <location filename="../src/gui/folder.cpp" line="498"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 byl stažen.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="511"/>
+ <location filename="../src/gui/folder.cpp" line="505"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 byl aktualizován.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="518"/>
+ <location filename="../src/gui/folder.cpp" line="512"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 byl přejmenován na %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="525"/>
+ <location filename="../src/gui/folder.cpp" line="519"/>
<source>%1 has been moved to %2.</source>
<translation>%1 byl přemístěn do %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="495"/>
+ <location filename="../src/gui/folder.cpp" line="489"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 soubor bude smazán.</numerusform><numerusform>%1 a %n další soubory budou smazány.</numerusform><numerusform>%1 a %n další soubory budou smazány.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="502"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 soubor byl stažen.</numerusform><numerusform>%1 a %n další soubory byly staženy.</numerusform><numerusform>%1 a %n další soubory byly staženy.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="509"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 soubor byl aktualizován.</numerusform><numerusform>%1 a %n další soubory byly aktualizovány.</numerusform><numerusform>%1 a %n další soubory byly aktualizovány.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="516"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 byl přejmenován na %2.</numerusform><numerusform>%1 byl přejmenován na %2 a %n další soubory byly přejmenovány.</numerusform><numerusform>%1 byl přejmenován na %2 a %n další soubory byly přejmenovány.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="523"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 byl přesunut do %2.</numerusform><numerusform>%1 byl přesunut do %2 a %n dalších souborů bylo přesunuto.</numerusform><numerusform>%1 byl přesunut do %2 a %n dalších souborů bylo přesunuto.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="530"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 má problém se synchronizací.</numerusform><numerusform>%1 a %n dalších souborů má problém se synchronizací.</numerusform><numerusform>%1 a %n dalších souborů má problém se synchronizací.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="532"/>
+ <location filename="../src/gui/folder.cpp" line="526"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 má problém se synchronizací. Prosím zkontrolujte chybový soubor.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="537"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 soubor nemůže být synchronizován kvůli chybám. Shlédněte log pro detaily.</numerusform><numerusform>%1 a %n dalších souborů nemohou být synchronizovány kvůli chybám. Shlédněte log pro detaily.</numerusform><numerusform>%1 a %n dalších souborů nemohou být synchronizovány kvůli chybám. Shlédněte log pro detaily.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="533"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 nebyl kvůli chybě synchronizován. Detaily jsou k nalezení v logu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="545"/>
+ <location filename="../src/gui/folder.cpp" line="539"/>
<source>Sync Activity</source>
<translation>Průběh synchronizace</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="755"/>
+ <location filename="../src/gui/folder.cpp" line="747"/>
<source>Could not read system exclude file</source>
<translation>Nezdařilo se přečtení systémového exclude souboru</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="966"/>
+ <location filename="../src/gui/folder.cpp" line="958"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Byl přidán nový adresář %2 větší než %1 MB.
Pokud ho chcete stáhnout, přejděte prosím do nastavení a označte ho.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="984"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -700,22 +700,22 @@ Toto může být způsobeno změnou v nastavení synchronizace adresáře nebo t
Opravdu chcete provést tuto akci?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="988"/>
+ <location filename="../src/gui/folder.cpp" line="980"/>
<source>Remove All Files?</source>
<translation>Odstranit všechny soubory?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="990"/>
+ <location filename="../src/gui/folder.cpp" line="982"/>
<source>Remove all files</source>
<translation>Odstranit všechny soubory</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="991"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Keep files</source>
<translation>Ponechat soubory</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1001"/>
<source>This sync would reset the files to an erlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -724,17 +724,17 @@ Toto může být způsobeno obnovením zálohy na straně serveru.
Pokračováním v synchronizaci způsobí přepsání všech vašich souborů staršími soubory z dřívějšího stavu. Přejete si ponechat své místní nejaktuálnější soubory jako konfliktní soubory?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1014"/>
+ <location filename="../src/gui/folder.cpp" line="1006"/>
<source>Backup detected</source>
<translation>Záloha nalezena</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1016"/>
+ <location filename="../src/gui/folder.cpp" line="1008"/>
<source>Normal Synchronisation</source>
<translation>Normální synchronizace</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1017"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Keep Local Files as Conflict</source>
<translation>Ponechat místní soubory jako konflikt</translation>
</message>
@@ -2100,48 +2100,48 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="293"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
<translation>Soubor odebrán</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="305"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Místní soubor se během synchronizace změnil. </translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="317"/>
- <location filename="../src/libsync/propagateupload.cpp" line="706"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="321"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="710"/>
<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="633"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>Vynucené ukončení procesu při resetu HTTP připojení s Qt < 5.4.2.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="641"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="645"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Soubor zde byl editován, ale je součástí sdílení pouze pro čtení. Původní soubor byl obnoven a editovaná verze je uložena v konfliktním souboru.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="672"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
<translation>Chybí adresa URL</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="695"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
<translation>Místní soubor byl odstraněn během synchronizace.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="721"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation>Server nepotvrdil poslední část dat. (Nebyl nalezen e-tag)</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="794"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
<translation>Chyba zápisu metadat do databáze</translation>
</message>
@@ -3501,7 +3501,7 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="593"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation>QT_LAYOUT_DIRECTION</translation>
</message>
diff --git a/translations/client_de.ts b/translations/client_de.ts
index 0fdccfb..43a0d9d 100644
--- a/translations/client_de.ts
+++ b/translations/client_de.ts
@@ -579,118 +579,118 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="129"/>
<source>Local folder %1 does not exist.</source>
<translation>Lokales Verzeichnis %1 existiert nicht.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="132"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 sollte ein Ordner sein, ist es aber nicht.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>%1 is not readable.</source>
<translation>%1 ist nicht lesbar.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="387"/>
+ <location filename="../src/gui/folder.cpp" line="381"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="497"/>
+ <location filename="../src/gui/folder.cpp" line="491"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 wurde gelöscht.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="504"/>
+ <location filename="../src/gui/folder.cpp" line="498"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 wurde heruntergeladen.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="511"/>
+ <location filename="../src/gui/folder.cpp" line="505"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 wurde aktualisiert.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="518"/>
+ <location filename="../src/gui/folder.cpp" line="512"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 wurde in %2 umbenannt.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="525"/>
+ <location filename="../src/gui/folder.cpp" line="519"/>
<source>%1 has been moved to %2.</source>
<translation>%1 wurde in %2 verschoben.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="495"/>
+ <location filename="../src/gui/folder.cpp" line="489"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 und %n andere Datei wurde gelöscht.</numerusform><numerusform>%1 und %n andere Dateien wurden gelöscht.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="502"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 und %n andere Datei wurde heruntergeladen.</numerusform><numerusform>%1 und %n andere Dateien wurden heruntergeladen.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="509"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 und %n andere Datei wurde aktualisiert.</numerusform><numerusform>%1 und %n andere Dateien wurden aktualisiert.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="516"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 wurde in %2 umbenannt und %n andere Datei wurde umbenannt.</numerusform><numerusform>%1 wurde in %2 umbenannt und %n andere Dateien wurden umbenannt.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="523"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 wurde in %2 verschoben und %n andere Datei wurde verschoben.</numerusform><numerusform>%1 wurde in %2 verschoben und %n andere Dateien wurden verschoben.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="530"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 und %n andere Datei haben Konflikte beim Abgleichen.</numerusform><numerusform>%1 und %n andere Dateien haben Konflikte beim Abgleichen.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="532"/>
+ <location filename="../src/gui/folder.cpp" line="526"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>Es gab einen Konflikt bei der Synchronisierung von %1. Bitte prüfen Sie die Konfliktdatei!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="537"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 und %n weitere Datei konnten aufgrund von Fehlern nicht synchronisiert werden. Schauen Sie in das Protokoll für Details.</numerusform><numerusform>%1 und %n weitere Dateien konnten aufgrund von Fehlern nicht synchronisiert werden. Schauen Sie in das Protokoll für Details.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="533"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 konnte aufgrund eines Fehlers nicht synchronisiert werden. Schauen Sie in das Protokoll für Details.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="545"/>
+ <location filename="../src/gui/folder.cpp" line="539"/>
<source>Sync Activity</source>
<translation>Synchronisierungsaktivität</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="755"/>
+ <location filename="../src/gui/folder.cpp" line="747"/>
<source>Could not read system exclude file</source>
<translation>Systemeigene Ausschlussdatei kann nicht gelesen werden</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="966"/>
+ <location filename="../src/gui/folder.cpp" line="958"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Ein neue Order größer als %1 MB wurde hinzugefügt: %2. Bitte besuchen Sie die Einstellungen, falls sie ihn herunterladen wollen.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="984"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -699,22 +699,22 @@ Die Ursache ist, dass der Ordner entweder neu konfiguriert wurde, oder weil alle
Sind Sie sicher, dass Sie diese Operation durchführen möchten?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="988"/>
+ <location filename="../src/gui/folder.cpp" line="980"/>
<source>Remove All Files?</source>
<translation>Alle Dateien löschen?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="990"/>
+ <location filename="../src/gui/folder.cpp" line="982"/>
<source>Remove all files</source>
<translation>Lösche alle Dateien</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="991"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Keep files</source>
<translation>Dateien behalten</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1001"/>
<source>This sync would reset the files to an erlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -723,17 +723,17 @@ Der Grund dafür ist möglicherweise, dass auf dem Server ein Backup eingespielt
Wenn diese Synchronisation fortgesetzt wird, werden Dateien eventuell von älteren Versionen überschrieben. Möchten Sie die neueren Dateien als Konflikt-Dateien behalten?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1014"/>
+ <location filename="../src/gui/folder.cpp" line="1006"/>
<source>Backup detected</source>
<translation>Backup erkannt</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1016"/>
+ <location filename="../src/gui/folder.cpp" line="1008"/>
<source>Normal Synchronisation</source>
<translation>Normale Synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1017"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Keep Local Files as Conflict</source>
<translation>Lokale Konfliktdateien behalten</translation>
</message>
@@ -2098,48 +2098,48 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="293"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
<translation>Datei gelöscht</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="305"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Lokale Datei hat sich während der Synchronisation geändert. Die Synchronisation wird wiederaufgenommen.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="317"/>
- <location filename="../src/libsync/propagateupload.cpp" line="706"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="321"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
<translation>Eine lokale Datei wurde während der Synchronisation geändert.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="633"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>Auftragsabbruch beim Rücksetzen der HTTP-Verbindung mit QT < 5.4.2 wird erzwungen.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="641"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="645"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Die Datei wurde von einer Nur-Lese-Freigabe lokal bearbeitet. Die Datei wurde wiederhergestellt und Ihre Bearbeitung ist in der Konflikte-Datei.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="672"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
<translation>Poll-URL fehlt</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="695"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
<translation>Die lokale Datei wurde während der Synchronisation gelöscht.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="721"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation>Der Server hat den letzten Block nicht bestätigt. (Der E-Tag war nicht vorhanden)</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="794"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
<translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation>
</message>
@@ -3499,7 +3499,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="593"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation>QT_LAYOUT_DIRECTION</translation>
</message>
diff --git a/translations/client_el.ts b/translations/client_el.ts
index b26735e..9e37dbc 100644
--- a/translations/client_el.ts
+++ b/translations/client_el.ts
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="129"/>
<source>Local folder %1 does not exist.</source>
<translation>Δεν υπάρχει ο τοπικός φάκελος %1.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="132"/>
<source>%1 should be a folder but is not.</source>
<translation>Το %1 θα έπρεπε να είναι φάκελος αλλά δεν είναι.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>%1 is not readable.</source>
<translation> Το %1 δεν είναι αναγνώσιμο. </translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="387"/>
+ <location filename="../src/gui/folder.cpp" line="381"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="497"/>
+ <location filename="../src/gui/folder.cpp" line="491"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>Το %1 αφαιρέθηκε.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="504"/>
+ <location filename="../src/gui/folder.cpp" line="498"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>Το %1 έχει ληφθεί.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="511"/>
+ <location filename="../src/gui/folder.cpp" line="505"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>Το %1 έχει ενημερωθεί.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="518"/>
+ <location filename="../src/gui/folder.cpp" line="512"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>Το %1 έχει μετονομαστεί σε %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="525"/>
+ <location filename="../src/gui/folder.cpp" line="519"/>
<source>%1 has been moved to %2.</source>
<translation>Το %1 έχει μετακινηθεί στο %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="495"/>
+ <location filename="../src/gui/folder.cpp" line="489"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="502"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="509"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="516"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="523"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="530"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="532"/>
+ <location filename="../src/gui/folder.cpp" line="526"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="537"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="533"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 δεν ήταν δυνατό να συγχρονιστεί εξαιτίας ενός σφάλματος. Δείτε το αρχείο καταγραφής για λεπτομέρειες.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="545"/>
+ <location filename="../src/gui/folder.cpp" line="539"/>
<source>Sync Activity</source>
<translation>Δραστηριότητα Συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="755"/>
+ <location filename="../src/gui/folder.cpp" line="747"/>
<source>Could not read system exclude file</source>
<translation>Αδυναμία ανάγνωσης αρχείου αποκλεισμού συστήματος</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="966"/>
+ <location filename="../src/gui/folder.cpp" line="958"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Ένας νέος φάκελος μεγαλύτερος από %1 MB έχει προστεθεί: %2.
Παρακαλούμε πηγαίνετε στις ρυθμίσεις για να επιλέξετε αν επιθυμείτε να τον κατεβάσετε.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="984"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -700,39 +700,39 @@ Are you sure you want to perform this operation?</source>
Είστε σίγουροι ότι θέλετε να εκτελέσετε αυτή τη λειτουργία;</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="988"/>
+ <location filename="../src/gui/folder.cpp" line="980"/>
<source>Remove All Files?</source>
<translation>Αφαίρεση Όλων των Αρχείων;</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="990"/>
+ <location filename="../src/gui/folder.cpp" line="982"/>
<source>Remove all files</source>
<translation>Αφαίρεση όλων των αρχείων</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="991"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Keep files</source>
<translation>Διατήρηση αρχείων</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1001"/>
<source>This sync would reset the files to an erlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1014"/>
+ <location filename="../src/gui/folder.cpp" line="1006"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1016"/>
+ <location filename="../src/gui/folder.cpp" line="1008"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1017"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@@ -2098,48 +2098,48 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="293"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
<translation>Το αρχείο αφαιρέθηκε</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="305"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Το τοπικό αρχείο τροποποιήθηκε κατά τη διάρκεια του συγχρονισμού. Θα συγχρονιστεί πάλι.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="317"/>
- <location filename="../src/libsync/propagateupload.cpp" line="706"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="321"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
<translation>Το τοπικό αρχείο τροποποιήθηκε κατά τον συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="633"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>Εξαναγκασμός ακύρωσης εργασίας στην επαναφορά σύνδεσης HTTP με Qt < 5.4.2</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="641"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="645"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Το αρχείο υπέστη επεξεργασία τοπικά αλλά είναι τμήμα ενός διαμοιρασμένου καταλόγου μόνο για ανάγνωση. Επαναφέρθηκε και το επεξεργασμένο βρίσκεται στο αρχείο συγκρούσεων.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="672"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
<translation>Η διεύθυνση poll URL λείπει</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="695"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
<translation>Το τοπικό αρχείο αφαιρέθηκε κατά το συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="721"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation>Ο διακομιστής δεν αναγνώρισε το τελευταίο τμήμα. (Δεν υπήρχε e-tag)</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="794"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
@@ -3499,7 +3499,7 @@ It is not advisable to use it.</source>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="593"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_en.ts b/translations/client_en.ts
index 4915d37..83dddf2 100644
--- a/translations/client_en.ts
+++ b/translations/client_en.ts
@@ -587,57 +587,57 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="129"/>
<source>Local folder %1 does not exist.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="132"/>
<source>%1 should be a folder but is not.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>%1 is not readable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="387"/>
+ <location filename="../src/gui/folder.cpp" line="381"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="497"/>
+ <location filename="../src/gui/folder.cpp" line="491"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="504"/>
+ <location filename="../src/gui/folder.cpp" line="498"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="511"/>
+ <location filename="../src/gui/folder.cpp" line="505"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="518"/>
+ <location filename="../src/gui/folder.cpp" line="512"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="525"/>
+ <location filename="../src/gui/folder.cpp" line="519"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="495"/>
+ <location filename="../src/gui/folder.cpp" line="489"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -645,7 +645,7 @@
</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="502"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -653,7 +653,7 @@
</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="509"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -661,7 +661,7 @@
</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="516"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -669,7 +669,7 @@
</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="523"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -677,7 +677,7 @@
</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="530"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -685,12 +685,12 @@
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="532"/>
+ <location filename="../src/gui/folder.cpp" line="526"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="537"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -698,67 +698,67 @@
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="533"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="545"/>
+ <location filename="../src/gui/folder.cpp" line="539"/>
<source>Sync Activity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="755"/>
+ <location filename="../src/gui/folder.cpp" line="747"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="966"/>
+ <location filename="../src/gui/folder.cpp" line="958"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="984"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="988"/>
+ <location filename="../src/gui/folder.cpp" line="980"/>
<source>Remove All Files?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="990"/>
+ <location filename="../src/gui/folder.cpp" line="982"/>
<source>Remove all files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="991"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Keep files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1001"/>
<source>This sync would reset the files to an erlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1014"/>
+ <location filename="../src/gui/folder.cpp" line="1006"/>
<source>Backup detected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1016"/>
+ <location filename="../src/gui/folder.cpp" line="1008"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1017"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"></translation>
</message>
@@ -2119,48 +2119,48 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="293"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="305"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="317"/>
- <location filename="../src/libsync/propagateupload.cpp" line="706"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="321"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="633"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="641"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="645"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="672"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="695"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="721"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="794"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"></translation>
</message>
@@ -3518,7 +3518,7 @@ It is not advisable to use it.</source>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="593"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/client_es.ts b/translations/client_es.ts
index ad76b11..0ac5d4a 100644
--- a/translations/client_es.ts
+++ b/translations/client_es.ts
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="129"/>
<source>Local folder %1 does not exist.</source>
<translation>La carpeta local %1 no existe.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="132"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 debería ser un directorio, pero no lo es.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>%1 is not readable.</source>
<translation>%1 es ilegible.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="387"/>
+ <location filename="../src/gui/folder.cpp" line="381"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="497"/>
+ <location filename="../src/gui/folder.cpp" line="491"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido eliminado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="504"/>
+ <location filename="../src/gui/folder.cpp" line="498"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido descargado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="511"/>
+ <location filename="../src/gui/folder.cpp" line="505"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido actualizado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="518"/>
+ <location filename="../src/gui/folder.cpp" line="512"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 ha sido renombrado a %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="525"/>
+ <location filename="../src/gui/folder.cpp" line="519"/>
<source>%1 has been moved to %2.</source>
<translation>%1 ha sido movido a %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="495"/>
+ <location filename="../src/gui/folder.cpp" line="489"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 y otro archivo han sido borrados.</numerusform><numerusform>%1 y otros %n archivos han sido borrados.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="502"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 y otro archivo han sido descargados.</numerusform><numerusform>%1 y otros %n archivos han sido descargados.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="509"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 y otro archivo han sido actualizados.</numerusform><numerusform>%1 y otros %n archivos han sido actualizados.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="516"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 ha sido renombrado a %2 y otro archivo ha sido renombrado.</numerusform><numerusform>%1 ha sido renombrado a %2 y otros %n archivos han sido renombrado.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="523"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 ha sido movido a %2 y otro archivo ha sido movido.</numerusform><numerusform>%1 ha sido movido a %2 y otros %n archivos han sido movidos.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="530"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 y otro archivo han tenido conflictos al sincronizar.</numerusform><numerusform>%1 y otros %n archivos han tenido conflictos al sincronizar.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="532"/>
+ <location filename="../src/gui/folder.cpp" line="526"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>Conflicto al sincronizar %1. Por favor compruebe el archivo!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="537"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 y otro archivo no pudieron ser sincronizados debido a errores. Para más detalles vea el registro.</numerusform><numerusform>%1 y otros %n archivos no pudieron ser sincronizados debido a errores. Para más detalles vea el registro.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="533"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 no pudo ser sincronizado debido a un error. Para más detalles, vea el registro.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="545"/>
+ <location filename="../src/gui/folder.cpp" line="539"/>
<source>Sync Activity</source>
<translation>Actividad de la sincronización</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="755"/>
+ <location filename="../src/gui/folder.cpp" line="747"/>
<source>Could not read system exclude file</source>
<translation>No se ha podido leer el archivo de exclusión del sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="966"/>
+ <location filename="../src/gui/folder.cpp" line="958"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Se ha añadido una nueva carpeta más grande de %1 MB: %2.
Por favor diríjase a los ajustes para seleccionarlo si desea descargarlo.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="984"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -700,22 +700,22 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q
¿Está seguro de que desea realizar esta operación?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="988"/>
+ <location filename="../src/gui/folder.cpp" line="980"/>
<source>Remove All Files?</source>
<translation>¿Eliminar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="990"/>
+ <location filename="../src/gui/folder.cpp" line="982"/>
<source>Remove all files</source>
<translation>Eliminar todos los archivos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="991"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1001"/>
<source>This sync would reset the files to an erlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -724,17 +724,17 @@ esto es similar a restaurar un backup en el servidor.
Continuar con la sincronización hará que todos los archivos sean sobreescritos con versiones anteriores de los mismos. Desea mantener los archivos locales sin cambios en caso de conflicto?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1014"/>
+ <location filename="../src/gui/folder.cpp" line="1006"/>
<source>Backup detected</source>
<translation>Backup detectado</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1016"/>
+ <location filename="../src/gui/folder.cpp" line="1008"/>
<source>Normal Synchronisation</source>
<translation>Sincronización Normal</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1017"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Keep Local Files as Conflict</source>
<translation>Mantener los archivos locales en caso de conflicto</translation>
</message>
@@ -2099,48 +2099,48 @@ No se recomienda usarla.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="293"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
<translation>Archivo eliminado</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="305"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Archivo local cambió durante la sincronización. Será actualizado.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="317"/>
- <location filename="../src/libsync/propagateupload.cpp" line="706"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="321"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
<translation>Un archivo local fue modificado durante la sincronización.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="633"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>Forzar el trabajo en una conexión HTTP, causará un Reset si Qt< 5.4.2.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="641"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="645"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>El archivo fue modificado localmente; pero es parte de una carpeta compartida en modo de sólo lectura. Ha sido recuperado y su modificación está en el archivo de conflicto.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="672"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
<translation>Falta la URL de la encuesta</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="695"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
<translation>El archivo local ha sido eliminado durante la sincronización.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="721"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation>El servidor no reconoció la última parte. (No había una e-tag presente)</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="794"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
<translation>Error al escribir los metadatos en la base de datos</translation>
</message>
@@ -3500,7 +3500,7 @@ No se recomienda usarla.</translation>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="593"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation>QT_LAYOUT_DIRECTION</translation>
</message>
diff --git a/translations/client_es_AR.ts b/translations/client_es_AR.ts
index 6112e94..a280c28 100644
--- a/translations/client_es_AR.ts
+++ b/translations/client_es_AR.ts
@@ -579,157 +579,157 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="129"/>
<source>Local folder %1 does not exist.</source>
<translation>El directorio local %1 no existe.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="132"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 debé ser una carpeta pero no lo es.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>%1 is not readable.</source>
<translation>No se puede leer %1.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="387"/>
+ <location filename="../src/gui/folder.cpp" line="381"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="497"/>
+ <location filename="../src/gui/folder.cpp" line="491"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido eliminado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="504"/>
+ <location filename="../src/gui/folder.cpp" line="498"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido descargado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="511"/>
+ <location filename="../src/gui/folder.cpp" line="505"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido actualizado</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="518"/>
+ <location filename="../src/gui/folder.cpp" line="512"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="525"/>
+ <location filename="../src/gui/folder.cpp" line="519"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="495"/>
+ <location filename="../src/gui/folder.cpp" line="489"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="502"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="509"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="516"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="523"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="530"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="532"/>
+ <location filename="../src/gui/folder.cpp" line="526"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="537"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="533"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="545"/>
+ <location filename="../src/gui/folder.cpp" line="539"/>
<source>Sync Activity</source>
<translation>Actividad de Sync</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="755"/>
+ <location filename="../src/gui/folder.cpp" line="747"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="966"/>
+ <location filename="../src/gui/folder.cpp" line="958"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="984"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="988"/>
+ <location filename="../src/gui/folder.cpp" line="980"/>
<source>Remove All Files?</source>
<translation>¿Borrar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="990"/>
+ <location filename="../src/gui/folder.cpp" line="982"/>
<source>Remove all files</source>
<translation>Borrar todos los archivos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="991"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1001"/>
<source>This sync would reset the files to an erlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1014"/>
+ <location filename="../src/gui/folder.cpp" line="1006"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1016"/>
+ <location filename="../src/gui/folder.cpp" line="1008"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1017"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@@ -2087,48 +2087,48 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="293"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="305"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="317"/>
- <location filename="../src/libsync/propagateupload.cpp" line="706"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="321"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="633"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="641"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="645"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="672"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="695"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="721"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="794"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
@@ -3487,7 +3487,7 @@ It is not advisable to use it.</source>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="593"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_et.ts b/translations/client_et.ts
index 7fc8d9c..6d712fe 100644
--- a/translations/client_et.ts
+++ b/translations/client_et.ts
@@ -579,157 +579,157 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="129"/>
<source>Local folder %1 does not exist.</source>
<translation>Kohalikku kausta %1 pole olemas.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="132"/>
<source>%1 should be a folder but is not.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>%1 is not readable.</source>
<translation>%1 pole loetav.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="387"/>
+ <location filename="../src/gui/folder.cpp" line="381"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="497"/>
+ <location filename="../src/gui/folder.cpp" line="491"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 on eemaldatud.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="504"/>
+ <location filename="../src/gui/folder.cpp" line="498"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 on alla laaditud.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="511"/>
+ <location filename="../src/gui/folder.cpp" line="505"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 on uuendatud.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="518"/>
+ <location filename="../src/gui/folder.cpp" line="512"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 on ümber nimetatud %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="525"/>
+ <location filename="../src/gui/folder.cpp" line="519"/>
<source>%1 has been moved to %2.</source>
<translation>%1 on tõstetud %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="495"/>
+ <location filename="../src/gui/folder.cpp" line="489"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="502"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="509"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="516"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="523"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="530"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="532"/>
+ <location filename="../src/gui/folder.cpp" line="526"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="537"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="533"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 sünkroniseerimine ebaõnnestus tõrke tõttu. Lisainfot vaata logist.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="545"/>
+ <location filename="../src/gui/folder.cpp" line="539"/>
<source>Sync Activity</source>
<translation>Sünkroniseerimise tegevus</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="755"/>
+ <location filename="../src/gui/folder.cpp" line="747"/>
<source>Could not read system exclude file</source>
<translation>Süsteemi väljajätmiste faili lugemine ebaõnnestus</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="966"/>
+ <location filename="../src/gui/folder.cpp" line="958"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="984"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="988"/>
+ <location filename="../src/gui/folder.cpp" line="980"/>
<source>Remove All Files?</source>
<translation>Kustutada kõik failid?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="990"/>
+ <location filename="../src/gui/folder.cpp" line="982"/>
<source>Remove all files</source>
<translation>Kustutada kõik failid</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="991"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Keep files</source>
<translation>Säilita failid</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1001"/>
<source>This sync would reset the files to an erlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1014"/>
+ <location filename="../src/gui/folder.cpp" line="1006"/>
<source>Backup detected</source>
<translation>Leiti varukoopia</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1016"/>
+ <location filename="../src/gui/folder.cpp" line="1008"/>
<source>Normal Synchronisation</source>
<translation>Tavaline sünkroonimine</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1017"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@@ -2088,48 +2088,48 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="293"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
<translation>Fail eemaldatud</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="305"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="309"/>
<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="317"/>
- <location filename="../src/libsync/propagateupload.cpp" line="706"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="321"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="710"/>
<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="633"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="641"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="645"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Faili on lokaalselt muudetud, kuid see on osa kirjutamisõiguseta jagamisest. See on taastatud ning sinu muudatus on konfliktses failis.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="672"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
<translation>Küsitluse URL puudub</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="695"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
<translation>Kohalik fail on eemaldatud sünkroniseeringu käigus.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="721"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="794"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
@@ -3489,7 +3489,7 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="593"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_eu.ts b/translations/client_eu.ts
index 832571b..30f6ead 100644
--- a/translations/client_eu.ts
+++ b/translations/client_eu.ts
@@ -579,157 +579,157 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="129"/>
<source>Local folder %1 does not exist.</source>
<translation>Bertako %1 karpeta ez da existitzen.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="132"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 karpeta bat izan behar zen baina ez da.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>%1 is not readable.</source>
<translation>%1 ezin da irakurri.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="387"/>
+ <location filename="../src/gui/folder.cpp" line="381"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="497"/>
+ <location filename="../src/gui/folder.cpp" line="491"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ezabatua izan da.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="504"/>
+ <location filename="../src/gui/folder.cpp" line="498"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 deskargatu da.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="511"/>
+ <location filename="../src/gui/folder.cpp" line="505"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 kargatu da.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="518"/>
+ <location filename="../src/gui/folder.cpp" line="512"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 %2-(e)ra berrizendatu da.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="525"/>
+ <location filename="../src/gui/folder.cpp" line="519"/>
<source>%1 has been moved to %2.</source>
<translation>%1 %2-(e)ra mugitu da.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="495"/>
+ <location filename="../src/gui/folder.cpp" line="489"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="502"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="509"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="516"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="523"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="530"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="532"/>
+ <location filename="../src/gui/folder.cpp" line="526"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="537"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="533"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 ezin izan da sinkronizatu akats bat dela eta. Ikusi egunerkoa zehaztapen gehiago izateko.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="545"/>
+ <location filename="../src/gui/folder.cpp" line="539"/>
<source>Sync Activity</source>
<translation>Sinkronizazio Jarduerak</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="755"/>
+ <location filename="../src/gui/folder.cpp" line="747"/>
<source>Could not read system exclude file</source>
<translation>Ezin izan da sistemako baztertutakoen fitxategia irakurri</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="966"/>
+ <location filename="../src/gui/folder.cpp" line="958"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="984"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="988"/>
+ <location filename="../src/gui/folder.cpp" line="980"/>
<source>Remove All Files?</source>
<translation>Ezabatu Fitxategi Guztiak?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="990"/>
+ <location filename="../src/gui/folder.cpp" line="982"/>
<source>Remove all files</source>
<translation>Ezabatu fitxategi guztiak</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="991"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Keep files</source>
<translation>Mantendu fitxategiak</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1001"/>
<source>This sync would reset the files to an erlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1014"/>
+ <location filename="../src/gui/folder.cpp" line="1006"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1016"/>
+ <location filename="../src/gui/folder.cpp" line="1008"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1017"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@@ -2094,48 +2094,48 @@ Ez da gomendagarria erabltzea.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="293"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
<translation>Fitxategia Ezabatua</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="305"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="317"/>
- <location filename="../src/libsync/propagateupload.cpp" line="706"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="321"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
<translation>Fitxategi lokala aldatu da sinkronizazioan.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="633"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="641"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="645"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="672"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="695"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
<translation>Fitxategi lokala ezabatu da sinkronizazioan.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="721"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="794"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
@@ -3493,7 +3493,7 @@ Ez da gomendagarria erabltzea.</translation>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="593"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_fa.ts b/translations/client_fa.ts
index 05af625..411395f 100644
--- a/translations/client_fa.ts
+++ b/translations/client_fa.ts
@@ -579,157 +579,157 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="129"/>
<source>Local folder %1 does not exist.</source>
<translation>پوشه محلی %1 موجود نیست.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="132"/>
<source>%1 should be a folder but is not.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>%1 is not readable.</source>
<translation>%1 قابل خواندن نیست.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="387"/>
+ <location filename="../src/gui/folder.cpp" line="381"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="497"/>
+ <location filename="../src/gui/folder.cpp" line="491"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 حذف شده است.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="504"/>
+ <location filename="../src/gui/folder.cpp" line="498"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 بارگزاری شد.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="511"/>
+ <location filename="../src/gui/folder.cpp" line="505"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 بروز رسانی شده است.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="518"/>
+ <location filename="../src/gui/folder.cpp" line="512"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 به %2 تغییر نام داده شده است.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="525"/>
+ <location filename="../src/gui/folder.cpp" line="519"/>
<source>%1 has been moved to %2.</source>
<translation>%1 به %2 انتقال داده شده است.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="495"/>
+ <location filename="../src/gui/folder.cpp" line="489"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="502"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="509"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="516"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="523"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="530"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="532"/>
+ <location filename="../src/gui/folder.cpp" line="526"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="537"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="533"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="545"/>
+ <location filename="../src/gui/folder.cpp" line="539"/>
<source>Sync Activity</source>
<translation>فعالیت همگام سازی</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="755"/>
+ <location filename="../src/gui/folder.cpp" line="747"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="966"/>
+ <location filename="../src/gui/folder.cpp" line="958"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="984"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="988"/>
+ <location filename="../src/gui/folder.cpp" line="980"/>
<source>Remove All Files?</source>
<translation>حذف تمام فایل ها؟</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="990"/>
+ <location filename="../src/gui/folder.cpp" line="982"/>
<source>Remove all files</source>
<translation>حذف تمام فایل ها</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="991"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Keep files</source>
<translation>نگه داشتن فایل ها</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1001"/>
<source>This sync would reset the files to an erlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1014"/>
+ <location filename="../src/gui/folder.cpp" line="1006"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1016"/>
+ <location filename="../src/gui/folder.cpp" line="1008"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1017"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@@ -2087,48 +2087,48 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="293"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
<translation>فایل حذف شد</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="305"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="317"/>
- <location filename="../src/libsync/propagateupload.cpp" line="706"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="321"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
<translation>فایل محلی در حین همگامسازی تغییر کرده است.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="633"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="641"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="645"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="672"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="695"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
<translation>فایل محلی در حین همگامسازی حذف شده است.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="721"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="794"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
@@ -3486,7 +3486,7 @@ It is not advisable to use it.</source>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="593"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_fi.ts b/translations/client_fi.ts
index c5e3327..afa8e9b 100644
--- a/translations/client_fi.ts
+++ b/translations/client_fi.ts
@@ -579,158 +579,158 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="129"/>
<source>Local folder %1 does not exist.</source>
<translation>Paikallista kansiota %1 ei ole olemassa.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="132"/>
<source>%1 should be a folder but is not.</source>
<translation>Kohteen %1 pitäisi olla kansio, mutta se ei kuitenkaan ole kansio.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>%1 is not readable.</source>
<translation>%1 ei ole luettavissa.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="387"/>
+ <location filename="../src/gui/folder.cpp" line="381"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="497"/>
+ <location filename="../src/gui/folder.cpp" line="491"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 on poistettu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="504"/>
+ <location filename="../src/gui/folder.cpp" line="498"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 on ladattu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="511"/>
+ <location filename="../src/gui/folder.cpp" line="505"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 on päivitetty.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="518"/>
+ <location filename="../src/gui/folder.cpp" line="512"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 on nimetty uudeelleen muotoon %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="525"/>
+ <location filename="../src/gui/folder.cpp" line="519"/>
<source>%1 has been moved to %2.</source>
<translation>%1 on siirretty kohteeseen %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="495"/>
+ <location filename="../src/gui/folder.cpp" line="489"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="502"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="509"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="516"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="523"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="530"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="532"/>
+ <location filename="../src/gui/folder.cpp" line="526"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="537"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="533"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>Kohdetta %1 ei voi synkronoida virheen vuoksi. Katso tarkemmat tiedot lokista.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="545"/>
+ <location filename="../src/gui/folder.cpp" line="539"/>
<source>Sync Activity</source>
<translation>Synkronointiaktiviteetti</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="755"/>
+ <location filename="../src/gui/folder.cpp" line="747"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="966"/>
+ <location filename="../src/gui/folder.cpp" line="958"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Uusi kansio, joka on suurempi kuin %1 Mt, on lisätty: %2.
Siirry asetuksiin valitaksesi sen, jos haluat ladata kyseisen kansion.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="984"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="988"/>
+ <location filename="../src/gui/folder.cpp" line="980"/>
<source>Remove All Files?</source>
<translation>Poistetaanko kaikki tiedostot?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="990"/>
+ <location filename="../src/gui/folder.cpp" line="982"/>
<source>Remove all files</source>
<translation>Poista kaikki tiedostot</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="991"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Keep files</source>
<translation>Säilytä tiedostot</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1001"/>
<source>This sync would reset the files to an erlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1014"/>
+ <location filename="../src/gui/folder.cpp" line="1006"/>
<source>Backup detected</source>
<translation>Varmuuskopio poistettu</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1016"/>
+ <location filename="../src/gui/folder.cpp" line="1008"/>
<source>Normal Synchronisation</source>
<translation>Normaali synkronointi</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1017"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@@ -2095,48 +2095,48 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="293"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
<translation>Tiedosto poistettu</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="305"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="317"/>
- <location filename="../src/libsync/propagateupload.cpp" line="706"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="321"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
<translation>Paikallinen tiedosto muuttui synkronoinnin aikana.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="633"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="641"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="645"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="672"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="695"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
<translation>Paikallinen tiedosto poistettiin synkronoinnin aikana.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="721"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="794"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
<translation>Virhe kirjoittaessa metadataa tietokantaan</translation>
</message>
@@ -3496,7 +3496,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="593"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_fr.ts b/translations/client_fr.ts
index 7452f28..d82c94d 100644
--- a/translations/client_fr.ts
+++ b/translations/client_fr.ts
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="129"/>
<source>Local folder %1 does not exist.</source>
<translation>Le dossier local %1 n'existe pas.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="132"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 devrait être un dossier mais ne l'est pas.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>%1 is not readable.</source>
<translation>%1 ne peut pas être lu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="387"/>
+ <location filename="../src/gui/folder.cpp" line="381"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1 : %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="497"/>
+ <location filename="../src/gui/folder.cpp" line="491"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 a été supprimé.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="504"/>
+ <location filename="../src/gui/folder.cpp" line="498"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 a été téléchargé.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="511"/>
+ <location filename="../src/gui/folder.cpp" line="505"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 a été mis à jour.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="518"/>
+ <location filename="../src/gui/folder.cpp" line="512"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 a été renommé en %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="525"/>
+ <location filename="../src/gui/folder.cpp" line="519"/>
<source>%1 has been moved to %2.</source>
<translation>%1 a été déplacé vers %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="495"/>
+ <location filename="../src/gui/folder.cpp" line="489"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 a été supprimé.</numerusform><numerusform>%1 et %n autres fichiers ont été supprimés.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="502"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 a été téléchargé.</numerusform><numerusform>%1 et %n autres fichiers ont été téléchargés.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="509"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 a été mis à jour.</numerusform><numerusform>%1 et %n autres fichiers ont été mis à jour.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="516"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 a été renommé en %2.</numerusform><numerusform>%1 a été renommé en %2 et %n autres fichiers ont été renommés.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="523"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 a été déplacé vers %2.</numerusform><numerusform>%1 a été déplacé vers %2 et %n autres fichiers ont été déplacés.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="530"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 a un conflit de synchronisation.</numerusform><numerusform>%1 et %n autres fichiers ont des problèmes de synchronisation.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="532"/>
+ <location filename="../src/gui/folder.cpp" line="526"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 a un problème de synchronisation. Merci de vérifier le fichier conflit !</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="537"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 ne peut pas être synchronisé en raison d'erreurs. Consultez les logs pour les détails.</numerusform><numerusform>%1 et %n autres fichiers n'ont pas pu être synchronisés en raison d'erreurs. Consultez les logs pour les détails.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="533"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 n'a pu être synchronisé pour cause d'erreur. Consultez les logs pour les détails.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="545"/>
+ <location filename="../src/gui/folder.cpp" line="539"/>
<source>Sync Activity</source>
<translation>Activité de synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="755"/>
+ <location filename="../src/gui/folder.cpp" line="747"/>
<source>Could not read system exclude file</source>
<translation>Impossible de lire le fichier d'exclusion du système</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="966"/>
+ <location filename="../src/gui/folder.cpp" line="958"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Un nouveau dossier de taille supérieure à %1 Mo a été ajouté : %2.
Veuillez le sélectionner dans la fenêtre des paramètres pour le télécharger.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="984"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -700,22 +700,22 @@ Peut-être la configuration a-t-elle été modifiée, ou les fichiers supprimé
Êtes-vous sûr de vouloir effectuer cette opération ?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="988"/>
+ <location filename="../src/gui/folder.cpp" line="980"/>
<source>Remove All Files?</source>
<translation>Supprimer tous les fichiers ?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="990"/>
+ <location filename="../src/gui/folder.cpp" line="982"/>
<source>Remove all files</source>
<translation>Supprimer tous les fichiers</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="991"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Keep files</source>
<translation>Garder les fichiers</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1001"/>
<source>This sync would reset the files to an erlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -724,17 +724,17 @@ Cela peut être dû à une copie de sauvegarde restaurée sur le serveur.
Continuer la synchronisation comme d'habitude fera en sorte que tous les fichiers soient remplacés par des fichiers plus vieux d'un état précédent. Voulez-vous garder les versions les plus récentes de vos fichiers en tant que fichiers conflictuels ?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1014"/>
+ <location filename="../src/gui/folder.cpp" line="1006"/>
<source>Backup detected</source>
<translation>Sauvegarde détecté</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1016"/>
+ <location filename="../src/gui/folder.cpp" line="1008"/>
<source>Normal Synchronisation</source>
<translation>Synchronisation normale</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1017"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Keep Local Files as Conflict</source>
<translation>Garder les fichiers locaux comme Conflits</translation>
</message>
@@ -2100,48 +2100,48 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="293"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
<translation>Fichier supprimé</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="305"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="309"/>
<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="317"/>
- <location filename="../src/libsync/propagateupload.cpp" line="706"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="321"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
<translation>Fichier local modifié pendant la synchronisation.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="633"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>Arrêt forcé du job après réinitialisation de connexion HTTP avec Qt < 5.4.2.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="641"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="645"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Le fichier a été modifié localement mais appartient à un partage en lecture seule. Il a été restauré et vos modifications sont présentes dans le fichiers de conflit.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="672"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
<translation>URL de sondage manquante</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="695"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
<translation>Fichier local supprimé pendant la synchronisation.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="721"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation>Le serveur n'a pas confirmé la réception du dernier morceau. (Aucun e-tag n'était présent).</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="794"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
<translation>Erreur à l'écriture des métadonnées dans la base de données</translation>
</message>
@@ -3501,7 +3501,7 @@ Il est déconseillé de l'utiliser.</translation>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="593"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation>QT_LAYOUT_DIRECTION</translation>
</message>
diff --git a/translations/client_gl.ts b/translations/client_gl.ts
index 80d2a66..770c383 100644
--- a/translations/client_gl.ts
+++ b/translations/client_gl.ts
@@ -579,158 +579,158 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="129"/>
<source>Local folder %1 does not exist.</source>
<translation>O cartafol local %1 non existe.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="132"/>
<source>%1 should be a folder but is not.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>%1 is not readable.</source>
<translation>%1 non é lexíbel.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="387"/>
+ <location filename="../src/gui/folder.cpp" line="381"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="497"/>
+ <location filename="../src/gui/folder.cpp" line="491"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi retirado satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="504"/>
+ <location filename="../src/gui/folder.cpp" line="498"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi descargado satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="511"/>
+ <location filename="../src/gui/folder.cpp" line="505"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi enviado satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="518"/>
+ <location filename="../src/gui/folder.cpp" line="512"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 foi renomeado satisfactoriamente a %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="525"/>
+ <location filename="../src/gui/folder.cpp" line="519"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido satisfactoriamente a %2</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="495"/>
+ <location filename="../src/gui/folder.cpp" line="489"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="502"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="509"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="516"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="523"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="530"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="532"/>
+ <location filename="../src/gui/folder.cpp" line="526"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="537"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="533"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 non puido sincronizarse por mor dun erro. Vexa os detalles no rexistro.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="545"/>
+ <location filename="../src/gui/folder.cpp" line="539"/>
<source>Sync Activity</source>
<translation>Actividade de sincronización</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="755"/>
+ <location filename="../src/gui/folder.cpp" line="747"/>
<source>Could not read system exclude file</source>
<translation>Non foi posíbel ler o ficheiro de exclusión do sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="966"/>
+ <location filename="../src/gui/folder.cpp" line="958"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Foi engadido un novo cartafol maior de %1 MB: %2.
Vaia aos axustes e seleccióneo se quere descargalo.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="984"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="988"/>
+ <location filename="../src/gui/folder.cpp" line="980"/>
<source>Remove All Files?</source>
<translation>Retirar todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="990"/>
+ <location filename="../src/gui/folder.cpp" line="982"/>
<source>Remove all files</source>
<translation>Retirar todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="991"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1001"/>
<source>This sync would reset the files to an erlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1014"/>
+ <location filename="../src/gui/folder.cpp" line="1006"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1016"/>
+ <location filename="../src/gui/folder.cpp" line="1008"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1017"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@@ -2094,48 +2094,48 @@ Recomendámoslle que non o use.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="293"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
<translation>Ficheiro retirado</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="305"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="309"/>
<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="317"/>
- <location filename="../src/libsync/propagateupload.cpp" line="706"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="321"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="710"/>
<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="633"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>Forzando a interrupción do traballo na conexión HTTP reiniciandoa con Qt <5.4.2.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="641"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="645"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>O ficheiro foi editado localmente mais é parte dunha compartición de só lectura. O ficheiro foi restaurado e a súa edición atopase no ficheiro de conflitos.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="672"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
<translation>Non se atopa o URL requirido</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="695"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
<translation>O ficheiro local retirarase durante a sincronización.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="721"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="794"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
@@ -3495,7 +3495,7 @@ Recomendámoslle que non o use.</translation>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="593"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_hu.ts b/translations/client_hu.ts
index 6ae88ea..942c013 100644
--- a/translations/client_hu.ts
+++ b/translations/client_hu.ts
@@ -579,157 +579,157 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="129"/>
<source>Local folder %1 does not exist.</source>
<translation>%1 helyi mappa nem létezik.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="132"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 valószínűleg könyvtár, de nem az.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>%1 is not readable.</source>
<translation>%1 nem olvasható.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="387"/>
+ <location filename="../src/gui/folder.cpp" line="381"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="497"/>
+ <location filename="../src/gui/folder.cpp" line="491"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 sikeresen törölve.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="504"/>
+ <location filename="../src/gui/folder.cpp" line="498"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 sikeresen letöltve.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="511"/>
+ <location filename="../src/gui/folder.cpp" line="505"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 sikeresen feltöltve.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="518"/>
+ <location filename="../src/gui/folder.cpp" line="512"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 átnevezve erre: %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="525"/>
+ <location filename="../src/gui/folder.cpp" line="519"/>
<source>%1 has been moved to %2.</source>
<translation>%1 áthelyezve ide: %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="495"/>
+ <location filename="../src/gui/folder.cpp" line="489"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 és %n további fájl törölve.</numerusform><numerusform>%1 és %n további fájl törölve.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="502"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 és %n további fájl letöltve.</numerusform><numerusform>%1 és %n további fájl letöltve.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="509"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 és %n további fájl feltöltve.</numerusform><numerusform>%1 és %n további fájl feltöltve.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="516"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 átnevezve erre: %2 és még %n további fájl átnevezve.</numerusform><numerusform>%1 átnevezve erre: %2 és még %n további fájl átnevezve.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="523"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 áthelyezve ide: %2 és még %n további fájl áthelyezve.</numerusform><numerusform>%1 áthelyezve ide: %2 és még %n további fájl áthelyezve.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="530"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 és %n további fájl szinkronizálási konfliktussal rendelkezik.</numerusform><numerusform>%1 és %n további fájl szinkronizálási konfliktussal rendelkezik.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="532"/>
+ <location filename="../src/gui/folder.cpp" line="526"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 fájl szinkronizálási konfliktussal rendelkezik. Kérjük ellenőrizze a konfliktus fájlt!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="537"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 és %n további fájlt nem sikerült szinkronizálni. Bővebb információ a naplófájlban.</numerusform><numerusform>%1 és %n további fájlt nem sikerült szinkronizálni. Bővebb információ a naplófájlban.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="533"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 nem sikerült szinkronizálni. Bővebb információ a naplófájlban.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="545"/>
+ <location filename="../src/gui/folder.cpp" line="539"/>
<source>Sync Activity</source>
<translation>Szinkronizálási aktivitás</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="755"/>
+ <location filename="../src/gui/folder.cpp" line="747"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="966"/>
+ <location filename="../src/gui/folder.cpp" line="958"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="984"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="988"/>
+ <location filename="../src/gui/folder.cpp" line="980"/>
<source>Remove All Files?</source>
<translation>Törli az összes fájlt?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="990"/>
+ <location filename="../src/gui/folder.cpp" line="982"/>
<source>Remove all files</source>
<translation>Összes fájl eltávolítása</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="991"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Keep files</source>
<translation>Fájlok megtartása</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1001"/>
<source>This sync would reset the files to an erlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1014"/>
+ <location filename="../src/gui/folder.cpp" line="1006"/>
<source>Backup detected</source>
<translation>Biztonsági mentés észlelve</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1016"/>
+ <location filename="../src/gui/folder.cpp" line="1008"/>
<source>Normal Synchronisation</source>
<translation>Normal szinkronizáció</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1017"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Keep Local Files as Conflict</source>
<translation>Helyi file-ok megtartása konfliktusként</translation>
</message>
@@ -2091,48 +2091,48 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="293"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
<translation>Fájl törölve</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="305"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="317"/>
- <location filename="../src/libsync/propagateupload.cpp" line="706"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="321"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="633"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="641"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="645"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="672"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="695"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
<translation>A helyi fájl el lett távolítva a szinkronizálás alatt.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="721"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="794"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
@@ -3491,7 +3491,7 @@ It is not advisable to use it.</source>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="593"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_it.ts b/translations/client_it.ts
index d910442..af94fd1 100644
--- a/translations/client_it.ts
+++ b/translations/client_it.ts
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="129"/>
<source>Local folder %1 does not exist.</source>
<translation>La cartella locale %1 non esiste.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="132"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 dovrebbe essere una cartella, ma non lo è.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>%1 is not readable.</source>
<translation>%1 non è leggibile.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="387"/>
+ <location filename="../src/gui/folder.cpp" line="381"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="497"/>
+ <location filename="../src/gui/folder.cpp" line="491"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 è stato rimosso.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="504"/>
+ <location filename="../src/gui/folder.cpp" line="498"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 è stato scaricato.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="511"/>
+ <location filename="../src/gui/folder.cpp" line="505"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 è stato aggiornato.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="518"/>
+ <location filename="../src/gui/folder.cpp" line="512"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 è stato rinominato in %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="525"/>
+ <location filename="../src/gui/folder.cpp" line="519"/>
<source>%1 has been moved to %2.</source>
<translation>%1 è stato spostato in %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="495"/>
+ <location filename="../src/gui/folder.cpp" line="489"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 e %n altro file sono stati rimossi.</numerusform><numerusform>%1 e %n altri file sono stati rimossi.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="502"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 e %n altro file sono stati scaricati.</numerusform><numerusform>%1 e %n altri file sono stati scaricati.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="509"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 e %n altro file sono stati aggiornati.</numerusform><numerusform>%1 e %n altri file sono stati aggiornati.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="516"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 è stato rinominato in %2 e %n altro file sono stati rinominati.</numerusform><numerusform>%1 è stato rinominato in %2 e %n altri file sono stati rinominati.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="523"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 è stato spostato in %2 e %n altro file sono stati spostati.</numerusform><numerusform>%1 è stato spostato in %2 e %n altri file sono stati spostati.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="530"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 e %n altro file hanno conflitti di sincronizzazione.</numerusform><numerusform>%1 e %n altri file hanno conflitti di sincronizzazione.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="532"/>
+ <location filename="../src/gui/folder.cpp" line="526"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 ha un conflitto di sincronizzazione. Controlla il file in conflitto!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="537"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>1% e %n altro file non sono stati sincronizzati a causa di errori. Controlla il log per i dettagli.</numerusform><numerusform>1% e %n altri file non sono stati sincronizzati a causa di errori. Controlla il log per i dettagli.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="533"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 non può essere sincronizzato a causa di un errore. Controlla il log per i dettagli.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="545"/>
+ <location filename="../src/gui/folder.cpp" line="539"/>
<source>Sync Activity</source>
<translation>Sincronizza attività</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="755"/>
+ <location filename="../src/gui/folder.cpp" line="747"/>
<source>Could not read system exclude file</source>
<translation>Impossibile leggere il file di esclusione di sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="966"/>
+ <location filename="../src/gui/folder.cpp" line="958"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Una nuova cartella più grande di %1 MB è stata aggiunta: %2.
Vai nelle impostazioni per selezionarla se desideri scaricarla.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="984"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -700,22 +700,22 @@ Ciò potrebbe accadere in caso di riconfigurazione della cartella o di rimozione
Sei sicuro di voler eseguire questa operazione?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="988"/>
+ <location filename="../src/gui/folder.cpp" line="980"/>
<source>Remove All Files?</source>
<translation>Vuoi rimuovere tutti i file?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="990"/>
+ <location filename="../src/gui/folder.cpp" line="982"/>
<source>Remove all files</source>
<translation>Rimuovi tutti i file</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="991"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Keep files</source>
<translation>Mantieni i file</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1001"/>
<source>This sync would reset the files to an erlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -724,17 +724,17 @@ Ciò potrebbe verificarsi in seguito al ripristino di un backup sul server.
Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tutti i tuoi file con file più datati in uno stato precedente. Vuoi mantenere i tuoi file locali più recenti come file di conflitto?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1014"/>
+ <location filename="../src/gui/folder.cpp" line="1006"/>
<source>Backup detected</source>
<translation>Backup rilevato</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1016"/>
+ <location filename="../src/gui/folder.cpp" line="1008"/>
<source>Normal Synchronisation</source>
<translation>Sincronizzazione normale</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1017"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Keep Local Files as Conflict</source>
<translation>Mantieni i file locali come conflitto</translation>
</message>
@@ -2099,48 +2099,48 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="293"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
<translation>File rimosso</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="305"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="309"/>
<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="317"/>
- <location filename="../src/libsync/propagateupload.cpp" line="706"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="321"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="710"/>
<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="633"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>Forzare l'interruzione dell'operazione in caso di ripristino della connessione HTTP con Qt < 5.4.2.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="641"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="645"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Il file è stato modificato localmente, ma è parte di una condivisione in sola lettura. È stato ripristinato e la tua modifica è nel file di conflitto.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="672"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
<translation>URL di richiesta mancante</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="695"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
<translation>Il file locale è stato rimosso durante la sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="721"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation>Il server non ha riconosciuto l'ultimo pezzo. (Non era presente alcun e-tag)</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="794"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
<translation>Errore durante la scrittura dei metadati nel database</translation>
</message>
@@ -3500,7 +3500,7 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="593"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation>QT_LAYOUT_DIRECTION</translation>
</message>
diff --git a/translations/client_ja.ts b/translations/client_ja.ts
index 9e95ca6..06dcb02 100644
--- a/translations/client_ja.ts
+++ b/translations/client_ja.ts
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="129"/>
<source>Local folder %1 does not exist.</source>
<translation>ローカルフォルダー %1 は存在しません。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="132"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 はフォルダーのはずですが、そうではないようです。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>%1 is not readable.</source>
<translation>%1 は読み込み可能ではありません。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="387"/>
+ <location filename="../src/gui/folder.cpp" line="381"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="497"/>
+ <location filename="../src/gui/folder.cpp" line="491"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 は削除されました。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="504"/>
+ <location filename="../src/gui/folder.cpp" line="498"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 はダウンロードされました。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="511"/>
+ <location filename="../src/gui/folder.cpp" line="505"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 が更新されました。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="518"/>
+ <location filename="../src/gui/folder.cpp" line="512"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 の名前が %2 に変更されました。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="525"/>
+ <location filename="../src/gui/folder.cpp" line="519"/>
<source>%1 has been moved to %2.</source>
<translation>%1 は %2 に移動しました。</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="495"/>
+ <location filename="../src/gui/folder.cpp" line="489"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 とその他 %n 個のファイルが削除されました。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="502"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 とその他 %n 個のファイルがダウンロードされました。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="509"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 とその他 %n 個のファイルが更新されました。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="516"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 を %2 にファイル名を変更し、その他 %n 個のファイル名を変更しました。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="523"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 を %2 に移動し、その他 %n 個のファイルを移動しました。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="530"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 と その他 %n 個のファイルが同期で衝突しました。</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="532"/>
+ <location filename="../src/gui/folder.cpp" line="526"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 が同期で衝突しています。コンフリクトファイルを確認してください。</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="537"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>エラーにより、%1 と その他 %n 個のファイルが同期できませんでした。ログで詳細を確認してください。</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="533"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>エラーにより %1 が未同期です。ログで詳細を確認してください。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="545"/>
+ <location filename="../src/gui/folder.cpp" line="539"/>
<source>Sync Activity</source>
<translation>同期アクティビティ</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="755"/>
+ <location filename="../src/gui/folder.cpp" line="747"/>
<source>Could not read system exclude file</source>
<translation>システム上の除外ファイルを読み込めません</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="966"/>
+ <location filename="../src/gui/folder.cpp" line="958"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>新しい %1 MB以上のフォルダーが追加されました: %2
ダウンロードしたい場合は、設定画面で選択してください。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="984"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -700,22 +700,22 @@ Are you sure you want to perform this operation?</source>
本当にこの操作を実行しますか？</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="988"/>
+ <location filename="../src/gui/folder.cpp" line="980"/>
<source>Remove All Files?</source>
<translation>すべてのファイルを削除しますか？</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="990"/>
+ <location filename="../src/gui/folder.cpp" line="982"/>
<source>Remove all files</source>
<translation>すべてのファイルを削除</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="991"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Keep files</source>
<translation>ファイルを残す</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1001"/>
<source>This sync would reset the files to an erlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -724,17 +724,17 @@ Continuing the sync as normal will cause all your files to be overwritten by an
このまま同期を続けた場合、あたらしいファイルが全て古いファイルで上書きされます。ローカルファイルで新しいものをコンフリクトファイルとして保持しますか？</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1014"/>
+ <location filename="../src/gui/folder.cpp" line="1006"/>
<source>Backup detected</source>
<translation>バックアップが検出されました</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1016"/>
+ <location filename="../src/gui/folder.cpp" line="1008"/>
<source>Normal Synchronisation</source>
<translation>正常同期</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1017"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Keep Local Files as Conflict</source>
<translation>コンフリクト時にローカルファイルを保持</translation>
</message>
@@ -2098,48 +2098,48 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="293"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
<translation>ファイルを削除しました</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="305"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>ローカルファイルが同期中に変更されました。再開されます。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="317"/>
- <location filename="../src/libsync/propagateupload.cpp" line="706"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="321"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
<translation>ローカルのファイルが同期中に変更されました。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="633"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>5.4.2 以下のQt でHTTP 接続リセットが強制終了されました</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="641"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="645"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>ファイルがローカルで編集されましたが、読み込み専用の共有の一部です。ファイルは復元され、あなたの編集は競合するファイル内にあります。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="672"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
<translation>ポーリングURLがありません</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="695"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
<translation>ローカルファイルを同期中に削除します。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="721"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation>サーバーは最終チャンクを認識しませんでした。(e-tag が存在しませんでした)</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="794"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
<translation>メタデータのデータベースへの書き込みに失敗</translation>
</message>
@@ -3499,7 +3499,7 @@ It is not advisable to use it.</source>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="593"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation>QT_LAYOUT_DIRECTION</translation>
</message>
diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts
index 9233335..59e0227 100644
--- a/translations/client_nb_NO.ts
+++ b/translations/client_nb_NO.ts
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="129"/>
<source>Local folder %1 does not exist.</source>
<translation>Lokal mappe %1 eksisterer ikke.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="132"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 skal være en mappe men er ikke det.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>%1 is not readable.</source>
<translation>%1 kan ikke leses.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="387"/>
+ <location filename="../src/gui/folder.cpp" line="381"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="497"/>
+ <location filename="../src/gui/folder.cpp" line="491"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 har blitt fjernet.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="504"/>
+ <location filename="../src/gui/folder.cpp" line="498"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 har blitt lastet ned.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="511"/>
+ <location filename="../src/gui/folder.cpp" line="505"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 har blitt oppdatert.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="518"/>
+ <location filename="../src/gui/folder.cpp" line="512"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 har blitt omdøpt til %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="525"/>
+ <location filename="../src/gui/folder.cpp" line="519"/>
<source>%1 has been moved to %2.</source>
<translation>%1 har blitt flyttet til %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="495"/>
+ <location filename="../src/gui/folder.cpp" line="489"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="502"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="509"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="516"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="523"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="530"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="532"/>
+ <location filename="../src/gui/folder.cpp" line="526"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="537"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="533"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 kunne ikke synkroniseres pga. en feil. Se loggen for detaljer.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="545"/>
+ <location filename="../src/gui/folder.cpp" line="539"/>
<source>Sync Activity</source>
<translation>Synkroniseringsaktivitet</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="755"/>
+ <location filename="../src/gui/folder.cpp" line="747"/>
<source>Could not read system exclude file</source>
<translation>Klarte ikke å lese systemets ekskluderingsfil</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="966"/>
+ <location filename="../src/gui/folder.cpp" line="958"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>En ny mappe større enn %1 MB er blitt lagt til: %2.
Gå til Innstillinger og velg mappen hvis du ønsker å laste den ned.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="984"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -700,22 +700,22 @@ Dette kan være fordi mappen ble omkonfigurert i det stille, eller alle filene b
Er du sikker på at du vil utføre denne operasjonen?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="988"/>
+ <location filename="../src/gui/folder.cpp" line="980"/>
<source>Remove All Files?</source>
<translation>Fjerne alle filer?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="990"/>
+ <location filename="../src/gui/folder.cpp" line="982"/>
<source>Remove all files</source>
<translation>Fjern alle filer</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="991"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Keep files</source>
<translation>Behold filer</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1001"/>
<source>This sync would reset the files to an erlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -724,17 +724,17 @@ Dette kan være fordi en backup ble gjenopprettet på serveren.
Hvis synkroniseringen fortsetter som normalt, vil alle filene dine bli overskrevet av en eldre fil i en tidligere tilstand. Ønsker du å beholde dine ferskeste lokale filer som konflikt-filer?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1014"/>
+ <location filename="../src/gui/folder.cpp" line="1006"/>
<source>Backup detected</source>
<translation>Backup oppdaget</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1016"/>
+ <location filename="../src/gui/folder.cpp" line="1008"/>
<source>Normal Synchronisation</source>
<translation>Normal synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1017"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Keep Local Files as Conflict</source>
<translation>Behold lokale filer som konflikt</translation>
</message>
@@ -2100,48 +2100,48 @@ Det er ikke tilrådelig å bruke den.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="293"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
<translation>Fil fjernet</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="305"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="309"/>
<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="317"/>
- <location filename="../src/libsync/propagateupload.cpp" line="706"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="321"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
<translation>Lokal fil endret under synkronisering.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="633"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>Tvinger avbryting av jobb ved HTTP connection reset med Qt < 5.4.2.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="641"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="645"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Filen ble redigert lokalt men er en del av en deling med lesetilgang. Den er blitt gjenopprettet og din endring er i konfliktfilen.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="672"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
<translation>Forespørsels-URL mangler</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="695"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
<translation>Den lokale filen ble fjernet under synkronisering.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="721"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation>Serveren godtok ikke den siste deloverføringen. (Ingen e-tag var tilstede)</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="794"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
@@ -3501,7 +3501,7 @@ Det er ikke tilrådelig å bruke den.</translation>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="593"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation>LTR</translation>
</message>
diff --git a/translations/client_nl.ts b/translations/client_nl.ts
index 87415e2..7c9700d 100644
--- a/translations/client_nl.ts
+++ b/translations/client_nl.ts
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="129"/>
<source>Local folder %1 does not exist.</source>
<translation>Lokale map %1 bestaat niet.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="132"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 zou een map moeten zijn, maar is dat niet.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>%1 is not readable.</source>
<translation>%1 is niet leesbaar.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="387"/>
+ <location filename="../src/gui/folder.cpp" line="381"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="497"/>
+ <location filename="../src/gui/folder.cpp" line="491"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 is verwijderd.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="504"/>
+ <location filename="../src/gui/folder.cpp" line="498"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 is gedownload.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="511"/>
+ <location filename="../src/gui/folder.cpp" line="505"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 is bijgewerkt.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="518"/>
+ <location filename="../src/gui/folder.cpp" line="512"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 is hernoemd naar %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="525"/>
+ <location filename="../src/gui/folder.cpp" line="519"/>
<source>%1 has been moved to %2.</source>
<translation>%1 is verplaatst naar %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="495"/>
+ <location filename="../src/gui/folder.cpp" line="489"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 en %n ander bestand(en) zijn verwijderd.</numerusform><numerusform>%1 en %n andere bestand(en) zijn verwijderd.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="502"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 en %n ander bestand(en) zijn gedownload.</numerusform><numerusform>%1 en %n andere bestand(en) zijn gedownload.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="509"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 en %n ander bestand(en) zijn bijgewerkt.</numerusform><numerusform>%1 en %n andere bestand(en) zijn bijgewerkt.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="516"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 is hernoemd naar %2 en %n ander bestand(en) is hernoemd.</numerusform><numerusform>%1 is hernoemd naar %2 en %n andere bestand(en) zijn hernoemd.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="523"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 is verplaatst naar %2 en %n ander bestand(en) is verplaatst.</numerusform><numerusform>%1 is verplaatst naar %2 en %n andere bestand(en) zijn verplaatst.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="530"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 en %n ander bestand(en) hebben een sync conflict.</numerusform><numerusform>%1 en %n andere bestand(en) hebben sync conflicten.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="532"/>
+ <location filename="../src/gui/folder.cpp" line="526"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 heeft een sync conflict. Controleer het conflict bestand!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="537"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 en %n ander bestand(en) konden niet worden gesynchroniseerd wegens fouten. Bekijk het log voor details.</numerusform><numerusform>%1 en %n andere bestand(en) konden niet worden gesynchroniseerd wegens fouten. Bekijk het log voor details.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="533"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 kon niet worden gesynchroniseerd door een fout. Bekijk het log voor details.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="545"/>
+ <location filename="../src/gui/folder.cpp" line="539"/>
<source>Sync Activity</source>
<translation>Synchronisatie-activiteit</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="755"/>
+ <location filename="../src/gui/folder.cpp" line="747"/>
<source>Could not read system exclude file</source>
<translation>Kon het systeem-uitsluitingsbestand niet lezen</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="966"/>
+ <location filename="../src/gui/folder.cpp" line="958"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Een nieuwe map groter dan %1 MB is toegevoegd: %2
Ga naar de instellingen om het te selecteren als u deze wilt downloaden.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="984"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -700,22 +700,22 @@ Dat zou kunnen gebeuren, omdat de map stilletjes was geherconfigureerd, of omdat
Weet je zeker dat je door wilt gaan?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="988"/>
+ <location filename="../src/gui/folder.cpp" line="980"/>
<source>Remove All Files?</source>
<translation>Verwijder alle bestanden?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="990"/>
+ <location filename="../src/gui/folder.cpp" line="982"/>
<source>Remove all files</source>
<translation>Verwijder alle bestanden</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="991"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Keep files</source>
<translation>Bewaar bestanden</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1001"/>
<source>This sync would reset the files to an erlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -724,17 +724,17 @@ Dit kan komen doordat een backup is hersteld op de server.
Doorgaan met deze synchronisatie overschrijft al uw bestandend door een eerdere versie. Wilt u uw lokale meer recentere bestanden behouden als conflict bestanden?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1014"/>
+ <location filename="../src/gui/folder.cpp" line="1006"/>
<source>Backup detected</source>
<translation>Backup gedetecteerd</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1016"/>
+ <location filename="../src/gui/folder.cpp" line="1008"/>
<source>Normal Synchronisation</source>
<translation>Normale synchronisatie</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1017"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Keep Local Files as Conflict</source>
<translation>Behoud lokale bestanden als conflict</translation>
</message>
@@ -2101,48 +2101,48 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="293"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
<translation>Bestand verwijderd</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="305"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Lokaal bestand gewijzigd bij sync. Wordt opnieuw meengenomen.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="317"/>
- <location filename="../src/libsync/propagateupload.cpp" line="706"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="321"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
<translation>Lokaal bestand gewijzigd bij sync.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="633"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>Forceren job-beëindiging op HTTP verbindingsreset met Qt < 5.4.2.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="641"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="645"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Het bestand is lokaal bewerkt, maar hoort bij een alleen-lezen share. Het originele bestand is teruggezet en uw bewerking staat in het conflicten bestand.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="672"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
<translation>URL opvraag ontbreekt</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="695"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
<translation>Het lokale bestand werd verwijderd tijdens sync.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="721"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation>De server heeft het laatste deel niet bevestigd (er was geen e-tag aanwezig)</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="794"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
<translation>Fout bij schrijven van Metadata naar de database</translation>
</message>
@@ -3502,7 +3502,7 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="593"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation>QT_LAYOUT_DIRECTION</translation>
</message>
diff --git a/translations/client_pl.ts b/translations/client_pl.ts
index bcea251..397048c 100644
--- a/translations/client_pl.ts
+++ b/translations/client_pl.ts
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="129"/>
<source>Local folder %1 does not exist.</source>
<translation>Folder lokalny %1 nie istnieje.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="132"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 powinien być katalogiem, ale nie jest.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>%1 is not readable.</source>
<translation>%1 jest nie do odczytu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="387"/>
+ <location filename="../src/gui/folder.cpp" line="381"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="497"/>
+ <location filename="../src/gui/folder.cpp" line="491"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 został usunięty.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="504"/>
+ <location filename="../src/gui/folder.cpp" line="498"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 został ściągnięty.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="511"/>
+ <location filename="../src/gui/folder.cpp" line="505"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 został uaktualniony.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="518"/>
+ <location filename="../src/gui/folder.cpp" line="512"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 zmienił nazwę na %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="525"/>
+ <location filename="../src/gui/folder.cpp" line="519"/>
<source>%1 has been moved to %2.</source>
<translation>%1 został przeniesiony do %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="495"/>
+ <location filename="../src/gui/folder.cpp" line="489"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="502"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="509"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="516"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="523"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="530"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="532"/>
+ <location filename="../src/gui/folder.cpp" line="526"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 ma konflikt synchronizacji. Sprawdź konfliktujący plik!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="537"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="533"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 nie może zostać zsynchronizowany z powodu błędu. Zobacz szczegóły w logu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="545"/>
+ <location filename="../src/gui/folder.cpp" line="539"/>
<source>Sync Activity</source>
<translation>Aktywności synchronizacji</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="755"/>
+ <location filename="../src/gui/folder.cpp" line="747"/>
<source>Could not read system exclude file</source>
<translation>Nie można przeczytać pliku wyłączeń</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="966"/>
+ <location filename="../src/gui/folder.cpp" line="958"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Nowy folder większy od %1 MB został dodany
Przejdź do ustawień i zaznacz go, jeśli chcesz go pobrać.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="984"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -700,22 +700,22 @@ Może to być spowodowane faktem, że folder został przekonfigurowany lub wszys
Czy jesteś pewien, że chcesz wykonać tę operację ? </translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="988"/>
+ <location filename="../src/gui/folder.cpp" line="980"/>
<source>Remove All Files?</source>
<translation>Usunąć wszystkie pliki?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="990"/>
+ <location filename="../src/gui/folder.cpp" line="982"/>
<source>Remove all files</source>
<translation>Usuń wszystkie pliki</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="991"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Keep files</source>
<translation>Pozostaw pliki</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1001"/>
<source>This sync would reset the files to an erlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -724,17 +724,17 @@ Być może została przywrócona kopia zapasowa serwera?
Jeśli kontynuujesz synchronizację, pliki zostaną nadpisane przez swój pierwotny stan. Czy chcesz zatrzymać swoje ostatnie pliki i nadać im status konfliktu?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1014"/>
+ <location filename="../src/gui/folder.cpp" line="1006"/>
<source>Backup detected</source>
<translation>Wykryto kopię zapasową.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1016"/>
+ <location filename="../src/gui/folder.cpp" line="1008"/>
<source>Normal Synchronisation</source>
<translation>Normalna synchronizacja.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1017"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Keep Local Files as Conflict</source>
<translation>Zatrzymaj pliki lokalne i ustaw status konfliktu.</translation>
</message>
@@ -2100,48 +2100,48 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="293"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
<translation>Usunięto plik</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="305"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="317"/>
- <location filename="../src/libsync/propagateupload.cpp" line="706"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="321"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
<translation>Lokalny plik zmienił się podczas synchronizacji.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="633"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="641"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="645"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Plik był edytowany lokalnie ale jest częścią udziału z prawem tylko do odczytu. Został przywrócony i Twoja edycja jest w pliku konfliktu</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="672"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="695"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
<translation>Pliki lokalny został usunięty podczas synchronizacji.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="721"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="794"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
<translation>Błąd podczas zapisu metadanych do bazy</translation>
</message>
@@ -3502,7 +3502,7 @@ Kliknij</translation>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="593"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_pt.ts b/translations/client_pt.ts
index 673c9c7..3cc852a 100644
--- a/translations/client_pt.ts
+++ b/translations/client_pt.ts
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="129"/>
<source>Local folder %1 does not exist.</source>
<translation>A pasta local %1 não existe.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="132"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 deveria ser uma pasta, mas não é.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>%1 is not readable.</source>
<translation>%1 não é legível.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="387"/>
+ <location filename="../src/gui/folder.cpp" line="381"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="497"/>
+ <location filename="../src/gui/folder.cpp" line="491"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi removido.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="504"/>
+ <location filename="../src/gui/folder.cpp" line="498"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi transferido.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="511"/>
+ <location filename="../src/gui/folder.cpp" line="505"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi atualizado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="518"/>
+ <location filename="../src/gui/folder.cpp" line="512"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 foi renomeado para %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="525"/>
+ <location filename="../src/gui/folder.cpp" line="519"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido para %2</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="495"/>
+ <location filename="../src/gui/folder.cpp" line="489"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>'%1' e %n outro(s) ficheiro(s) foram removidos</numerusform><numerusform>'%1' e %n outros ficheiros foram removidos</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="502"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 e %n outro ficheiro foram transferidos.</numerusform><numerusform>%1 e %n outros ficheiros foram transferidos.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="509"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 e %n outro ficheiro foram actualizados.</numerusform><numerusform>%1 e %n outros ficheiros foram actualizados.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="516"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 foi renomeado para %2 e %n outro ficheiro foi renomeado.</numerusform><numerusform>%1 foi renomeado para %2 e %n outros ficheiros foram renomeados.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="523"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 foi movido para %2 e %n outro ficheiro foi movido.</numerusform><numerusform>%1 foi movido para %2 e %n outros ficheiros foram movidos.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="530"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 tem e %n outro ficheiro têm problemas de sincronização.</numerusform><numerusform>%1 tem e %n outros ficheiros têm problemas de sincronização.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="532"/>
+ <location filename="../src/gui/folder.cpp" line="526"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 tem um problema de sincronização. Por favor, verifique o ficheiro com conflito!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="537"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 e %n outro ficheiro não podem ser sincronizados devido a erros. Consulte o registo de eventos para mais detalhes.</numerusform><numerusform>%1 e %n outros ficheiros não podem ser sincronizados devido a erros. Consulte o registo de eventos para mais detalhes.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="533"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>Não foi possível sincronizar %1 devido a um erro. Consulte o registo para detalhes.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="545"/>
+ <location filename="../src/gui/folder.cpp" line="539"/>
<source>Sync Activity</source>
<translation>Atividade de Sincronização</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="755"/>
+ <location filename="../src/gui/folder.cpp" line="747"/>
<source>Could not read system exclude file</source>
<translation>Não foi possível ler o ficheiro excluir do sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="966"/>
+ <location filename="../src/gui/folder.cpp" line="958"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Foi adicionada uma nova pasta maior do que %1 MB: %2.
Por favor, vá às configurações para a selecionar, se a desejar transferir.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="984"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -700,22 +700,22 @@ Isto poderá acontecer porque a pasta foi reconfigurada silenciosamente, ou todo
Tem a certeza que deseja realizar esta operação?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="988"/>
+ <location filename="../src/gui/folder.cpp" line="980"/>
<source>Remove All Files?</source>
<translation>Remover todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="990"/>
+ <location filename="../src/gui/folder.cpp" line="982"/>
<source>Remove all files</source>
<translation>Remover todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="991"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Keep files</source>
<translation>Manter ficheiros</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1001"/>
<source>This sync would reset the files to an erlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -724,17 +724,17 @@ Isto pode ser porque um backup foi restaurado no servidor.
Continuando a sincronização fará com que todos os seus ficheiros sejam substituídos por um ficheiro mais velho num estado anterior. Deseja manter os seus ficheiros locais mais recentes como ficheiros de conflito?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1014"/>
+ <location filename="../src/gui/folder.cpp" line="1006"/>
<source>Backup detected</source>
<translation>Detetada cópia de segurança</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1016"/>
+ <location filename="../src/gui/folder.cpp" line="1008"/>
<source>Normal Synchronisation</source>
<translation>Sincronização Normal</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1017"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Keep Local Files as Conflict</source>
<translation>Manter Ficheiros Locais como Conflito</translation>
</message>
@@ -2100,48 +2100,48 @@ Não é aconselhada a sua utilização.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="293"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
<translation>Ficheiro Eliminado</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="305"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="309"/>
<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="317"/>
- <location filename="../src/libsync/propagateupload.cpp" line="706"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="321"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="710"/>
<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="633"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>A forçar aborto no trabalho de redefinição de conexão HTTP com Qt < 5.4.3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="641"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="645"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>O ficheiro foi editado localmente mas faz parte de uma prtilha só de leitura. Foi restaurado mas a edição está no ficheiro de conflito.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="672"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
<translation>URL poll em falta</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="695"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
<translation>O arquivo local foi removido durante a sincronização.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="721"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation>O servidor não reconheceu a última parte. (Nenhuma e-tag estava presente)</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="794"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
<translation>Erro ao escrever a meta-informação par a base de dados</translation>
</message>
@@ -3501,7 +3501,7 @@ Não é aconselhada a sua utilização.</translation>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="593"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation>QT_LAYOUT_DIRECTION</translation>
</message>
diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts
index e33c500..24fe575 100644
--- a/translations/client_pt_BR.ts
+++ b/translations/client_pt_BR.ts
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="129"/>
<source>Local folder %1 does not exist.</source>
<translation>A pasta local %1 não existe.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="132"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 deve ser uma pasta, mas não é.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>%1 is not readable.</source>
<translation>%1 não pode ser lido.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="387"/>
+ <location filename="../src/gui/folder.cpp" line="381"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="497"/>
+ <location filename="../src/gui/folder.cpp" line="491"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi removido.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="504"/>
+ <location filename="../src/gui/folder.cpp" line="498"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi baixado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="511"/>
+ <location filename="../src/gui/folder.cpp" line="505"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi atualizado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="518"/>
+ <location filename="../src/gui/folder.cpp" line="512"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 foi renomeado para %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="525"/>
+ <location filename="../src/gui/folder.cpp" line="519"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido para %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="495"/>
+ <location filename="../src/gui/folder.cpp" line="489"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 e %n outro arquivo foi removido.</numerusform><numerusform>%1 e %n outros arquivos foram removidos.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="502"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 e %n outro arquivo foi baixado.</numerusform><numerusform>%1 e %n outros arquivos foram removidos.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="509"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 e %n outro arquivo foi atualizado.</numerusform><numerusform>%1 e %n outros arquivos foram atualizados.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="516"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 foi renomeado para %2 e %n outro arquivo foi renomeado.</numerusform><numerusform>%1 foi renomeado para %2 e %n outros arquivos foram renomeados.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="523"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 foi movido para %2 e %n outro arquivo foi movido.</numerusform><numerusform>%1 foi movido para %2 e %n outros arquivos foram movidos.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="530"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 tem e %n outro arquivo tem conflito na sincronização.</numerusform><numerusform>%1 tem e %n outros arquivos teem conflito na sincronização.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="532"/>
+ <location filename="../src/gui/folder.cpp" line="526"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 tem um conflito na sincronização. Por favor verifique o arquivo de conflito!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="537"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 e %n outro arquivo não pode ser sincronizado devido a erros. Veja o log para detalhes.</numerusform><numerusform>%1 e %n outros arquivos não poderam ser sincronizados devido a erros. Veja o log para detalhes.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="533"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 não pode ser sincronizado devido a um erro. Veja o log para obter detalhes.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="545"/>
+ <location filename="../src/gui/folder.cpp" line="539"/>
<source>Sync Activity</source>
<translation>Atividade de Sincronização</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="755"/>
+ <location filename="../src/gui/folder.cpp" line="747"/>
<source>Could not read system exclude file</source>
<translation>Não foi possível ler o sistema de arquivo de exclusão</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="966"/>
+ <location filename="../src/gui/folder.cpp" line="958"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Uma nova pasta maior que %1 MB foi adicionada: %2.
Por favor, vá nas configurações para selecionar o que você deseja para fazer o download.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="984"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -700,22 +700,22 @@ Isso pode ser porque a pasta foi reconfigurada em silêncio, ou porque todos os
Tem certeza de que deseja executar esta operação?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="988"/>
+ <location filename="../src/gui/folder.cpp" line="980"/>
<source>Remove All Files?</source>
<translation>Deseja Remover Todos os Arquivos?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="990"/>
+ <location filename="../src/gui/folder.cpp" line="982"/>
<source>Remove all files</source>
<translation>Remover todos os arquivos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="991"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Keep files</source>
<translation>Manter arquivos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1001"/>
<source>This sync would reset the files to an erlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -724,17 +724,17 @@ Isso pode ser porque um backup foi restaurado no servidor.
Continuando a sincronização como normal fará com que todos os seus arquivos sejam substituídos por um arquivo mais velho em um estado anterior. Você deseja manter seus locais de arquivos mais recentes como arquivos de conflito?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1014"/>
+ <location filename="../src/gui/folder.cpp" line="1006"/>
<source>Backup detected</source>
<translation>Backup detectado</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1016"/>
+ <location filename="../src/gui/folder.cpp" line="1008"/>
<source>Normal Synchronisation</source>
<translation>Sincronização Normal</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1017"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Keep Local Files as Conflict</source>
<translation>Manter Arquivos Locais como Conflito</translation>
</message>
@@ -2100,48 +2100,48 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="293"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
<translation>Arquivo Removido</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="305"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="309"/>
<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="317"/>
- <location filename="../src/libsync/propagateupload.cpp" line="706"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="321"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="710"/>
<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="633"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>Forçando cancelamento do trabalho em redefinição de conexão HTTP com o Qt < 5.4.2.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="641"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="645"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>O arquivo foi editado localmente mas faz parte de compartilhamento só de leitura. Ele foi restaurado mas sua edição está em conflito com o arquivo.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="672"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
<translation>Faltando conjunto de URL</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="695"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
<translation>O arquivo local foi removido durante a sincronização.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="721"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation>O servidor não reconheceu o último pedaço. (Nenhuma e-tag estava presente)</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="794"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
<translation>Ocorreu um erro ao escrever metadados ao banco de dados</translation>
</message>
@@ -3501,7 +3501,7 @@ It is not advisable to use it.</source>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="593"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation>QT_LAYOUT_DIRECTION</translation>
</message>
diff --git a/translations/client_ru.ts b/translations/client_ru.ts
index d7b9df8..692f234 100644
--- a/translations/client_ru.ts
+++ b/translations/client_ru.ts
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="129"/>
<source>Local folder %1 does not exist.</source>
<translation>Локальный каталог %1 не существует.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="132"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 должен быть папкой, но ей не является.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>%1 is not readable.</source>
<translation>%1 не может быть прочитан.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="387"/>
+ <location filename="../src/gui/folder.cpp" line="381"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="497"/>
+ <location filename="../src/gui/folder.cpp" line="491"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>'%1' был удалён</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="504"/>
+ <location filename="../src/gui/folder.cpp" line="498"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 был загружен.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="511"/>
+ <location filename="../src/gui/folder.cpp" line="505"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 был обновлён.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="518"/>
+ <location filename="../src/gui/folder.cpp" line="512"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 был переименован в %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="525"/>
+ <location filename="../src/gui/folder.cpp" line="519"/>
<source>%1 has been moved to %2.</source>
<translation>%1 был перемещён в %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="495"/>
+ <location filename="../src/gui/folder.cpp" line="489"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 и ещё %n другой файл был удалён.</numerusform><numerusform>%1 и ещё %n других файла было удалено.</numerusform><numerusform>%1 и ещё %n других файлов были удалены.</numerusform><numerusform>%1 и ещё %n других файлов были удалены.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="502"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 и ещё %n другой файл были скачаны.</numerusform><numerusform>%1 и ещё %n других файла были скачаны.</numerusform><numerusform>%1 и ещё %n других файлов были скачаны.</numerusform><numerusform>%1 и ещё %n других файлов были скачаны.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="509"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 и ещё %n другой файл были обновлены.</numerusform><numerusform>%1 и ещё %n других файла были обновлены.</numerusform><numerusform>%1 и ещё %n других файлов были обновлены.</numerusform><numerusform>%1 и ещё %n других файлов были обновлены.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="516"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 был переименован в %2, и ещё %n другой файл был переименован.</numerusform><numerusform>%1 был переименован в %2, и ещё %n других файла были переименованы.</numerusform><numerusform>%1 был переименован в %2, и ещё %n других файлов были переименованы.</numerusform><numerusform>%1 был переименован в %2, и ещё %n других файлов были переименованы.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="523"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 был перемещён в %2, и ещё %n другой файл был перемещён.</numerusform><numerusform>%1 был перемещён в %2, и ещё %n других файла были перемещены.</numerusform><numerusform>%1 был перемещён в %2, и ещё %n других файла были перемещены.</numerusform><numerusform>%1 был перемещён в %2, и ещё %n других файла были перемещены.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="530"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>У %1 и ещё у %n другого файла есть конфликты синхронизации.</numerusform><numerusform>У %1 и ещё у %n других файлов есть конфликты синхронизации.</numerusform><numerusform>У %1 и ещё у %n других файлов есть конфликты синхронизации.</numerusform><numerusform>У %1 и ещё у %n других файлов есть конфликты синхронизации.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="532"/>
+ <location filename="../src/gui/folder.cpp" line="526"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>У %1 есть конфликт синхронизации. Пожалуйста, проверьте конфликтный файл!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="537"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 и ещё %n другой файл не удалось синхронизировать из-за ошибок. Подробности смотрите в журнале.</numerusform><numerusform>%1 и ещё %n других файла не удалось синхронизировать из-за ошибок. Подробности смотрите в журнале.</numerusform><numerusform>%1 и ещё %n других файлов не удалось синхронизировать из-за ошибок. Подробности смотрите в журнале.</numerusform><numerusform>%1 и ещё %n других файлов не удалось синхронизировать из-за ошибок. Подробности смо [...]
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="533"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 не может быть синхронизирован из-за ошибки. Смотрите детали в журнале.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="545"/>
+ <location filename="../src/gui/folder.cpp" line="539"/>
<source>Sync Activity</source>
<translation>Журнал синхронизации</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="755"/>
+ <location filename="../src/gui/folder.cpp" line="747"/>
<source>Could not read system exclude file</source>
<translation>Невозможно прочесть системный файл исключений</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="966"/>
+ <location filename="../src/gui/folder.cpp" line="958"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Новый каталог размером более %1 МБ был добавлен: %2.
Пожалуйста, перейдите в настройки, если хотите скачать его.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="984"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -700,22 +700,22 @@ Are you sure you want to perform this operation?</source>
Вы действительно хотите выполнить эту операцию?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="988"/>
+ <location filename="../src/gui/folder.cpp" line="980"/>
<source>Remove All Files?</source>
<translation>Удалить все файлы?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="990"/>
+ <location filename="../src/gui/folder.cpp" line="982"/>
<source>Remove all files</source>
<translation>Удалить все файлы</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="991"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Keep files</source>
<translation>Сохранить файлы</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1001"/>
<source>This sync would reset the files to an erlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -724,17 +724,17 @@ Continuing the sync as normal will cause all your files to be overwritten by an
Продолжение синхронизации в обычном режиме приведет к тому, что все ваши файлы будут перезаписаны старыми файлами в новом состоянии. Вы желаете оставить ваши локальные файлы как конфликтующие?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1014"/>
+ <location filename="../src/gui/folder.cpp" line="1006"/>
<source>Backup detected</source>
<translation>Обнаружена резервная копия</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1016"/>
+ <location filename="../src/gui/folder.cpp" line="1008"/>
<source>Normal Synchronisation</source>
<translation>Обычная синхронизация</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1017"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Keep Local Files as Conflict</source>
<translation>Сохранить локальные файлы как конфликтующие</translation>
</message>
@@ -2099,48 +2099,48 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="293"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
<translation>Файл Перемещён</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="305"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Локальный файл изменился в процессе синхронизации. Операция будет возобновлена.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="317"/>
- <location filename="../src/libsync/propagateupload.cpp" line="706"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="321"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
<translation>Локальный файл изменился в процессе синхронизации.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="633"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>Принудительная остановка задачи при сбросе HTTP подключения для Qt < 5.4.2.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="641"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="645"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Измененный файл принадлежит удаленному общему ресурсу только для чтения. Файл был восстановлен, ваши правки доступны в файле конфликтов.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="672"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
<translation>Не хватает сформированного URL</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="695"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
<translation>Локальный файл был удалён в процессе синхронизации.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="721"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation>Сервер не смог подтвердить последнюю часть данных.(Отсутствовали теги e-tag)</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="794"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
<translation>Ошибка записи метаданных в базу данных</translation>
</message>
@@ -3500,7 +3500,7 @@ It is not advisable to use it.</source>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="593"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation>QT_LAYOUT_DIRECTION</translation>
</message>
diff --git a/translations/client_sk.ts b/translations/client_sk.ts
index 7c91786..1b12c97 100644
--- a/translations/client_sk.ts
+++ b/translations/client_sk.ts
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="129"/>
<source>Local folder %1 does not exist.</source>
<translation>Lokálny priečinok %1 neexistuje.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="132"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 by mal byť priečinok, avšak nie je.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>%1 is not readable.</source>
<translation>%1 nie je čitateľný.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="387"/>
+ <location filename="../src/gui/folder.cpp" line="381"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="497"/>
+ <location filename="../src/gui/folder.cpp" line="491"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 bol zmazaný.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="504"/>
+ <location filename="../src/gui/folder.cpp" line="498"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 bol stiahnutý.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="511"/>
+ <location filename="../src/gui/folder.cpp" line="505"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 bol aktualizovaný.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="518"/>
+ <location filename="../src/gui/folder.cpp" line="512"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 bol premenovaný na %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="525"/>
+ <location filename="../src/gui/folder.cpp" line="519"/>
<source>%1 has been moved to %2.</source>
<translation>%1 bol presunutý do %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="495"/>
+ <location filename="../src/gui/folder.cpp" line="489"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="502"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="509"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="516"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="523"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="530"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="532"/>
+ <location filename="../src/gui/folder.cpp" line="526"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="537"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="533"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 nemôže byť synchronizovaný kvôli chybe. Pozrite sa do logu pre podrobnosti.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="545"/>
+ <location filename="../src/gui/folder.cpp" line="539"/>
<source>Sync Activity</source>
<translation>Aktivita synchronizácie</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="755"/>
+ <location filename="../src/gui/folder.cpp" line="747"/>
<source>Could not read system exclude file</source>
<translation>Nemožno čítať systémový exclude file</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="966"/>
+ <location filename="../src/gui/folder.cpp" line="958"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Bol pridaný nový priečinok, väčší ako %1 MB: %2.
Pokiaľ si ho prajete stiahnuť, vyberte ho v nastaveniach.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="984"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -700,39 +700,39 @@ Dôvodom môže byť, že sa daný priečinok potichu rekonfiguroval, alebo boli
Ste si istý, že chcete pokračovať?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="988"/>
+ <location filename="../src/gui/folder.cpp" line="980"/>
<source>Remove All Files?</source>
<translation>Odstrániť všetky súbory?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="990"/>
+ <location filename="../src/gui/folder.cpp" line="982"/>
<source>Remove all files</source>
<translation>Odstrániť všetky súbory</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="991"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Keep files</source>
<translation>Ponechať súbory</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1001"/>
<source>This sync would reset the files to an erlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1014"/>
+ <location filename="../src/gui/folder.cpp" line="1006"/>
<source>Backup detected</source>
<translation>Záloha je dostupná</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1016"/>
+ <location filename="../src/gui/folder.cpp" line="1008"/>
<source>Normal Synchronisation</source>
<translation>Bežná synchronizácia</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1017"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@@ -2092,48 +2092,48 @@ Nie je vhodné ju používať.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="293"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
<translation>Súbor zmazaný</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="305"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="309"/>
<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="317"/>
- <location filename="../src/libsync/propagateupload.cpp" line="706"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="321"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="710"/>
<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="633"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>Vynútené ukončenie procesu pri resete HTTP pripojení s Qt < 5.4.2.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="641"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="645"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Súbor bol zmenený, ale je súčasťou zdieľania len na čítanie. Pôvodný súbor bol obnovený a upravená verzia je uložená v konfliktnom súbore.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="672"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
<translation>Chýba URL adresa</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="695"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
<translation>Lokálny súbor bol odstránený počas synchronizácie.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="721"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="794"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
@@ -3493,7 +3493,7 @@ Nie je vhodné ju používať.</translation>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="593"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_sl.ts b/translations/client_sl.ts
index e1ca988..0d55e43 100644
--- a/translations/client_sl.ts
+++ b/translations/client_sl.ts
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="129"/>
<source>Local folder %1 does not exist.</source>
<translation>Krajevna mapa %1 ne obstaja.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="132"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 bi morala biti mapa, pa ni.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>%1 is not readable.</source>
<translation>%1 ni mogoče brati.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="387"/>
+ <location filename="../src/gui/folder.cpp" line="381"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="497"/>
+ <location filename="../src/gui/folder.cpp" line="491"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>Datoteka %1 je odstranjena.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="504"/>
+ <location filename="../src/gui/folder.cpp" line="498"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>Datoteka %1 je prejeta.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="511"/>
+ <location filename="../src/gui/folder.cpp" line="505"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>Datoteka %1 je posodobljena.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="518"/>
+ <location filename="../src/gui/folder.cpp" line="512"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>Datoteka %1 je preimenovana v %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="525"/>
+ <location filename="../src/gui/folder.cpp" line="519"/>
<source>%1 has been moved to %2.</source>
<translation>Datoteka %1 je premaknjena v %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="495"/>
+ <location filename="../src/gui/folder.cpp" line="489"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="502"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="509"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="516"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="523"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="530"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="532"/>
+ <location filename="../src/gui/folder.cpp" line="526"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="537"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="533"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>Datoteke %1 zaradi napake ni mogoče uskladiti. Več podrobnosti je zabeleženih v dnevniški datoteki.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="545"/>
+ <location filename="../src/gui/folder.cpp" line="539"/>
<source>Sync Activity</source>
<translation>Dejavnost usklajevanja</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="755"/>
+ <location filename="../src/gui/folder.cpp" line="747"/>
<source>Could not read system exclude file</source>
<translation>Ni mogoče prebrati sistemske izločitvene datoteke</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="966"/>
+ <location filename="../src/gui/folder.cpp" line="958"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Dodana je nova mapa, ki presega %1 MB: %2.
Med nastavitvami jo lahko izberete in označite za prejem.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="984"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -700,39 +700,39 @@ Mapa je bila morda odstranjena, ali pa so bile spremenjene nastavitve.
Ali ste prepričani, da želite izvesti to opravilo?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="988"/>
+ <location filename="../src/gui/folder.cpp" line="980"/>
<source>Remove All Files?</source>
<translation>Ali naj bodo odstranjene vse datoteke?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="990"/>
+ <location filename="../src/gui/folder.cpp" line="982"/>
<source>Remove all files</source>
<translation>Odstrani vse datoteke</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="991"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Keep files</source>
<translation>Ohrani datoteke</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1001"/>
<source>This sync would reset the files to an erlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1014"/>
+ <location filename="../src/gui/folder.cpp" line="1006"/>
<source>Backup detected</source>
<translation>Varnostna kopija je zaznana</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1016"/>
+ <location filename="../src/gui/folder.cpp" line="1008"/>
<source>Normal Synchronisation</source>
<translation>Običajno usklajevanje</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1017"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Keep Local Files as Conflict</source>
<translation>Ohrani krajevne datoteke kot datoteke v sporu</translation>
</message>
@@ -2097,48 +2097,48 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="293"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
<translation>Datoteka je odstranjena</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="305"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="309"/>
<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="317"/>
- <location filename="../src/libsync/propagateupload.cpp" line="706"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="321"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="710"/>
<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="633"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="641"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="645"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Datoteka je bila krajevno spremenjena, vendar pa je označena za souporabo le za branje. Izvorna datoteka je obnovljena, vaše spremembe pa so zabeležene v datoteki spora.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="672"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="695"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
<translation>Krajevna datoteka je bila med usklajevanjem odstranjena.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="721"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation>Strežnik ne sprejme zadnjega paketa (ni navedene e-oznake)</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="794"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
<translation>Napaka zapisovanja metapodatkov v podatkovno zbirko</translation>
</message>
@@ -3498,7 +3498,7 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="593"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation>QT_LAYOUT_DIRECTION</translation>
</message>
diff --git a/translations/client_sr.ts b/translations/client_sr.ts
index 0f0aca7..e867e4a 100644
--- a/translations/client_sr.ts
+++ b/translations/client_sr.ts
@@ -579,157 +579,157 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="129"/>
<source>Local folder %1 does not exist.</source>
<translation>Локална фасцикла %1 не постоји.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="132"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 би требало да је фасцикла али није.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>%1 is not readable.</source>
<translation>%1 није читљив.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="387"/>
+ <location filename="../src/gui/folder.cpp" line="381"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="497"/>
+ <location filename="../src/gui/folder.cpp" line="491"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 је уклоњен.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="504"/>
+ <location filename="../src/gui/folder.cpp" line="498"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 је преузет.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="511"/>
+ <location filename="../src/gui/folder.cpp" line="505"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 је ажуриран.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="518"/>
+ <location filename="../src/gui/folder.cpp" line="512"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 је преименован у %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="525"/>
+ <location filename="../src/gui/folder.cpp" line="519"/>
<source>%1 has been moved to %2.</source>
<translation>%1 је премештен у %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="495"/>
+ <location filename="../src/gui/folder.cpp" line="489"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="502"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="509"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="516"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="523"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="530"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="532"/>
+ <location filename="../src/gui/folder.cpp" line="526"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="537"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="533"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 није синхронизован због грешке. Погледајте записник за детаље.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="545"/>
+ <location filename="../src/gui/folder.cpp" line="539"/>
<source>Sync Activity</source>
<translation>Активност синхронизације</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="755"/>
+ <location filename="../src/gui/folder.cpp" line="747"/>
<source>Could not read system exclude file</source>
<translation>Не могу да прочитам системски списак за игнорисање</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="966"/>
+ <location filename="../src/gui/folder.cpp" line="958"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="984"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="988"/>
+ <location filename="../src/gui/folder.cpp" line="980"/>
<source>Remove All Files?</source>
<translation>Уклонити све фајлове?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="990"/>
+ <location filename="../src/gui/folder.cpp" line="982"/>
<source>Remove all files</source>
<translation>Уклони све фајлове</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="991"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Keep files</source>
<translation>Остави фајлове</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1001"/>
<source>This sync would reset the files to an erlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1014"/>
+ <location filename="../src/gui/folder.cpp" line="1006"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1016"/>
+ <location filename="../src/gui/folder.cpp" line="1008"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1017"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@@ -2093,48 +2093,48 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="293"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
<translation>Фајл уклоњен</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="305"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Локални фајл је измењен током синхронизације. Биће настављена.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="317"/>
- <location filename="../src/libsync/propagateupload.cpp" line="706"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="321"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
<translation>Локални фајл измењен током синхронизације.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="633"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>Присили прекид посла код прекида ХТТП везе са КуТ < 5.4.2</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="641"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="645"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Фајл је измењен локално али је у саставу дељења које је само за читање. Враћен је у претходно стање а измене су у фајлу сукоба.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="672"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
<translation>Адреса упита недостаје</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="695"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
<translation>Локални фајл је уклоњен током синхронизације.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="721"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="794"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
@@ -3494,7 +3494,7 @@ It is not advisable to use it.</source>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="593"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_sv.ts b/translations/client_sv.ts
index 40616cb..605ec32 100644
--- a/translations/client_sv.ts
+++ b/translations/client_sv.ts
@@ -445,17 +445,17 @@
<message numerus="yes">
<location filename="../src/gui/activitywidget.cpp" line="359"/>
<source>You received %n new notification(s) from %1 and %2.</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>Du tog emot %1 ny notis från %1 och %2.</numerusform><numerusform>Du tog emot %n nya notiser från %1 och %2.</numerusform></translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="361"/>
<source>You received new notifications from %1, %2 and other accounts.</source>
- <translation type="unfinished"/>
+ <translation>Du tog emot nya notiser från %1, %2 och andra konton.</translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="365"/>
<source>%1 Notifications - Action Required</source>
- <translation type="unfinished"/>
+ <translation>%1 Notiser - Åtgärd krävs</translation>
</message>
</context>
<context>
@@ -524,7 +524,7 @@
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="772"/>
<source>Error writing metadata to the database</source>
- <translation type="unfinished"/>
+ <translation>Fel vid skrivning av metadata till databasen</translation>
</message>
</context>
<context>
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="129"/>
<source>Local folder %1 does not exist.</source>
<translation>Den lokala mappen %1 finns inte.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="132"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 borde vara en mapp, men är inte det.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>%1 is not readable.</source>
<translation>%1 är inte läsbar.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="387"/>
+ <location filename="../src/gui/folder.cpp" line="381"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="497"/>
+ <location filename="../src/gui/folder.cpp" line="491"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 har tagits bort.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="504"/>
+ <location filename="../src/gui/folder.cpp" line="498"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 har laddats ner.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="511"/>
+ <location filename="../src/gui/folder.cpp" line="505"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 har uppdaterats.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="518"/>
+ <location filename="../src/gui/folder.cpp" line="512"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 har döpts om till %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="525"/>
+ <location filename="../src/gui/folder.cpp" line="519"/>
<source>%1 has been moved to %2.</source>
<translation>%1 har flyttats till %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="495"/>
+ <location filename="../src/gui/folder.cpp" line="489"/>
<source>%1 and %n other file(s) have been removed.</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>%1 och %n andra filer har tagits bort.</numerusform><numerusform>%1 och %n andra filer har tagits bort.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="502"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 and %n other file(s) have been downloaded.</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>%1 och %n andra filer har laddats ner.</numerusform><numerusform>%1 och %n andra filer har laddats ner.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="509"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 and %n other file(s) have been updated.</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>%1 och %n andra filer har uppdaterats.</numerusform><numerusform>%1 och %n andra filer har uppdaterats.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="516"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>%1 har döpts om till %2 och %n andra filer har döpts om.</numerusform><numerusform>%1 har döpts om till %2 och %n andra filer har döpts om.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="523"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>%1 har flyttats till %2 och %n andra filer har flyttats.</numerusform><numerusform>%1 har flyttats till %2 och %n andra filer har flyttats.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="530"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>%1 och %n andra filer har synk-konflikter.</numerusform><numerusform>%1 och %n andra filer har synk-konflikter.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="532"/>
+ <location filename="../src/gui/folder.cpp" line="526"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
- <translation type="unfinished"/>
+ <translation>%1 har en synk-konflikt. Vänligen kontrollera konfliktfilen!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="537"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>%1 och %n andra filer kunde inte synkas på grund av fel. Se loggen för detaljer.</numerusform><numerusform>%1 och %n andra filer kunde inte synkas på grund av fel. Se loggen för detaljer.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="533"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 kunde inte synkroniseras på grund av ett fel. Kolla loggen för ytterligare detaljer.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="545"/>
+ <location filename="../src/gui/folder.cpp" line="539"/>
<source>Sync Activity</source>
<translation>Synk aktivitet</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="755"/>
+ <location filename="../src/gui/folder.cpp" line="747"/>
<source>Could not read system exclude file</source>
<translation>Kunde inte läsa systemets exkluderings-fil</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="966"/>
+ <location filename="../src/gui/folder.cpp" line="958"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>En ny mapp större än %1 MB har lagts till: %2.
Var god gå in i inställningarna för att markera mappen om du vill ladda ner den.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="984"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -700,22 +700,22 @@ Detta kan bero på att mappen omkonfigurerats i bakgrunden, eller för att alla
Är du säker på att du vill fortsätta?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="988"/>
+ <location filename="../src/gui/folder.cpp" line="980"/>
<source>Remove All Files?</source>
<translation>Ta bort alla filer?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="990"/>
+ <location filename="../src/gui/folder.cpp" line="982"/>
<source>Remove all files</source>
<translation>Ta bort alla filer</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="991"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Keep files</source>
<translation>Behåll filer</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1001"/>
<source>This sync would reset the files to an erlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -724,17 +724,17 @@ Det kan vara på grund av att en backup återställts på servern..
Om du fortsätter synkningen leder till att dina filer skrivs över av äldre filer i ett tidigare stadium. Vill du spara dina senaste lokala filer som konfliktfiler?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1014"/>
+ <location filename="../src/gui/folder.cpp" line="1006"/>
<source>Backup detected</source>
<translation>Backup upptäckt</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1016"/>
+ <location filename="../src/gui/folder.cpp" line="1008"/>
<source>Normal Synchronisation</source>
<translation>Normal synkronisation</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1017"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Keep Local Files as Conflict</source>
<translation>Behåll lokala filer som konflikt</translation>
</message>
@@ -862,7 +862,7 @@ Om du fortsätter synkningen leder till att dina filer skrivs över av äldre fi
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="241"/>
<source>Synchronizing with local folder</source>
- <translation type="unfinished"/>
+ <translation>Synkroniserar med lokal mapp</translation>
</message>
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="285"/>
@@ -975,7 +975,7 @@ Om du fortsätter synkningen leder till att dina filer skrivs över av äldre fi
<location filename="../src/gui/folderstatusmodel.cpp" line="938"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
- <translation type="unfinished"/>
+ <translation>%5 kvar, %1 av %2, fil %3 av %4</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
@@ -1523,24 +1523,24 @@ Objekt som tillåter radering kommer tas bort om de förhindrar en mapp att tas
<message>
<location filename="../src/gui/notificationwidget.cpp" line="50"/>
<source>Created at %1</source>
- <translation type="unfinished"/>
+ <translation>Skapad %1</translation>
</message>
<message>
<location filename="../src/gui/notificationwidget.cpp" line="99"/>
<source>Closing in a few seconds...</source>
- <translation type="unfinished"/>
+ <translation>Stänger om ett par sekunder...</translation>
</message>
<message>
<location filename="../src/gui/notificationwidget.cpp" line="133"/>
<source>%1 request failed at %2</source>
<extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment>
- <translation type="unfinished"/>
+ <translation>%1 begäran misslyckades %2</translation>
</message>
<message>
<location filename="../src/gui/notificationwidget.cpp" line="139"/>
<source>'%1' selected at %2</source>
<extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment>
- <translation type="unfinished"/>
+ <translation>'%1' vald %2</translation>
</message>
</context>
<context>
@@ -1685,7 +1685,7 @@ ytterligare rättigheter under processen.</translation>
<message>
<location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="51"/>
<source>&Email</source>
- <translation type="unfinished"/>
+ <translation>&E-post</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
@@ -1920,7 +1920,7 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="712"/>
<source>Error writing metadata to the database</source>
- <translation type="unfinished"/>
+ <translation>Fel vid skrivning av metadata till databasen</translation>
</message>
</context>
<context>
@@ -1953,7 +1953,7 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="552"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
- <translation type="unfinished"/>
+ <translation>Den nedladdade filen är tom men servern sa att den skulle vara %1.</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="693"/>
@@ -1968,7 +1968,7 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="791"/>
<source>Error writing metadata to the database</source>
- <translation type="unfinished"/>
+ <translation>Fel vid skrivning av metadata till databasen</translation>
</message>
</context>
<context>
@@ -2009,7 +2009,7 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Error writing metadata to the database</source>
- <translation type="unfinished"/>
+ <translation>Fel vid skrivning av metadata till databasen</translation>
</message>
</context>
<context>
@@ -2040,7 +2040,7 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
<source>Error writing metadata to the database</source>
- <translation type="unfinished"/>
+ <translation>Fel vid skrivning av metadata till databasen</translation>
</message>
</context>
<context>
@@ -2066,7 +2066,7 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/libsync/propagateremotemkdir.cpp" line="148"/>
<source>Error writing metadata to the database</source>
- <translation type="unfinished"/>
+ <translation>Fel vid skrivning av metadata till databasen</translation>
</message>
</context>
<context>
@@ -2094,56 +2094,56 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
<source>Error writing metadata to the database</source>
- <translation type="unfinished"/>
+ <translation>Fel vid skrivning av metadata till databasen</translation>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="293"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
<translation>Filen Raderad</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="305"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Lokal fil ändrades under synkningen. Den kommer återupptas.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="317"/>
- <location filename="../src/libsync/propagateupload.cpp" line="706"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="321"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
<translation>Lokal fil ändrades under synk.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="633"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>Tvinga jobbavbryt vid återställning av HTTP-anslutning med Qt < 5.4.2.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="641"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="645"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Filen ändrades lokalt men är en del av en endast-läsbar delning. Den återställdes och din editering är i konflikt filen.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="672"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
<translation>Hämtnings-URL saknas</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="695"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
<translation>Den lokala filen togs bort under synkronisering.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="721"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation>Servern bekräftade inte senaste leveransen. (Ingen e-tagg fanns)</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="794"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
- <translation type="unfinished"/>
+ <translation>Fel vid skrivning av metadata till databasen</translation>
</message>
</context>
<context>
@@ -2385,7 +2385,7 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/gui/sharedialog.cpp" line="113"/>
<source>Retrieving maximum possible sharing permissions from server...</source>
- <translation type="unfinished"/>
+ <translation>Tar emot maximal delningsbehörighet från servern...</translation>
</message>
<message>
<location filename="../src/gui/sharedialog.cpp" line="169"/>
@@ -2975,12 +2975,12 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/libsync/syncengine.cpp" line="754"/>
<source>Unable to read the blacklist from the local database</source>
- <translation type="unfinished"/>
+ <translation>Kunde inte läsa svartlistan från den lokala databasen</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="787"/>
<source>Unable to read from the sync journal.</source>
- <translation type="unfinished"/>
+ <translation>Kunde inte läsa från synk-journalen.</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="833"/>
@@ -3501,7 +3501,7 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="593"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation>QT_LAYOUT_DIRECTION</translation>
</message>
@@ -3569,32 +3569,32 @@ Det är inte lämpligt använda den.</translation>
<message numerus="yes">
<location filename="../src/libsync/utility.cpp" line="319"/>
<source>%n year(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>%n år</numerusform><numerusform>%n år</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/libsync/utility.cpp" line="320"/>
<source>%n month(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>%n månad(er)</numerusform><numerusform>%n månad(er)</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/libsync/utility.cpp" line="321"/>
<source>%n day(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>%n dag(ar)</numerusform><numerusform>%n dag(ar)</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/libsync/utility.cpp" line="322"/>
<source>%n hour(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>%n timme/timmar</numerusform><numerusform>%n timme/timmar</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/libsync/utility.cpp" line="323"/>
<source>%n minute(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>%n minut(er)</numerusform><numerusform>%n minut(er)</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/libsync/utility.cpp" line="324"/>
<source>%n second(s)</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>%n sekund(er)</numerusform><numerusform>%n sekund(er)</numerusform></translation>
</message>
<message>
<location filename="../src/libsync/utility.cpp" line="348"/>
@@ -3638,7 +3638,7 @@ Det är inte lämpligt använda den.</translation>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
<source>Server version downloaded, copied changed local file into conflict file</source>
- <translation type="unfinished"/>
+ <translation>Serverversionen nedladdad, kopierade den ändrade lokala filen till konfliktfil</translation>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="39"/>
diff --git a/translations/client_th.ts b/translations/client_th.ts
index 1143368..16a5f59 100644
--- a/translations/client_th.ts
+++ b/translations/client_th.ts
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="129"/>
<source>Local folder %1 does not exist.</source>
<translation>โฟลเดอร์ต้นทาง %1 ไม่มีอยู่</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="132"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 ควรจะเป็นโฟลเดอร์ แต่ทำไม่ได้</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>%1 is not readable.</source>
<translation>ไม่สามารถอ่านข้อมูล %1 ได้</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="387"/>
+ <location filename="../src/gui/folder.cpp" line="381"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="497"/>
+ <location filename="../src/gui/folder.cpp" line="491"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ได้ถูกลบออก</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="504"/>
+ <location filename="../src/gui/folder.cpp" line="498"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 ได้ถูกดาวน์โหลด</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="511"/>
+ <location filename="../src/gui/folder.cpp" line="505"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 ได้ถูกอัพเดทเรียบร้อยแล้ว</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="518"/>
+ <location filename="../src/gui/folder.cpp" line="512"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 ได้ถูกเปลี่ยนชื่อเป็น %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="525"/>
+ <location filename="../src/gui/folder.cpp" line="519"/>
<source>%1 has been moved to %2.</source>
<translation>%1 ได้ถูกย้ายไปยัง %2</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="495"/>
+ <location filename="../src/gui/folder.cpp" line="489"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 และ %n ไฟล์อื่นๆได้ถูกลบออก</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="502"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 และ %n ไฟล์อื่นๆ ได้ถูกดาวน์โหลดเรียบร้อยแล้ว</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="509"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 และ %n ไฟล์อื่นๆ ได้รับการอัพเดท</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="516"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="523"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="530"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="532"/>
+ <location filename="../src/gui/folder.cpp" line="526"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="537"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="533"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 ไม่สามารถประสานข้อมูลเนื่องจากมีข้อผิดพลาด ดูบันทึกสำหรับรายละเอียด</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="545"/>
+ <location filename="../src/gui/folder.cpp" line="539"/>
<source>Sync Activity</source>
<translation>ความเคลื่อนไหวของการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="755"/>
+ <location filename="../src/gui/folder.cpp" line="747"/>
<source>Could not read system exclude file</source>
<translation>ไม่สามารถอ่าน ยกเว้นไฟล์ระบบ</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="966"/>
+ <location filename="../src/gui/folder.cpp" line="958"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>โฟลเดอร์ใหม่มีขนาดใหญ่กว่า %1 เมกะไบต์ ได้ถูกเพิ่ม: %2
กรุณาไปตั้งค่าถ้าคุณต้องการให้มันดาวน์โหลดได้</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="984"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -700,39 +700,39 @@ Are you sure you want to perform this operation?</source>
คุณแน่ใจว่าคุณต้องการที่จะดำเนินการนี้?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="988"/>
+ <location filename="../src/gui/folder.cpp" line="980"/>
<source>Remove All Files?</source>
<translation>ลบไฟล์ทั้งหมด?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="990"/>
+ <location filename="../src/gui/folder.cpp" line="982"/>
<source>Remove all files</source>
<translation>ลบไฟล์ทั้งหมด</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="991"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Keep files</source>
<translation>เก็บไฟล์เอาไว้</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1001"/>
<source>This sync would reset the files to an erlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1014"/>
+ <location filename="../src/gui/folder.cpp" line="1006"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1016"/>
+ <location filename="../src/gui/folder.cpp" line="1008"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1017"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@@ -2098,48 +2098,48 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="293"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
<translation>ไฟล์ถูกลบไปแล้ว</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="305"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>ไฟล์ต้นทางถูกเปลี่ยนแปลงในระหว่างการซิงค์ มันจะกลับมา</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="317"/>
- <location filename="../src/libsync/propagateupload.cpp" line="706"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="321"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
<translation>ไฟล์ต้นทางถูกเปลี่ยนแปลงขณะกำลังประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="633"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>บังคับให้ยกเลิกงานในการตั้งค่าการเชื่อมต่อ HTTP กับ Qt < 5.4.2</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="641"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="645"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>ไฟล์ต้นทางที่ถูกแก้ไขแต่เป็นส่วนหนึ่งของการแชร์ให้อ่านอย่างเดียว มันถูกเรียกคืนและแก้ไขของคุณอยู่ในไฟล์ความขัดแย้ง</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="672"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
<translation>URL แบบสำรวจความคิดเห็นหายไป</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="695"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
<translation>ไฟล์ต้นทางถูกลบออกในระหว่างการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="721"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation>เซิร์ฟเวอร์ไม่ยอมรับส่วนสุดท้าย (ไม่มี e-tag ในปัจจุบัน)</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="794"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
<translation>ข้อผิดพลาดในการเขียนข้อมูลเมตาไปยังฐานข้อมูล</translation>
</message>
@@ -3497,7 +3497,7 @@ It is not advisable to use it.</source>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="593"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation>QT_LAYOUT_DIRECTION</translation>
</message>
diff --git a/translations/client_tr.ts b/translations/client_tr.ts
index 7d08bef..9bd217c 100644
--- a/translations/client_tr.ts
+++ b/translations/client_tr.ts
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="129"/>
<source>Local folder %1 does not exist.</source>
<translation>%1 yerel klasörü mevcut değil.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="132"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 bir dizin olmalı, ancak değil.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>%1 is not readable.</source>
<translation>%1 okunabilir değil.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="387"/>
+ <location filename="../src/gui/folder.cpp" line="381"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="497"/>
+ <location filename="../src/gui/folder.cpp" line="491"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 kaldırıldı.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="504"/>
+ <location filename="../src/gui/folder.cpp" line="498"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 indirildi.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="511"/>
+ <location filename="../src/gui/folder.cpp" line="505"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 güncellendi.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="518"/>
+ <location filename="../src/gui/folder.cpp" line="512"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1, %2 olarak adlandırıldı.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="525"/>
+ <location filename="../src/gui/folder.cpp" line="519"/>
<source>%1 has been moved to %2.</source>
<translation>%1, %2 konumuna taşındı.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="495"/>
+ <location filename="../src/gui/folder.cpp" line="489"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>'%1' ve diğer %n dosya kaldırıldı.</numerusform><numerusform>'%1' ve diğer %n dosya kaldırıldı.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="502"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>'%1' ve diğer %n dosya indirildi.</numerusform><numerusform>'%1' ve diğer %n dosya indirildi.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="509"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>'%1' ve diğer %n dosya güncellendi.</numerusform><numerusform>'%1' ve diğer %n dosya güncellendi.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="516"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="523"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="530"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="532"/>
+ <location filename="../src/gui/folder.cpp" line="526"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="537"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="533"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 bir hata nedeniyle eşitlenemedi. Ayrıntılar için günlüğe bakın.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="545"/>
+ <location filename="../src/gui/folder.cpp" line="539"/>
<source>Sync Activity</source>
<translation>Eşitleme Etkinliği</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="755"/>
+ <location filename="../src/gui/folder.cpp" line="747"/>
<source>Could not read system exclude file</source>
<translation>Sistem hariç tutulma dosyası okunamadı</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="966"/>
+ <location filename="../src/gui/folder.cpp" line="958"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>%1 MB boyutundan daha büyük bir yeni klasör eklendi: %2\n
İndirmek istiyorsanız lütfen ayarlar bölümünden seçin.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="984"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -700,22 +700,22 @@ Bu, klasörün sessizce yeniden yapılandırılması veya tüm dosyaların el il
Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="988"/>
+ <location filename="../src/gui/folder.cpp" line="980"/>
<source>Remove All Files?</source>
<translation>Tüm Dosyalar Kaldırılsın mı?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="990"/>
+ <location filename="../src/gui/folder.cpp" line="982"/>
<source>Remove all files</source>
<translation>Tüm dosyaları kaldır</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="991"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Keep files</source>
<translation>Dosyaları koru</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1001"/>
<source>This sync would reset the files to an erlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -723,17 +723,17 @@ Continuing the sync as normal will cause all your files to be overwritten by an
Bunun nedeni sunucuda bir yedeğin geri yüklenmesinden dolayı olabilir. Eşitlemeye normal şekilde devam etmek dosyalarınızın daha önceki durumu ile üzerine yazılmasına sebep olacak. Çakışma durumunda en son yerel dosyalarınızı tutmak ister misiniz?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1014"/>
+ <location filename="../src/gui/folder.cpp" line="1006"/>
<source>Backup detected</source>
<translation>Yedek bulundu</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1016"/>
+ <location filename="../src/gui/folder.cpp" line="1008"/>
<source>Normal Synchronisation</source>
<translation>Normal Eşitleme</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1017"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Keep Local Files as Conflict</source>
<translation>Çakışma Durumunda Yerel Dosyaları Tut</translation>
</message>
@@ -2098,48 +2098,48 @@ Kullanmanız önerilmez.</translation>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="293"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
<translation>Dosya Kaldırıldı</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="305"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Eşitleme sırasında yerel dosya değişti. Devam edilecek.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="317"/>
- <location filename="../src/libsync/propagateupload.cpp" line="706"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="321"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
<translation>Eşitleme sırasında yerel dosya değişti.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="633"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>Qt < 5.4.2 ile HTTP bağlantı sıfırlamasında görev iptali zorlanıyor.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="641"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="645"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Dosya yerel olarak düzenlendi ancak salt okunur paylaşımın bir parçası. Geri yüklendi ve düzenlemeniz çakışan dosyada.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="672"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
<translation>Getirme URL'si eksik</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="695"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
<translation>Eşitleme sırasında yerel dosya kaldırıldı.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="721"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation>Sunucu son yığını onaylamadı. (Mevcut e-etiket bulunamadı)</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="794"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
<translation>Veritabanına metaveri yazma hatası</translation>
</message>
@@ -3499,7 +3499,7 @@ Kullanmanız önerilmez.</translation>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="593"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation>QT_LAYOUT_DIRECTION</translation>
</message>
diff --git a/translations/client_uk.ts b/translations/client_uk.ts
index 5f745b1..8b279a2 100644
--- a/translations/client_uk.ts
+++ b/translations/client_uk.ts
@@ -579,157 +579,157 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="129"/>
<source>Local folder %1 does not exist.</source>
<translation>Локальна тека %1 не існує.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="132"/>
<source>%1 should be a folder but is not.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>%1 is not readable.</source>
<translation>%1 не читається.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="387"/>
+ <location filename="../src/gui/folder.cpp" line="381"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="497"/>
+ <location filename="../src/gui/folder.cpp" line="491"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 видалено.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="504"/>
+ <location filename="../src/gui/folder.cpp" line="498"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 завантажено.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="511"/>
+ <location filename="../src/gui/folder.cpp" line="505"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 оновлено.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="518"/>
+ <location filename="../src/gui/folder.cpp" line="512"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 перейменовано на %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="525"/>
+ <location filename="../src/gui/folder.cpp" line="519"/>
<source>%1 has been moved to %2.</source>
<translation>%1 переміщено в %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="495"/>
+ <location filename="../src/gui/folder.cpp" line="489"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="502"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="509"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="516"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="523"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="530"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="532"/>
+ <location filename="../src/gui/folder.cpp" line="526"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="537"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="533"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 не може синхронізуватися через помилки. Дивіться деталі в журналі.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="545"/>
+ <location filename="../src/gui/folder.cpp" line="539"/>
<source>Sync Activity</source>
<translation>Журнал синхронізації</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="755"/>
+ <location filename="../src/gui/folder.cpp" line="747"/>
<source>Could not read system exclude file</source>
<translation>Неможливо прочитати виключений системний файл</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="966"/>
+ <location filename="../src/gui/folder.cpp" line="958"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="984"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="988"/>
+ <location filename="../src/gui/folder.cpp" line="980"/>
<source>Remove All Files?</source>
<translation>Видалити усі файли?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="990"/>
+ <location filename="../src/gui/folder.cpp" line="982"/>
<source>Remove all files</source>
<translation>Видалити усі файли</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="991"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Keep files</source>
<translation>Зберегти файли</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1001"/>
<source>This sync would reset the files to an erlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1014"/>
+ <location filename="../src/gui/folder.cpp" line="1006"/>
<source>Backup detected</source>
<translation>Резервну копію знайдено</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1016"/>
+ <location filename="../src/gui/folder.cpp" line="1008"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1017"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@@ -2088,48 +2088,48 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="293"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
<translation>Файл видалено</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="305"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Локальний файл змінився під час синхронізації. Його буде відновлено.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="317"/>
- <location filename="../src/libsync/propagateupload.cpp" line="706"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="321"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
<translation>Локальний файл змінився під час синхронізації.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="633"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>Примусове припинення завдання при скиданні HTTP з’єднання з Qt < 5.4.2.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="641"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="645"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Файл було змінено локально, але він розташований в теці з правами лише на перегляд. Файл відновлено, а ваші зміни розташовані в теці конфліктів.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="672"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
<translation>Не вистачає сформованого URL</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="695"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
<translation>Локальний файл було видалено під час синхронізації.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="721"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="794"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
@@ -3489,7 +3489,7 @@ It is not advisable to use it.</source>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="593"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts
index e636e09..81a6d1e 100644
--- a/translations/client_zh_CN.ts
+++ b/translations/client_zh_CN.ts
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="129"/>
<source>Local folder %1 does not exist.</source>
<translation>本地文件夹 %1 不存在。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="132"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 应该是一个文件夹，但是它现在不是文件夹</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>%1 is not readable.</source>
<translation>%1 不可读。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="387"/>
+ <location filename="../src/gui/folder.cpp" line="381"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="497"/>
+ <location filename="../src/gui/folder.cpp" line="491"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 已移除。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="504"/>
+ <location filename="../src/gui/folder.cpp" line="498"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 已下载。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="511"/>
+ <location filename="../src/gui/folder.cpp" line="505"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 已更新。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="518"/>
+ <location filename="../src/gui/folder.cpp" line="512"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 已更名为 %2。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="525"/>
+ <location filename="../src/gui/folder.cpp" line="519"/>
<source>%1 has been moved to %2.</source>
<translation>%1 已移动至 %2。</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="495"/>
+ <location filename="../src/gui/folder.cpp" line="489"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 和 %n 其它文件已被移除。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="502"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 和 %n 其它文件已下载。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="509"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 和 %n 其它文件已更新。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="516"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 已经更名为 %2，其它 %3 文件也已更名。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="523"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 已移动到 %2，其它 %3 文件也已移动。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="530"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 和 %n 其他文件有同步冲突。</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="532"/>
+ <location filename="../src/gui/folder.cpp" line="526"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 有同步冲突。请检查冲突文件！</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="537"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 和 %n 其他文件由于错误不能同步。详细信息请查看日志。</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="533"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 同步出错。详情请查看日志。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="545"/>
+ <location filename="../src/gui/folder.cpp" line="539"/>
<source>Sync Activity</source>
<translation>同步活动</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="755"/>
+ <location filename="../src/gui/folder.cpp" line="747"/>
<source>Could not read system exclude file</source>
<translation>无法读取系统排除的文件</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="966"/>
+ <location filename="../src/gui/folder.cpp" line="958"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>新文件夹 %2 添加成功，大于 %1 MB。
请前往设置选择是否下载。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="984"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -700,22 +700,22 @@ Are you sure you want to perform this operation?</source>
你确定执行该操作吗？</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="988"/>
+ <location filename="../src/gui/folder.cpp" line="980"/>
<source>Remove All Files?</source>
<translation>删除所有文件？</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="990"/>
+ <location filename="../src/gui/folder.cpp" line="982"/>
<source>Remove all files</source>
<translation>删除所有文件</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="991"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Keep files</source>
<translation>保持所有文件</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1001"/>
<source>This sync would reset the files to an erlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -724,17 +724,17 @@ Continuing the sync as normal will cause all your files to be overwritten by an
继续同步将会导致所有你的文件被之前的状态覆盖，你是否保留本地的文件？</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1014"/>
+ <location filename="../src/gui/folder.cpp" line="1006"/>
<source>Backup detected</source>
<translation>备份已删除</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1016"/>
+ <location filename="../src/gui/folder.cpp" line="1008"/>
<source>Normal Synchronisation</source>
<translation>正常同步</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1017"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Keep Local Files as Conflict</source>
<translation>保留本地文件为冲突文件</translation>
</message>
@@ -2098,48 +2098,48 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="293"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
<translation>已移除文件</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="305"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>本地文件在同步时已修改，完成后会再次同步</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="317"/>
- <location filename="../src/libsync/propagateupload.cpp" line="706"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="321"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
<translation>本地文件在同步时已修改。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="633"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>Qt < 5.4.2 时强制中止连接重置。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="641"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="645"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>文件已经在本地修改，但这是某个只读分享的一部分，原文件已经恢复。您的修改已保存在冲突文件中。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="672"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
<translation>缺少轮询 URL</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="695"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
<translation>本地文件在同步时已删除。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="721"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation>服务器找不到上一分块。(找不到 E-tag)</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="794"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
<translation>向数据库写入元数据错误</translation>
</message>
@@ -3499,7 +3499,7 @@ It is not advisable to use it.</source>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="593"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation>QT_LAYOUT_DIRECTION</translation>
</message>
diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts
index 271b65e..aceab3e 100644
--- a/translations/client_zh_TW.ts
+++ b/translations/client_zh_TW.ts
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="129"/>
<source>Local folder %1 does not exist.</source>
<translation>本地資料夾 %1 不存在</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="132"/>
<source>%1 should be a folder but is not.</source>
<translation>資料夾不存在, %1 必須是資料夾</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>%1 is not readable.</source>
<translation>%1 是不可讀的</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="387"/>
+ <location filename="../src/gui/folder.cpp" line="381"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="497"/>
+ <location filename="../src/gui/folder.cpp" line="491"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 已被移除。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="504"/>
+ <location filename="../src/gui/folder.cpp" line="498"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 已被下載。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="511"/>
+ <location filename="../src/gui/folder.cpp" line="505"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 已被更新。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="518"/>
+ <location filename="../src/gui/folder.cpp" line="512"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 已被重新命名為 %2。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="525"/>
+ <location filename="../src/gui/folder.cpp" line="519"/>
<source>%1 has been moved to %2.</source>
<translation>%1 已被搬移至 %2。</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="495"/>
+ <location filename="../src/gui/folder.cpp" line="489"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="502"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="509"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="516"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="523"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="530"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="532"/>
+ <location filename="../src/gui/folder.cpp" line="526"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="537"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="533"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 因為錯誤無法被同步。請從紀錄檔觀看細節。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="545"/>
+ <location filename="../src/gui/folder.cpp" line="539"/>
<source>Sync Activity</source>
<translation>同步活動</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="755"/>
+ <location filename="../src/gui/folder.cpp" line="747"/>
<source>Could not read system exclude file</source>
<translation>無法讀取系統的排除檔案</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="966"/>
+ <location filename="../src/gui/folder.cpp" line="958"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>一個大於 %1 MB 的資料夾已經新增至: %2.
如果您想要下載它的話，請至設定中選取。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="984"/>
+ <location filename="../src/gui/folder.cpp" line="976"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
@@ -700,39 +700,39 @@ Are you sure you want to perform this operation?</source>
您確定要執行這項動作?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="988"/>
+ <location filename="../src/gui/folder.cpp" line="980"/>
<source>Remove All Files?</source>
<translation>移除所有檔案?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="990"/>
+ <location filename="../src/gui/folder.cpp" line="982"/>
<source>Remove all files</source>
<translation>移除所有檔案</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="991"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Keep files</source>
<translation>保留檔案</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1001"/>
<source>This sync would reset the files to an erlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1014"/>
+ <location filename="../src/gui/folder.cpp" line="1006"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1016"/>
+ <location filename="../src/gui/folder.cpp" line="1008"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1017"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@@ -2098,48 +2098,48 @@ It is not advisable to use it.</source>
<context>
<name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="293"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
<translation>檔案已移除</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="305"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>本地端的檔案在同步的過程中被更改，此檔案將會被還原。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="317"/>
- <location filename="../src/libsync/propagateupload.cpp" line="706"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="321"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
<translation>本地端的檔案在同步過程中被更改。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="633"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>HTTP連線工作被強制中斷，Qt版本< 5.4.2</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="641"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="645"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>檔案已經在本機上修改，但這檔案是只供讀取的分享，您的修改已還原並保存在衝突檔案中。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="672"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
<translation>缺少輪詢的超連結</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="695"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
<translation>本地端的檔案在同步過程中被刪除。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="721"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation>伺服器不承認檔案的最後一個分割檔。(e-tag不存在)</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="794"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
@@ -3499,7 +3499,7 @@ It is not advisable to use it.</source>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="581"/>
+ <location filename="../src/gui/application.cpp" line="593"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation type="unfinished"/>
</message>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list