[tx-robot] updated from transifex

This commit is contained in:
Jenkins for ownCloud 2016-04-07 02:19:10 -04:00
Родитель 271bea39ff
Коммит 4dd8d61e4e
31 изменённых файлов: 1894 добавлений и 1626 удалений

Просмотреть файл

@ -585,136 +585,143 @@
<translation>No es pot llegir %1.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="380"/>
<location filename="../src/gui/folder.cpp" line="383"/>
<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="481"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 i %2 altres fitxers s&apos;han esborrat</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="483"/>
<location filename="../src/gui/folder.cpp" line="493"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>S&apos;ha esborrat &apos;%1&apos;</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="488"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 i %2 altres fitxers s&apos;han descarregat.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="490"/>
<location filename="../src/gui/folder.cpp" line="500"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>S&apos;ha descarregat %1</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="495"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 i %2 altres fitxer(s) s&apos;han actualitzat.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="497"/>
<location filename="../src/gui/folder.cpp" line="507"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>S&apos;ha actualitzat %1</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="502"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 s&apos;ha reanomenat a %2 i %3 altres fitxers s&apos;han reanomenat.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="504"/>
<location filename="../src/gui/folder.cpp" line="514"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 s&apos;ha reanomenat a %2.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="509"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 s&apos;ha reanomenat a %2 i %3 altres fitxers s&apos;han eliminat.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="511"/>
<location filename="../src/gui/folder.cpp" line="521"/>
<source>%1 has been moved to %2.</source>
<translation>%1 s&apos;ha mogut a %2.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 i altres %2 fitxers no s&apos;han sincronitzat per errors.
Consulteu el registre per obtenir més informació.</translation>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="491"/>
<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="498"/>
<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="505"/>
<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="512"/>
<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="519"/>
<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="526"/>
<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="518"/>
<location filename="../src/gui/folder.cpp" line="528"/>
<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="533"/>
<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="535"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 no s&apos;ha pogut sincronitzar degut a un error. Mireu el registre per més detalls.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="524"/>
<location filename="../src/gui/folder.cpp" line="541"/>
<source>Sync Activity</source>
<translation>Activitat de sincronització</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="727"/>
<location filename="../src/gui/folder.cpp" line="744"/>
<source>Could not read system exclude file</source>
<translation>No s&apos;ha pogut llegir el fitxer d&apos;exclusió del sistema</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="934"/>
<location filename="../src/gui/folder.cpp" line="951"/>
<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&apos;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="951"/>
<location filename="../src/gui/folder.cpp" line="968"/>
<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="955"/>
<location filename="../src/gui/folder.cpp" line="972"/>
<source>Remove All Files?</source>
<translation>Esborra tots els fitxers?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="957"/>
<location filename="../src/gui/folder.cpp" line="974"/>
<source>Remove all files</source>
<translation>Esborra tots els fitxers</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="958"/>
<location filename="../src/gui/folder.cpp" line="975"/>
<source>Keep files</source>
<translation>Mantén els fitxers</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="976"/>
<location filename="../src/gui/folder.cpp" line="993"/>
<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="981"/>
<location filename="../src/gui/folder.cpp" line="998"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="983"/>
<location filename="../src/gui/folder.cpp" line="1000"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="984"/>
<location filename="../src/gui/folder.cpp" line="1001"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@ -3593,8 +3600,8 @@ No és aconsellada usar-la.</translation>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
<source>Downloaded, renamed conflicting file</source>
<translation>Descarregat, fitxer conflictiu reanomenat</translation>
<source>Server version downloaded, copied changed local file into conflict file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="39"/>

Просмотреть файл

@ -585,96 +585,104 @@
<translation>%1 není čitelný.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="380"/>
<location filename="../src/gui/folder.cpp" line="383"/>
<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="481"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 a %2 dalších souborů bylo odebráno.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="483"/>
<location filename="../src/gui/folder.cpp" line="493"/>
<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="488"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 a %2 dalších souborů bylo staženo.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="490"/>
<location filename="../src/gui/folder.cpp" line="500"/>
<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="495"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 a %2 dalších souborů bylo aktualizováno.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="497"/>
<location filename="../src/gui/folder.cpp" line="507"/>
<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="502"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 byl přejmenován na %2 a %3 dalších souborů bylo přejmenováno.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="504"/>
<location filename="../src/gui/folder.cpp" line="514"/>
<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="509"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 byl přesunut do %2 a %3 dalších souborů bylo přesunuto.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="511"/>
<location filename="../src/gui/folder.cpp" line="521"/>
<source>%1 has been moved to %2.</source>
<translation>%1 byl přemístěn do %2.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 a %2 další soubory nebyly kvůli chybě synchronizovány. Detaily jsou k nalezení v logu.</translation>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="491"/>
<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="498"/>
<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="505"/>
<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="512"/>
<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="519"/>
<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="526"/>
<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="518"/>
<location filename="../src/gui/folder.cpp" line="528"/>
<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="533"/>
<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="535"/>
<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="524"/>
<location filename="../src/gui/folder.cpp" line="541"/>
<source>Sync Activity</source>
<translation>Průběh synchronizace</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="727"/>
<location filename="../src/gui/folder.cpp" line="744"/>
<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="934"/>
<location filename="../src/gui/folder.cpp" line="951"/>
<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="951"/>
<location filename="../src/gui/folder.cpp" line="968"/>
<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>
@ -683,22 +691,22 @@ Toto může být způsobeno změnou v nastavení synchronizace složky nebo tím
Opravdu chcete provést tuto akci?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="955"/>
<location filename="../src/gui/folder.cpp" line="972"/>
<source>Remove All Files?</source>
<translation>Odstranit všechny soubory?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="957"/>
<location filename="../src/gui/folder.cpp" line="974"/>
<source>Remove all files</source>
<translation>Odstranit všechny soubory</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="958"/>
<location filename="../src/gui/folder.cpp" line="975"/>
<source>Keep files</source>
<translation>Ponechat soubory</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="976"/>
<location filename="../src/gui/folder.cpp" line="993"/>
<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>
@ -707,17 +715,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="981"/>
<location filename="../src/gui/folder.cpp" line="998"/>
<source>Backup detected</source>
<translation>Záloha nalezena</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="983"/>
<location filename="../src/gui/folder.cpp" line="1000"/>
<source>Normal Synchronisation</source>
<translation>Normální synchronizace</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="984"/>
<location filename="../src/gui/folder.cpp" line="1001"/>
<source>Keep Local Files as Conflict</source>
<translation>Ponechat místní soubory jako konflikt</translation>
</message>
@ -3600,8 +3608,8 @@ Nedoporučuje se jí používat.</translation>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
<source>Downloaded, renamed conflicting file</source>
<translation>Staženo, konfliktní soubor přejmenován</translation>
<source>Server version downloaded, copied changed local file into conflict file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="39"/>

Просмотреть файл

@ -585,95 +585,103 @@
<translation>%1 ist nicht lesbar.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="380"/>
<location filename="../src/gui/folder.cpp" line="383"/>
<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="481"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 und %2 andere Dateien wurden gelöscht.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="483"/>
<location filename="../src/gui/folder.cpp" line="493"/>
<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="488"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 und %2 andere Dateien wurden heruntergeladen.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="490"/>
<location filename="../src/gui/folder.cpp" line="500"/>
<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="495"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 und %2 andere Dateien wurden aktualisiert.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="497"/>
<location filename="../src/gui/folder.cpp" line="507"/>
<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="502"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 wurde in %2 umbenannt und %3 andere Dateien wurden umbenannt.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="504"/>
<location filename="../src/gui/folder.cpp" line="514"/>
<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="509"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 wurde in %2 verschoben und %3 andere Dateien wurden verschoben.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="511"/>
<location filename="../src/gui/folder.cpp" line="521"/>
<source>%1 has been moved to %2.</source>
<translation>%1 wurde in %2 verschoben.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 und %2 weitere Dateien konnten aufgrund von Fehlern nicht synchronisiert werden. Schauen Sie in das Protokoll für Details.</translation>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="491"/>
<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="498"/>
<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="505"/>
<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="512"/>
<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="519"/>
<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="526"/>
<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="518"/>
<location filename="../src/gui/folder.cpp" line="528"/>
<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="533"/>
<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="535"/>
<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="524"/>
<location filename="../src/gui/folder.cpp" line="541"/>
<source>Sync Activity</source>
<translation>Synchronisierungsaktivität</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="727"/>
<location filename="../src/gui/folder.cpp" line="744"/>
<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="934"/>
<location filename="../src/gui/folder.cpp" line="951"/>
<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="951"/>
<location filename="../src/gui/folder.cpp" line="968"/>
<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>
@ -682,22 +690,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="955"/>
<location filename="../src/gui/folder.cpp" line="972"/>
<source>Remove All Files?</source>
<translation>Alle Dateien löschen?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="957"/>
<location filename="../src/gui/folder.cpp" line="974"/>
<source>Remove all files</source>
<translation>Lösche alle Dateien</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="958"/>
<location filename="../src/gui/folder.cpp" line="975"/>
<source>Keep files</source>
<translation>Dateien behalten</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="976"/>
<location filename="../src/gui/folder.cpp" line="993"/>
<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>
@ -706,17 +714,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="981"/>
<location filename="../src/gui/folder.cpp" line="998"/>
<source>Backup detected</source>
<translation>Backup erkannt</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="983"/>
<location filename="../src/gui/folder.cpp" line="1000"/>
<source>Normal Synchronisation</source>
<translation>Normale Synchronisation</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="984"/>
<location filename="../src/gui/folder.cpp" line="1001"/>
<source>Keep Local Files as Conflict</source>
<translation>Lokale Konfliktdateien behalten</translation>
</message>
@ -3597,8 +3605,8 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
<source>Downloaded, renamed conflicting file</source>
<translation>Die umbenannte, konfliktbehaftete Datei wurde heruntergeladen</translation>
<source>Server version downloaded, copied changed local file into conflict file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="39"/>

Просмотреть файл

@ -585,96 +585,104 @@
<translation> Το %1 δεν είναι αναγνώσιμο. </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="380"/>
<location filename="../src/gui/folder.cpp" line="383"/>
<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="481"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>Το %1 και άλλα %2 αρχεία αφαιρέθηκαν.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="483"/>
<location filename="../src/gui/folder.cpp" line="493"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>Το %1 αφαιρέθηκε.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="488"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>Το αρχείο %1 και άλλα %2 αρχεία έχουν ληφθεί.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="490"/>
<location filename="../src/gui/folder.cpp" line="500"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>Το %1 έχει ληφθεί.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="495"/>
<source>%1 and %2 other files have been updated.</source>
<translation>Το αρχείο %1 και %2 άλλα αρχεία έχουν ενημερωθεί.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="497"/>
<location filename="../src/gui/folder.cpp" line="507"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>Το %1 έχει ενημερωθεί.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="502"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>Το αρχείο %1 έχει μετονομαστεί σε %2 και άλλα %3 αρχεία έχουν μετονομαστεί.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="504"/>
<location filename="../src/gui/folder.cpp" line="514"/>
<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="509"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>Το αρχείο %1 έχει μετακινηθεί στο %2 και %3 άλλα αρχεία έχουν μετακινηθεί.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="511"/>
<location filename="../src/gui/folder.cpp" line="521"/>
<source>%1 has been moved to %2.</source>
<translation>Το %1 έχει μετακινηθεί στο %2.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 και %2 άλλα αρχεία δεν ήταν δυνατό να συγχρονιστούν εξαιτίας σφαλμάτων. Δείτε το αρχείο καταγραφής για λεπτομέρειες.</translation>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="491"/>
<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="498"/>
<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="505"/>
<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="512"/>
<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="519"/>
<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="526"/>
<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="518"/>
<location filename="../src/gui/folder.cpp" line="528"/>
<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="533"/>
<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="535"/>
<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="524"/>
<location filename="../src/gui/folder.cpp" line="541"/>
<source>Sync Activity</source>
<translation>Δραστηριότητα Συγχρονισμού</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="727"/>
<location filename="../src/gui/folder.cpp" line="744"/>
<source>Could not read system exclude file</source>
<translation>Αδυναμία ανάγνωσης αρχείου αποκλεισμού συστήματος</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="934"/>
<location filename="../src/gui/folder.cpp" line="951"/>
<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="951"/>
<location filename="../src/gui/folder.cpp" line="968"/>
<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>
@ -683,39 +691,39 @@ Are you sure you want to perform this operation?</source>
Είστε σίγουροι ότι θέλετε να εκτελέσετε αυτή τη λειτουργία;</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="955"/>
<location filename="../src/gui/folder.cpp" line="972"/>
<source>Remove All Files?</source>
<translation>Αφαίρεση Όλων των Αρχείων;</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="957"/>
<location filename="../src/gui/folder.cpp" line="974"/>
<source>Remove all files</source>
<translation>Αφαίρεση όλων των αρχείων</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="958"/>
<location filename="../src/gui/folder.cpp" line="975"/>
<source>Keep files</source>
<translation>Διατήρηση αρχείων</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="976"/>
<location filename="../src/gui/folder.cpp" line="993"/>
<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="981"/>
<location filename="../src/gui/folder.cpp" line="998"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="983"/>
<location filename="../src/gui/folder.cpp" line="1000"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="984"/>
<location filename="../src/gui/folder.cpp" line="1001"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@ -3598,8 +3606,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
<source>Downloaded, renamed conflicting file</source>
<translation>Μεταφορτώθηκε, μετονομάστηκε το αρχείο που συνέπιπτε</translation>
<source>Server version downloaded, copied changed local file into conflict file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="39"/>

Просмотреть файл

@ -593,134 +593,163 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="380"/>
<location filename="../src/gui/folder.cpp" line="383"/>
<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="481"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="483"/>
<location filename="../src/gui/folder.cpp" line="493"/>
<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="488"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="490"/>
<location filename="../src/gui/folder.cpp" line="500"/>
<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="495"/>
<source>%1 and %2 other files have been updated.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="497"/>
<location filename="../src/gui/folder.cpp" line="507"/>
<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="502"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="504"/>
<location filename="../src/gui/folder.cpp" line="514"/>
<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="509"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="511"/>
<location filename="../src/gui/folder.cpp" line="521"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="491"/>
<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="498"/>
<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="505"/>
<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="512"/>
<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="519"/>
<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="526"/>
<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="518"/>
<location filename="../src/gui/folder.cpp" line="528"/>
<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="533"/>
<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="535"/>
<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="524"/>
<location filename="../src/gui/folder.cpp" line="541"/>
<source>Sync Activity</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="727"/>
<location filename="../src/gui/folder.cpp" line="744"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="934"/>
<location filename="../src/gui/folder.cpp" line="951"/>
<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="951"/>
<location filename="../src/gui/folder.cpp" line="968"/>
<source>This sync would remove all the files in the sync folder &apos;%1&apos;.
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="955"/>
<location filename="../src/gui/folder.cpp" line="972"/>
<source>Remove All Files?</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="957"/>
<location filename="../src/gui/folder.cpp" line="974"/>
<source>Remove all files</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="958"/>
<location filename="../src/gui/folder.cpp" line="975"/>
<source>Keep files</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="976"/>
<location filename="../src/gui/folder.cpp" line="993"/>
<source>This sync would reset the files to an erlier time in the sync folder &apos;%1&apos;.
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="981"/>
<location filename="../src/gui/folder.cpp" line="998"/>
<source>Backup detected</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="983"/>
<location filename="../src/gui/folder.cpp" line="1000"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="984"/>
<location filename="../src/gui/folder.cpp" line="1001"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"></translation>
</message>
@ -3605,7 +3634,7 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
<source>Downloaded, renamed conflicting file</source>
<source>Server version downloaded, copied changed local file into conflict file</source>
<translation type="unfinished"></translation>
</message>
<message>

Просмотреть файл

@ -585,96 +585,104 @@
<translation>%1 es ilegible.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="380"/>
<location filename="../src/gui/folder.cpp" line="383"/>
<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="481"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 y %2 otros archivos han sido eliminados.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="483"/>
<location filename="../src/gui/folder.cpp" line="493"/>
<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="488"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 y %2 otros archivos han sido descargados.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="490"/>
<location filename="../src/gui/folder.cpp" line="500"/>
<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="495"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 y %2 otros archivos han sido actualizados.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="497"/>
<location filename="../src/gui/folder.cpp" line="507"/>
<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="502"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 ha sido renombrado a %2 y %3 otros archivos han sido renombrados.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="504"/>
<location filename="../src/gui/folder.cpp" line="514"/>
<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="509"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 ha sido movido a %2 y %3 otros archivos han sido movidos.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="511"/>
<location filename="../src/gui/folder.cpp" line="521"/>
<source>%1 has been moved to %2.</source>
<translation>%1 ha sido movido a %2.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 y otros %2 archivos no pudieron ser sincronizados debido a errores. Para más detalles, vea el registro.</translation>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="491"/>
<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="498"/>
<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="505"/>
<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="512"/>
<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="519"/>
<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="526"/>
<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="518"/>
<location filename="../src/gui/folder.cpp" line="528"/>
<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="533"/>
<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="535"/>
<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="524"/>
<location filename="../src/gui/folder.cpp" line="541"/>
<source>Sync Activity</source>
<translation>Actividad de la sincronización</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="727"/>
<location filename="../src/gui/folder.cpp" line="744"/>
<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="934"/>
<location filename="../src/gui/folder.cpp" line="951"/>
<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="951"/>
<location filename="../src/gui/folder.cpp" line="968"/>
<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>
@ -683,22 +691,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="955"/>
<location filename="../src/gui/folder.cpp" line="972"/>
<source>Remove All Files?</source>
<translation>¿Eliminar todos los archivos?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="957"/>
<location filename="../src/gui/folder.cpp" line="974"/>
<source>Remove all files</source>
<translation>Eliminar todos los archivos</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="958"/>
<location filename="../src/gui/folder.cpp" line="975"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="976"/>
<location filename="../src/gui/folder.cpp" line="993"/>
<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>
@ -707,17 +715,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="981"/>
<location filename="../src/gui/folder.cpp" line="998"/>
<source>Backup detected</source>
<translation>Backup detectado</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="983"/>
<location filename="../src/gui/folder.cpp" line="1000"/>
<source>Normal Synchronisation</source>
<translation>Sincronización Normal</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="984"/>
<location filename="../src/gui/folder.cpp" line="1001"/>
<source>Keep Local Files as Conflict</source>
<translation>Mantener los archivos locales en caso de conflicto</translation>
</message>
@ -3596,8 +3604,8 @@ No se recomienda usarla.</translation>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
<source>Downloaded, renamed conflicting file</source>
<translation>Descargado, conflicto con el archivo renombrado</translation>
<source>Server version downloaded, copied changed local file into conflict file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="39"/>

Просмотреть файл

@ -585,134 +585,142 @@
<translation>No se puede leer %1.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="380"/>
<location filename="../src/gui/folder.cpp" line="383"/>
<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="481"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 y %2 otros archivos fueron eliminados.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="483"/>
<location filename="../src/gui/folder.cpp" line="493"/>
<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="488"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 y %2 otros archivos han sido descargados.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="490"/>
<location filename="../src/gui/folder.cpp" line="500"/>
<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="495"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 y %2 otros archivos han sido actualizados.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="497"/>
<location filename="../src/gui/folder.cpp" line="507"/>
<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="502"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="504"/>
<location filename="../src/gui/folder.cpp" line="514"/>
<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="509"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="511"/>
<location filename="../src/gui/folder.cpp" line="521"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="491"/>
<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="498"/>
<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="505"/>
<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="512"/>
<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="519"/>
<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="526"/>
<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="518"/>
<location filename="../src/gui/folder.cpp" line="528"/>
<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="533"/>
<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="535"/>
<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="524"/>
<location filename="../src/gui/folder.cpp" line="541"/>
<source>Sync Activity</source>
<translation>Actividad de Sync</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="727"/>
<location filename="../src/gui/folder.cpp" line="744"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="934"/>
<location filename="../src/gui/folder.cpp" line="951"/>
<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="951"/>
<location filename="../src/gui/folder.cpp" line="968"/>
<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="955"/>
<location filename="../src/gui/folder.cpp" line="972"/>
<source>Remove All Files?</source>
<translation>¿Borrar todos los archivos?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="957"/>
<location filename="../src/gui/folder.cpp" line="974"/>
<source>Remove all files</source>
<translation>Borrar todos los archivos</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="958"/>
<location filename="../src/gui/folder.cpp" line="975"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="976"/>
<location filename="../src/gui/folder.cpp" line="993"/>
<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="981"/>
<location filename="../src/gui/folder.cpp" line="998"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="983"/>
<location filename="../src/gui/folder.cpp" line="1000"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="984"/>
<location filename="../src/gui/folder.cpp" line="1001"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@ -3580,8 +3588,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
<source>Downloaded, renamed conflicting file</source>
<translation>Descargado, renombrando archivo conflictivo</translation>
<source>Server version downloaded, copied changed local file into conflict file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="39"/>

Просмотреть файл

@ -585,134 +585,142 @@
<translation>%1 pole loetav.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="380"/>
<location filename="../src/gui/folder.cpp" line="383"/>
<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="481"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ja %2 teist faili eemaldati.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="483"/>
<location filename="../src/gui/folder.cpp" line="493"/>
<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="488"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 ja %2 teist faili on alla laaditud.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="490"/>
<location filename="../src/gui/folder.cpp" line="500"/>
<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="495"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 ja %2 teist faili on uuendatud.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="497"/>
<location filename="../src/gui/folder.cpp" line="507"/>
<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="502"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 on ümber nimetatud %2 ja %3 muud faili on samuti ümber nimetatud</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="504"/>
<location filename="../src/gui/folder.cpp" line="514"/>
<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="509"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 on tõstetud %2 ning %3 muud faili on samuti liigutatud.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="511"/>
<location filename="../src/gui/folder.cpp" line="521"/>
<source>%1 has been moved to %2.</source>
<translation>%1 on tõstetud %2.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 ja veel %2 muu faili sünkroniseerimine ebaõnnestus tõrgete tõttu. Vaata üksikasju.</translation>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="491"/>
<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="498"/>
<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="505"/>
<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="512"/>
<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="519"/>
<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="526"/>
<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="518"/>
<location filename="../src/gui/folder.cpp" line="528"/>
<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="533"/>
<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="535"/>
<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="524"/>
<location filename="../src/gui/folder.cpp" line="541"/>
<source>Sync Activity</source>
<translation>Sünkroniseerimise tegevus</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="727"/>
<location filename="../src/gui/folder.cpp" line="744"/>
<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="934"/>
<location filename="../src/gui/folder.cpp" line="951"/>
<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="951"/>
<location filename="../src/gui/folder.cpp" line="968"/>
<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="955"/>
<location filename="../src/gui/folder.cpp" line="972"/>
<source>Remove All Files?</source>
<translation>Kustutada kõik failid?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="957"/>
<location filename="../src/gui/folder.cpp" line="974"/>
<source>Remove all files</source>
<translation>Kustutada kõik failid</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="958"/>
<location filename="../src/gui/folder.cpp" line="975"/>
<source>Keep files</source>
<translation>Säilita failid</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="976"/>
<location filename="../src/gui/folder.cpp" line="993"/>
<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="981"/>
<location filename="../src/gui/folder.cpp" line="998"/>
<source>Backup detected</source>
<translation>Leiti varukoopia</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="983"/>
<location filename="../src/gui/folder.cpp" line="1000"/>
<source>Normal Synchronisation</source>
<translation>Tavaline sünkroonimine</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="984"/>
<location filename="../src/gui/folder.cpp" line="1001"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@ -3582,8 +3590,8 @@ Selle kasutamine pole soovitatav.</translation>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
<source>Downloaded, renamed conflicting file</source>
<translation>Alla laaditud, konfliktse faili ümbernimetamine</translation>
<source>Server version downloaded, copied changed local file into conflict file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="39"/>

Просмотреть файл

@ -585,134 +585,142 @@
<translation>%1 ezin da irakurri.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="380"/>
<location filename="../src/gui/folder.cpp" line="383"/>
<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="481"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 eta beste %2 fitxategi ezabatu dira.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="483"/>
<location filename="../src/gui/folder.cpp" line="493"/>
<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="488"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 eta beste %2 fitxategi deskargatu dira.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="490"/>
<location filename="../src/gui/folder.cpp" line="500"/>
<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="495"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 eta beste %2 fitxategi kargatu dira.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="497"/>
<location filename="../src/gui/folder.cpp" line="507"/>
<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="502"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 %2-(e)ra berrizendatu da eta beste %3 fitxategi berrizendatu dira.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="504"/>
<location filename="../src/gui/folder.cpp" line="514"/>
<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="509"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 %2-(e)ra berrizendatu da eta beste %3 fitxategi mugitu dira.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="511"/>
<location filename="../src/gui/folder.cpp" line="521"/>
<source>%1 has been moved to %2.</source>
<translation>%1 %2-(e)ra mugitu da.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="491"/>
<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="498"/>
<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="505"/>
<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="512"/>
<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="519"/>
<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="526"/>
<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="518"/>
<location filename="../src/gui/folder.cpp" line="528"/>
<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="533"/>
<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="535"/>
<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="524"/>
<location filename="../src/gui/folder.cpp" line="541"/>
<source>Sync Activity</source>
<translation>Sinkronizazio Jarduerak</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="727"/>
<location filename="../src/gui/folder.cpp" line="744"/>
<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="934"/>
<location filename="../src/gui/folder.cpp" line="951"/>
<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="951"/>
<location filename="../src/gui/folder.cpp" line="968"/>
<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="955"/>
<location filename="../src/gui/folder.cpp" line="972"/>
<source>Remove All Files?</source>
<translation>Ezabatu Fitxategi Guztiak?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="957"/>
<location filename="../src/gui/folder.cpp" line="974"/>
<source>Remove all files</source>
<translation>Ezabatu fitxategi guztiak</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="958"/>
<location filename="../src/gui/folder.cpp" line="975"/>
<source>Keep files</source>
<translation>Mantendu fitxategiak</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="976"/>
<location filename="../src/gui/folder.cpp" line="993"/>
<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="981"/>
<location filename="../src/gui/folder.cpp" line="998"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="983"/>
<location filename="../src/gui/folder.cpp" line="1000"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="984"/>
<location filename="../src/gui/folder.cpp" line="1001"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@ -3586,7 +3594,7 @@ Ez da gomendagarria erabltzea.</translation>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
<source>Downloaded, renamed conflicting file</source>
<source>Server version downloaded, copied changed local file into conflict file</source>
<translation type="unfinished"/>
</message>
<message>

Просмотреть файл

@ -585,134 +585,142 @@
<translation>%1 قابل خواندن نیست.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="380"/>
<location filename="../src/gui/folder.cpp" line="383"/>
<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="481"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="483"/>
<location filename="../src/gui/folder.cpp" line="493"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 حذف شده است.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="488"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 و %2 فایل دیگر دانلود شدهاند.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="490"/>
<location filename="../src/gui/folder.cpp" line="500"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 بارگزاری شد.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="495"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 و %2 فایل دیگر بروز رسانی شدهاند.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="497"/>
<location filename="../src/gui/folder.cpp" line="507"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 بروز رسانی شده است.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="502"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="504"/>
<location filename="../src/gui/folder.cpp" line="514"/>
<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="509"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="511"/>
<location filename="../src/gui/folder.cpp" line="521"/>
<source>%1 has been moved to %2.</source>
<translation>%1 به %2 انتقال داده شده است.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"/>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="491"/>
<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="498"/>
<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="505"/>
<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="512"/>
<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="519"/>
<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="526"/>
<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="518"/>
<location filename="../src/gui/folder.cpp" line="528"/>
<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="533"/>
<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="535"/>
<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="524"/>
<location filename="../src/gui/folder.cpp" line="541"/>
<source>Sync Activity</source>
<translation>فعالیت همگام سازی</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="727"/>
<location filename="../src/gui/folder.cpp" line="744"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="934"/>
<location filename="../src/gui/folder.cpp" line="951"/>
<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="951"/>
<location filename="../src/gui/folder.cpp" line="968"/>
<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="955"/>
<location filename="../src/gui/folder.cpp" line="972"/>
<source>Remove All Files?</source>
<translation>حذف تمام فایل ها؟</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="957"/>
<location filename="../src/gui/folder.cpp" line="974"/>
<source>Remove all files</source>
<translation>حذف تمام فایل ها</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="958"/>
<location filename="../src/gui/folder.cpp" line="975"/>
<source>Keep files</source>
<translation>نگه داشتن فایل ها</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="976"/>
<location filename="../src/gui/folder.cpp" line="993"/>
<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="981"/>
<location filename="../src/gui/folder.cpp" line="998"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="983"/>
<location filename="../src/gui/folder.cpp" line="1000"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="984"/>
<location filename="../src/gui/folder.cpp" line="1001"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@ -3579,7 +3587,7 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
<source>Downloaded, renamed conflicting file</source>
<source>Server version downloaded, copied changed local file into conflict file</source>
<translation type="unfinished"/>
</message>
<message>

Просмотреть файл

@ -585,135 +585,143 @@
<translation>%1 ei ole luettavissa.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="380"/>
<location filename="../src/gui/folder.cpp" line="383"/>
<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="481"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ja %2 muuta tiedostoa on poistettu.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="483"/>
<location filename="../src/gui/folder.cpp" line="493"/>
<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="488"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 ja %2 muuta tiedostoa on ladattu.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="490"/>
<location filename="../src/gui/folder.cpp" line="500"/>
<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="495"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 ja %2 muuta tiedostoa on päivitetty.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="497"/>
<location filename="../src/gui/folder.cpp" line="507"/>
<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="502"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="504"/>
<location filename="../src/gui/folder.cpp" line="514"/>
<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="509"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="511"/>
<location filename="../src/gui/folder.cpp" line="521"/>
<source>%1 has been moved to %2.</source>
<translation>%1 on siirretty kohteeseen %2.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>Kohdetta %1 ja %2 muuta tiedostoa ei voi synkronoida virheiden vuoksi. Katso tarkemmat tiedot lokista.</translation>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="491"/>
<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="498"/>
<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="505"/>
<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="512"/>
<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="519"/>
<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="526"/>
<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="518"/>
<location filename="../src/gui/folder.cpp" line="528"/>
<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="533"/>
<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="535"/>
<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="524"/>
<location filename="../src/gui/folder.cpp" line="541"/>
<source>Sync Activity</source>
<translation>Synkronointiaktiviteetti</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="727"/>
<location filename="../src/gui/folder.cpp" line="744"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="934"/>
<location filename="../src/gui/folder.cpp" line="951"/>
<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="951"/>
<location filename="../src/gui/folder.cpp" line="968"/>
<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="955"/>
<location filename="../src/gui/folder.cpp" line="972"/>
<source>Remove All Files?</source>
<translation>Poistetaanko kaikki tiedostot?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="957"/>
<location filename="../src/gui/folder.cpp" line="974"/>
<source>Remove all files</source>
<translation>Poista kaikki tiedostot</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="958"/>
<location filename="../src/gui/folder.cpp" line="975"/>
<source>Keep files</source>
<translation>Säilytä tiedostot</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="976"/>
<location filename="../src/gui/folder.cpp" line="993"/>
<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="981"/>
<location filename="../src/gui/folder.cpp" line="998"/>
<source>Backup detected</source>
<translation>Varmuuskopio poistettu</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="983"/>
<location filename="../src/gui/folder.cpp" line="1000"/>
<source>Normal Synchronisation</source>
<translation>Normaali synkronointi</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="984"/>
<location filename="../src/gui/folder.cpp" line="1001"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@ -3589,8 +3597,8 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
<source>Downloaded, renamed conflicting file</source>
<translation>Ladattu, ristiriidassa oleva tiedosto nimetty uudelleen</translation>
<source>Server version downloaded, copied changed local file into conflict file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="39"/>

Просмотреть файл

@ -439,7 +439,7 @@
<message numerus="yes">
<location filename="../src/gui/activitywidget.cpp" line="334"/>
<source>You received %n new notification(s) from %2.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
<translation><numerusform>Vous avez reçu %n nouvelle notification de %2.</numerusform><numerusform>Vous avez reçu %n nouvelles notifications de %2.</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/gui/activitywidget.cpp" line="342"/>
@ -585,96 +585,104 @@
<translation>%1 ne peut pas être lu.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="380"/>
<location filename="../src/gui/folder.cpp" line="383"/>
<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="481"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 et %2 autres fichiers ont é supprimés.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="483"/>
<location filename="../src/gui/folder.cpp" line="493"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 a é supprimé.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="488"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 et %2 autres fichiers ont é téléchargés.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="490"/>
<location filename="../src/gui/folder.cpp" line="500"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 a é téléchargé.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="495"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 et %2 autres fichiers ont é mis à jour.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="497"/>
<location filename="../src/gui/folder.cpp" line="507"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 a é mis à jour.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="502"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 a é renommé en %2 et %3 autres fichiers ont é renommés.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="504"/>
<location filename="../src/gui/folder.cpp" line="514"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 a é renommé en %2.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="509"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 a é déplacé vers %2 et %3 autres fichiers ont é déplacés.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="511"/>
<location filename="../src/gui/folder.cpp" line="521"/>
<source>%1 has been moved to %2.</source>
<translation>%1 a é déplacé vers %2.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 et %2 autres fichiers n&apos;ont pu être synchronisés pour cause d&apos;erreur. Consultez les logs pour les détails.</translation>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="491"/>
<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="498"/>
<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="505"/>
<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="512"/>
<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="519"/>
<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="526"/>
<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="518"/>
<location filename="../src/gui/folder.cpp" line="528"/>
<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="533"/>
<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="535"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 n&apos;a pu être synchronisé pour cause d&apos;erreur. Consultez les logs pour les détails.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="524"/>
<location filename="../src/gui/folder.cpp" line="541"/>
<source>Sync Activity</source>
<translation>Activité de synchronisation</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="727"/>
<location filename="../src/gui/folder.cpp" line="744"/>
<source>Could not read system exclude file</source>
<translation>Impossible de lire le fichier d&apos;exclusion du système</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="934"/>
<location filename="../src/gui/folder.cpp" line="951"/>
<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 é 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="951"/>
<location filename="../src/gui/folder.cpp" line="968"/>
<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>
@ -683,22 +691,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="955"/>
<location filename="../src/gui/folder.cpp" line="972"/>
<source>Remove All Files?</source>
<translation>Supprimer tous les fichiers ?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="957"/>
<location filename="../src/gui/folder.cpp" line="974"/>
<source>Remove all files</source>
<translation>Supprimer tous les fichiers</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="958"/>
<location filename="../src/gui/folder.cpp" line="975"/>
<source>Keep files</source>
<translation>Garder les fichiers</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="976"/>
<location filename="../src/gui/folder.cpp" line="993"/>
<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>
@ -707,17 +715,17 @@ Cela peut être dû à une copie de sauvegarde restaurée sur le serveur.
Continuer la synchronisation comme d&apos;habitude fera en sorte que tous les fichiers soient remplacés par des fichiers plus vieux d&apos;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="981"/>
<location filename="../src/gui/folder.cpp" line="998"/>
<source>Backup detected</source>
<translation>Sauvegarde détecté</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="983"/>
<location filename="../src/gui/folder.cpp" line="1000"/>
<source>Normal Synchronisation</source>
<translation>Synchronisation normale</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="984"/>
<location filename="../src/gui/folder.cpp" line="1001"/>
<source>Keep Local Files as Conflict</source>
<translation>Garder les fichiers locaux comme Conflits</translation>
</message>
@ -3600,8 +3608,8 @@ Il est déconseillé de l&apos;utiliser.</translation>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
<source>Downloaded, renamed conflicting file</source>
<translation>Téléchargé. Le fichier en conflit a é renommé.</translation>
<source>Server version downloaded, copied changed local file into conflict file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="39"/>

Просмотреть файл

@ -585,135 +585,143 @@
<translation>%1 non é lexíbel.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="380"/>
<location filename="../src/gui/folder.cpp" line="383"/>
<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="481"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>O ficheiro %1 e outros %2 foron retirados satisfactoriamente.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="483"/>
<location filename="../src/gui/folder.cpp" line="493"/>
<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="488"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>O ficheiro %1 e outros %2 foron descargados satisfactoriamente.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="490"/>
<location filename="../src/gui/folder.cpp" line="500"/>
<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="495"/>
<source>%1 and %2 other files have been updated.</source>
<translation>O ficheiro %1 e outros %2 foron enviados satisfactoriamente.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="497"/>
<location filename="../src/gui/folder.cpp" line="507"/>
<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="502"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 foi renomeado satisfactoriamente a %2 e outros %3 tamén foron renomeados satisfactoriamente.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="504"/>
<location filename="../src/gui/folder.cpp" line="514"/>
<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="509"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 foi movido satisfactoriamente a %2 e outros %3 tamén foron movidos satisfactoriamente.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="511"/>
<location filename="../src/gui/folder.cpp" line="521"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido satisfactoriamente a %2</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 e %2 non puideron sincronizarse por mor de erros. Vexa os detalles no rexistro.</translation>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="491"/>
<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="498"/>
<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="505"/>
<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="512"/>
<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="519"/>
<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="526"/>
<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="518"/>
<location filename="../src/gui/folder.cpp" line="528"/>
<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="533"/>
<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="535"/>
<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="524"/>
<location filename="../src/gui/folder.cpp" line="541"/>
<source>Sync Activity</source>
<translation>Actividade de sincronización</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="727"/>
<location filename="../src/gui/folder.cpp" line="744"/>
<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="934"/>
<location filename="../src/gui/folder.cpp" line="951"/>
<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="951"/>
<location filename="../src/gui/folder.cpp" line="968"/>
<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="955"/>
<location filename="../src/gui/folder.cpp" line="972"/>
<source>Remove All Files?</source>
<translation>Retirar todos os ficheiros?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="957"/>
<location filename="../src/gui/folder.cpp" line="974"/>
<source>Remove all files</source>
<translation>Retirar todos os ficheiros</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="958"/>
<location filename="../src/gui/folder.cpp" line="975"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="976"/>
<location filename="../src/gui/folder.cpp" line="993"/>
<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="981"/>
<location filename="../src/gui/folder.cpp" line="998"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="983"/>
<location filename="../src/gui/folder.cpp" line="1000"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="984"/>
<location filename="../src/gui/folder.cpp" line="1001"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@ -3591,8 +3599,8 @@ Recomendámoslle que non o use.</translation>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
<source>Downloaded, renamed conflicting file</source>
<translation>Descargado, cambiar o nome do ficheiro en conflito</translation>
<source>Server version downloaded, copied changed local file into conflict file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="39"/>

Просмотреть файл

@ -585,134 +585,142 @@
<translation>%1 nem olvasható.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="380"/>
<location filename="../src/gui/folder.cpp" line="383"/>
<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="481"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 és %2 további fájl törölve.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="483"/>
<location filename="../src/gui/folder.cpp" line="493"/>
<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="488"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 és %2 további fájl letöltve.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="490"/>
<location filename="../src/gui/folder.cpp" line="500"/>
<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="495"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 és %2 további fájl feltöltve.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="497"/>
<location filename="../src/gui/folder.cpp" line="507"/>
<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="502"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 átnevezve erre: %2 és %3 további fájl átnevezve.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="504"/>
<location filename="../src/gui/folder.cpp" line="514"/>
<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="509"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 áthelyezve ide: %2 és %3 további fájl áthelyezve.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="511"/>
<location filename="../src/gui/folder.cpp" line="521"/>
<source>%1 has been moved to %2.</source>
<translation>%1 áthelyezve ide: %2.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 és %2 további fájlt nem sikerült szinkronizálni. Bővebb információ a naplófájlban.</translation>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="491"/>
<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="498"/>
<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="505"/>
<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="512"/>
<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="519"/>
<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="526"/>
<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="518"/>
<location filename="../src/gui/folder.cpp" line="528"/>
<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="533"/>
<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="535"/>
<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="524"/>
<location filename="../src/gui/folder.cpp" line="541"/>
<source>Sync Activity</source>
<translation>Szinkronizálási aktivitás</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="727"/>
<location filename="../src/gui/folder.cpp" line="744"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="934"/>
<location filename="../src/gui/folder.cpp" line="951"/>
<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="951"/>
<location filename="../src/gui/folder.cpp" line="968"/>
<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="955"/>
<location filename="../src/gui/folder.cpp" line="972"/>
<source>Remove All Files?</source>
<translation>El legyen távolítva az összes fájl?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="957"/>
<location filename="../src/gui/folder.cpp" line="974"/>
<source>Remove all files</source>
<translation>Összes fájl eltávolítása</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="958"/>
<location filename="../src/gui/folder.cpp" line="975"/>
<source>Keep files</source>
<translation>Fájlok megtartása</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="976"/>
<location filename="../src/gui/folder.cpp" line="993"/>
<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="981"/>
<location filename="../src/gui/folder.cpp" line="998"/>
<source>Backup detected</source>
<translation>Biztonsági mentés észlelve</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="983"/>
<location filename="../src/gui/folder.cpp" line="1000"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="984"/>
<location filename="../src/gui/folder.cpp" line="1001"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@ -3584,8 +3592,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
<source>Downloaded, renamed conflicting file</source>
<translation>Letöltve, átnevezve az ütköző fájl</translation>
<source>Server version downloaded, copied changed local file into conflict file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="39"/>

Просмотреть файл

@ -585,96 +585,104 @@
<translation>%1 non è leggibile.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="380"/>
<location filename="../src/gui/folder.cpp" line="383"/>
<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="481"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 e %2 altri file sono stati rimossi.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="483"/>
<location filename="../src/gui/folder.cpp" line="493"/>
<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="488"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 e %2 altri file sono stati scaricati.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="490"/>
<location filename="../src/gui/folder.cpp" line="500"/>
<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="495"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 e %2 altri file sono stati aggiornati.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="497"/>
<location filename="../src/gui/folder.cpp" line="507"/>
<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="502"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 è stato rinominato in %2 e %3 altri file sono stati rinominati.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="504"/>
<location filename="../src/gui/folder.cpp" line="514"/>
<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="509"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 è stato spostato in %2 e %3 altri file sono stati spostati.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="511"/>
<location filename="../src/gui/folder.cpp" line="521"/>
<source>%1 has been moved to %2.</source>
<translation>%1 è stato spostato in %2.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>1% e altri %2 file non sono stati sincronizzati a causa di errori. Controlla il log per i dettagli.</translation>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="491"/>
<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="498"/>
<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="505"/>
<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="512"/>
<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="519"/>
<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="526"/>
<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="518"/>
<location filename="../src/gui/folder.cpp" line="528"/>
<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="533"/>
<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="535"/>
<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="524"/>
<location filename="../src/gui/folder.cpp" line="541"/>
<source>Sync Activity</source>
<translation>Sincronizza attività</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="727"/>
<location filename="../src/gui/folder.cpp" line="744"/>
<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="934"/>
<location filename="../src/gui/folder.cpp" line="951"/>
<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="951"/>
<location filename="../src/gui/folder.cpp" line="968"/>
<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>
@ -683,22 +691,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="955"/>
<location filename="../src/gui/folder.cpp" line="972"/>
<source>Remove All Files?</source>
<translation>Vuoi rimuovere tutti i file?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="957"/>
<location filename="../src/gui/folder.cpp" line="974"/>
<source>Remove all files</source>
<translation>Rimuovi tutti i file</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="958"/>
<location filename="../src/gui/folder.cpp" line="975"/>
<source>Keep files</source>
<translation>Mantieni i file</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="976"/>
<location filename="../src/gui/folder.cpp" line="993"/>
<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>
@ -707,17 +715,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="981"/>
<location filename="../src/gui/folder.cpp" line="998"/>
<source>Backup detected</source>
<translation>Backup rilevato</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="983"/>
<location filename="../src/gui/folder.cpp" line="1000"/>
<source>Normal Synchronisation</source>
<translation>Sincronizzazione normale</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="984"/>
<location filename="../src/gui/folder.cpp" line="1001"/>
<source>Keep Local Files as Conflict</source>
<translation>Mantieni i file locali come conflitto</translation>
</message>
@ -3597,8 +3605,8 @@ Non è consigliabile utilizzarlo.</translation>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
<source>Downloaded, renamed conflicting file</source>
<translation>Scaricato, file in conflitto rinominato</translation>
<source>Server version downloaded, copied changed local file into conflict file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="39"/>

Просмотреть файл

@ -585,96 +585,104 @@
<translation>%1 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="380"/>
<location filename="../src/gui/folder.cpp" line="383"/>
<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="481"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 %2 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="483"/>
<location filename="../src/gui/folder.cpp" line="493"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="488"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 %2 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="490"/>
<location filename="../src/gui/folder.cpp" line="500"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="495"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 %2 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="497"/>
<location filename="../src/gui/folder.cpp" line="507"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="502"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 %2 %3 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="504"/>
<location filename="../src/gui/folder.cpp" line="514"/>
<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="509"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 %2 %3 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="511"/>
<location filename="../src/gui/folder.cpp" line="521"/>
<source>%1 has been moved to %2.</source>
<translation>%1 %2 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 %2 </translation>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="491"/>
<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="498"/>
<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="505"/>
<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="512"/>
<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="519"/>
<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="526"/>
<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="518"/>
<location filename="../src/gui/folder.cpp" line="528"/>
<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="533"/>
<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="535"/>
<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="524"/>
<location filename="../src/gui/folder.cpp" line="541"/>
<source>Sync Activity</source>
<translation></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="727"/>
<location filename="../src/gui/folder.cpp" line="744"/>
<source>Could not read system exclude file</source>
<translation></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="934"/>
<location filename="../src/gui/folder.cpp" line="951"/>
<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="951"/>
<location filename="../src/gui/folder.cpp" line="968"/>
<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>
@ -683,22 +691,22 @@ Are you sure you want to perform this operation?</source>
</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="955"/>
<location filename="../src/gui/folder.cpp" line="972"/>
<source>Remove All Files?</source>
<translation></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="957"/>
<location filename="../src/gui/folder.cpp" line="974"/>
<source>Remove all files</source>
<translation></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="958"/>
<location filename="../src/gui/folder.cpp" line="975"/>
<source>Keep files</source>
<translation></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="976"/>
<location filename="../src/gui/folder.cpp" line="993"/>
<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>
@ -707,17 +715,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="981"/>
<location filename="../src/gui/folder.cpp" line="998"/>
<source>Backup detected</source>
<translation></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="983"/>
<location filename="../src/gui/folder.cpp" line="1000"/>
<source>Normal Synchronisation</source>
<translation></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="984"/>
<location filename="../src/gui/folder.cpp" line="1001"/>
<source>Keep Local Files as Conflict</source>
<translation></translation>
</message>
@ -3594,8 +3602,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
<source>Downloaded, renamed conflicting file</source>
<translation></translation>
<source>Server version downloaded, copied changed local file into conflict file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="39"/>

Просмотреть файл

@ -585,96 +585,104 @@
<translation>%1 kan ikke leses.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="380"/>
<location filename="../src/gui/folder.cpp" line="383"/>
<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="481"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 og %2 andre filer har blitt fjernet.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="483"/>
<location filename="../src/gui/folder.cpp" line="493"/>
<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="488"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 og %2 andre filer har blitt lastet ned.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="490"/>
<location filename="../src/gui/folder.cpp" line="500"/>
<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="495"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 og %2 andre filer har blitt oppdatert.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="497"/>
<location filename="../src/gui/folder.cpp" line="507"/>
<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="502"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 har blitt omdøpt til %2 og %3 andre filer har blitt omdøpt.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="504"/>
<location filename="../src/gui/folder.cpp" line="514"/>
<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="509"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 har blitt flyttet til %2 og %3 andre filer har blitt flyttet.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="511"/>
<location filename="../src/gui/folder.cpp" line="521"/>
<source>%1 has been moved to %2.</source>
<translation>%1 har blitt flyttet til %2.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 og %2 andre filer kunne ikke synkroniseres pga. feil. Se loggen for detaljer.</translation>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="491"/>
<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="498"/>
<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="505"/>
<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="512"/>
<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="519"/>
<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="526"/>
<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="518"/>
<location filename="../src/gui/folder.cpp" line="528"/>
<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="533"/>
<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="535"/>
<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="524"/>
<location filename="../src/gui/folder.cpp" line="541"/>
<source>Sync Activity</source>
<translation>Synkroniseringsaktivitet</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="727"/>
<location filename="../src/gui/folder.cpp" line="744"/>
<source>Could not read system exclude file</source>
<translation>Klarte ikke å lese systemets ekskluderingsfil</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="934"/>
<location filename="../src/gui/folder.cpp" line="951"/>
<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.
til Innstillinger og velg mappen hvis du ønsker å laste den ned.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="951"/>
<location filename="../src/gui/folder.cpp" line="968"/>
<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>
@ -683,22 +691,22 @@ Dette kan være fordi mappen ble omkonfigurert i det stille, eller alle filene b
Er du sikker at du vil utføre denne operasjonen?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="955"/>
<location filename="../src/gui/folder.cpp" line="972"/>
<source>Remove All Files?</source>
<translation>Fjerne alle filer?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="957"/>
<location filename="../src/gui/folder.cpp" line="974"/>
<source>Remove all files</source>
<translation>Fjern alle filer</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="958"/>
<location filename="../src/gui/folder.cpp" line="975"/>
<source>Keep files</source>
<translation>Behold filer</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="976"/>
<location filename="../src/gui/folder.cpp" line="993"/>
<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>
@ -707,17 +715,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="981"/>
<location filename="../src/gui/folder.cpp" line="998"/>
<source>Backup detected</source>
<translation>Backup oppdaget</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="983"/>
<location filename="../src/gui/folder.cpp" line="1000"/>
<source>Normal Synchronisation</source>
<translation>Normal synkronisering</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="984"/>
<location filename="../src/gui/folder.cpp" line="1001"/>
<source>Keep Local Files as Conflict</source>
<translation>Behold lokale filer som konflikt</translation>
</message>
@ -3598,8 +3606,8 @@ Det er ikke tilrådelig å bruke den.</translation>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
<source>Downloaded, renamed conflicting file</source>
<translation>Nedlastet, omdøpt konfliktfil</translation>
<source>Server version downloaded, copied changed local file into conflict file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="39"/>

Просмотреть файл

@ -585,96 +585,104 @@
<translation>%1 is niet leesbaar.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="380"/>
<location filename="../src/gui/folder.cpp" line="383"/>
<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="481"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 en %2 andere bestanden zijn verwijderd.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="483"/>
<location filename="../src/gui/folder.cpp" line="493"/>
<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="488"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 en %2 andere bestanden zijn gedownload.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="490"/>
<location filename="../src/gui/folder.cpp" line="500"/>
<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="495"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 en %2 andere bestanden zijn bijgewerkt.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="497"/>
<location filename="../src/gui/folder.cpp" line="507"/>
<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="502"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 is hernoemd naar %2 en %3 andere bestanden zijn ook hernoemd.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="504"/>
<location filename="../src/gui/folder.cpp" line="514"/>
<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="509"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 is verplaatst naar %2 en %3 andere bestanden zijn ook verplaatst.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="511"/>
<location filename="../src/gui/folder.cpp" line="521"/>
<source>%1 has been moved to %2.</source>
<translation>%1 is verplaatst naar %2.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 en %2 andere bestanden konden niet worden gesynchroniseerd door fouten. Bekijk het log voor details.</translation>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="491"/>
<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="498"/>
<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="505"/>
<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="512"/>
<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="519"/>
<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="526"/>
<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="518"/>
<location filename="../src/gui/folder.cpp" line="528"/>
<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="533"/>
<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="535"/>
<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="524"/>
<location filename="../src/gui/folder.cpp" line="541"/>
<source>Sync Activity</source>
<translation>Synchronisatie-activiteit</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="727"/>
<location filename="../src/gui/folder.cpp" line="744"/>
<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="934"/>
<location filename="../src/gui/folder.cpp" line="951"/>
<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="951"/>
<location filename="../src/gui/folder.cpp" line="968"/>
<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>
@ -683,22 +691,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="955"/>
<location filename="../src/gui/folder.cpp" line="972"/>
<source>Remove All Files?</source>
<translation>Verwijder alle bestanden?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="957"/>
<location filename="../src/gui/folder.cpp" line="974"/>
<source>Remove all files</source>
<translation>Verwijder alle bestanden</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="958"/>
<location filename="../src/gui/folder.cpp" line="975"/>
<source>Keep files</source>
<translation>Bewaar bestanden</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="976"/>
<location filename="../src/gui/folder.cpp" line="993"/>
<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>
@ -707,17 +715,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="981"/>
<location filename="../src/gui/folder.cpp" line="998"/>
<source>Backup detected</source>
<translation>Backup gedetecteerd</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="983"/>
<location filename="../src/gui/folder.cpp" line="1000"/>
<source>Normal Synchronisation</source>
<translation>Normale synchronisatie</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="984"/>
<location filename="../src/gui/folder.cpp" line="1001"/>
<source>Keep Local Files as Conflict</source>
<translation>Behoud lokale bestanden als conflict</translation>
</message>
@ -3599,8 +3607,8 @@ We adviseren deze site niet te gebruiken.</translation>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
<source>Downloaded, renamed conflicting file</source>
<translation>Gedownload, conflicterend bestand hernoemd</translation>
<source>Server version downloaded, copied changed local file into conflict file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="39"/>

Просмотреть файл

@ -585,96 +585,104 @@
<translation>%1 jest nie do odczytu.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="380"/>
<location filename="../src/gui/folder.cpp" line="383"/>
<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="481"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 i %2 inne pliki zostały usunięte.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="483"/>
<location filename="../src/gui/folder.cpp" line="493"/>
<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="488"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 i %2 pozostałe pliki zostały ściągnięte.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="490"/>
<location filename="../src/gui/folder.cpp" line="500"/>
<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="495"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 i %2 inne pliki zostały zaktualizowane.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="497"/>
<location filename="../src/gui/folder.cpp" line="507"/>
<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="502"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 zmienił nazwę na %2 i %3 inne pliki mają zmienione nazwy.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="504"/>
<location filename="../src/gui/folder.cpp" line="514"/>
<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="509"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 został zmieniony na %2 i %3 inne pliku zostały przeniesione.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="511"/>
<location filename="../src/gui/folder.cpp" line="521"/>
<source>%1 has been moved to %2.</source>
<translation>%1 został przeniesiony do %2.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 i %2 inne pliki nie mogą zostać zsynchronizowane z powodu błędów. Zobacz szczegóły w logu.</translation>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="491"/>
<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="498"/>
<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="505"/>
<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="512"/>
<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="519"/>
<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="526"/>
<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="518"/>
<location filename="../src/gui/folder.cpp" line="528"/>
<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="533"/>
<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="535"/>
<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="524"/>
<location filename="../src/gui/folder.cpp" line="541"/>
<source>Sync Activity</source>
<translation>Aktywności synchronizacji</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="727"/>
<location filename="../src/gui/folder.cpp" line="744"/>
<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="934"/>
<location filename="../src/gui/folder.cpp" line="951"/>
<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="951"/>
<location filename="../src/gui/folder.cpp" line="968"/>
<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>
@ -683,22 +691,22 @@ Może to być spowodowane faktem, że folder został przekonfigurowany lub wszys
Czy jesteś pewien, że chcesz wykonać operację ? </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="955"/>
<location filename="../src/gui/folder.cpp" line="972"/>
<source>Remove All Files?</source>
<translation>Usunąć wszystkie pliki?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="957"/>
<location filename="../src/gui/folder.cpp" line="974"/>
<source>Remove all files</source>
<translation>Usuń wszystkie pliki</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="958"/>
<location filename="../src/gui/folder.cpp" line="975"/>
<source>Keep files</source>
<translation>Pozostaw pliki</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="976"/>
<location filename="../src/gui/folder.cpp" line="993"/>
<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>
@ -707,17 +715,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="981"/>
<location filename="../src/gui/folder.cpp" line="998"/>
<source>Backup detected</source>
<translation>Wykryto kopię zapasową.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="983"/>
<location filename="../src/gui/folder.cpp" line="1000"/>
<source>Normal Synchronisation</source>
<translation>Normalna synchronizacja.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="984"/>
<location filename="../src/gui/folder.cpp" line="1001"/>
<source>Keep Local Files as Conflict</source>
<translation>Zatrzymaj pliki lokalne i ustaw status konfliktu.</translation>
</message>
@ -3595,7 +3603,7 @@ Kliknij</translation>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
<source>Downloaded, renamed conflicting file</source>
<source>Server version downloaded, copied changed local file into conflict file</source>
<translation type="unfinished"/>
</message>
<message>

Просмотреть файл

@ -73,12 +73,12 @@
<message>
<location filename="../src/gui/notificationwidget.ui" line="56"/>
<source>Lorem ipsum dolor sit amet</source>
<translation type="unfinished"/>
<translation>Lorem ipsum dolor sit amet</translation>
</message>
<message>
<location filename="../src/gui/notificationwidget.ui" line="63"/>
<source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
<translation type="unfinished"/>
<translation>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm</translation>
</message>
<message>
<location filename="../src/gui/notificationwidget.ui" line="83"/>
@ -439,22 +439,22 @@
<message numerus="yes">
<location filename="../src/gui/activitywidget.cpp" line="334"/>
<source>You received %n new notification(s) from %2.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
<translation><numerusform>Recebeu %n nova notificação de %2.</numerusform><numerusform>Recebeu %n novas notificações de %2.</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/gui/activitywidget.cpp" line="342"/>
<source>You received %n new notification(s) from %1 and %2.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
<translation><numerusform>Recebeu %n nova notificação de %1 e %2.</numerusform><numerusform>Recebeu %n novas notificações de %1 e %2.</numerusform></translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="344"/>
<source>You received new notifications from %1, %2 and other accounts.</source>
<translation type="unfinished"/>
<translation>Recebeu novas notificações de %1, %2 e outras contas.</translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="348"/>
<source>%1 Notifications - Action Required</source>
<translation type="unfinished"/>
<translation>%1 Notificações - Acção Necessária</translation>
</message>
</context>
<context>
@ -585,96 +585,104 @@
<translation>%1 não é legível.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="380"/>
<location filename="../src/gui/folder.cpp" line="383"/>
<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="481"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 e %2 outros ficheiros foram removidos.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="483"/>
<location filename="../src/gui/folder.cpp" line="493"/>
<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="488"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>Foi feito o download de outros ficheiros %1 e %2.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="490"/>
<location filename="../src/gui/folder.cpp" line="500"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi descarregado.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="495"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 e %2 outros ficheiros foram atualizados.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="497"/>
<location filename="../src/gui/folder.cpp" line="507"/>
<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="502"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 foi renomeado para %2 e %3 outros ficheiros foram renomeados.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="504"/>
<location filename="../src/gui/folder.cpp" line="514"/>
<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="509"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 foi movido para %2 e %3 outros ficheiros foram movidos.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="511"/>
<location filename="../src/gui/folder.cpp" line="521"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido para %2</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 e %2 outros ficheiros não sincronizaram devido a erros. Verifica o log para mais detalhes.</translation>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="491"/>
<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="498"/>
<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="505"/>
<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="512"/>
<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="519"/>
<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="526"/>
<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="518"/>
<location filename="../src/gui/folder.cpp" line="528"/>
<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="533"/>
<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="535"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 não sincronizou devido a um erro. Verifica o log para mais detalhes.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="524"/>
<location filename="../src/gui/folder.cpp" line="541"/>
<source>Sync Activity</source>
<translation>Atividade de Sincronização</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="727"/>
<location filename="../src/gui/folder.cpp" line="744"/>
<source>Could not read system exclude file</source>
<translation>Não foi possível ler o ficheiro system exclude</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="934"/>
<location filename="../src/gui/folder.cpp" line="951"/>
<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, às definições para a selecionar, se a desejar transferir.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="951"/>
<location filename="../src/gui/folder.cpp" line="968"/>
<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>
@ -683,22 +691,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="955"/>
<location filename="../src/gui/folder.cpp" line="972"/>
<source>Remove All Files?</source>
<translation>Remover todos os ficheiros?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="957"/>
<location filename="../src/gui/folder.cpp" line="974"/>
<source>Remove all files</source>
<translation>Remover todos os ficheiros</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="958"/>
<location filename="../src/gui/folder.cpp" line="975"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="976"/>
<location filename="../src/gui/folder.cpp" line="993"/>
<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>
@ -707,17 +715,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="981"/>
<location filename="../src/gui/folder.cpp" line="998"/>
<source>Backup detected</source>
<translation>Cópia de segurança encontrada</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="983"/>
<location filename="../src/gui/folder.cpp" line="1000"/>
<source>Normal Synchronisation</source>
<translation>Sincronização Normal</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="984"/>
<location filename="../src/gui/folder.cpp" line="1001"/>
<source>Keep Local Files as Conflict</source>
<translation>Manter Ficheiros Locais como Conflito</translation>
</message>
@ -845,7 +853,7 @@ Continuando a sincronização fará com que todos os seus ficheiros sejam substi
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="241"/>
<source>Synchronizing with local folder</source>
<translation type="unfinished"/>
<translation>A sincronizar com pasta local</translation>
</message>
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="285"/>
@ -958,7 +966,7 @@ Continuando a sincronização fará com que todos os seus ficheiros sejam substi
<location filename="../src/gui/folderstatusmodel.cpp" line="920"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
<translation type="unfinished"/>
<translation>%5 restante, %1 de %2, ficheiro %3 de %4</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="926"/>
@ -1532,13 +1540,13 @@ Os itens onde é permitido a eliminação serão eliminados se estes impedirem a
<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 pedido falhou a %2</translation>
</message>
<message>
<location filename="../src/gui/notificationwidget.cpp" line="139"/>
<source>&apos;%1&apos; selected at %2</source>
<extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment>
<translation type="unfinished"/>
<translation>&apos;%1&apos; selecionado a %2</translation>
</message>
</context>
<context>
@ -3597,8 +3605,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
<source>Downloaded, renamed conflicting file</source>
<translation>Descarregado, ficheiro em conflito renomeado</translation>
<source>Server version downloaded, copied changed local file into conflict file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="39"/>

Просмотреть файл

@ -585,96 +585,104 @@
<translation>%1 não pode ser lido.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="380"/>
<location filename="../src/gui/folder.cpp" line="383"/>
<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="481"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 e %2 outros arquivos foram removidos.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="483"/>
<location filename="../src/gui/folder.cpp" line="493"/>
<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="488"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 e %2 outros arquivos foram baixados.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="490"/>
<location filename="../src/gui/folder.cpp" line="500"/>
<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="495"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 e %2 outros arquivos foram atualizados.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="497"/>
<location filename="../src/gui/folder.cpp" line="507"/>
<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="502"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 foi renomeado para %2 e %3 outros três arquivos foram renomeados.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="504"/>
<location filename="../src/gui/folder.cpp" line="514"/>
<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="509"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 foi movido para %2 e %3 outros arquivos foram movidos.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="511"/>
<location filename="../src/gui/folder.cpp" line="521"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido para %2.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 e %2 outros arquivos não puderam ser sincronizados devido a erros. Veja o log para obter detalhes.</translation>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="491"/>
<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="498"/>
<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="505"/>
<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="512"/>
<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="519"/>
<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="526"/>
<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="518"/>
<location filename="../src/gui/folder.cpp" line="528"/>
<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="533"/>
<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="535"/>
<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="524"/>
<location filename="../src/gui/folder.cpp" line="541"/>
<source>Sync Activity</source>
<translation>Atividade de Sincronização</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="727"/>
<location filename="../src/gui/folder.cpp" line="744"/>
<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="934"/>
<location filename="../src/gui/folder.cpp" line="951"/>
<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, nas configurações para selecionar o que você deseja para fazer o download.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="951"/>
<location filename="../src/gui/folder.cpp" line="968"/>
<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>
@ -683,22 +691,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="955"/>
<location filename="../src/gui/folder.cpp" line="972"/>
<source>Remove All Files?</source>
<translation>Deseja Remover Todos os Arquivos?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="957"/>
<location filename="../src/gui/folder.cpp" line="974"/>
<source>Remove all files</source>
<translation>Remover todos os arquivos</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="958"/>
<location filename="../src/gui/folder.cpp" line="975"/>
<source>Keep files</source>
<translation>Manter arquivos</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="976"/>
<location filename="../src/gui/folder.cpp" line="993"/>
<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>
@ -707,17 +715,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="981"/>
<location filename="../src/gui/folder.cpp" line="998"/>
<source>Backup detected</source>
<translation>Backup detectado</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="983"/>
<location filename="../src/gui/folder.cpp" line="1000"/>
<source>Normal Synchronisation</source>
<translation>Sincronização Normal</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="984"/>
<location filename="../src/gui/folder.cpp" line="1001"/>
<source>Keep Local Files as Conflict</source>
<translation>Manter Arquivos Locais como Conflito</translation>
</message>
@ -3597,8 +3605,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
<source>Downloaded, renamed conflicting file</source>
<translation>Transferido, arquivo conflitante renomeado</translation>
<source>Server version downloaded, copied changed local file into conflict file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="39"/>

Просмотреть файл

@ -585,96 +585,104 @@
<translation>%1 не может быть прочитан.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="380"/>
<location filename="../src/gui/folder.cpp" line="383"/>
<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="481"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>&apos;%1&apos; и ещё %2 других файлов были удалены.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="483"/>
<location filename="../src/gui/folder.cpp" line="493"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>&apos;%1&apos; был удалён</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="488"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>&apos;%1&apos; и ещё %2 других файлов были загружены.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="490"/>
<location filename="../src/gui/folder.cpp" line="500"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 был загружен.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="495"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 и ещё %2 других файла были обновлены.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="497"/>
<location filename="../src/gui/folder.cpp" line="507"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 был обновлён.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="502"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 был переименован в %2 и ещё %3 других файлов были переименованы.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="504"/>
<location filename="../src/gui/folder.cpp" line="514"/>
<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="509"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 был перемещён в %2 и ещё %3 других файлов были перемещены.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="511"/>
<location filename="../src/gui/folder.cpp" line="521"/>
<source>%1 has been moved to %2.</source>
<translation>%1 был перемещён в %2.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 и %2 другие файлы не могут быть синхронизированы из-за ошибок. Смотрите детали в журнале.</translation>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="491"/>
<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="498"/>
<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="505"/>
<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="512"/>
<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="519"/>
<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="526"/>
<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="518"/>
<location filename="../src/gui/folder.cpp" line="528"/>
<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="533"/>
<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="535"/>
<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="524"/>
<location filename="../src/gui/folder.cpp" line="541"/>
<source>Sync Activity</source>
<translation>Журнал синхронизации</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="727"/>
<location filename="../src/gui/folder.cpp" line="744"/>
<source>Could not read system exclude file</source>
<translation>Невозможно прочесть системный файл исключений</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="934"/>
<location filename="../src/gui/folder.cpp" line="951"/>
<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="951"/>
<location filename="../src/gui/folder.cpp" line="968"/>
<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>
@ -683,22 +691,22 @@ Are you sure you want to perform this operation?</source>
Вы действительно хотите выполнить эту операцию?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="955"/>
<location filename="../src/gui/folder.cpp" line="972"/>
<source>Remove All Files?</source>
<translation>Удалить все файлы?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="957"/>
<location filename="../src/gui/folder.cpp" line="974"/>
<source>Remove all files</source>
<translation>Удалить все файлы</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="958"/>
<location filename="../src/gui/folder.cpp" line="975"/>
<source>Keep files</source>
<translation>Сохранить файлы</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="976"/>
<location filename="../src/gui/folder.cpp" line="993"/>
<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>
@ -707,17 +715,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="981"/>
<location filename="../src/gui/folder.cpp" line="998"/>
<source>Backup detected</source>
<translation>Обнаружена резервная копия</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="983"/>
<location filename="../src/gui/folder.cpp" line="1000"/>
<source>Normal Synchronisation</source>
<translation>Обычная синхронизация</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="984"/>
<location filename="../src/gui/folder.cpp" line="1001"/>
<source>Keep Local Files as Conflict</source>
<translation>Сохранить локальные файлы как конфликтующие</translation>
</message>
@ -3601,8 +3609,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
<source>Downloaded, renamed conflicting file</source>
<translation>Закачено с переименование конфликтующего файла</translation>
<source>Server version downloaded, copied changed local file into conflict file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="39"/>

Просмотреть файл

@ -585,96 +585,104 @@
<translation>%1 nie je čitateľný.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="380"/>
<location filename="../src/gui/folder.cpp" line="383"/>
<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="481"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 a %2 ďalších súborov bolo zmazaných.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="483"/>
<location filename="../src/gui/folder.cpp" line="493"/>
<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="488"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 a %2 ďalších súborov bolo stiahnutých.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="490"/>
<location filename="../src/gui/folder.cpp" line="500"/>
<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="495"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 a %2 ďalších súborov bolo aktualizovaných.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="497"/>
<location filename="../src/gui/folder.cpp" line="507"/>
<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="502"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 bol premenovaný na %2 a %3 ďalších súborov bolo premenovaných.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="504"/>
<location filename="../src/gui/folder.cpp" line="514"/>
<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="509"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 bol presunutý do %2 a %3 ďalších súborov bolo presunutých.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="511"/>
<location filename="../src/gui/folder.cpp" line="521"/>
<source>%1 has been moved to %2.</source>
<translation>%1 bol presunutý do %2.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 a %2 ďalšie súbory nemožno synchronizovať kvôli chybám. Pozrite sa do logu pre podrobnosti.</translation>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="491"/>
<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="498"/>
<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="505"/>
<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="512"/>
<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="519"/>
<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="526"/>
<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="518"/>
<location filename="../src/gui/folder.cpp" line="528"/>
<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="533"/>
<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="535"/>
<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="524"/>
<location filename="../src/gui/folder.cpp" line="541"/>
<source>Sync Activity</source>
<translation>Aktivita synchronizácie</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="727"/>
<location filename="../src/gui/folder.cpp" line="744"/>
<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="934"/>
<location filename="../src/gui/folder.cpp" line="951"/>
<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="951"/>
<location filename="../src/gui/folder.cpp" line="968"/>
<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>
@ -683,39 +691,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="955"/>
<location filename="../src/gui/folder.cpp" line="972"/>
<source>Remove All Files?</source>
<translation>Odstrániť všetky súbory?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="957"/>
<location filename="../src/gui/folder.cpp" line="974"/>
<source>Remove all files</source>
<translation>Odstrániť všetky súbory</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="958"/>
<location filename="../src/gui/folder.cpp" line="975"/>
<source>Keep files</source>
<translation>Ponechať súbory</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="976"/>
<location filename="../src/gui/folder.cpp" line="993"/>
<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="981"/>
<location filename="../src/gui/folder.cpp" line="998"/>
<source>Backup detected</source>
<translation>Záloha je dostupná</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="983"/>
<location filename="../src/gui/folder.cpp" line="1000"/>
<source>Normal Synchronisation</source>
<translation>Bežná synchronizácia</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="984"/>
<location filename="../src/gui/folder.cpp" line="1001"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@ -3592,8 +3600,8 @@ Nie je vhodné ju používať.</translation>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
<source>Downloaded, renamed conflicting file</source>
<translation>Stiahnuté, konfliktný súbor bol premenovaný</translation>
<source>Server version downloaded, copied changed local file into conflict file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="39"/>

Просмотреть файл

@ -73,12 +73,12 @@
<message>
<location filename="../src/gui/notificationwidget.ui" line="56"/>
<source>Lorem ipsum dolor sit amet</source>
<translation type="unfinished"/>
<translation>Lorem ipsum dolor sit amet</translation>
</message>
<message>
<location filename="../src/gui/notificationwidget.ui" line="63"/>
<source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
<translation type="unfinished"/>
<translation>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </translation>
</message>
<message>
<location filename="../src/gui/notificationwidget.ui" line="83"/>
@ -429,7 +429,7 @@
<message>
<location filename="../src/gui/activitywidget.cpp" line="137"/>
<source>Action Required: Notifications</source>
<translation type="unfinished"/>
<translation>Zahtevano je dejanje: obvestila</translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="142"/>
@ -449,7 +449,7 @@
<message>
<location filename="../src/gui/activitywidget.cpp" line="344"/>
<source>You received new notifications from %1, %2 and other accounts.</source>
<translation type="unfinished"/>
<translation>Prejeli ste nova obvestila prek %1, %2 in drugih računov.</translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="348"/>
@ -585,96 +585,104 @@
<translation>%1 ni mogoče brati.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="380"/>
<location filename="../src/gui/folder.cpp" line="383"/>
<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="481"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>Datoteka %1 in %2 drugih datotek je odstranjenih.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="483"/>
<location filename="../src/gui/folder.cpp" line="493"/>
<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="488"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>Datoteka %1 in %2 drugih datotek je prejetih.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="490"/>
<location filename="../src/gui/folder.cpp" line="500"/>
<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="495"/>
<source>%1 and %2 other files have been updated.</source>
<translation>Datoteka %1 in še %2 drugih datotek je posodobljenih.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="497"/>
<location filename="../src/gui/folder.cpp" line="507"/>
<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="502"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>Datoteka %1 je preimenovana v %2. Preimenovanih je bilo še nekaj datotek (%3).</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="504"/>
<location filename="../src/gui/folder.cpp" line="514"/>
<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="509"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>Datoteka %1 je premaknjena v %2. Premaknjenih je bilo še nekaj datotek (%3).</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="511"/>
<location filename="../src/gui/folder.cpp" line="521"/>
<source>%1 has been moved to %2.</source>
<translation>Datoteka %1 je premaknjena v %2.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>Datoteka %1 in še %2 drugih datotek ni mogoče uskladiti zaradi napake. Več podrobnosti je zabeleženih v dnevniški datoteki.</translation>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="491"/>
<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="498"/>
<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="505"/>
<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="512"/>
<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="519"/>
<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="526"/>
<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="518"/>
<location filename="../src/gui/folder.cpp" line="528"/>
<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="533"/>
<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="535"/>
<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="524"/>
<location filename="../src/gui/folder.cpp" line="541"/>
<source>Sync Activity</source>
<translation>Dejavnost usklajevanja</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="727"/>
<location filename="../src/gui/folder.cpp" line="744"/>
<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="934"/>
<location filename="../src/gui/folder.cpp" line="951"/>
<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="951"/>
<location filename="../src/gui/folder.cpp" line="968"/>
<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>
@ -683,39 +691,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="955"/>
<location filename="../src/gui/folder.cpp" line="972"/>
<source>Remove All Files?</source>
<translation>Ali naj bodo odstranjene vse datoteke?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="957"/>
<location filename="../src/gui/folder.cpp" line="974"/>
<source>Remove all files</source>
<translation>Odstrani vse datoteke</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="958"/>
<location filename="../src/gui/folder.cpp" line="975"/>
<source>Keep files</source>
<translation>Ohrani datoteke</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="976"/>
<location filename="../src/gui/folder.cpp" line="993"/>
<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="981"/>
<location filename="../src/gui/folder.cpp" line="998"/>
<source>Backup detected</source>
<translation>Varnostna kopija je zaznana</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="983"/>
<location filename="../src/gui/folder.cpp" line="1000"/>
<source>Normal Synchronisation</source>
<translation>Običajno usklajevanje</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="984"/>
<location filename="../src/gui/folder.cpp" line="1001"/>
<source>Keep Local Files as Conflict</source>
<translation>Ohrani krajevne datoteke kot datoteke v sporu</translation>
</message>
@ -843,7 +851,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="241"/>
<source>Synchronizing with local folder</source>
<translation type="unfinished"/>
<translation>Poteka usklajevanje s krajevno mapo</translation>
</message>
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="285"/>
@ -1518,7 +1526,7 @@ Predmeti na mestu, kjer je brisanje dovoljeno, bodo izbisani, v kolikor zaradi n
<message>
<location filename="../src/gui/notificationwidget.cpp" line="50"/>
<source>Created at %1</source>
<translation type="unfinished"/>
<translation>Ustvarjeno ob %1$s</translation>
</message>
<message>
<location filename="../src/gui/notificationwidget.cpp" line="99"/>
@ -3593,8 +3601,8 @@ Uporaba ni priporočljiva.</translation>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
<source>Downloaded, renamed conflicting file</source>
<translation>Prejem in preimenovanje datoteke v sporu</translation>
<source>Server version downloaded, copied changed local file into conflict file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="39"/>

Просмотреть файл

@ -585,134 +585,142 @@
<translation>%1 није читљив.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="380"/>
<location filename="../src/gui/folder.cpp" line="383"/>
<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="481"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 и још %2 фајлова је уклоњено.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="483"/>
<location filename="../src/gui/folder.cpp" line="493"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 је уклоњен.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="488"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 и још %2 је преузето.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="490"/>
<location filename="../src/gui/folder.cpp" line="500"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 је преузет.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="495"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 и још %2 је ажурирано.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="497"/>
<location filename="../src/gui/folder.cpp" line="507"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 је ажуриран.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="502"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 је преименован у %2 и још %3 је преименовано.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="504"/>
<location filename="../src/gui/folder.cpp" line="514"/>
<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="509"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 је премештен у %2 и још %3 је премештено.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="511"/>
<location filename="../src/gui/folder.cpp" line="521"/>
<source>%1 has been moved to %2.</source>
<translation>%1 је премештен у %2.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 и још %2 није могло бити синхронизовано због грешака. Погледајте записник за детаље.</translation>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="491"/>
<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="498"/>
<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="505"/>
<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="512"/>
<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="519"/>
<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="526"/>
<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="518"/>
<location filename="../src/gui/folder.cpp" line="528"/>
<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="533"/>
<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="535"/>
<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="524"/>
<location filename="../src/gui/folder.cpp" line="541"/>
<source>Sync Activity</source>
<translation>Активност синхронизације</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="727"/>
<location filename="../src/gui/folder.cpp" line="744"/>
<source>Could not read system exclude file</source>
<translation>Не могу да прочитам системски списак за игнорисање</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="934"/>
<location filename="../src/gui/folder.cpp" line="951"/>
<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="951"/>
<location filename="../src/gui/folder.cpp" line="968"/>
<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="955"/>
<location filename="../src/gui/folder.cpp" line="972"/>
<source>Remove All Files?</source>
<translation>Уклонити све фајлове?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="957"/>
<location filename="../src/gui/folder.cpp" line="974"/>
<source>Remove all files</source>
<translation>Уклони све фајлове</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="958"/>
<location filename="../src/gui/folder.cpp" line="975"/>
<source>Keep files</source>
<translation>Остави фајлове</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="976"/>
<location filename="../src/gui/folder.cpp" line="993"/>
<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="981"/>
<location filename="../src/gui/folder.cpp" line="998"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="983"/>
<location filename="../src/gui/folder.cpp" line="1000"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="984"/>
<location filename="../src/gui/folder.cpp" line="1001"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@ -3593,8 +3601,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
<source>Downloaded, renamed conflicting file</source>
<translation>Преузето. Преименован сукобљени фајл</translation>
<source>Server version downloaded, copied changed local file into conflict file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="39"/>

Просмотреть файл

@ -585,96 +585,104 @@
<translation>%1 är inte läsbar.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="380"/>
<location filename="../src/gui/folder.cpp" line="383"/>
<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="481"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 och %2 andra filer har tagits bort.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="483"/>
<location filename="../src/gui/folder.cpp" line="493"/>
<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="488"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 och %2 andra filer har laddats ner.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="490"/>
<location filename="../src/gui/folder.cpp" line="500"/>
<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="495"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 och %2 andra filer har uppdaterats.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="497"/>
<location filename="../src/gui/folder.cpp" line="507"/>
<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="502"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 har döpts om till %2 och %3 andra filer har bytt namn. </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="504"/>
<location filename="../src/gui/folder.cpp" line="514"/>
<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="509"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 har flyttats till %2 och %3 andra filer har tagits bort.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="511"/>
<location filename="../src/gui/folder.cpp" line="521"/>
<source>%1 has been moved to %2.</source>
<translation>%1 har flyttats till %2.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 och %2 andra filer kunde inte synkroniseras grund av ett fel. Kolla loggen för ytterligare detaljer.</translation>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="491"/>
<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="498"/>
<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="505"/>
<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="512"/>
<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="519"/>
<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="526"/>
<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="518"/>
<location filename="../src/gui/folder.cpp" line="528"/>
<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="533"/>
<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="535"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 kunde inte synkroniseras grund av ett fel. Kolla loggen för ytterligare detaljer.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="524"/>
<location filename="../src/gui/folder.cpp" line="541"/>
<source>Sync Activity</source>
<translation>Synk aktivitet</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="727"/>
<location filename="../src/gui/folder.cpp" line="744"/>
<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="934"/>
<location filename="../src/gui/folder.cpp" line="951"/>
<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 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="951"/>
<location filename="../src/gui/folder.cpp" line="968"/>
<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>
@ -683,22 +691,22 @@ Detta kan bero på att mappen omkonfigurerats i bakgrunden, eller för att alla
Är du säker att du vill fortsätta?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="955"/>
<location filename="../src/gui/folder.cpp" line="972"/>
<source>Remove All Files?</source>
<translation>Ta bort alla filer?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="957"/>
<location filename="../src/gui/folder.cpp" line="974"/>
<source>Remove all files</source>
<translation>Ta bort alla filer</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="958"/>
<location filename="../src/gui/folder.cpp" line="975"/>
<source>Keep files</source>
<translation>Behåll filer</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="976"/>
<location filename="../src/gui/folder.cpp" line="993"/>
<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>
@ -707,17 +715,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="981"/>
<location filename="../src/gui/folder.cpp" line="998"/>
<source>Backup detected</source>
<translation>Backup upptäckt</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="983"/>
<location filename="../src/gui/folder.cpp" line="1000"/>
<source>Normal Synchronisation</source>
<translation>Normal synkronisation</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="984"/>
<location filename="../src/gui/folder.cpp" line="1001"/>
<source>Keep Local Files as Conflict</source>
<translation>Behåll lokala filer som konflikt</translation>
</message>
@ -3598,8 +3606,8 @@ Det är inte lämpligt använda den.</translation>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
<source>Downloaded, renamed conflicting file</source>
<translation>Nedladdad, omdöpt konfliktfil</translation>
<source>Server version downloaded, copied changed local file into conflict file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="39"/>

Просмотреть файл

@ -585,96 +585,104 @@
<translation> %1 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="380"/>
<location filename="../src/gui/folder.cpp" line="383"/>
<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="481"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 %2 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="483"/>
<location filename="../src/gui/folder.cpp" line="493"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="488"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 %2 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="490"/>
<location filename="../src/gui/folder.cpp" line="500"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="495"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 %2 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="497"/>
<location filename="../src/gui/folder.cpp" line="507"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="502"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 %2 %3 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="504"/>
<location filename="../src/gui/folder.cpp" line="514"/>
<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="509"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 %2 %3 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="511"/>
<location filename="../src/gui/folder.cpp" line="521"/>
<source>%1 has been moved to %2.</source>
<translation>%1 %2</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 %2 </translation>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="491"/>
<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="498"/>
<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="505"/>
<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="512"/>
<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="519"/>
<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="526"/>
<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="518"/>
<location filename="../src/gui/folder.cpp" line="528"/>
<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="533"/>
<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="535"/>
<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="524"/>
<location filename="../src/gui/folder.cpp" line="541"/>
<source>Sync Activity</source>
<translation></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="727"/>
<location filename="../src/gui/folder.cpp" line="744"/>
<source>Could not read system exclude file</source>
<translation> </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="934"/>
<location filename="../src/gui/folder.cpp" line="951"/>
<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="951"/>
<location filename="../src/gui/folder.cpp" line="968"/>
<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>
@ -683,39 +691,39 @@ Are you sure you want to perform this operation?</source>
?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="955"/>
<location filename="../src/gui/folder.cpp" line="972"/>
<source>Remove All Files?</source>
<translation>?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="957"/>
<location filename="../src/gui/folder.cpp" line="974"/>
<source>Remove all files</source>
<translation></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="958"/>
<location filename="../src/gui/folder.cpp" line="975"/>
<source>Keep files</source>
<translation></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="976"/>
<location filename="../src/gui/folder.cpp" line="993"/>
<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="981"/>
<location filename="../src/gui/folder.cpp" line="998"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="983"/>
<location filename="../src/gui/folder.cpp" line="1000"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="984"/>
<location filename="../src/gui/folder.cpp" line="1001"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@ -3590,8 +3598,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
<source>Downloaded, renamed conflicting file</source>
<translation> </translation>
<source>Server version downloaded, copied changed local file into conflict file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="39"/>

Просмотреть файл

@ -585,96 +585,104 @@
<translation>%1 okunabilir değil.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="380"/>
<location filename="../src/gui/folder.cpp" line="383"/>
<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="481"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ve diğer %2 dosya kaldırıldı.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="483"/>
<location filename="../src/gui/folder.cpp" line="493"/>
<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="488"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 ve diğer %2 dosya indirildi.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="490"/>
<location filename="../src/gui/folder.cpp" line="500"/>
<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="495"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 ve diğer %2 dosya güncellendi.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="497"/>
<location filename="../src/gui/folder.cpp" line="507"/>
<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="502"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1, %2 olarak ve diğer %3 dosya adlandırıldı.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="504"/>
<location filename="../src/gui/folder.cpp" line="514"/>
<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="509"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1, %2 konumuna ve diğer %3 dosya taşındı.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="511"/>
<location filename="../src/gui/folder.cpp" line="521"/>
<source>%1 has been moved to %2.</source>
<translation>%1, %2 konumuna taşındı.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 ve diğer %2 dosya hatalar nedeniyle eşitlenemedi. Ayrıntılar için günlüğe bakın.</translation>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="491"/>
<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="498"/>
<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="505"/>
<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="512"/>
<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="519"/>
<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="526"/>
<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="518"/>
<location filename="../src/gui/folder.cpp" line="528"/>
<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="533"/>
<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="535"/>
<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="524"/>
<location filename="../src/gui/folder.cpp" line="541"/>
<source>Sync Activity</source>
<translation>Eşitleme Etkinliği</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="727"/>
<location filename="../src/gui/folder.cpp" line="744"/>
<source>Could not read system exclude file</source>
<translation>Sistem hariç tutulma dosyası okunamadı</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="934"/>
<location filename="../src/gui/folder.cpp" line="951"/>
<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="951"/>
<location filename="../src/gui/folder.cpp" line="968"/>
<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>
@ -683,22 +691,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="955"/>
<location filename="../src/gui/folder.cpp" line="972"/>
<source>Remove All Files?</source>
<translation>Tüm Dosyalar Kaldırılsın mı?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="957"/>
<location filename="../src/gui/folder.cpp" line="974"/>
<source>Remove all files</source>
<translation>Tüm dosyaları kaldır</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="958"/>
<location filename="../src/gui/folder.cpp" line="975"/>
<source>Keep files</source>
<translation>Dosyaları koru</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="976"/>
<location filename="../src/gui/folder.cpp" line="993"/>
<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>
@ -706,17 +714,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="981"/>
<location filename="../src/gui/folder.cpp" line="998"/>
<source>Backup detected</source>
<translation>Yedek bulundu</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="983"/>
<location filename="../src/gui/folder.cpp" line="1000"/>
<source>Normal Synchronisation</source>
<translation>Normal Eşitleme</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="984"/>
<location filename="../src/gui/folder.cpp" line="1001"/>
<source>Keep Local Files as Conflict</source>
<translation>Çakışma Durumunda Yerel Dosyaları Tut</translation>
</message>
@ -3596,8 +3604,8 @@ Kullanmanız önerilmez.</translation>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
<source>Downloaded, renamed conflicting file</source>
<translation>Çelişkili dosya indirildi ve yeniden adlandırıldı</translation>
<source>Server version downloaded, copied changed local file into conflict file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="39"/>

Просмотреть файл

@ -585,134 +585,142 @@
<translation>%1 не читається.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="380"/>
<location filename="../src/gui/folder.cpp" line="383"/>
<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="481"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 та %2 інших файлів було видалено.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="483"/>
<location filename="../src/gui/folder.cpp" line="493"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 видалено.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="488"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 та %2 інших файлів було завантажено.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="490"/>
<location filename="../src/gui/folder.cpp" line="500"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 завантажено.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="495"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 та %2 інших файлів було оновлено.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="497"/>
<location filename="../src/gui/folder.cpp" line="507"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 оновлено.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="502"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 перейменовано в %2 та ще %3 інших файлів перейменовано.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="504"/>
<location filename="../src/gui/folder.cpp" line="514"/>
<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="509"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 переміщено до %2 та ще %3 інших файлів.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="511"/>
<location filename="../src/gui/folder.cpp" line="521"/>
<source>%1 has been moved to %2.</source>
<translation>%1 переміщено в %2.</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 та %2 інші файли не можуть синхронізуватися через помилки. Дивіться деталі в журналі.</translation>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="491"/>
<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="498"/>
<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="505"/>
<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="512"/>
<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="519"/>
<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="526"/>
<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="518"/>
<location filename="../src/gui/folder.cpp" line="528"/>
<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="533"/>
<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="535"/>
<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="524"/>
<location filename="../src/gui/folder.cpp" line="541"/>
<source>Sync Activity</source>
<translation>Журнал синхронізації</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="727"/>
<location filename="../src/gui/folder.cpp" line="744"/>
<source>Could not read system exclude file</source>
<translation>Неможливо прочитати виключений системний файл</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="934"/>
<location filename="../src/gui/folder.cpp" line="951"/>
<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="951"/>
<location filename="../src/gui/folder.cpp" line="968"/>
<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="955"/>
<location filename="../src/gui/folder.cpp" line="972"/>
<source>Remove All Files?</source>
<translation>Видалити усі файли?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="957"/>
<location filename="../src/gui/folder.cpp" line="974"/>
<source>Remove all files</source>
<translation>Видалити усі файли</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="958"/>
<location filename="../src/gui/folder.cpp" line="975"/>
<source>Keep files</source>
<translation>Зберегти файли</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="976"/>
<location filename="../src/gui/folder.cpp" line="993"/>
<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="981"/>
<location filename="../src/gui/folder.cpp" line="998"/>
<source>Backup detected</source>
<translation>Резервну копію знайдено</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="983"/>
<location filename="../src/gui/folder.cpp" line="1000"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="984"/>
<location filename="../src/gui/folder.cpp" line="1001"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@ -3588,8 +3596,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
<source>Downloaded, renamed conflicting file</source>
<translation>Завантажено, перейменовано конфліктний файл</translation>
<source>Server version downloaded, copied changed local file into conflict file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="39"/>

Просмотреть файл

@ -585,96 +585,104 @@
<translation>%1 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="380"/>
<location filename="../src/gui/folder.cpp" line="383"/>
<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="481"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 %2 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="483"/>
<location filename="../src/gui/folder.cpp" line="493"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="488"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 %2 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="490"/>
<location filename="../src/gui/folder.cpp" line="500"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="495"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 %2 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="497"/>
<location filename="../src/gui/folder.cpp" line="507"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="502"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 %2 %3 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="504"/>
<location filename="../src/gui/folder.cpp" line="514"/>
<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="509"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 %2 %3 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="511"/>
<location filename="../src/gui/folder.cpp" line="521"/>
<source>%1 has been moved to %2.</source>
<translation>%1 %2</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 %2 </translation>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="491"/>
<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="498"/>
<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="505"/>
<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="512"/>
<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="519"/>
<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="526"/>
<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="518"/>
<location filename="../src/gui/folder.cpp" line="528"/>
<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="533"/>
<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="535"/>
<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="524"/>
<location filename="../src/gui/folder.cpp" line="541"/>
<source>Sync Activity</source>
<translation></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="727"/>
<location filename="../src/gui/folder.cpp" line="744"/>
<source>Could not read system exclude file</source>
<translation></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="934"/>
<location filename="../src/gui/folder.cpp" line="951"/>
<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="951"/>
<location filename="../src/gui/folder.cpp" line="968"/>
<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>
@ -683,22 +691,22 @@ Are you sure you want to perform this operation?</source>
</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="955"/>
<location filename="../src/gui/folder.cpp" line="972"/>
<source>Remove All Files?</source>
<translation></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="957"/>
<location filename="../src/gui/folder.cpp" line="974"/>
<source>Remove all files</source>
<translation></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="958"/>
<location filename="../src/gui/folder.cpp" line="975"/>
<source>Keep files</source>
<translation></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="976"/>
<location filename="../src/gui/folder.cpp" line="993"/>
<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>
@ -707,17 +715,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="981"/>
<location filename="../src/gui/folder.cpp" line="998"/>
<source>Backup detected</source>
<translation></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="983"/>
<location filename="../src/gui/folder.cpp" line="1000"/>
<source>Normal Synchronisation</source>
<translation></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="984"/>
<location filename="../src/gui/folder.cpp" line="1001"/>
<source>Keep Local Files as Conflict</source>
<translation></translation>
</message>
@ -3593,8 +3601,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
<source>Downloaded, renamed conflicting file</source>
<translation></translation>
<source>Server version downloaded, copied changed local file into conflict file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="39"/>

Просмотреть файл

@ -585,96 +585,104 @@
<translation>%1 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="380"/>
<location filename="../src/gui/folder.cpp" line="383"/>
<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="481"/>
<source>%1 and %2 other files have been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 %2 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="483"/>
<location filename="../src/gui/folder.cpp" line="493"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="488"/>
<source>%1 and %2 other files have been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 %2 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="490"/>
<location filename="../src/gui/folder.cpp" line="500"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="495"/>
<source>%1 and %2 other files have been updated.</source>
<translation>%1 %2 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="497"/>
<location filename="../src/gui/folder.cpp" line="507"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="502"/>
<source>%1 has been renamed to %2 and %3 other files have been renamed.</source>
<translation>%1 %2 %3 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="504"/>
<location filename="../src/gui/folder.cpp" line="514"/>
<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="509"/>
<source>%1 has been moved to %2 and %3 other files have been moved.</source>
<translation>%1 %2 %3 </translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="511"/>
<location filename="../src/gui/folder.cpp" line="521"/>
<source>%1 has been moved to %2.</source>
<translation>%1 %2</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="516"/>
<source>%1 and %2 other files could not be synced due to errors. See the log for details.</source>
<comment>%1 names a file.</comment>
<translation>%1 %2 </translation>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="491"/>
<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="498"/>
<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="505"/>
<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="512"/>
<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="519"/>
<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="526"/>
<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="518"/>
<location filename="../src/gui/folder.cpp" line="528"/>
<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="533"/>
<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="535"/>
<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="524"/>
<location filename="../src/gui/folder.cpp" line="541"/>
<source>Sync Activity</source>
<translation></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="727"/>
<location filename="../src/gui/folder.cpp" line="744"/>
<source>Could not read system exclude file</source>
<translation></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="934"/>
<location filename="../src/gui/folder.cpp" line="951"/>
<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="951"/>
<location filename="../src/gui/folder.cpp" line="968"/>
<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>
@ -683,39 +691,39 @@ Are you sure you want to perform this operation?</source>
?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="955"/>
<location filename="../src/gui/folder.cpp" line="972"/>
<source>Remove All Files?</source>
<translation>?</translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="957"/>
<location filename="../src/gui/folder.cpp" line="974"/>
<source>Remove all files</source>
<translation></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="958"/>
<location filename="../src/gui/folder.cpp" line="975"/>
<source>Keep files</source>
<translation></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="976"/>
<location filename="../src/gui/folder.cpp" line="993"/>
<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="981"/>
<location filename="../src/gui/folder.cpp" line="998"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="983"/>
<location filename="../src/gui/folder.cpp" line="1000"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="984"/>
<location filename="../src/gui/folder.cpp" line="1001"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@ -3594,8 +3602,8 @@ It is not advisable to use it.</source>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
<source>Downloaded, renamed conflicting file</source>
<translation></translation>
<source>Server version downloaded, copied changed local file into conflict file</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="39"/>