# Translations
+# Translations
+
+
# Translations
Comment[oc]=@APPLICATION_NAME@ sincronizacion del client
GenericName[oc]=Dorsièr de Sincronizacion
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="184"/>
+ <location filename="../src/gui/sharedialog.cpp" line="192"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>El fitxer no es pot compartir perquè va ser compartit sense permisos de compartició.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="198"/>
+ <location filename="../src/gui/sharedialog.cpp" line="206"/>
<source>Users and Groups</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="205"/>
+ <location filename="../src/gui/sharedialog.cpp" line="213"/>
<source>Public Links</source>
<translation type="unfinished"/>
</message>
<translation>Comparteix amb %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="507"/>
+ <location filename="../src/gui/socketapi.cpp" line="555"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="516"/>
+ <location filename="../src/gui/socketapi.cpp" line="563"/>
<source>Share...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="518"/>
+ <location filename="../src/gui/socketapi.cpp" line="565"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="519"/>
+ <location filename="../src/gui/socketapi.cpp" line="566"/>
<source>Send private link by email...</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="482"/>
+ <location filename="../src/libsync/syncengine.cpp" line="491"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="753"/>
+ <location filename="../src/libsync/syncengine.cpp" line="769"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="788"/>
+ <location filename="../src/libsync/syncengine.cpp" line="804"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1261"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1277"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1284"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1570"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1586"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1577"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1593"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<translation>El nom de fitxer és massa llarg.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="488"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
+ <source>Unresolved conflict.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="498"/>
<source>Stat failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="515"/>
+ <location filename="../src/libsync/syncengine.cpp" line="525"/>
<source>Filename encoding is not valid</source>
<translation>La codificació del nom de fitxer no és vàlida</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="683"/>
+ <location filename="../src/libsync/syncengine.cpp" line="699"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Caràcters no vàlids. Reanomeneu "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="807"/>
+ <location filename="../src/libsync/syncengine.cpp" line="823"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="848"/>
+ <location filename="../src/libsync/syncengine.cpp" line="864"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="897"/>
+ <location filename="../src/libsync/syncengine.cpp" line="913"/>
<source>Cannot open the sync journal</source>
<translation>No es pot obrir el diari de sincronització</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="951"/>
+ <location filename="../src/libsync/syncengine.cpp" line="967"/>
<source>File name contains at least one invalid character</source>
<translation>El nom del fitxer conté al menys un caràcter invàlid</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1187"/>
- <location filename="../src/libsync/syncengine.cpp" line="1227"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>S'ignora degut al filtre a «Trieu què sincronitzar»</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1246"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1262"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1293"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1309"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>No es permet pujar aquest fitxer perquè només és de lectura en el servidor, es restaura</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1309"/>
- <location filename="../src/libsync/syncengine.cpp" line="1328"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1325"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1344"/>
<source>Not allowed to remove, restoring</source>
<translation>No es permet l'eliminació, es restaura</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1341"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1357"/>
<source>Local files and share folder removed.</source>
<translation>Fitxers locals i carpeta compartida esborrats.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1411"/>
<source>Move not allowed, item restored</source>
<translation>No es permet moure'l, l'element es restaura</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>Move not allowed because %1 is read-only</source>
<translation>No es permet moure perquè %1 només és de lectura</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the destination</source>
<translation>el destí</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the source</source>
<translation>l'origen</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/common/utility.cpp" line="441"/>
+ <location filename="../src/common/utility.cpp" line="442"/>
<source>in the future</source>
<translation>al futur</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="437"/>
+ <location filename="../src/common/utility.cpp" line="438"/>
<source>%n day(s) ago</source>
<translation><numerusform>fa %n dia</numerusform><numerusform>fa %n dies</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="445"/>
+ <location filename="../src/common/utility.cpp" line="446"/>
<source>%n hour(s) ago</source>
<translation><numerusform>fa %n hora</numerusform><numerusform>fa %n hores</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="450"/>
+ <location filename="../src/common/utility.cpp" line="451"/>
<source>now</source>
<translation>ara</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="452"/>
+ <location filename="../src/common/utility.cpp" line="453"/>
<source>Less than a minute ago</source>
<translation>Fa menys d'un minut</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="455"/>
+ <location filename="../src/common/utility.cpp" line="456"/>
<source>%n minute(s) ago</source>
<translation><numerusform>fa %n minut</numerusform><numerusform>fa %n minuts</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="458"/>
+ <location filename="../src/common/utility.cpp" line="459"/>
<source>Some time ago</source>
<translation>Fa una estona</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="129"/>
+ <location filename="../src/common/utility.cpp" line="130"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="133"/>
+ <location filename="../src/common/utility.cpp" line="134"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="137"/>
+ <location filename="../src/common/utility.cpp" line="138"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="140"/>
+ <location filename="../src/common/utility.cpp" line="141"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="309"/>
+ <location filename="../src/common/utility.cpp" line="310"/>
<source>%n year(s)</source>
<translation><numerusform>%n any</numerusform><numerusform>%n anys</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="310"/>
+ <location filename="../src/common/utility.cpp" line="311"/>
<source>%n month(s)</source>
<translation><numerusform>%n mes</numerusform><numerusform>%n mesos</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="311"/>
+ <location filename="../src/common/utility.cpp" line="312"/>
<source>%n day(s)</source>
<translation><numerusform>%n dia</numerusform><numerusform>%n dies</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="312"/>
+ <location filename="../src/common/utility.cpp" line="313"/>
<source>%n hour(s)</source>
<translation><numerusform>%n hora</numerusform><numerusform>%n hores</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="313"/>
+ <location filename="../src/common/utility.cpp" line="314"/>
<source>%n minute(s)</source>
<translation><numerusform>%n minut</numerusform><numerusform>%n minuts</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="314"/>
+ <location filename="../src/common/utility.cpp" line="315"/>
<source>%n second(s)</source>
<translation><numerusform>%n segon</numerusform><numerusform>%n segons</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="338"/>
+ <location filename="../src/common/utility.cpp" line="339"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<translation>Přijímání nejvyšších možných oprávnění pro sdílení ze serveru...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="184"/>
+ <location filename="../src/gui/sharedialog.cpp" line="192"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Tento soubor nelze sdílet, protože byl nasdílen bez možnosti dalšího sdílení.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="198"/>
+ <location filename="../src/gui/sharedialog.cpp" line="206"/>
<source>Users and Groups</source>
<translation>Uživatelé a skupiny</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="205"/>
+ <location filename="../src/gui/sharedialog.cpp" line="213"/>
<source>Public Links</source>
<translation>Veřejné odkazy</translation>
</message>
<translation>Sdílet s %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="507"/>
+ <location filename="../src/gui/socketapi.cpp" line="555"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="516"/>
+ <location filename="../src/gui/socketapi.cpp" line="563"/>
<source>Share...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="518"/>
+ <location filename="../src/gui/socketapi.cpp" line="565"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="519"/>
+ <location filename="../src/gui/socketapi.cpp" line="566"/>
<source>Send private link by email...</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="482"/>
+ <location filename="../src/libsync/syncengine.cpp" line="491"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="753"/>
+ <location filename="../src/libsync/syncengine.cpp" line="769"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Je dostupných pouze %1, pro spuštění je potřeba alespoň %2</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="788"/>
+ <location filename="../src/libsync/syncengine.cpp" line="804"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1261"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1277"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Není povoleno, protože nemáte oprávnění vytvořit nadřazený adresář</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1284"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Není povoleno, protože nemáte oprávnění přidávat soubory do tohoto adresáře</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1570"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1586"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1577"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1593"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<translation>Jméno souboru je příliš dlouhé.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="488"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
+ <source>Unresolved conflict.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="498"/>
<source>Stat failed.</source>
<translation>Stat selhal.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="515"/>
+ <location filename="../src/libsync/syncengine.cpp" line="525"/>
<source>Filename encoding is not valid</source>
<translation>Kódování znaků jména soubor je neplatné</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="683"/>
+ <location filename="../src/libsync/syncengine.cpp" line="699"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Neplatné znaky, prosím přejmenujte "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="807"/>
+ <location filename="../src/libsync/syncengine.cpp" line="823"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Nelze načíst blacklist z místní databáze</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="848"/>
+ <location filename="../src/libsync/syncengine.cpp" line="864"/>
<source>Unable to read from the sync journal.</source>
<translation>Nelze číst ze žurnálu synchronizace.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="897"/>
+ <location filename="../src/libsync/syncengine.cpp" line="913"/>
<source>Cannot open the sync journal</source>
<translation>Nelze otevřít synchronizační žurnál</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="951"/>
+ <location filename="../src/libsync/syncengine.cpp" line="967"/>
<source>File name contains at least one invalid character</source>
<translation>Jméno souboru obsahuje alespoň jeden neplatný znak</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1187"/>
- <location filename="../src/libsync/syncengine.cpp" line="1227"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorováno podle nastavení "vybrat co synchronizovat"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1246"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1262"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Není povoleno, protože nemáte oprávnění přidávat podadresáře do tohoto adresáře</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1293"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1309"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Není povoleno nahrát tento soubor, protože je na serveru uložen pouze pro čtení, obnovuji</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1309"/>
- <location filename="../src/libsync/syncengine.cpp" line="1328"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1325"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1344"/>
<source>Not allowed to remove, restoring</source>
<translation>Odstranění není povoleno, obnovuji</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1341"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1357"/>
<source>Local files and share folder removed.</source>
<translation>Místní soubory a sdílený adresář byly odstraněny.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1411"/>
<source>Move not allowed, item restored</source>
<translation>Přesun není povolen, položka obnovena</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Přesun není povolen, protože %1 je pouze pro čtení</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the destination</source>
<translation>cílové umístění</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the source</source>
<translation>zdroj</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/common/utility.cpp" line="441"/>
+ <location filename="../src/common/utility.cpp" line="442"/>
<source>in the future</source>
<translation>V budoucnosti</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="437"/>
+ <location filename="../src/common/utility.cpp" line="438"/>
<source>%n day(s) ago</source>
<translation><numerusform>před %n dnem</numerusform><numerusform>před %n dny</numerusform><numerusform>před %n dny</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="445"/>
+ <location filename="../src/common/utility.cpp" line="446"/>
<source>%n hour(s) ago</source>
<translation><numerusform>před %n hodinou</numerusform><numerusform>před %n hodinami</numerusform><numerusform>před %n hodinami</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="450"/>
+ <location filename="../src/common/utility.cpp" line="451"/>
<source>now</source>
<translation>nyní</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="452"/>
+ <location filename="../src/common/utility.cpp" line="453"/>
<source>Less than a minute ago</source>
<translation>Méně než před minutou</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="455"/>
+ <location filename="../src/common/utility.cpp" line="456"/>
<source>%n minute(s) ago</source>
<translation><numerusform>před %n minutou</numerusform><numerusform>před %n minutami</numerusform><numerusform>před %n minutami</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="458"/>
+ <location filename="../src/common/utility.cpp" line="459"/>
<source>Some time ago</source>
<translation>Před nějakým časem</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="129"/>
+ <location filename="../src/common/utility.cpp" line="130"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="133"/>
+ <location filename="../src/common/utility.cpp" line="134"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="137"/>
+ <location filename="../src/common/utility.cpp" line="138"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="140"/>
+ <location filename="../src/common/utility.cpp" line="141"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="309"/>
+ <location filename="../src/common/utility.cpp" line="310"/>
<source>%n year(s)</source>
<translation><numerusform>%n rok</numerusform><numerusform>%n roky</numerusform><numerusform>%n let</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="310"/>
+ <location filename="../src/common/utility.cpp" line="311"/>
<source>%n month(s)</source>
<translation><numerusform>%n měsíc</numerusform><numerusform>%n měsíce</numerusform><numerusform>%n měsíců</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="311"/>
+ <location filename="../src/common/utility.cpp" line="312"/>
<source>%n day(s)</source>
<translation><numerusform>%n den</numerusform><numerusform>%n dny</numerusform><numerusform>%n dní</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="312"/>
+ <location filename="../src/common/utility.cpp" line="313"/>
<source>%n hour(s)</source>
<translation><numerusform>%n hodina</numerusform><numerusform>%n hodiny</numerusform><numerusform>%n hodin</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="313"/>
+ <location filename="../src/common/utility.cpp" line="314"/>
<source>%n minute(s)</source>
<translation><numerusform>%n minuta</numerusform><numerusform>%n minuty</numerusform><numerusform>%n minut</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="314"/>
+ <location filename="../src/common/utility.cpp" line="315"/>
<source>%n second(s)</source>
<translation><numerusform>%n sekunda</numerusform><numerusform>%n sekundy</numerusform><numerusform>%n sekund</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="338"/>
+ <location filename="../src/common/utility.cpp" line="339"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<translation>Abrufen der maximal möglichen Freigabeberechtigungen vom Server...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="184"/>
+ <location filename="../src/gui/sharedialog.cpp" line="192"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Die Datei kann nicht geteilt werden, weil sie ohne erneute Teilungs-Berechtigung für Sie geteilt wurde.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="198"/>
+ <location filename="../src/gui/sharedialog.cpp" line="206"/>
<source>Users and Groups</source>
<translation>Nutzer und Gruppen</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="205"/>
+ <location filename="../src/gui/sharedialog.cpp" line="213"/>
<source>Public Links</source>
<translation>Öffentliche Links</translation>
</message>
<translation>Via %1 teilen</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="507"/>
+ <location filename="../src/gui/socketapi.cpp" line="555"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="516"/>
+ <location filename="../src/gui/socketapi.cpp" line="563"/>
<source>Share...</source>
<translation>Teilen…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="518"/>
+ <location filename="../src/gui/socketapi.cpp" line="565"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="519"/>
+ <location filename="../src/gui/socketapi.cpp" line="566"/>
<source>Send private link by email...</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="482"/>
+ <location filename="../src/libsync/syncengine.cpp" line="491"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="753"/>
+ <location filename="../src/libsync/syncengine.cpp" line="769"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Nur %1 sind verfügbar. Zum Beginnen werden mindestens %2 benötigt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="788"/>
+ <location filename="../src/libsync/syncengine.cpp" line="804"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1261"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1277"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Nicht erlaubt, da Sie keine Rechte zur Erstellung von Unterordnern haben</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1284"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Nicht erlaubt, da Sie keine Rechte zum Hinzufügen von Dateien in diesen Ordner haben</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1570"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1586"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1577"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1593"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<translation>Der Dateiname ist zu lang.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="488"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
+ <source>Unresolved conflict.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="498"/>
<source>Stat failed.</source>
<translation>Stat fehlgeschlagen.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="515"/>
+ <location filename="../src/libsync/syncengine.cpp" line="525"/>
<source>Filename encoding is not valid</source>
<translation>Dateikodierung ist ungültig</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="683"/>
+ <location filename="../src/libsync/syncengine.cpp" line="699"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Ungültige Zeichenm bitte benennen Sie "%1" um</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="807"/>
+ <location filename="../src/libsync/syncengine.cpp" line="823"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Fehler beim Einlesen der Blacklist aus der lokalen Datenbank</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="848"/>
+ <location filename="../src/libsync/syncengine.cpp" line="864"/>
<source>Unable to read from the sync journal.</source>
<translation>Fehler beim Einlesen des Synchronisierungsprotokolls.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="897"/>
+ <location filename="../src/libsync/syncengine.cpp" line="913"/>
<source>Cannot open the sync journal</source>
<translation>Synchronisationsbericht kann nicht geöffnet werden</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="951"/>
+ <location filename="../src/libsync/syncengine.cpp" line="967"/>
<source>File name contains at least one invalid character</source>
<translation>Der Dateiname enthält mindestens ein ungültiges Zeichen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1187"/>
- <location filename="../src/libsync/syncengine.cpp" line="1227"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Aufgrund der »Zu synchronisierende Elemente auswählen«-Sperrliste ignoriert</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1246"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1262"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Nicht erlaubt, da Sie keine Rechte zur Erstellung von Unterordnern haben</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1293"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1309"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Das Hochladen dieser Datei ist nicht erlaubt, da die Datei auf dem Server schreibgeschützt ist, Wiederherstellung</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1309"/>
- <location filename="../src/libsync/syncengine.cpp" line="1328"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1325"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1344"/>
<source>Not allowed to remove, restoring</source>
<translation>Löschen nicht erlaubt, Wiederherstellung</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1341"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1357"/>
<source>Local files and share folder removed.</source>
<translation>Lokale Dateien und Freigabeordner wurden entfernt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1411"/>
<source>Move not allowed, item restored</source>
<translation>Verschieben nicht erlaubt, Element wiederhergestellt</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Verschieben nicht erlaubt, da %1 schreibgeschützt ist</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the destination</source>
<translation>Das Ziel</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the source</source>
<translation>Die Quelle</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/common/utility.cpp" line="441"/>
+ <location filename="../src/common/utility.cpp" line="442"/>
<source>in the future</source>
<translation>in der Zukunft</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="437"/>
+ <location filename="../src/common/utility.cpp" line="438"/>
<source>%n day(s) ago</source>
<translation><numerusform>vor %n Tage(n)</numerusform><numerusform>vor %n Tage(n)</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="445"/>
+ <location filename="../src/common/utility.cpp" line="446"/>
<source>%n hour(s) ago</source>
<translation><numerusform>vor %n Stunde(n)</numerusform><numerusform>vor %n Stunde(n)</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="450"/>
+ <location filename="../src/common/utility.cpp" line="451"/>
<source>now</source>
<translation>jetzt</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="452"/>
+ <location filename="../src/common/utility.cpp" line="453"/>
<source>Less than a minute ago</source>
<translation>vor weniger als einer Minute</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="455"/>
+ <location filename="../src/common/utility.cpp" line="456"/>
<source>%n minute(s) ago</source>
<translation><numerusform>vor %n Minute(n)</numerusform><numerusform>vor %n Minute(n)</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="458"/>
+ <location filename="../src/common/utility.cpp" line="459"/>
<source>Some time ago</source>
<translation>vor einiger Zeit</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="129"/>
+ <location filename="../src/common/utility.cpp" line="130"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="133"/>
+ <location filename="../src/common/utility.cpp" line="134"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="137"/>
+ <location filename="../src/common/utility.cpp" line="138"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="140"/>
+ <location filename="../src/common/utility.cpp" line="141"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="309"/>
+ <location filename="../src/common/utility.cpp" line="310"/>
<source>%n year(s)</source>
<translation><numerusform>%n Jahr</numerusform><numerusform>%n Jahre</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="310"/>
+ <location filename="../src/common/utility.cpp" line="311"/>
<source>%n month(s)</source>
<translation><numerusform>%n Monat</numerusform><numerusform>%n Monate</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="311"/>
+ <location filename="../src/common/utility.cpp" line="312"/>
<source>%n day(s)</source>
<translation><numerusform>%n Tag</numerusform><numerusform>%n Tage</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="312"/>
+ <location filename="../src/common/utility.cpp" line="313"/>
<source>%n hour(s)</source>
<translation><numerusform>%n Stunde</numerusform><numerusform>%n Stunden</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="313"/>
+ <location filename="../src/common/utility.cpp" line="314"/>
<source>%n minute(s)</source>
<translation><numerusform>%n Minute</numerusform><numerusform>%n Minuten</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="314"/>
+ <location filename="../src/common/utility.cpp" line="315"/>
<source>%n second(s)</source>
<translation><numerusform>%n Sekunde</numerusform><numerusform>%n Sekunden</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="338"/>
+ <location filename="../src/common/utility.cpp" line="339"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<translation>Ανάκτηση των μέγιστων δυνατών δικαιωμάτων κοινής χρήσης από το διακομιστή ...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="184"/>
+ <location filename="../src/gui/sharedialog.cpp" line="192"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Το αρχείο δεν μπορεί να διαμοιραστεί γιατί διαμοιράστηκε χωρίς δικαιώματα διαμοιρασμού.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="198"/>
+ <location filename="../src/gui/sharedialog.cpp" line="206"/>
<source>Users and Groups</source>
<translation>Χρήστες και Ομάδες</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="205"/>
+ <location filename="../src/gui/sharedialog.cpp" line="213"/>
<source>Public Links</source>
<translation>Δημόσιοι σύνδεσμοι</translation>
</message>
<translation>Διαμοιρασμός με %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="507"/>
+ <location filename="../src/gui/socketapi.cpp" line="555"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="516"/>
+ <location filename="../src/gui/socketapi.cpp" line="563"/>
<source>Share...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="518"/>
+ <location filename="../src/gui/socketapi.cpp" line="565"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="519"/>
+ <location filename="../src/gui/socketapi.cpp" line="566"/>
<source>Send private link by email...</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="482"/>
+ <location filename="../src/libsync/syncengine.cpp" line="491"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="753"/>
+ <location filename="../src/libsync/syncengine.cpp" line="769"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Μόνο %1 είναι διαθέσιμα, απαιτούνται τουλάχιστον %2 για την εκκίνηση</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="788"/>
+ <location filename="../src/libsync/syncengine.cpp" line="804"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1261"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1277"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε γονικό κατάλογο</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1284"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε αρχεία σε αυτόν τον φάκελο</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1570"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1586"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1577"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1593"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<translation>Το όνομα αρχείου είνια πολύ μεγάλο.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="488"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
+ <source>Unresolved conflict.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="498"/>
<source>Stat failed.</source>
<translation>Απέτυχε.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="515"/>
+ <location filename="../src/libsync/syncengine.cpp" line="525"/>
<source>Filename encoding is not valid</source>
<translation>Η κωδικοποίηση του ονόματος αρχείου δεν είναι έγκυρη</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="683"/>
+ <location filename="../src/libsync/syncengine.cpp" line="699"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Μη έγκυροι χαρακτήρες, παρακαλώ μετονομάστε το "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="807"/>
+ <location filename="../src/libsync/syncengine.cpp" line="823"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Αδυναμία ανάγνωσης της μαύρης λίστας από την τοπική βάση δεδομένων</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="848"/>
+ <location filename="../src/libsync/syncengine.cpp" line="864"/>
<source>Unable to read from the sync journal.</source>
<translation>Αδυναμία ανάγνωσης από το ημερολόγιο συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="897"/>
+ <location filename="../src/libsync/syncengine.cpp" line="913"/>
<source>Cannot open the sync journal</source>
<translation>Αδυναμία ανοίγματος του αρχείου συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="951"/>
+ <location filename="../src/libsync/syncengine.cpp" line="967"/>
<source>File name contains at least one invalid character</source>
<translation>Το όνομα αρχείου περιέχει έναν τουλάχιστον μη έγκυρο χαρακτήρα</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1187"/>
- <location filename="../src/libsync/syncengine.cpp" line="1227"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Αγνοήθηκε εξαιτίας της μαύρης λίστας "διάλεξε τι να συγχρονιστεί"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1246"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1262"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε υποφακέλους σε αυτό τον φάκελο</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1293"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1309"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Δεν επιτρέπεται να μεταφορτώσετε αυτό το αρχείο επειδή είναι μόνο για ανάγνωση στο διακομιστή, αποκατάσταση σε εξέλιξη</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1309"/>
- <location filename="../src/libsync/syncengine.cpp" line="1328"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1325"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1344"/>
<source>Not allowed to remove, restoring</source>
<translation>Δεν επιτρέπεται η αφαίρεση, αποκατάσταση σε εξέλιξη</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1341"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1357"/>
<source>Local files and share folder removed.</source>
<translation>Οι τοπικοί φάκελοι και ο φάκελος κοινής χρήσης αφαιρέθηκαν.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1411"/>
<source>Move not allowed, item restored</source>
<translation>Η μετακίνηση δεν επιτρέπεται, το αντικείμενο αποκαταστάθηκε</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Η μετακίνηση δεν επιτρέπεται επειδή το %1 είναι μόνο για ανάγνωση</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the destination</source>
<translation>ο προορισμός</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the source</source>
<translation>η προέλευση</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/common/utility.cpp" line="441"/>
+ <location filename="../src/common/utility.cpp" line="442"/>
<source>in the future</source>
<translation>στο μέλλον</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="437"/>
+ <location filename="../src/common/utility.cpp" line="438"/>
<source>%n day(s) ago</source>
<translation><numerusform>%n μέρα(ες) πριν</numerusform><numerusform>%n μέρα(ες) πριν</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="445"/>
+ <location filename="../src/common/utility.cpp" line="446"/>
<source>%n hour(s) ago</source>
<translation><numerusform>%n ώρα(ες) πριν</numerusform><numerusform>%n ώρα(ες) πριν</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="450"/>
+ <location filename="../src/common/utility.cpp" line="451"/>
<source>now</source>
<translation>τώρα</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="452"/>
+ <location filename="../src/common/utility.cpp" line="453"/>
<source>Less than a minute ago</source>
<translation>Λιγότερο από ένα λεπτό πριν</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="455"/>
+ <location filename="../src/common/utility.cpp" line="456"/>
<source>%n minute(s) ago</source>
<translation><numerusform>%n λεπτό(ά) πριν</numerusform><numerusform>%n λεπτό(ά) πριν</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="458"/>
+ <location filename="../src/common/utility.cpp" line="459"/>
<source>Some time ago</source>
<translation>Λίγη ώρα πριν</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="129"/>
+ <location filename="../src/common/utility.cpp" line="130"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="133"/>
+ <location filename="../src/common/utility.cpp" line="134"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="137"/>
+ <location filename="../src/common/utility.cpp" line="138"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="140"/>
+ <location filename="../src/common/utility.cpp" line="141"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="309"/>
+ <location filename="../src/common/utility.cpp" line="310"/>
<source>%n year(s)</source>
<translation><numerusform>%n χρόνος</numerusform><numerusform>%n χρόνια</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="310"/>
+ <location filename="../src/common/utility.cpp" line="311"/>
<source>%n month(s)</source>
<translation><numerusform>%n μήνας(ες)</numerusform><numerusform>%n μήνας(ες)</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="311"/>
+ <location filename="../src/common/utility.cpp" line="312"/>
<source>%n day(s)</source>
<translation><numerusform>%n ημέρα(ες)</numerusform><numerusform>%n ημέρα(ες)</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="312"/>
+ <location filename="../src/common/utility.cpp" line="313"/>
<source>%n hour(s)</source>
<translation><numerusform>%n ώρα(ες)</numerusform><numerusform>%n ώρα(ες)</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="313"/>
+ <location filename="../src/common/utility.cpp" line="314"/>
<source>%n minute(s)</source>
<translation><numerusform>%n λεπτό(ά)</numerusform><numerusform>%n λεπτό(ά)</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="314"/>
+ <location filename="../src/common/utility.cpp" line="315"/>
<source>%n second(s)</source>
<translation><numerusform>%n δευτερόλεπτο(α)</numerusform><numerusform>%n δευτερόλεπτο(α)</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="338"/>
+ <location filename="../src/common/utility.cpp" line="339"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="184"/>
+ <location filename="../src/gui/sharedialog.cpp" line="192"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="198"/>
+ <location filename="../src/gui/sharedialog.cpp" line="206"/>
<source>Users and Groups</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="205"/>
+ <location filename="../src/gui/sharedialog.cpp" line="213"/>
<source>Public Links</source>
<translation type="unfinished"></translation>
</message>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="507"/>
+ <location filename="../src/gui/socketapi.cpp" line="555"/>
<source>I shared something with you</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="516"/>
+ <location filename="../src/gui/socketapi.cpp" line="563"/>
<source>Share...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="518"/>
+ <location filename="../src/gui/socketapi.cpp" line="565"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="519"/>
+ <location filename="../src/gui/socketapi.cpp" line="566"/>
<source>Send private link by email...</source>
<translation type="unfinished"></translation>
</message>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="482"/>
+ <location filename="../src/libsync/syncengine.cpp" line="491"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="753"/>
+ <location filename="../src/libsync/syncengine.cpp" line="769"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="788"/>
+ <location filename="../src/libsync/syncengine.cpp" line="804"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1261"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1277"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1284"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1570"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1586"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1577"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1593"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"></translation>
</message>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="488"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
+ <source>Unresolved conflict.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="498"/>
<source>Stat failed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="515"/>
+ <location filename="../src/libsync/syncengine.cpp" line="525"/>
<source>Filename encoding is not valid</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="683"/>
+ <location filename="../src/libsync/syncengine.cpp" line="699"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="807"/>
+ <location filename="../src/libsync/syncengine.cpp" line="823"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="848"/>
+ <location filename="../src/libsync/syncengine.cpp" line="864"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="897"/>
+ <location filename="../src/libsync/syncengine.cpp" line="913"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="951"/>
+ <location filename="../src/libsync/syncengine.cpp" line="967"/>
<source>File name contains at least one invalid character</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1187"/>
- <location filename="../src/libsync/syncengine.cpp" line="1227"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1246"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1262"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1293"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1309"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1309"/>
- <location filename="../src/libsync/syncengine.cpp" line="1328"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1325"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1344"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1341"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1357"/>
<source>Local files and share folder removed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1411"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the destination</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the source</source>
<translation type="unfinished"></translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/common/utility.cpp" line="441"/>
+ <location filename="../src/common/utility.cpp" line="442"/>
<source>in the future</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="437"/>
+ <location filename="../src/common/utility.cpp" line="438"/>
<source>%n day(s) ago</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="445"/>
+ <location filename="../src/common/utility.cpp" line="446"/>
<source>%n hour(s) ago</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="450"/>
+ <location filename="../src/common/utility.cpp" line="451"/>
<source>now</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="452"/>
+ <location filename="../src/common/utility.cpp" line="453"/>
<source>Less than a minute ago</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="455"/>
+ <location filename="../src/common/utility.cpp" line="456"/>
<source>%n minute(s) ago</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="458"/>
+ <location filename="../src/common/utility.cpp" line="459"/>
<source>Some time ago</source>
<translation type="unfinished"></translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="129"/>
+ <location filename="../src/common/utility.cpp" line="130"/>
<source>%L1 GB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="133"/>
+ <location filename="../src/common/utility.cpp" line="134"/>
<source>%L1 MB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="137"/>
+ <location filename="../src/common/utility.cpp" line="138"/>
<source>%L1 KB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="140"/>
+ <location filename="../src/common/utility.cpp" line="141"/>
<source>%L1 B</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="309"/>
+ <location filename="../src/common/utility.cpp" line="310"/>
<source>%n year(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="310"/>
+ <location filename="../src/common/utility.cpp" line="311"/>
<source>%n month(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="311"/>
+ <location filename="../src/common/utility.cpp" line="312"/>
<source>%n day(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="312"/>
+ <location filename="../src/common/utility.cpp" line="313"/>
<source>%n hour(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="313"/>
+ <location filename="../src/common/utility.cpp" line="314"/>
<source>%n minute(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="314"/>
+ <location filename="../src/common/utility.cpp" line="315"/>
<source>%n second(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="338"/>
+ <location filename="../src/common/utility.cpp" line="339"/>
<source>%1 %2</source>
<translation type="unfinished"></translation>
</message>
<translation>Descargando el maximo número de permisos compartidos del servidor...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="184"/>
+ <location filename="../src/gui/sharedialog.cpp" line="192"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>El archivo no puede compartirse; ya que fue compartido sin permisos correspondientes.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="198"/>
+ <location filename="../src/gui/sharedialog.cpp" line="206"/>
<source>Users and Groups</source>
<translation>Usuarios y Grupos</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="205"/>
+ <location filename="../src/gui/sharedialog.cpp" line="213"/>
<source>Public Links</source>
<translation>Enlaces Publicos</translation>
</message>
<translation>Compartir con %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="507"/>
+ <location filename="../src/gui/socketapi.cpp" line="555"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="516"/>
+ <location filename="../src/gui/socketapi.cpp" line="563"/>
<source>Share...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="518"/>
+ <location filename="../src/gui/socketapi.cpp" line="565"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="519"/>
+ <location filename="../src/gui/socketapi.cpp" line="566"/>
<source>Send private link by email...</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="482"/>
+ <location filename="../src/libsync/syncengine.cpp" line="491"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="753"/>
+ <location filename="../src/libsync/syncengine.cpp" line="769"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Solo %1 disponible, se necesita por lo menos %2 para comenzar</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="788"/>
+ <location filename="../src/libsync/syncengine.cpp" line="804"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1261"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1277"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>No permitido porque no tienes permiso para añadir un directorio padre</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1284"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>No permitido porque no tienes permiso para añadir archivos a ese directorio</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1570"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1586"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1577"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1593"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<translation>El nombre del archivo es demasiado largo.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="488"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
+ <source>Unresolved conflict.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="498"/>
<source>Stat failed.</source>
<translation>Stat ha fallado.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="515"/>
+ <location filename="../src/libsync/syncengine.cpp" line="525"/>
<source>Filename encoding is not valid</source>
<translation>Los caracteres del nombre de fichero no son válidos</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="683"/>
+ <location filename="../src/libsync/syncengine.cpp" line="699"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Caracteres inválidos, por favor renombre "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="807"/>
+ <location filename="../src/libsync/syncengine.cpp" line="823"/>
<source>Unable to read the blacklist from the local database</source>
<translation>No se pudo leer la lista de bloqueo de la base de datos local</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="848"/>
+ <location filename="../src/libsync/syncengine.cpp" line="864"/>
<source>Unable to read from the sync journal.</source>
<translation>No se ha podido leer desde el registro de sincronización</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="897"/>
+ <location filename="../src/libsync/syncengine.cpp" line="913"/>
<source>Cannot open the sync journal</source>
<translation>No es posible abrir el diario de sincronización</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="951"/>
+ <location filename="../src/libsync/syncengine.cpp" line="967"/>
<source>File name contains at least one invalid character</source>
<translation>Nombre de archivo contiene al menos un caracter no válido</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1187"/>
- <location filename="../src/libsync/syncengine.cpp" line="1227"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorado porque se encuentra en la lista negra de "elija qué va a sincronizar"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1246"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1262"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>No permitido porque no tienes permiso para añadir subdirectorios a ese directorio</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1293"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1309"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>No está permitido subir este archivo porque es de solo lectura en el servidor, restaurando.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1309"/>
- <location filename="../src/libsync/syncengine.cpp" line="1328"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1325"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1344"/>
<source>Not allowed to remove, restoring</source>
<translation>No está permitido borrar, restaurando.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1341"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1357"/>
<source>Local files and share folder removed.</source>
<translation>Se han eliminado los archivos locales y la carpeta compartida.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1411"/>
<source>Move not allowed, item restored</source>
<translation>No está permitido mover, elemento restaurado.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>Move not allowed because %1 is read-only</source>
<translation>No está permitido mover, porque %1 es de sólo lectura.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the destination</source>
<translation>destino</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the source</source>
<translation>origen</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/common/utility.cpp" line="441"/>
+ <location filename="../src/common/utility.cpp" line="442"/>
<source>in the future</source>
<translation>en el futuro</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="437"/>
+ <location filename="../src/common/utility.cpp" line="438"/>
<source>%n day(s) ago</source>
<translation><numerusform>Hace %n día(s)</numerusform><numerusform>Hace %n día(s)</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="445"/>
+ <location filename="../src/common/utility.cpp" line="446"/>
<source>%n hour(s) ago</source>
<translation><numerusform>Hace %n hora(s)</numerusform><numerusform>Hace %n hora(s)</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="450"/>
+ <location filename="../src/common/utility.cpp" line="451"/>
<source>now</source>
<translation>ahora</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="452"/>
+ <location filename="../src/common/utility.cpp" line="453"/>
<source>Less than a minute ago</source>
<translation>Hace menos de un minuto</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="455"/>
+ <location filename="../src/common/utility.cpp" line="456"/>
<source>%n minute(s) ago</source>
<translation><numerusform>Hace %n minutos(s)</numerusform><numerusform>Hace %n minutos(s)</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="458"/>
+ <location filename="../src/common/utility.cpp" line="459"/>
<source>Some time ago</source>
<translation>Hace unos momentos</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="129"/>
+ <location filename="../src/common/utility.cpp" line="130"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="133"/>
+ <location filename="../src/common/utility.cpp" line="134"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="137"/>
+ <location filename="../src/common/utility.cpp" line="138"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="140"/>
+ <location filename="../src/common/utility.cpp" line="141"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="309"/>
+ <location filename="../src/common/utility.cpp" line="310"/>
<source>%n year(s)</source>
<translation><numerusform>%n año</numerusform><numerusform>%n año(s)</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="310"/>
+ <location filename="../src/common/utility.cpp" line="311"/>
<source>%n month(s)</source>
<translation><numerusform>%n Mes</numerusform><numerusform>%n Mese(s)</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="311"/>
+ <location filename="../src/common/utility.cpp" line="312"/>
<source>%n day(s)</source>
<translation><numerusform>%n dia</numerusform><numerusform>%n dia(s)</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="312"/>
+ <location filename="../src/common/utility.cpp" line="313"/>
<source>%n hour(s)</source>
<translation><numerusform>%n hora</numerusform><numerusform>%n hora(s)</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="313"/>
+ <location filename="../src/common/utility.cpp" line="314"/>
<source>%n minute(s)</source>
<translation><numerusform>%n minuto</numerusform><numerusform>%n minuto(s)</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="314"/>
+ <location filename="../src/common/utility.cpp" line="315"/>
<source>%n second(s)</source>
<translation><numerusform>%n segundo</numerusform><numerusform>%n segundo(s)</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="338"/>
+ <location filename="../src/common/utility.cpp" line="339"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="184"/>
+ <location filename="../src/gui/sharedialog.cpp" line="192"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="198"/>
+ <location filename="../src/gui/sharedialog.cpp" line="206"/>
<source>Users and Groups</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="205"/>
+ <location filename="../src/gui/sharedialog.cpp" line="213"/>
<source>Public Links</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="507"/>
+ <location filename="../src/gui/socketapi.cpp" line="555"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="516"/>
+ <location filename="../src/gui/socketapi.cpp" line="563"/>
<source>Share...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="518"/>
+ <location filename="../src/gui/socketapi.cpp" line="565"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="519"/>
+ <location filename="../src/gui/socketapi.cpp" line="566"/>
<source>Send private link by email...</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="482"/>
+ <location filename="../src/libsync/syncengine.cpp" line="491"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="753"/>
+ <location filename="../src/libsync/syncengine.cpp" line="769"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="788"/>
+ <location filename="../src/libsync/syncengine.cpp" line="804"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1261"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1277"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1284"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1570"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1586"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1577"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1593"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="488"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
+ <source>Unresolved conflict.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="498"/>
<source>Stat failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="515"/>
+ <location filename="../src/libsync/syncengine.cpp" line="525"/>
<source>Filename encoding is not valid</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="683"/>
+ <location filename="../src/libsync/syncengine.cpp" line="699"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="807"/>
+ <location filename="../src/libsync/syncengine.cpp" line="823"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="848"/>
+ <location filename="../src/libsync/syncengine.cpp" line="864"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="897"/>
+ <location filename="../src/libsync/syncengine.cpp" line="913"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="951"/>
+ <location filename="../src/libsync/syncengine.cpp" line="967"/>
<source>File name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1187"/>
- <location filename="../src/libsync/syncengine.cpp" line="1227"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1246"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1262"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1293"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1309"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1309"/>
- <location filename="../src/libsync/syncengine.cpp" line="1328"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1325"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1344"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1341"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1357"/>
<source>Local files and share folder removed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1411"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the destination</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the source</source>
<translation type="unfinished"/>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/common/utility.cpp" line="441"/>
+ <location filename="../src/common/utility.cpp" line="442"/>
<source>in the future</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="437"/>
+ <location filename="../src/common/utility.cpp" line="438"/>
<source>%n day(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="445"/>
+ <location filename="../src/common/utility.cpp" line="446"/>
<source>%n hour(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="450"/>
+ <location filename="../src/common/utility.cpp" line="451"/>
<source>now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="452"/>
+ <location filename="../src/common/utility.cpp" line="453"/>
<source>Less than a minute ago</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="455"/>
+ <location filename="../src/common/utility.cpp" line="456"/>
<source>%n minute(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="458"/>
+ <location filename="../src/common/utility.cpp" line="459"/>
<source>Some time ago</source>
<translation type="unfinished"/>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="129"/>
+ <location filename="../src/common/utility.cpp" line="130"/>
<source>%L1 GB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="133"/>
+ <location filename="../src/common/utility.cpp" line="134"/>
<source>%L1 MB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="137"/>
+ <location filename="../src/common/utility.cpp" line="138"/>
<source>%L1 KB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="140"/>
+ <location filename="../src/common/utility.cpp" line="141"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="309"/>
+ <location filename="../src/common/utility.cpp" line="310"/>
<source>%n year(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="310"/>
+ <location filename="../src/common/utility.cpp" line="311"/>
<source>%n month(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="311"/>
+ <location filename="../src/common/utility.cpp" line="312"/>
<source>%n day(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="312"/>
+ <location filename="../src/common/utility.cpp" line="313"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="313"/>
+ <location filename="../src/common/utility.cpp" line="314"/>
<source>%n minute(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="314"/>
+ <location filename="../src/common/utility.cpp" line="315"/>
<source>%n second(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="338"/>
+ <location filename="../src/common/utility.cpp" line="339"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="184"/>
+ <location filename="../src/gui/sharedialog.cpp" line="192"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="198"/>
+ <location filename="../src/gui/sharedialog.cpp" line="206"/>
<source>Users and Groups</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="205"/>
+ <location filename="../src/gui/sharedialog.cpp" line="213"/>
<source>Public Links</source>
<translation>Avalikud lingid</translation>
</message>
<translation>Jagatud kasutajaga %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="507"/>
+ <location filename="../src/gui/socketapi.cpp" line="555"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="516"/>
+ <location filename="../src/gui/socketapi.cpp" line="563"/>
<source>Share...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="518"/>
+ <location filename="../src/gui/socketapi.cpp" line="565"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="519"/>
+ <location filename="../src/gui/socketapi.cpp" line="566"/>
<source>Send private link by email...</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="482"/>
+ <location filename="../src/libsync/syncengine.cpp" line="491"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="753"/>
+ <location filename="../src/libsync/syncengine.cpp" line="769"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="788"/>
+ <location filename="../src/libsync/syncengine.cpp" line="804"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1261"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1277"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1284"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1570"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1586"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1577"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1593"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<translation>Faili nimi on liiga pikk.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="488"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
+ <source>Unresolved conflict.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="498"/>
<source>Stat failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="515"/>
+ <location filename="../src/libsync/syncengine.cpp" line="525"/>
<source>Filename encoding is not valid</source>
<translation>Failinime kodeering pole kehtiv</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="683"/>
+ <location filename="../src/libsync/syncengine.cpp" line="699"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="807"/>
+ <location filename="../src/libsync/syncengine.cpp" line="823"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="848"/>
+ <location filename="../src/libsync/syncengine.cpp" line="864"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="897"/>
+ <location filename="../src/libsync/syncengine.cpp" line="913"/>
<source>Cannot open the sync journal</source>
<translation>Ei suuda avada sünkroniseeringu zurnaali</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="951"/>
+ <location filename="../src/libsync/syncengine.cpp" line="967"/>
<source>File name contains at least one invalid character</source>
<translation>Faili nimesonvähemalt üks keelatud märk</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1187"/>
- <location filename="../src/libsync/syncengine.cpp" line="1227"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>"Vali, mida sünkroniseerida" musta nimekirja tõttu vahele jäetud</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1246"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1262"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1293"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1309"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Pole lubatud üles laadida, kuna tegemist on ainult-loetava serveriga, taastan</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1309"/>
- <location filename="../src/libsync/syncengine.cpp" line="1328"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1325"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1344"/>
<source>Not allowed to remove, restoring</source>
<translation>Eemaldamine pole lubatud, taastan</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1341"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1357"/>
<source>Local files and share folder removed.</source>
<translation>Kohalikud failid ja jagatud kaustad eemaldatud.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1411"/>
<source>Move not allowed, item restored</source>
<translation>Liigutamine pole lubatud, üksus taastatud</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Liigutamien pole võimalik kuna %1 on ainult lugemiseks</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the destination</source>
<translation>sihtkoht</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the source</source>
<translation>allikas</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/common/utility.cpp" line="441"/>
+ <location filename="../src/common/utility.cpp" line="442"/>
<source>in the future</source>
<translation>tulevikus</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="437"/>
+ <location filename="../src/common/utility.cpp" line="438"/>
<source>%n day(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="445"/>
+ <location filename="../src/common/utility.cpp" line="446"/>
<source>%n hour(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="450"/>
+ <location filename="../src/common/utility.cpp" line="451"/>
<source>now</source>
<translation>kohe</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="452"/>
+ <location filename="../src/common/utility.cpp" line="453"/>
<source>Less than a minute ago</source>
<translation>Vähem kui minut tagasi</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="455"/>
+ <location filename="../src/common/utility.cpp" line="456"/>
<source>%n minute(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="458"/>
+ <location filename="../src/common/utility.cpp" line="459"/>
<source>Some time ago</source>
<translation>Mõni aeg tagasi</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="129"/>
+ <location filename="../src/common/utility.cpp" line="130"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="133"/>
+ <location filename="../src/common/utility.cpp" line="134"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="137"/>
+ <location filename="../src/common/utility.cpp" line="138"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="140"/>
+ <location filename="../src/common/utility.cpp" line="141"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="309"/>
+ <location filename="../src/common/utility.cpp" line="310"/>
<source>%n year(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="310"/>
+ <location filename="../src/common/utility.cpp" line="311"/>
<source>%n month(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="311"/>
+ <location filename="../src/common/utility.cpp" line="312"/>
<source>%n day(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="312"/>
+ <location filename="../src/common/utility.cpp" line="313"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="313"/>
+ <location filename="../src/common/utility.cpp" line="314"/>
<source>%n minute(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="314"/>
+ <location filename="../src/common/utility.cpp" line="315"/>
<source>%n second(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="338"/>
+ <location filename="../src/common/utility.cpp" line="339"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="184"/>
+ <location filename="../src/gui/sharedialog.cpp" line="192"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="198"/>
+ <location filename="../src/gui/sharedialog.cpp" line="206"/>
<source>Users and Groups</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="205"/>
+ <location filename="../src/gui/sharedialog.cpp" line="213"/>
<source>Public Links</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="507"/>
+ <location filename="../src/gui/socketapi.cpp" line="555"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="516"/>
+ <location filename="../src/gui/socketapi.cpp" line="563"/>
<source>Share...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="518"/>
+ <location filename="../src/gui/socketapi.cpp" line="565"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="519"/>
+ <location filename="../src/gui/socketapi.cpp" line="566"/>
<source>Send private link by email...</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="482"/>
+ <location filename="../src/libsync/syncengine.cpp" line="491"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="753"/>
+ <location filename="../src/libsync/syncengine.cpp" line="769"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="788"/>
+ <location filename="../src/libsync/syncengine.cpp" line="804"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1261"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1277"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1284"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1570"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1586"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1577"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1593"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="488"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
+ <source>Unresolved conflict.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="498"/>
<source>Stat failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="515"/>
+ <location filename="../src/libsync/syncengine.cpp" line="525"/>
<source>Filename encoding is not valid</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="683"/>
+ <location filename="../src/libsync/syncengine.cpp" line="699"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="807"/>
+ <location filename="../src/libsync/syncengine.cpp" line="823"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="848"/>
+ <location filename="../src/libsync/syncengine.cpp" line="864"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="897"/>
+ <location filename="../src/libsync/syncengine.cpp" line="913"/>
<source>Cannot open the sync journal</source>
<translation>Ezin da sinkronizazio egunerokoa ireki</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="951"/>
+ <location filename="../src/libsync/syncengine.cpp" line="967"/>
<source>File name contains at least one invalid character</source>
<translation>Fitxategi izenak behintzat baliogabeko karaktere bat du</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1187"/>
- <location filename="../src/libsync/syncengine.cpp" line="1227"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1246"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1262"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1293"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1309"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1309"/>
- <location filename="../src/libsync/syncengine.cpp" line="1328"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1325"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1344"/>
<source>Not allowed to remove, restoring</source>
<translation>Ezabatzeko baimenik gabe, berrezartzen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1341"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1357"/>
<source>Local files and share folder removed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1411"/>
<source>Move not allowed, item restored</source>
<translation>Mugitzea ez dago baimenduta, elementua berrezarri da</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Mugitzea ez dago baimenduta %1 irakurtzeko bakarrik delako</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the destination</source>
<translation>helburua</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the source</source>
<translation>jatorria</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/common/utility.cpp" line="441"/>
+ <location filename="../src/common/utility.cpp" line="442"/>
<source>in the future</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="437"/>
+ <location filename="../src/common/utility.cpp" line="438"/>
<source>%n day(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="445"/>
+ <location filename="../src/common/utility.cpp" line="446"/>
<source>%n hour(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="450"/>
+ <location filename="../src/common/utility.cpp" line="451"/>
<source>now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="452"/>
+ <location filename="../src/common/utility.cpp" line="453"/>
<source>Less than a minute ago</source>
<translation>orain dela minutu bat baino gutxiago</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="455"/>
+ <location filename="../src/common/utility.cpp" line="456"/>
<source>%n minute(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="458"/>
+ <location filename="../src/common/utility.cpp" line="459"/>
<source>Some time ago</source>
<translation type="unfinished"/>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="129"/>
+ <location filename="../src/common/utility.cpp" line="130"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="133"/>
+ <location filename="../src/common/utility.cpp" line="134"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="137"/>
+ <location filename="../src/common/utility.cpp" line="138"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="140"/>
+ <location filename="../src/common/utility.cpp" line="141"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="309"/>
+ <location filename="../src/common/utility.cpp" line="310"/>
<source>%n year(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="310"/>
+ <location filename="../src/common/utility.cpp" line="311"/>
<source>%n month(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="311"/>
+ <location filename="../src/common/utility.cpp" line="312"/>
<source>%n day(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="312"/>
+ <location filename="../src/common/utility.cpp" line="313"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="313"/>
+ <location filename="../src/common/utility.cpp" line="314"/>
<source>%n minute(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="314"/>
+ <location filename="../src/common/utility.cpp" line="315"/>
<source>%n second(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="338"/>
+ <location filename="../src/common/utility.cpp" line="339"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="184"/>
+ <location filename="../src/gui/sharedialog.cpp" line="192"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="198"/>
+ <location filename="../src/gui/sharedialog.cpp" line="206"/>
<source>Users and Groups</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="205"/>
+ <location filename="../src/gui/sharedialog.cpp" line="213"/>
<source>Public Links</source>
<translation type="unfinished"/>
</message>
<translation>اشتراکگذاری با %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="507"/>
+ <location filename="../src/gui/socketapi.cpp" line="555"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="516"/>
+ <location filename="../src/gui/socketapi.cpp" line="563"/>
<source>Share...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="518"/>
+ <location filename="../src/gui/socketapi.cpp" line="565"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="519"/>
+ <location filename="../src/gui/socketapi.cpp" line="566"/>
<source>Send private link by email...</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="482"/>
+ <location filename="../src/libsync/syncengine.cpp" line="491"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="753"/>
+ <location filename="../src/libsync/syncengine.cpp" line="769"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="788"/>
+ <location filename="../src/libsync/syncengine.cpp" line="804"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1261"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1277"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1284"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1570"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1586"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1577"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1593"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<translation>نام فایل خیلی طولانی است.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="488"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
+ <source>Unresolved conflict.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="498"/>
<source>Stat failed.</source>
<translation>وضعیت ناموفق</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="515"/>
+ <location filename="../src/libsync/syncengine.cpp" line="525"/>
<source>Filename encoding is not valid</source>
<translation>رمزگذاری نام فایل معتبر نیست</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="683"/>
+ <location filename="../src/libsync/syncengine.cpp" line="699"/>
<source>Invalid characters, please rename "%1"</source>
<translation>کاراکتر نامعتبر، لطفا "%1" را تغییر نام دهید</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="807"/>
+ <location filename="../src/libsync/syncengine.cpp" line="823"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="848"/>
+ <location filename="../src/libsync/syncengine.cpp" line="864"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="897"/>
+ <location filename="../src/libsync/syncengine.cpp" line="913"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="951"/>
+ <location filename="../src/libsync/syncengine.cpp" line="967"/>
<source>File name contains at least one invalid character</source>
<translation>نام فایل دارای حداقل یک کاراکتر نامعتبر است</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1187"/>
- <location filename="../src/libsync/syncengine.cpp" line="1227"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1246"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1262"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>با توجه به عدم اجازهی شما به ایجاد زیرپوشه به پوشه مجاز نیست</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1293"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1309"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>آپلود این فایل با توجه به فقط-خواندنی بودن آن در سرور مجاز نیست، در حال بازگرداندن</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1309"/>
- <location filename="../src/libsync/syncengine.cpp" line="1328"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1325"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1344"/>
<source>Not allowed to remove, restoring</source>
<translation>حذف مجاز نیست، در حال بازگردادن</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1341"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1357"/>
<source>Local files and share folder removed.</source>
<translation>فایلهای محلی و پوشهی اشتراک حذف شد.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1411"/>
<source>Move not allowed, item restored</source>
<translation>انتقال مجاز نیست، مورد بازگردانده شد</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the destination</source>
<translation>مقصد</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the source</source>
<translation>مبدا</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/common/utility.cpp" line="441"/>
+ <location filename="../src/common/utility.cpp" line="442"/>
<source>in the future</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="437"/>
+ <location filename="../src/common/utility.cpp" line="438"/>
<source>%n day(s) ago</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="445"/>
+ <location filename="../src/common/utility.cpp" line="446"/>
<source>%n hour(s) ago</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="450"/>
+ <location filename="../src/common/utility.cpp" line="451"/>
<source>now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="452"/>
+ <location filename="../src/common/utility.cpp" line="453"/>
<source>Less than a minute ago</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="455"/>
+ <location filename="../src/common/utility.cpp" line="456"/>
<source>%n minute(s) ago</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="458"/>
+ <location filename="../src/common/utility.cpp" line="459"/>
<source>Some time ago</source>
<translation type="unfinished"/>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="129"/>
+ <location filename="../src/common/utility.cpp" line="130"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="133"/>
+ <location filename="../src/common/utility.cpp" line="134"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="137"/>
+ <location filename="../src/common/utility.cpp" line="138"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="140"/>
+ <location filename="../src/common/utility.cpp" line="141"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="309"/>
+ <location filename="../src/common/utility.cpp" line="310"/>
<source>%n year(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="310"/>
+ <location filename="../src/common/utility.cpp" line="311"/>
<source>%n month(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="311"/>
+ <location filename="../src/common/utility.cpp" line="312"/>
<source>%n day(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="312"/>
+ <location filename="../src/common/utility.cpp" line="313"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="313"/>
+ <location filename="../src/common/utility.cpp" line="314"/>
<source>%n minute(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="314"/>
+ <location filename="../src/common/utility.cpp" line="315"/>
<source>%n second(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="338"/>
+ <location filename="../src/common/utility.cpp" line="339"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="184"/>
+ <location filename="../src/gui/sharedialog.cpp" line="192"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="198"/>
+ <location filename="../src/gui/sharedialog.cpp" line="206"/>
<source>Users and Groups</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="205"/>
+ <location filename="../src/gui/sharedialog.cpp" line="213"/>
<source>Public Links</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="507"/>
+ <location filename="../src/gui/socketapi.cpp" line="555"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="516"/>
+ <location filename="../src/gui/socketapi.cpp" line="563"/>
<source>Share...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="518"/>
+ <location filename="../src/gui/socketapi.cpp" line="565"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="519"/>
+ <location filename="../src/gui/socketapi.cpp" line="566"/>
<source>Send private link by email...</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="482"/>
+ <location filename="../src/libsync/syncengine.cpp" line="491"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="753"/>
+ <location filename="../src/libsync/syncengine.cpp" line="769"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Vain %1 on käytettävissä, käynnistymiseen tarvitaan %2</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="788"/>
+ <location filename="../src/libsync/syncengine.cpp" line="804"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1261"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1277"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Ei sallittu, koska käyttöoikeutesi eivät riitä ylätason kansion lisäämiseen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1284"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Ei sallittu, koska käyttöoikeutesi eivät riitä tiedostojen lisäämiseen kyseiseen kansioon</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1570"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1586"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1577"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1593"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<translation>Tiedoston nimi on liian pitkä.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="488"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
+ <source>Unresolved conflict.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="498"/>
<source>Stat failed.</source>
<translation>Stat epäonnistui.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="515"/>
+ <location filename="../src/libsync/syncengine.cpp" line="525"/>
<source>Filename encoding is not valid</source>
<translation>Tiedostonimen merkistökoodaus ei ole kelvollista</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="683"/>
+ <location filename="../src/libsync/syncengine.cpp" line="699"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Virheellisiä merkkejä, anna uusi nimi kohteelle "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="807"/>
+ <location filename="../src/libsync/syncengine.cpp" line="823"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="848"/>
+ <location filename="../src/libsync/syncengine.cpp" line="864"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="897"/>
+ <location filename="../src/libsync/syncengine.cpp" line="913"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="951"/>
+ <location filename="../src/libsync/syncengine.cpp" line="967"/>
<source>File name contains at least one invalid character</source>
<translation>Tiedoston nimi sisältää ainakin yhden virheellisen merkin</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1187"/>
- <location filename="../src/libsync/syncengine.cpp" line="1227"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1246"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1262"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Ei sallittu, koska oikeutesi eivät riitä alikansioiden lisäämiseen kyseiseen kansioon</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1293"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1309"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1309"/>
- <location filename="../src/libsync/syncengine.cpp" line="1328"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1325"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1344"/>
<source>Not allowed to remove, restoring</source>
<translation>Poistaminen ei ole sallittua, palautetaan</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1341"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1357"/>
<source>Local files and share folder removed.</source>
<translation>Paikalliset tiedostot ja jakokansio poistettu.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1411"/>
<source>Move not allowed, item restored</source>
<translation>Siirtäminen ei ole sallittua, kohde palautettu</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Siirto ei ole sallittu, koska %1 on "vain luku"-tilassa</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the destination</source>
<translation>kohde</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the source</source>
<translation>lähde</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/common/utility.cpp" line="441"/>
+ <location filename="../src/common/utility.cpp" line="442"/>
<source>in the future</source>
<translation>tulevaisuudessa</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="437"/>
+ <location filename="../src/common/utility.cpp" line="438"/>
<source>%n day(s) ago</source>
<translation><numerusform>%n päivä sitten</numerusform><numerusform>%n päivää sitten</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="445"/>
+ <location filename="../src/common/utility.cpp" line="446"/>
<source>%n hour(s) ago</source>
<translation><numerusform>%n tunti sitten</numerusform><numerusform>%n tuntia sitten</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="450"/>
+ <location filename="../src/common/utility.cpp" line="451"/>
<source>now</source>
<translation>nyt</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="452"/>
+ <location filename="../src/common/utility.cpp" line="453"/>
<source>Less than a minute ago</source>
<translation>Alle minuutti sitten</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="455"/>
+ <location filename="../src/common/utility.cpp" line="456"/>
<source>%n minute(s) ago</source>
<translation><numerusform>%n minuutti sitten</numerusform><numerusform>%n minuuttia sitten</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="458"/>
+ <location filename="../src/common/utility.cpp" line="459"/>
<source>Some time ago</source>
<translation>Jokin aika sitten</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="129"/>
+ <location filename="../src/common/utility.cpp" line="130"/>
<source>%L1 GB</source>
<translation>%L1 Gt</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="133"/>
+ <location filename="../src/common/utility.cpp" line="134"/>
<source>%L1 MB</source>
<translation>%L1 Mt</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="137"/>
+ <location filename="../src/common/utility.cpp" line="138"/>
<source>%L1 KB</source>
<translation>%L1 kt</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="140"/>
+ <location filename="../src/common/utility.cpp" line="141"/>
<source>%L1 B</source>
<translation>%L1 t</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="309"/>
+ <location filename="../src/common/utility.cpp" line="310"/>
<source>%n year(s)</source>
<translation><numerusform>%n vuosi</numerusform><numerusform>%n vuotta</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="310"/>
+ <location filename="../src/common/utility.cpp" line="311"/>
<source>%n month(s)</source>
<translation><numerusform>%n kuukausi</numerusform><numerusform>%n kuukautta</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="311"/>
+ <location filename="../src/common/utility.cpp" line="312"/>
<source>%n day(s)</source>
<translation><numerusform>%n päivä</numerusform><numerusform>%n päivää</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="312"/>
+ <location filename="../src/common/utility.cpp" line="313"/>
<source>%n hour(s)</source>
<translation><numerusform>%n tunti</numerusform><numerusform>%n tuntia</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="313"/>
+ <location filename="../src/common/utility.cpp" line="314"/>
<source>%n minute(s)</source>
<translation><numerusform>%n minuutti</numerusform><numerusform>%n minuuttia</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="314"/>
+ <location filename="../src/common/utility.cpp" line="315"/>
<source>%n second(s)</source>
<translation><numerusform>%n sekunti</numerusform><numerusform>%n sekuntia</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="338"/>
+ <location filename="../src/common/utility.cpp" line="339"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<translation>Récupération des permissions de partage maximales possibles depuis le serveur...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="184"/>
+ <location filename="../src/gui/sharedialog.cpp" line="192"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Le fichier ne peut pas être partagé car il a été partagé sans permission de repartage.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="198"/>
+ <location filename="../src/gui/sharedialog.cpp" line="206"/>
<source>Users and Groups</source>
<translation>Utilisateurs et Groupes</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="205"/>
+ <location filename="../src/gui/sharedialog.cpp" line="213"/>
<source>Public Links</source>
<translation>Liens publics</translation>
</message>
<translation>Partager avec %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="507"/>
+ <location filename="../src/gui/socketapi.cpp" line="555"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="516"/>
+ <location filename="../src/gui/socketapi.cpp" line="563"/>
<source>Share...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="518"/>
+ <location filename="../src/gui/socketapi.cpp" line="565"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="519"/>
+ <location filename="../src/gui/socketapi.cpp" line="566"/>
<source>Send private link by email...</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="482"/>
+ <location filename="../src/libsync/syncengine.cpp" line="491"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="753"/>
+ <location filename="../src/libsync/syncengine.cpp" line="769"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Seulement %1 disponibles, il faut au moins %2 pour démarrer</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="788"/>
+ <location filename="../src/libsync/syncengine.cpp" line="804"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1261"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1277"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Non autorisé car vous n'avez pas la permission d'ajouter un dossier parent</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1284"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Non autorisé car vous n'avez pas la permission d'ajouter des fichiers dans ce dossier</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1570"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1586"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1577"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1593"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<translation>Le nom de fichier est trop long.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="488"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
+ <source>Unresolved conflict.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="498"/>
<source>Stat failed.</source>
<translation>Stat échoué.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="515"/>
+ <location filename="../src/libsync/syncengine.cpp" line="525"/>
<source>Filename encoding is not valid</source>
<translation>L'encodage du nom de fichier n'est pas valide</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="683"/>
+ <location filename="../src/libsync/syncengine.cpp" line="699"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Caractères non valides. Veuillez renommer "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="807"/>
+ <location filename="../src/libsync/syncengine.cpp" line="823"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Impossible de lire la liste noire de la base de données locale</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="848"/>
+ <location filename="../src/libsync/syncengine.cpp" line="864"/>
<source>Unable to read from the sync journal.</source>
<translation>Impossible de lire le journal de synchronisation.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="897"/>
+ <location filename="../src/libsync/syncengine.cpp" line="913"/>
<source>Cannot open the sync journal</source>
<translation>Impossible d'ouvrir le journal de synchronisation</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="951"/>
+ <location filename="../src/libsync/syncengine.cpp" line="967"/>
<source>File name contains at least one invalid character</source>
<translation>Le nom de fichier contient au moins un caractère non valable</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1187"/>
- <location filename="../src/libsync/syncengine.cpp" line="1227"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignoré en raison de la liste noire "Sélectionner le contenu à synchroniser".</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1246"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1262"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Non autorisé car vous n'avez pas la permission d'ajouter des sous-dossiers dans ce dossier</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1293"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1309"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Non autorisé à envoyer ce fichier car il est en lecture seule sur le serveur. Restauration</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1309"/>
- <location filename="../src/libsync/syncengine.cpp" line="1328"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1325"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1344"/>
<source>Not allowed to remove, restoring</source>
<translation>Non autorisé à supprimer. Restauration</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1341"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1357"/>
<source>Local files and share folder removed.</source>
<translation>Fichiers locaux et dossier partagé supprimés.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1411"/>
<source>Move not allowed, item restored</source>
<translation>Déplacement non autorisé, élément restauré</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Déplacement non autorisé car %1 est en mode lecture seule</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the destination</source>
<translation>la destination</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the source</source>
<translation>la source</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/common/utility.cpp" line="441"/>
+ <location filename="../src/common/utility.cpp" line="442"/>
<source>in the future</source>
<translation>Dans le futur</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="437"/>
+ <location filename="../src/common/utility.cpp" line="438"/>
<source>%n day(s) ago</source>
<translation><numerusform>Hier</numerusform><numerusform>Il y a %n jours</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="445"/>
+ <location filename="../src/common/utility.cpp" line="446"/>
<source>%n hour(s) ago</source>
<translation><numerusform>Il y a %n heure</numerusform><numerusform>Il y a %n heures</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="450"/>
+ <location filename="../src/common/utility.cpp" line="451"/>
<source>now</source>
<translation>maintenant</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="452"/>
+ <location filename="../src/common/utility.cpp" line="453"/>
<source>Less than a minute ago</source>
<translation>Il y a moins d'une minute</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="455"/>
+ <location filename="../src/common/utility.cpp" line="456"/>
<source>%n minute(s) ago</source>
<translation><numerusform>Il y a %n minute</numerusform><numerusform>Il y a %n minutes</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="458"/>
+ <location filename="../src/common/utility.cpp" line="459"/>
<source>Some time ago</source>
<translation>Il y a quelque temps</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="129"/>
+ <location filename="../src/common/utility.cpp" line="130"/>
<source>%L1 GB</source>
<translation>%L1 Go</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="133"/>
+ <location filename="../src/common/utility.cpp" line="134"/>
<source>%L1 MB</source>
<translation>%L1 Mo</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="137"/>
+ <location filename="../src/common/utility.cpp" line="138"/>
<source>%L1 KB</source>
<translation>%L1 Ko</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="140"/>
+ <location filename="../src/common/utility.cpp" line="141"/>
<source>%L1 B</source>
<translation>%L1 octets</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="309"/>
+ <location filename="../src/common/utility.cpp" line="310"/>
<source>%n year(s)</source>
<translation><numerusform>%n an</numerusform><numerusform>%n ans</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="310"/>
+ <location filename="../src/common/utility.cpp" line="311"/>
<source>%n month(s)</source>
<translation><numerusform>%n mois</numerusform><numerusform>%n mois</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="311"/>
+ <location filename="../src/common/utility.cpp" line="312"/>
<source>%n day(s)</source>
<translation><numerusform>%n jour</numerusform><numerusform>%n jours</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="312"/>
+ <location filename="../src/common/utility.cpp" line="313"/>
<source>%n hour(s)</source>
<translation><numerusform>%n heure</numerusform><numerusform>%n heures</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="313"/>
+ <location filename="../src/common/utility.cpp" line="314"/>
<source>%n minute(s)</source>
<translation><numerusform>%n minute</numerusform><numerusform>%n minutes</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="314"/>
+ <location filename="../src/common/utility.cpp" line="315"/>
<source>%n second(s)</source>
<translation><numerusform>%n seconde</numerusform><numerusform>%n secondes</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="338"/>
+ <location filename="../src/common/utility.cpp" line="339"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="184"/>
+ <location filename="../src/gui/sharedialog.cpp" line="192"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Non é posíbel compartir o ficheiro, xa que foi compartido sen permisis para compartir.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="198"/>
+ <location filename="../src/gui/sharedialog.cpp" line="206"/>
<source>Users and Groups</source>
<translation>Usuarios e grupos</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="205"/>
+ <location filename="../src/gui/sharedialog.cpp" line="213"/>
<source>Public Links</source>
<translation type="unfinished"/>
</message>
<translation>Compartir con %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="507"/>
+ <location filename="../src/gui/socketapi.cpp" line="555"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="516"/>
+ <location filename="../src/gui/socketapi.cpp" line="563"/>
<source>Share...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="518"/>
+ <location filename="../src/gui/socketapi.cpp" line="565"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="519"/>
+ <location filename="../src/gui/socketapi.cpp" line="566"/>
<source>Send private link by email...</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="482"/>
+ <location filename="../src/libsync/syncengine.cpp" line="491"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="753"/>
+ <location filename="../src/libsync/syncengine.cpp" line="769"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="788"/>
+ <location filename="../src/libsync/syncengine.cpp" line="804"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1261"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1277"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1284"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1570"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1586"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1577"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1593"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<translation>O nome de ficheiro é longo de máis.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="488"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
+ <source>Unresolved conflict.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="498"/>
<source>Stat failed.</source>
<translation>Fallou a obtención de estatísticas.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="515"/>
+ <location filename="../src/libsync/syncengine.cpp" line="525"/>
<source>Filename encoding is not valid</source>
<translation>O nome de ficheiro codificado non é correcto</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="683"/>
+ <location filename="../src/libsync/syncengine.cpp" line="699"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Caracteres incorrectos, déalle outro nome a «%1»</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="807"/>
+ <location filename="../src/libsync/syncengine.cpp" line="823"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="848"/>
+ <location filename="../src/libsync/syncengine.cpp" line="864"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="897"/>
+ <location filename="../src/libsync/syncengine.cpp" line="913"/>
<source>Cannot open the sync journal</source>
<translation>Non foi posíbel abrir o rexistro de sincronización</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="951"/>
+ <location filename="../src/libsync/syncengine.cpp" line="967"/>
<source>File name contains at least one invalid character</source>
<translation>O nome de ficheiro contén algún carácter incorrecto</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1187"/>
- <location filename="../src/libsync/syncengine.cpp" line="1227"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorado por mor da lista negra de «escolla que sincronizar»</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1246"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1262"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1293"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1309"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Non está permitido o envío xa que o ficheiro é só de lectura no servidor, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1309"/>
- <location filename="../src/libsync/syncengine.cpp" line="1328"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1325"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1344"/>
<source>Not allowed to remove, restoring</source>
<translation>Non está permitido retiralo, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1341"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1357"/>
<source>Local files and share folder removed.</source>
<translation>Retirados os ficheiros locais e o cartafol compartido.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1411"/>
<source>Move not allowed, item restored</source>
<translation>Nos está permitido movelo, elemento restaurado</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Bon está permitido movelo xa que %1 é só de lectura</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the destination</source>
<translation>o destino</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the source</source>
<translation>a orixe</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/common/utility.cpp" line="441"/>
+ <location filename="../src/common/utility.cpp" line="442"/>
<source>in the future</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="437"/>
+ <location filename="../src/common/utility.cpp" line="438"/>
<source>%n day(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="445"/>
+ <location filename="../src/common/utility.cpp" line="446"/>
<source>%n hour(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="450"/>
+ <location filename="../src/common/utility.cpp" line="451"/>
<source>now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="452"/>
+ <location filename="../src/common/utility.cpp" line="453"/>
<source>Less than a minute ago</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="455"/>
+ <location filename="../src/common/utility.cpp" line="456"/>
<source>%n minute(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="458"/>
+ <location filename="../src/common/utility.cpp" line="459"/>
<source>Some time ago</source>
<translation type="unfinished"/>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="129"/>
+ <location filename="../src/common/utility.cpp" line="130"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="133"/>
+ <location filename="../src/common/utility.cpp" line="134"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="137"/>
+ <location filename="../src/common/utility.cpp" line="138"/>
<source>%L1 KB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="140"/>
+ <location filename="../src/common/utility.cpp" line="141"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="309"/>
+ <location filename="../src/common/utility.cpp" line="310"/>
<source>%n year(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="310"/>
+ <location filename="../src/common/utility.cpp" line="311"/>
<source>%n month(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="311"/>
+ <location filename="../src/common/utility.cpp" line="312"/>
<source>%n day(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="312"/>
+ <location filename="../src/common/utility.cpp" line="313"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="313"/>
+ <location filename="../src/common/utility.cpp" line="314"/>
<source>%n minute(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="314"/>
+ <location filename="../src/common/utility.cpp" line="315"/>
<source>%n second(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="338"/>
+ <location filename="../src/common/utility.cpp" line="339"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="184"/>
+ <location filename="../src/gui/sharedialog.cpp" line="192"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>A fájlt nem lehetett megosztani, mert megosztási jogosultság nélkül lett megosztva.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="198"/>
+ <location filename="../src/gui/sharedialog.cpp" line="206"/>
<source>Users and Groups</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="205"/>
+ <location filename="../src/gui/sharedialog.cpp" line="213"/>
<source>Public Links</source>
<translation type="unfinished"/>
</message>
<translation>Megosztás vele: %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="507"/>
+ <location filename="../src/gui/socketapi.cpp" line="555"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="516"/>
+ <location filename="../src/gui/socketapi.cpp" line="563"/>
<source>Share...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="518"/>
+ <location filename="../src/gui/socketapi.cpp" line="565"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="519"/>
+ <location filename="../src/gui/socketapi.cpp" line="566"/>
<source>Send private link by email...</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="482"/>
+ <location filename="../src/libsync/syncengine.cpp" line="491"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="753"/>
+ <location filename="../src/libsync/syncengine.cpp" line="769"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="788"/>
+ <location filename="../src/libsync/syncengine.cpp" line="804"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1261"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1277"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1284"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1570"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1586"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1577"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1593"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<translation>Fájlnév túl nagy.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="488"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
+ <source>Unresolved conflict.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="498"/>
<source>Stat failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="515"/>
+ <location filename="../src/libsync/syncengine.cpp" line="525"/>
<source>Filename encoding is not valid</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="683"/>
+ <location filename="../src/libsync/syncengine.cpp" line="699"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Érvénytelen karakterek, kérjük nevezd át: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="807"/>
+ <location filename="../src/libsync/syncengine.cpp" line="823"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="848"/>
+ <location filename="../src/libsync/syncengine.cpp" line="864"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="897"/>
+ <location filename="../src/libsync/syncengine.cpp" line="913"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="951"/>
+ <location filename="../src/libsync/syncengine.cpp" line="967"/>
<source>File name contains at least one invalid character</source>
<translation>A fájlnév legalább egy érvénytelen karaktert tartalmaz!</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1187"/>
- <location filename="../src/libsync/syncengine.cpp" line="1227"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1246"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1262"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1293"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1309"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1309"/>
- <location filename="../src/libsync/syncengine.cpp" line="1328"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1325"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1344"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1341"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1357"/>
<source>Local files and share folder removed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1411"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the destination</source>
<translation>a cél</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the source</source>
<translation>a forrás</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/common/utility.cpp" line="441"/>
+ <location filename="../src/common/utility.cpp" line="442"/>
<source>in the future</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="437"/>
+ <location filename="../src/common/utility.cpp" line="438"/>
<source>%n day(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="445"/>
+ <location filename="../src/common/utility.cpp" line="446"/>
<source>%n hour(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="450"/>
+ <location filename="../src/common/utility.cpp" line="451"/>
<source>now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="452"/>
+ <location filename="../src/common/utility.cpp" line="453"/>
<source>Less than a minute ago</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="455"/>
+ <location filename="../src/common/utility.cpp" line="456"/>
<source>%n minute(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="458"/>
+ <location filename="../src/common/utility.cpp" line="459"/>
<source>Some time ago</source>
<translation type="unfinished"/>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="129"/>
+ <location filename="../src/common/utility.cpp" line="130"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="133"/>
+ <location filename="../src/common/utility.cpp" line="134"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="137"/>
+ <location filename="../src/common/utility.cpp" line="138"/>
<source>%L1 KB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="140"/>
+ <location filename="../src/common/utility.cpp" line="141"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="309"/>
+ <location filename="../src/common/utility.cpp" line="310"/>
<source>%n year(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="310"/>
+ <location filename="../src/common/utility.cpp" line="311"/>
<source>%n month(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="311"/>
+ <location filename="../src/common/utility.cpp" line="312"/>
<source>%n day(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="312"/>
+ <location filename="../src/common/utility.cpp" line="313"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="313"/>
+ <location filename="../src/common/utility.cpp" line="314"/>
<source>%n minute(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="314"/>
+ <location filename="../src/common/utility.cpp" line="315"/>
<source>%n second(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="338"/>
+ <location filename="../src/common/utility.cpp" line="339"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<translation>Recupero di tutti i permessi di condivisione possibili dal server...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="184"/>
+ <location filename="../src/gui/sharedialog.cpp" line="192"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Il file non può essere condiviso poiché è stato condiviso senza il permesso di condivisione.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="198"/>
+ <location filename="../src/gui/sharedialog.cpp" line="206"/>
<source>Users and Groups</source>
<translation>Utenti e Gruppi</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="205"/>
+ <location filename="../src/gui/sharedialog.cpp" line="213"/>
<source>Public Links</source>
<translation>Collegamenti pubblici</translation>
</message>
<translation>Condividi con %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="507"/>
+ <location filename="../src/gui/socketapi.cpp" line="555"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="516"/>
+ <location filename="../src/gui/socketapi.cpp" line="563"/>
<source>Share...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="518"/>
+ <location filename="../src/gui/socketapi.cpp" line="565"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="519"/>
+ <location filename="../src/gui/socketapi.cpp" line="566"/>
<source>Send private link by email...</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="482"/>
+ <location filename="../src/libsync/syncengine.cpp" line="491"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="753"/>
+ <location filename="../src/libsync/syncengine.cpp" line="769"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Sono disponibili solo %1, servono almeno %2 per iniziare</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="788"/>
+ <location filename="../src/libsync/syncengine.cpp" line="804"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1261"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1277"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Non consentito poiché non disponi dei permessi per aggiungere la cartella superiore</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1284"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Non consentito poiché non disponi dei permessi per aggiungere file in quella cartella</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1570"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1586"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1577"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1593"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<translation>Il nome del file è troppo lungo.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="488"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
+ <source>Unresolved conflict.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="498"/>
<source>Stat failed.</source>
<translation>Stat non riuscita.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="515"/>
+ <location filename="../src/libsync/syncengine.cpp" line="525"/>
<source>Filename encoding is not valid</source>
<translation>La codifica del nome del file non è valida</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="683"/>
+ <location filename="../src/libsync/syncengine.cpp" line="699"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Caratteri non validi, rinomina "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="807"/>
+ <location filename="../src/libsync/syncengine.cpp" line="823"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Impossibile leggere la lista nera dal database locale</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="848"/>
+ <location filename="../src/libsync/syncengine.cpp" line="864"/>
<source>Unable to read from the sync journal.</source>
<translation>Impossibile leggere dal registro di sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="897"/>
+ <location filename="../src/libsync/syncengine.cpp" line="913"/>
<source>Cannot open the sync journal</source>
<translation>Impossibile aprire il registro di sincronizzazione</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="951"/>
+ <location filename="../src/libsync/syncengine.cpp" line="967"/>
<source>File name contains at least one invalid character</source>
<translation>Il nome del file contiene almeno un carattere non valido</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1187"/>
- <location filename="../src/libsync/syncengine.cpp" line="1227"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorato in base alla lista nera per la scelta di cosa sincronizzare</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1246"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1262"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Non consentito poiché non disponi dei permessi per aggiungere sottocartelle in quella cartella</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1293"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1309"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Il caricamento di questo file non è consentito poiché è in sola lettura sul server, ripristino</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1309"/>
- <location filename="../src/libsync/syncengine.cpp" line="1328"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1325"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1344"/>
<source>Not allowed to remove, restoring</source>
<translation>Rimozione non consentita, ripristino</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1341"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1357"/>
<source>Local files and share folder removed.</source>
<translation>I file locali e la cartella condivisa sono stati rimossi.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1411"/>
<source>Move not allowed, item restored</source>
<translation>Spostamento non consentito, elemento ripristinato</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Spostamento non consentito poiché %1 è in sola lettura</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the destination</source>
<translation>la destinazione</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the source</source>
<translation>l'origine</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/common/utility.cpp" line="441"/>
+ <location filename="../src/common/utility.cpp" line="442"/>
<source>in the future</source>
<translation>nel futuro</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="437"/>
+ <location filename="../src/common/utility.cpp" line="438"/>
<source>%n day(s) ago</source>
<translation><numerusform>%n giorno fa</numerusform><numerusform>%n giorni fa</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="445"/>
+ <location filename="../src/common/utility.cpp" line="446"/>
<source>%n hour(s) ago</source>
<translation><numerusform>%n ora fa</numerusform><numerusform>%n ore fa</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="450"/>
+ <location filename="../src/common/utility.cpp" line="451"/>
<source>now</source>
<translation>adesso</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="452"/>
+ <location filename="../src/common/utility.cpp" line="453"/>
<source>Less than a minute ago</source>
<translation>Meno di un minuto fa</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="455"/>
+ <location filename="../src/common/utility.cpp" line="456"/>
<source>%n minute(s) ago</source>
<translation><numerusform>%n minuto fa</numerusform><numerusform>%n minuti fa</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="458"/>
+ <location filename="../src/common/utility.cpp" line="459"/>
<source>Some time ago</source>
<translation>Tempo fa</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="129"/>
+ <location filename="../src/common/utility.cpp" line="130"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="133"/>
+ <location filename="../src/common/utility.cpp" line="134"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="137"/>
+ <location filename="../src/common/utility.cpp" line="138"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="140"/>
+ <location filename="../src/common/utility.cpp" line="141"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="309"/>
+ <location filename="../src/common/utility.cpp" line="310"/>
<source>%n year(s)</source>
<translation><numerusform>% anno</numerusform><numerusform>%n anni</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="310"/>
+ <location filename="../src/common/utility.cpp" line="311"/>
<source>%n month(s)</source>
<translation><numerusform>%n mese</numerusform><numerusform>%n mesi</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="311"/>
+ <location filename="../src/common/utility.cpp" line="312"/>
<source>%n day(s)</source>
<translation><numerusform>%n giorno</numerusform><numerusform>%n giorni</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="312"/>
+ <location filename="../src/common/utility.cpp" line="313"/>
<source>%n hour(s)</source>
<translation><numerusform>%n ora</numerusform><numerusform>%n ore</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="313"/>
+ <location filename="../src/common/utility.cpp" line="314"/>
<source>%n minute(s)</source>
<translation><numerusform>%n minuto</numerusform><numerusform>%n minuti</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="314"/>
+ <location filename="../src/common/utility.cpp" line="315"/>
<source>%n second(s)</source>
<translation><numerusform>%n secondo</numerusform><numerusform>%n secondi</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="338"/>
+ <location filename="../src/common/utility.cpp" line="339"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<translation>サーバーから共有権限を取得できる最大数で取得しています</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="184"/>
+ <location filename="../src/gui/sharedialog.cpp" line="192"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>再共有権限がない共有ため、このファイルは共有できません。</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="198"/>
+ <location filename="../src/gui/sharedialog.cpp" line="206"/>
<source>Users and Groups</source>
<translation>ユーザーとグループ</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="205"/>
+ <location filename="../src/gui/sharedialog.cpp" line="213"/>
<source>Public Links</source>
<translation>公開リンク</translation>
</message>
<translation>%1 と共有</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="507"/>
+ <location filename="../src/gui/socketapi.cpp" line="555"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="516"/>
+ <location filename="../src/gui/socketapi.cpp" line="563"/>
<source>Share...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="518"/>
+ <location filename="../src/gui/socketapi.cpp" line="565"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="519"/>
+ <location filename="../src/gui/socketapi.cpp" line="566"/>
<source>Send private link by email...</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="482"/>
+ <location filename="../src/libsync/syncengine.cpp" line="491"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="753"/>
+ <location filename="../src/libsync/syncengine.cpp" line="769"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>%1 しか空き容量がありません、開始するためには少なくとも %2 は必要です。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="788"/>
+ <location filename="../src/libsync/syncengine.cpp" line="804"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1261"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1277"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>親フォルダーを追加する権限がありません</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1284"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>そのフォルダーにファイルを追加する権限がありません</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1570"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1586"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1577"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1593"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<translation>ファイル名が長すぎます</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="488"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
+ <source>Unresolved conflict.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="498"/>
<source>Stat failed.</source>
<translation>情報取得エラー</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="515"/>
+ <location filename="../src/libsync/syncengine.cpp" line="525"/>
<source>Filename encoding is not valid</source>
<translation>ファイル名のエンコーディングが無効です。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="683"/>
+ <location filename="../src/libsync/syncengine.cpp" line="699"/>
<source>Invalid characters, please rename "%1"</source>
<translation>無効な文字です、"%1" を変更してください。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="807"/>
+ <location filename="../src/libsync/syncengine.cpp" line="823"/>
<source>Unable to read the blacklist from the local database</source>
<translation>ローカルデータベースからブラックリストを読み込みできません</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="848"/>
+ <location filename="../src/libsync/syncengine.cpp" line="864"/>
<source>Unable to read from the sync journal.</source>
<translation>同期ジャーナルから読み込みできません</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="897"/>
+ <location filename="../src/libsync/syncengine.cpp" line="913"/>
<source>Cannot open the sync journal</source>
<translation>同期ジャーナルを開くことができません</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="951"/>
+ <location filename="../src/libsync/syncengine.cpp" line="967"/>
<source>File name contains at least one invalid character</source>
<translation>ファイル名に1文字以上の無効な文字が含まれています</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1187"/>
- <location filename="../src/libsync/syncengine.cpp" line="1227"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>"同期対象先" ブラックリストにより無視されました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1246"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1262"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>そのフォルダーにサブフォルダーを追加する権限がありません</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1293"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1309"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>サーバーでは読み取り専用となっているため、このファイルをアップロードすることはできません、復元しています</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1309"/>
- <location filename="../src/libsync/syncengine.cpp" line="1328"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1325"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1344"/>
<source>Not allowed to remove, restoring</source>
<translation>削除できないので復元しています</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1341"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1357"/>
<source>Local files and share folder removed.</source>
<translation>ローカルファイルと共有フォルダーを削除しました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1411"/>
<source>Move not allowed, item restored</source>
<translation>移動できないので項目を復元しました</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>Move not allowed because %1 is read-only</source>
<translation>%1 は読み取り専用のため移動できません</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the destination</source>
<translation>移動先</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the source</source>
<translation>移動元</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/common/utility.cpp" line="441"/>
+ <location filename="../src/common/utility.cpp" line="442"/>
<source>in the future</source>
<translation>今後</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="437"/>
+ <location filename="../src/common/utility.cpp" line="438"/>
<source>%n day(s) ago</source>
<translation><numerusform>%n日前</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="445"/>
+ <location filename="../src/common/utility.cpp" line="446"/>
<source>%n hour(s) ago</source>
<translation><numerusform>%n 時間前</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="450"/>
+ <location filename="../src/common/utility.cpp" line="451"/>
<source>now</source>
<translation>今</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="452"/>
+ <location filename="../src/common/utility.cpp" line="453"/>
<source>Less than a minute ago</source>
<translation>1分以内</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="455"/>
+ <location filename="../src/common/utility.cpp" line="456"/>
<source>%n minute(s) ago</source>
<translation><numerusform> %n 分前</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="458"/>
+ <location filename="../src/common/utility.cpp" line="459"/>
<source>Some time ago</source>
<translation>数分前</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="129"/>
+ <location filename="../src/common/utility.cpp" line="130"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="133"/>
+ <location filename="../src/common/utility.cpp" line="134"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="137"/>
+ <location filename="../src/common/utility.cpp" line="138"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="140"/>
+ <location filename="../src/common/utility.cpp" line="141"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="309"/>
+ <location filename="../src/common/utility.cpp" line="310"/>
<source>%n year(s)</source>
<translation><numerusform>%n 年</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="310"/>
+ <location filename="../src/common/utility.cpp" line="311"/>
<source>%n month(s)</source>
<translation><numerusform>%n ヶ月</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="311"/>
+ <location filename="../src/common/utility.cpp" line="312"/>
<source>%n day(s)</source>
<translation><numerusform>%n 日</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="312"/>
+ <location filename="../src/common/utility.cpp" line="313"/>
<source>%n hour(s)</source>
<translation><numerusform>%n 時間</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="313"/>
+ <location filename="../src/common/utility.cpp" line="314"/>
<source>%n minute(s)</source>
<translation><numerusform>%n 分</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="314"/>
+ <location filename="../src/common/utility.cpp" line="315"/>
<source>%n second(s)</source>
<translation><numerusform>%n 秒</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="338"/>
+ <location filename="../src/common/utility.cpp" line="339"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<translation>Henter maksimalt mulige delerettigheter fra serveren...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="184"/>
+ <location filename="../src/gui/sharedialog.cpp" line="192"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Filen kan ikke deles fordi den ble delt uten adgang til å dele.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="198"/>
+ <location filename="../src/gui/sharedialog.cpp" line="206"/>
<source>Users and Groups</source>
<translation>Brukere og grupper</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="205"/>
+ <location filename="../src/gui/sharedialog.cpp" line="213"/>
<source>Public Links</source>
<translation>Offentlige lenker</translation>
</message>
<translation>Del med %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="507"/>
+ <location filename="../src/gui/socketapi.cpp" line="555"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="516"/>
+ <location filename="../src/gui/socketapi.cpp" line="563"/>
<source>Share...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="518"/>
+ <location filename="../src/gui/socketapi.cpp" line="565"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="519"/>
+ <location filename="../src/gui/socketapi.cpp" line="566"/>
<source>Send private link by email...</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="482"/>
+ <location filename="../src/libsync/syncengine.cpp" line="491"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="753"/>
+ <location filename="../src/libsync/syncengine.cpp" line="769"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Bare %1 er tilgjengelig, trenger minst %2 for å begynne</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="788"/>
+ <location filename="../src/libsync/syncengine.cpp" line="804"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1261"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1277"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Ikke tillatt fordi du ikke har lov til å legge til foreldremappe</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1284"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Ikke tillatt fordi du ikke har lov til å opprette filer i den mappen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1570"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1586"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1577"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1593"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<translation>Filnavn er for langt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="488"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
+ <source>Unresolved conflict.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="498"/>
<source>Stat failed.</source>
<translation>Stat feilet.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="515"/>
+ <location filename="../src/libsync/syncengine.cpp" line="525"/>
<source>Filename encoding is not valid</source>
<translation>Filnavn-koding er ikke gyldig</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="683"/>
+ <location filename="../src/libsync/syncengine.cpp" line="699"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Ugyldige tegn, gi et annet navn til "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="807"/>
+ <location filename="../src/libsync/syncengine.cpp" line="823"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Kan ikke lese svartelisten fra den lokale databasen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="848"/>
+ <location filename="../src/libsync/syncengine.cpp" line="864"/>
<source>Unable to read from the sync journal.</source>
<translation>Kan ikke lese fra synkroniseringsjournalen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="897"/>
+ <location filename="../src/libsync/syncengine.cpp" line="913"/>
<source>Cannot open the sync journal</source>
<translation>Kan ikke åpne synkroniseringsjournalen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="951"/>
+ <location filename="../src/libsync/syncengine.cpp" line="967"/>
<source>File name contains at least one invalid character</source>
<translation>Filnavnet inneholder minst ett ulovlig tegn</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1187"/>
- <location filename="../src/libsync/syncengine.cpp" line="1227"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorert på grunn av svartelisten "velg hva som skal synkroniseres"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1246"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1262"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Ikke tillatt fordi du ikke har lov til å lage undermapper i den mappen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1293"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1309"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Ikke tillatt å laste opp denne filenfordi den er skrivebeskyttet på serveren, gjenoppretter</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1309"/>
- <location filename="../src/libsync/syncengine.cpp" line="1328"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1325"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1344"/>
<source>Not allowed to remove, restoring</source>
<translation>Ikke tillatt å fjerne, gjenoppretter</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1341"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1357"/>
<source>Local files and share folder removed.</source>
<translation>Lokale filer og delingsmappe fjernet.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1411"/>
<source>Move not allowed, item restored</source>
<translation>Flytting ikke tillatt, element gjenopprettet</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Flytting ikke tillatt fordi %1 er skrivebeskyttet</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the destination</source>
<translation>målet</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the source</source>
<translation>kilden</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/common/utility.cpp" line="441"/>
+ <location filename="../src/common/utility.cpp" line="442"/>
<source>in the future</source>
<translation>fram i tid</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="437"/>
+ <location filename="../src/common/utility.cpp" line="438"/>
<source>%n day(s) ago</source>
<translation><numerusform>i går</numerusform><numerusform>for %n dager siden</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="445"/>
+ <location filename="../src/common/utility.cpp" line="446"/>
<source>%n hour(s) ago</source>
<translation><numerusform>for %n time siden</numerusform><numerusform>for %n timer siden</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="450"/>
+ <location filename="../src/common/utility.cpp" line="451"/>
<source>now</source>
<translation>nå</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="452"/>
+ <location filename="../src/common/utility.cpp" line="453"/>
<source>Less than a minute ago</source>
<translation>For mindre enn et minutt siden</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="455"/>
+ <location filename="../src/common/utility.cpp" line="456"/>
<source>%n minute(s) ago</source>
<translation><numerusform>for %n minutt siden</numerusform><numerusform>for %n minutter siden</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="458"/>
+ <location filename="../src/common/utility.cpp" line="459"/>
<source>Some time ago</source>
<translation>For en stund siden</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="129"/>
+ <location filename="../src/common/utility.cpp" line="130"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="133"/>
+ <location filename="../src/common/utility.cpp" line="134"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="137"/>
+ <location filename="../src/common/utility.cpp" line="138"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="140"/>
+ <location filename="../src/common/utility.cpp" line="141"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="309"/>
+ <location filename="../src/common/utility.cpp" line="310"/>
<source>%n year(s)</source>
<translation><numerusform>%n år</numerusform><numerusform>%n år</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="310"/>
+ <location filename="../src/common/utility.cpp" line="311"/>
<source>%n month(s)</source>
<translation><numerusform>%n måned</numerusform><numerusform>%n måneder</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="311"/>
+ <location filename="../src/common/utility.cpp" line="312"/>
<source>%n day(s)</source>
<translation><numerusform>%n dag</numerusform><numerusform>%n dager</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="312"/>
+ <location filename="../src/common/utility.cpp" line="313"/>
<source>%n hour(s)</source>
<translation><numerusform>%n time</numerusform><numerusform>%n timer</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="313"/>
+ <location filename="../src/common/utility.cpp" line="314"/>
<source>%n minute(s)</source>
<translation><numerusform>%n minutt</numerusform><numerusform>%n minutter</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="314"/>
+ <location filename="../src/common/utility.cpp" line="315"/>
<source>%n second(s)</source>
<translation><numerusform>%n sekund</numerusform><numerusform>%n sekunder</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="338"/>
+ <location filename="../src/common/utility.cpp" line="339"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<translation>Maximum aantal mogelijke permissies van de server ophalen...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="184"/>
+ <location filename="../src/gui/sharedialog.cpp" line="192"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Het bestand kan niet worden gedeeld, omdat het werd gedeeld zonder verder delen toestemming.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="198"/>
+ <location filename="../src/gui/sharedialog.cpp" line="206"/>
<source>Users and Groups</source>
<translation>Gebruikers en Groepen</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="205"/>
+ <location filename="../src/gui/sharedialog.cpp" line="213"/>
<source>Public Links</source>
<translation>Openbare Links</translation>
</message>
<translation>Delen met %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="507"/>
+ <location filename="../src/gui/socketapi.cpp" line="555"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="516"/>
+ <location filename="../src/gui/socketapi.cpp" line="563"/>
<source>Share...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="518"/>
+ <location filename="../src/gui/socketapi.cpp" line="565"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="519"/>
+ <location filename="../src/gui/socketapi.cpp" line="566"/>
<source>Send private link by email...</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="482"/>
+ <location filename="../src/libsync/syncengine.cpp" line="491"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="753"/>
+ <location filename="../src/libsync/syncengine.cpp" line="769"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Slechts %1 beschikbaar, maar heeft minimaal %2 nodig om te starten</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="788"/>
+ <location filename="../src/libsync/syncengine.cpp" line="804"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1261"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1277"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Niet toegestaan omdat u geen rechten hebt om een bovenliggende map toe te voegen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1284"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Niet toegestaan omdat u geen rechten hebt om bestanden in die map toe te voegen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1570"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1586"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1577"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1593"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<translation>De bestandsnaam is te lang.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="488"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
+ <source>Unresolved conflict.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="498"/>
<source>Stat failed.</source>
<translation>Stat mislukt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="515"/>
+ <location filename="../src/libsync/syncengine.cpp" line="525"/>
<source>Filename encoding is not valid</source>
<translation>Bestandsnaamcodering is niet geldig</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="683"/>
+ <location filename="../src/libsync/syncengine.cpp" line="699"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Ongeldige tekens, hernoem "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="807"/>
+ <location filename="../src/libsync/syncengine.cpp" line="823"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Kan de blacklist niet lezen uit de lokale database</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="848"/>
+ <location filename="../src/libsync/syncengine.cpp" line="864"/>
<source>Unable to read from the sync journal.</source>
<translation>Niet mogelijk om te lezen uit het synchronisatie verslag.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="897"/>
+ <location filename="../src/libsync/syncengine.cpp" line="913"/>
<source>Cannot open the sync journal</source>
<translation>Kan het sync transactielog niet openen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="951"/>
+ <location filename="../src/libsync/syncengine.cpp" line="967"/>
<source>File name contains at least one invalid character</source>
<translation>De bestandsnaam bevat ten minste één ongeldig teken</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1187"/>
- <location filename="../src/libsync/syncengine.cpp" line="1227"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Genegeerd vanwege de "wat synchroniseren" zwarte lijst</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1246"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1262"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Niet toegestaan, omdat je geen permissies hebt om submappen aan die map toe te voegen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1293"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1309"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Niet toegestaan om dit bestand te uploaden, omdat het alleen-lezen is op de server, herstellen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1309"/>
- <location filename="../src/libsync/syncengine.cpp" line="1328"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1325"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1344"/>
<source>Not allowed to remove, restoring</source>
<translation>Niet toegestaan om te verwijderen, herstellen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1341"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1357"/>
<source>Local files and share folder removed.</source>
<translation>Lokale bestanden en share-map verwijderd. </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1411"/>
<source>Move not allowed, item restored</source>
<translation>Verplaatsen niet toegestaan, object hersteld</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Verplaatsen niet toegestaan, omdat %1 alleen-lezen is</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the destination</source>
<translation>bestemming</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the source</source>
<translation>bron</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/common/utility.cpp" line="441"/>
+ <location filename="../src/common/utility.cpp" line="442"/>
<source>in the future</source>
<translation>in de toekomst</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="437"/>
+ <location filename="../src/common/utility.cpp" line="438"/>
<source>%n day(s) ago</source>
<translation><numerusform>%n dag geleden</numerusform><numerusform>%n dagen geleden</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="445"/>
+ <location filename="../src/common/utility.cpp" line="446"/>
<source>%n hour(s) ago</source>
<translation><numerusform>%n uur geleden</numerusform><numerusform>%n uur geleden</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="450"/>
+ <location filename="../src/common/utility.cpp" line="451"/>
<source>now</source>
<translation>nu</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="452"/>
+ <location filename="../src/common/utility.cpp" line="453"/>
<source>Less than a minute ago</source>
<translation>Minder dan een minuut geleden</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="455"/>
+ <location filename="../src/common/utility.cpp" line="456"/>
<source>%n minute(s) ago</source>
<translation><numerusform>%n minuut geleden</numerusform><numerusform>%n minuten geleden</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="458"/>
+ <location filename="../src/common/utility.cpp" line="459"/>
<source>Some time ago</source>
<translation>Even geleden</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="129"/>
+ <location filename="../src/common/utility.cpp" line="130"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="133"/>
+ <location filename="../src/common/utility.cpp" line="134"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="137"/>
+ <location filename="../src/common/utility.cpp" line="138"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="140"/>
+ <location filename="../src/common/utility.cpp" line="141"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="309"/>
+ <location filename="../src/common/utility.cpp" line="310"/>
<source>%n year(s)</source>
<translation><numerusform>%n jaar</numerusform><numerusform>%n jaar</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="310"/>
+ <location filename="../src/common/utility.cpp" line="311"/>
<source>%n month(s)</source>
<translation><numerusform>%n maand</numerusform><numerusform>%n maanden</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="311"/>
+ <location filename="../src/common/utility.cpp" line="312"/>
<source>%n day(s)</source>
<translation><numerusform>%n dag</numerusform><numerusform>%n dagen</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="312"/>
+ <location filename="../src/common/utility.cpp" line="313"/>
<source>%n hour(s)</source>
<translation><numerusform>%n uur</numerusform><numerusform>%n uur</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="313"/>
+ <location filename="../src/common/utility.cpp" line="314"/>
<source>%n minute(s)</source>
<translation><numerusform>%n minuut</numerusform><numerusform>%n minuten</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="314"/>
+ <location filename="../src/common/utility.cpp" line="315"/>
<source>%n second(s)</source>
<translation><numerusform>%n seconde</numerusform><numerusform>%n seconde(n)</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="338"/>
+ <location filename="../src/common/utility.cpp" line="339"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="184"/>
+ <location filename="../src/gui/sharedialog.cpp" line="192"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="198"/>
+ <location filename="../src/gui/sharedialog.cpp" line="206"/>
<source>Users and Groups</source>
<translation>Użytkownicy i grupy</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="205"/>
+ <location filename="../src/gui/sharedialog.cpp" line="213"/>
<source>Public Links</source>
<translation>Linki publiczne</translation>
</message>
<translation>Współdzielone z %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="507"/>
+ <location filename="../src/gui/socketapi.cpp" line="555"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="516"/>
+ <location filename="../src/gui/socketapi.cpp" line="563"/>
<source>Share...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="518"/>
+ <location filename="../src/gui/socketapi.cpp" line="565"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="519"/>
+ <location filename="../src/gui/socketapi.cpp" line="566"/>
<source>Send private link by email...</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="482"/>
+ <location filename="../src/libsync/syncengine.cpp" line="491"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="753"/>
+ <location filename="../src/libsync/syncengine.cpp" line="769"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="788"/>
+ <location filename="../src/libsync/syncengine.cpp" line="804"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1261"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1277"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Niedozwolone, ponieważ nie masz uprawnień do dodawania katalogu nadrzędnego</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1284"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Niedozwolone, ponieważ nie masz uprawnień do dodawania plików w tym katalogu</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1570"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1586"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1577"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1593"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<translation>Nazwa pliku zbyt długa</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="488"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
+ <source>Unresolved conflict.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="498"/>
<source>Stat failed.</source>
<translation>Błąd statystyk.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="515"/>
+ <location filename="../src/libsync/syncengine.cpp" line="525"/>
<source>Filename encoding is not valid</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="683"/>
+ <location filename="../src/libsync/syncengine.cpp" line="699"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="807"/>
+ <location filename="../src/libsync/syncengine.cpp" line="823"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Nie można odczytać czarnej listy z lokalnej bazy danych</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="848"/>
+ <location filename="../src/libsync/syncengine.cpp" line="864"/>
<source>Unable to read from the sync journal.</source>
<translation>Nie można czytać z dziennika synchronizacji.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="897"/>
+ <location filename="../src/libsync/syncengine.cpp" line="913"/>
<source>Cannot open the sync journal</source>
<translation>Nie można otworzyć dziennika synchronizacji</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="951"/>
+ <location filename="../src/libsync/syncengine.cpp" line="967"/>
<source>File name contains at least one invalid character</source>
<translation>Nazwa pliku zawiera co najmniej jeden nieprawidłowy znak</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1187"/>
- <location filename="../src/libsync/syncengine.cpp" line="1227"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1246"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1262"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Niedozwolone, ponieważ nie masz uprawnień do dodawania podkatalogów w tym katalogu</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1293"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1309"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Wgrywanie niedozwolone, ponieważ plik jest tylko do odczytu na serwerze, przywracanie</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1309"/>
- <location filename="../src/libsync/syncengine.cpp" line="1328"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1325"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1344"/>
<source>Not allowed to remove, restoring</source>
<translation>Brak uprawnień by usunąć, przywracanie</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1341"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1357"/>
<source>Local files and share folder removed.</source>
<translation>Lokalne pliki i udostępniane foldery zostały usunięte.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1411"/>
<source>Move not allowed, item restored</source>
<translation>Przenoszenie niedozwolone, obiekt przywrócony</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Przenoszenie niedozwolone, ponieważ %1 jest tylko do odczytu</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the destination</source>
<translation>docelowy</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the source</source>
<translation>źródło</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/common/utility.cpp" line="441"/>
+ <location filename="../src/common/utility.cpp" line="442"/>
<source>in the future</source>
<translation>w przyszłości</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="437"/>
+ <location filename="../src/common/utility.cpp" line="438"/>
<source>%n day(s) ago</source>
<translation><numerusform>%n dzień temu</numerusform><numerusform>%n dni temu</numerusform><numerusform>%n dni temu</numerusform><numerusform>%n dni temu</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="445"/>
+ <location filename="../src/common/utility.cpp" line="446"/>
<source>%n hour(s) ago</source>
<translation><numerusform>%n godzinę temu</numerusform><numerusform>%n godziny temu</numerusform><numerusform>%n godzin temu</numerusform><numerusform>%n godzin temu</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="450"/>
+ <location filename="../src/common/utility.cpp" line="451"/>
<source>now</source>
<translation>teraz</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="452"/>
+ <location filename="../src/common/utility.cpp" line="453"/>
<source>Less than a minute ago</source>
<translation>Mniej niż minutę temu</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="455"/>
+ <location filename="../src/common/utility.cpp" line="456"/>
<source>%n minute(s) ago</source>
<translation><numerusform>%n minutę temu</numerusform><numerusform>%n minuty temu</numerusform><numerusform>%n minut temu</numerusform><numerusform>%n minut temu</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="458"/>
+ <location filename="../src/common/utility.cpp" line="459"/>
<source>Some time ago</source>
<translation>Jakiś czas temu</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="129"/>
+ <location filename="../src/common/utility.cpp" line="130"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="133"/>
+ <location filename="../src/common/utility.cpp" line="134"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="137"/>
+ <location filename="../src/common/utility.cpp" line="138"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="140"/>
+ <location filename="../src/common/utility.cpp" line="141"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="309"/>
+ <location filename="../src/common/utility.cpp" line="310"/>
<source>%n year(s)</source>
<translation><numerusform>%n rok</numerusform><numerusform>%n lata</numerusform><numerusform>%n lat</numerusform><numerusform>%n lat</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="310"/>
+ <location filename="../src/common/utility.cpp" line="311"/>
<source>%n month(s)</source>
<translation><numerusform>%n miesiąc</numerusform><numerusform>%n miesiące</numerusform><numerusform>%n miesięcy</numerusform><numerusform>%n miesięcy</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="311"/>
+ <location filename="../src/common/utility.cpp" line="312"/>
<source>%n day(s)</source>
<translation><numerusform>%n dzień</numerusform><numerusform>%n dni</numerusform><numerusform>%n dni</numerusform><numerusform>%n dni</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="312"/>
+ <location filename="../src/common/utility.cpp" line="313"/>
<source>%n hour(s)</source>
<translation><numerusform>%n godzina</numerusform><numerusform>%n godziny</numerusform><numerusform>%n godzin</numerusform><numerusform>%n godzin</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="313"/>
+ <location filename="../src/common/utility.cpp" line="314"/>
<source>%n minute(s)</source>
<translation><numerusform>%n minuta</numerusform><numerusform>%n minuty</numerusform><numerusform>%n minut</numerusform><numerusform>%n minut</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="314"/>
+ <location filename="../src/common/utility.cpp" line="315"/>
<source>%n second(s)</source>
<translation><numerusform>%n sekunda</numerusform><numerusform>%n sekundy</numerusform><numerusform>%n sekund</numerusform><numerusform>%n sekund</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="338"/>
+ <location filename="../src/common/utility.cpp" line="339"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<translation>A obter do servidor as permissões máximas de partilha...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="184"/>
+ <location filename="../src/gui/sharedialog.cpp" line="192"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>O ficheiro não pode ser partilhado porque foi partilhado sem permissão de partilha.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="198"/>
+ <location filename="../src/gui/sharedialog.cpp" line="206"/>
<source>Users and Groups</source>
<translation>Utilizadores e Grupos</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="205"/>
+ <location filename="../src/gui/sharedialog.cpp" line="213"/>
<source>Public Links</source>
<translation>Ligações públicas</translation>
</message>
<translation>Partilhar com %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="507"/>
+ <location filename="../src/gui/socketapi.cpp" line="555"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="516"/>
+ <location filename="../src/gui/socketapi.cpp" line="563"/>
<source>Share...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="518"/>
+ <location filename="../src/gui/socketapi.cpp" line="565"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="519"/>
+ <location filename="../src/gui/socketapi.cpp" line="566"/>
<source>Send private link by email...</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="482"/>
+ <location filename="../src/libsync/syncengine.cpp" line="491"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="753"/>
+ <location filename="../src/libsync/syncengine.cpp" line="769"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Apenas %1 estão disponíveis, é preciso um mínimo de %2 para começar</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="788"/>
+ <location filename="../src/libsync/syncengine.cpp" line="804"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1261"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1277"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Não permitido, porque não tem permissão para adicionar a pasta fonte</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1284"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Não permitido, porque não tem permissão para adicionar os ficheiros nessa pasta</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1570"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1586"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1577"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1593"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<translation>O nome do ficheiro é muito grande</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="488"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
+ <source>Unresolved conflict.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="498"/>
<source>Stat failed.</source>
<translation>Estado falhou.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="515"/>
+ <location filename="../src/libsync/syncengine.cpp" line="525"/>
<source>Filename encoding is not valid</source>
<translation>Codificação de nome de ficheiro não é válida</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="683"/>
+ <location filename="../src/libsync/syncengine.cpp" line="699"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Carateres inválidos, por favor, renomeie "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="807"/>
+ <location filename="../src/libsync/syncengine.cpp" line="823"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Não foi possível ler a lista negra a partir da base de dados local</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="848"/>
+ <location filename="../src/libsync/syncengine.cpp" line="864"/>
<source>Unable to read from the sync journal.</source>
<translation>Não foi possível ler a partir do jornal de sincronização.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="897"/>
+ <location filename="../src/libsync/syncengine.cpp" line="913"/>
<source>Cannot open the sync journal</source>
<translation>Impossível abrir o jornal de sincronismo</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="951"/>
+ <location filename="../src/libsync/syncengine.cpp" line="967"/>
<source>File name contains at least one invalid character</source>
<translation>O nome de ficheiro contém pelo menos um caráter inválido</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1187"/>
- <location filename="../src/libsync/syncengine.cpp" line="1227"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorado devido à blacklist de escolha para sincronização</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1246"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1262"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Não permitido, porque não tem permissão para adicionar as subpastas nessa pasta</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1293"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1309"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Não é permitido enviar este ficheiro porque este é só de leitura no servidor, a restaurar</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1309"/>
- <location filename="../src/libsync/syncengine.cpp" line="1328"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1325"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1344"/>
<source>Not allowed to remove, restoring</source>
<translation>Não autorizado para remoção, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1341"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1357"/>
<source>Local files and share folder removed.</source>
<translation>Ficheiros locais e pasta partilhada removidos.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1411"/>
<source>Move not allowed, item restored</source>
<translation>Mover não foi permitido, item restaurado</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Mover não foi autorizado porque %1 é só de leitura</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the destination</source>
<translation>o destino</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the source</source>
<translation>a origem</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/common/utility.cpp" line="441"/>
+ <location filename="../src/common/utility.cpp" line="442"/>
<source>in the future</source>
<translation>no futuro</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="437"/>
+ <location filename="../src/common/utility.cpp" line="438"/>
<source>%n day(s) ago</source>
<translation><numerusform>%n dia atrás</numerusform><numerusform>%n dias atrás</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="445"/>
+ <location filename="../src/common/utility.cpp" line="446"/>
<source>%n hour(s) ago</source>
<translation><numerusform>%n hora atrás</numerusform><numerusform>%n horas atrás</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="450"/>
+ <location filename="../src/common/utility.cpp" line="451"/>
<source>now</source>
<translation>agora</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="452"/>
+ <location filename="../src/common/utility.cpp" line="453"/>
<source>Less than a minute ago</source>
<translation>Menos de um minuto atrás</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="455"/>
+ <location filename="../src/common/utility.cpp" line="456"/>
<source>%n minute(s) ago</source>
<translation><numerusform>%n minuto atrás</numerusform><numerusform>%n minutos atrás</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="458"/>
+ <location filename="../src/common/utility.cpp" line="459"/>
<source>Some time ago</source>
<translation>Algum tempo atrás</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="129"/>
+ <location filename="../src/common/utility.cpp" line="130"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="133"/>
+ <location filename="../src/common/utility.cpp" line="134"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="137"/>
+ <location filename="../src/common/utility.cpp" line="138"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="140"/>
+ <location filename="../src/common/utility.cpp" line="141"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="309"/>
+ <location filename="../src/common/utility.cpp" line="310"/>
<source>%n year(s)</source>
<translation><numerusform>%n ano</numerusform><numerusform>%n ano(s)</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="310"/>
+ <location filename="../src/common/utility.cpp" line="311"/>
<source>%n month(s)</source>
<translation><numerusform>%n mês</numerusform><numerusform>%n meses</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="311"/>
+ <location filename="../src/common/utility.cpp" line="312"/>
<source>%n day(s)</source>
<translation><numerusform>%n dia</numerusform><numerusform>%n dias</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="312"/>
+ <location filename="../src/common/utility.cpp" line="313"/>
<source>%n hour(s)</source>
<translation><numerusform>%n hora</numerusform><numerusform>%n horas</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="313"/>
+ <location filename="../src/common/utility.cpp" line="314"/>
<source>%n minute(s)</source>
<translation><numerusform>%n minuto</numerusform><numerusform>%n minutos</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="314"/>
+ <location filename="../src/common/utility.cpp" line="315"/>
<source>%n second(s)</source>
<translation><numerusform>%n segundo</numerusform><numerusform>%n segundos</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="338"/>
+ <location filename="../src/common/utility.cpp" line="339"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<translation>Recuperando máximo possível de permissões de compartilhamento do servidor...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="184"/>
+ <location filename="../src/gui/sharedialog.cpp" line="192"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>O arquivo não pode ser partilhado, pois foi compartilhado sem permissão de compartilhamento.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="198"/>
+ <location filename="../src/gui/sharedialog.cpp" line="206"/>
<source>Users and Groups</source>
<translation>Usuários e Grupos</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="205"/>
+ <location filename="../src/gui/sharedialog.cpp" line="213"/>
<source>Public Links</source>
<translation>Linques Públicos</translation>
</message>
<translation>Compartilhar com %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="507"/>
+ <location filename="../src/gui/socketapi.cpp" line="555"/>
<source>I shared something with you</source>
<translation>Eu compartilhei algo com você</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="516"/>
+ <location filename="../src/gui/socketapi.cpp" line="563"/>
<source>Share...</source>
<translation>Compartilhar...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="518"/>
+ <location filename="../src/gui/socketapi.cpp" line="565"/>
<source>Copy private link to clipboard</source>
<translation>Copie o linque privado para a área de transferência</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="519"/>
+ <location filename="../src/gui/socketapi.cpp" line="566"/>
<source>Send private link by email...</source>
<translation>Envie o linque privado por e-mail...</translation>
</message>
<translation>A hierarquia de pastas é muito profunda</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="482"/>
+ <location filename="../src/libsync/syncengine.cpp" line="491"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Conflito: Versão do servidor baixada, cópia local renomeada e não carregada.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="753"/>
+ <location filename="../src/libsync/syncengine.cpp" line="769"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Apenas %1 estão disponíveis, precisamos de pelo menos %2 para começar</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="788"/>
+ <location filename="../src/libsync/syncengine.cpp" line="804"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation>Não é possível abrir ou criar o banco de dados de sincronização local. Certifique-se de ter acesso de gravação na pasta de sincronização.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1261"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1277"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Não permitido porque você não tem permissão para adicionar pasta mãe</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1284"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Não permitido porque você não tem permissão para adicionar arquivos na pasta</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1570"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1586"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation>O espaço em disco é pequeno: Os downloads que reduzam o espaço livre abaixo de %1 foram ignorados.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1577"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1593"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation>Há espaço disponível no servidor para alguns envios.</translation>
</message>
<translation>O nome do arquivo é muito longo.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="488"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
+ <source>Unresolved conflict.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="498"/>
<source>Stat failed.</source>
<translation>Stat falhou.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="515"/>
+ <location filename="../src/libsync/syncengine.cpp" line="525"/>
<source>Filename encoding is not valid</source>
<translation>A codificação do nome do arquivo não é válida</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="683"/>
+ <location filename="../src/libsync/syncengine.cpp" line="699"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Caracteres inválidos, por favor renomear "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="807"/>
+ <location filename="../src/libsync/syncengine.cpp" line="823"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Não é possível ler a lista negra a partir do banco de dados local</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="848"/>
+ <location filename="../src/libsync/syncengine.cpp" line="864"/>
<source>Unable to read from the sync journal.</source>
<translation>Não é possível ler a partir do relatório de sincronização.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="897"/>
+ <location filename="../src/libsync/syncengine.cpp" line="913"/>
<source>Cannot open the sync journal</source>
<translation>Não é possível abrir o arquivo de sincronização</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="951"/>
+ <location filename="../src/libsync/syncengine.cpp" line="967"/>
<source>File name contains at least one invalid character</source>
<translation>O nome do arquivo contem pelo menos um caractere inválido </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1187"/>
- <location filename="../src/libsync/syncengine.cpp" line="1227"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorado por causa da lista negra "escolher o que sincronizar"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1246"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1262"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Não permitido porque você não tem permissão para adicionar subpastas para essa pasta</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1293"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1309"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Não é permitido fazer o upload deste arquivo porque ele é somente leitura no servidor, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1309"/>
- <location filename="../src/libsync/syncengine.cpp" line="1328"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1325"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1344"/>
<source>Not allowed to remove, restoring</source>
<translation>Não é permitido remover, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1341"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1357"/>
<source>Local files and share folder removed.</source>
<translation>Arquivos locais e pasta compartilhada removida.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1411"/>
<source>Move not allowed, item restored</source>
<translation>Não é permitido mover, item restaurado</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Não é permitido mover porque %1 é somente para leitura</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the destination</source>
<translation>o destino</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the source</source>
<translation>a fonte</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/common/utility.cpp" line="441"/>
+ <location filename="../src/common/utility.cpp" line="442"/>
<source>in the future</source>
<translation>no futuro</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="437"/>
+ <location filename="../src/common/utility.cpp" line="438"/>
<source>%n day(s) ago</source>
<translation><numerusform>%n dia(s) atrás</numerusform><numerusform>%n dia(s) atrás</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="445"/>
+ <location filename="../src/common/utility.cpp" line="446"/>
<source>%n hour(s) ago</source>
<translation><numerusform>%n hora(s) atrás</numerusform><numerusform>%n hora(s) atrás</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="450"/>
+ <location filename="../src/common/utility.cpp" line="451"/>
<source>now</source>
<translation>agora</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="452"/>
+ <location filename="../src/common/utility.cpp" line="453"/>
<source>Less than a minute ago</source>
<translation>A menos de um minuto atrás</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="455"/>
+ <location filename="../src/common/utility.cpp" line="456"/>
<source>%n minute(s) ago</source>
<translation><numerusform>%n minuto(s) atrás</numerusform><numerusform>%n minuto(s) atrás</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="458"/>
+ <location filename="../src/common/utility.cpp" line="459"/>
<source>Some time ago</source>
<translation>Algum tempo atrás</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="129"/>
+ <location filename="../src/common/utility.cpp" line="130"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="133"/>
+ <location filename="../src/common/utility.cpp" line="134"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="137"/>
+ <location filename="../src/common/utility.cpp" line="138"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="140"/>
+ <location filename="../src/common/utility.cpp" line="141"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="309"/>
+ <location filename="../src/common/utility.cpp" line="310"/>
<source>%n year(s)</source>
<translation><numerusform>%n ano</numerusform><numerusform>%n ano(s)</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="310"/>
+ <location filename="../src/common/utility.cpp" line="311"/>
<source>%n month(s)</source>
<translation><numerusform>%n mês</numerusform><numerusform>%n mês(es)</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="311"/>
+ <location filename="../src/common/utility.cpp" line="312"/>
<source>%n day(s)</source>
<translation><numerusform>%n day</numerusform><numerusform>%n dia(s)</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="312"/>
+ <location filename="../src/common/utility.cpp" line="313"/>
<source>%n hour(s)</source>
<translation><numerusform>%n hora</numerusform><numerusform>%n hora(s)</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="313"/>
+ <location filename="../src/common/utility.cpp" line="314"/>
<source>%n minute(s)</source>
<translation><numerusform>%n minuto</numerusform><numerusform>%n minuto(s)</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="314"/>
+ <location filename="../src/common/utility.cpp" line="315"/>
<source>%n second(s)</source>
<translation><numerusform>%n segundo</numerusform><numerusform>%n segundo(s)</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="338"/>
+ <location filename="../src/common/utility.cpp" line="339"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<translation>Запрос максимально возможных прав для предоставления доступа с сервера…</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="184"/>
+ <location filename="../src/gui/sharedialog.cpp" line="192"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Невозможно предоставить общий доступ к файлу: нет разрешения на предоставление общего доступа.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="198"/>
+ <location filename="../src/gui/sharedialog.cpp" line="206"/>
<source>Users and Groups</source>
<translation>Пользователи и группы</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="205"/>
+ <location filename="../src/gui/sharedialog.cpp" line="213"/>
<source>Public Links</source>
<translation>Общедоступные ссылки</translation>
</message>
<translation>Поделиться с %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="507"/>
+ <location filename="../src/gui/socketapi.cpp" line="555"/>
<source>I shared something with you</source>
<translation>Я поделился с тобой</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="516"/>
+ <location filename="../src/gui/socketapi.cpp" line="563"/>
<source>Share...</source>
<translation>Поделиться...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="518"/>
+ <location filename="../src/gui/socketapi.cpp" line="565"/>
<source>Copy private link to clipboard</source>
<translation>Копировать приватную ссылку в буфер обмена...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="519"/>
+ <location filename="../src/gui/socketapi.cpp" line="566"/>
<source>Send private link by email...</source>
<translation>Отправить приватную ссылку по email...</translation>
</message>
<translation>Иерархия каталогов слишком глубока</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="482"/>
+ <location filename="../src/libsync/syncengine.cpp" line="491"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Конфликт: Серверная версия скачана, локальная копия переименована и не закачана.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="753"/>
+ <location filename="../src/libsync/syncengine.cpp" line="769"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Только %1 доступно, нужно как минимум %2 чтобы начать</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="788"/>
+ <location filename="../src/libsync/syncengine.cpp" line="804"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation>Не могу открыть или создать локальную базу данных синхронизации. Удостоверьтесь, что у вас есть доступ на запись в каталог синхронизации.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1261"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1277"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Не разрешается, так как у вас нет полномочий на добавление родительской папки</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1284"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Не разрешается, так как у вас нет полномочий на добавление файлов в эту папку</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1570"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1586"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation>Мало места на диске: Скачивания, которые сократят свободное место ниже %1, будут пропущены.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1577"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1593"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation>На сервере недостаточно места для некоторых закачек.</translation>
</message>
<translation>Имя файла слишком длинное.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="488"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
+ <source>Unresolved conflict.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="498"/>
<source>Stat failed.</source>
<translation>Не удалось загрузить статистику.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="515"/>
+ <location filename="../src/libsync/syncengine.cpp" line="525"/>
<source>Filename encoding is not valid</source>
<translation>Кодировка имени файла не верна</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="683"/>
+ <location filename="../src/libsync/syncengine.cpp" line="699"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Недопустимые символы, пожалуйста, переименуйте "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="807"/>
+ <location filename="../src/libsync/syncengine.cpp" line="823"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Не удалось прочитать файл чёрного списка из локальной базы данных.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="848"/>
+ <location filename="../src/libsync/syncengine.cpp" line="864"/>
<source>Unable to read from the sync journal.</source>
<translation>Не удалось прочитать из журнала синхронизации.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="897"/>
+ <location filename="../src/libsync/syncengine.cpp" line="913"/>
<source>Cannot open the sync journal</source>
<translation>Не удаётся открыть журнал синхронизации</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="951"/>
+ <location filename="../src/libsync/syncengine.cpp" line="967"/>
<source>File name contains at least one invalid character</source>
<translation>Имя файла содержит по крайней мере один некорректный символ</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1187"/>
- <location filename="../src/libsync/syncengine.cpp" line="1227"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Игнорируется из-за черного списка в "что синхронизировать"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1246"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1262"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Не разрешается, так как у вас нет полномочий на добавление подпапок в папку.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1293"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1309"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Не допускается загрузка этого файла, так как на сервере он помечен только для чтения, восстанавливаем</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1309"/>
- <location filename="../src/libsync/syncengine.cpp" line="1328"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1325"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1344"/>
<source>Not allowed to remove, restoring</source>
<translation>Не допускается удаление, восстанавливаем</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1341"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1357"/>
<source>Local files and share folder removed.</source>
<translation>Локальные файлы и общий каталог удалены.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1411"/>
<source>Move not allowed, item restored</source>
<translation>Перемещение не допускается, элемент восстановлен</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Перемещение не допускается, поскольку %1 помечен только для чтения</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the destination</source>
<translation>назначение</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the source</source>
<translation>источник</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/common/utility.cpp" line="441"/>
+ <location filename="../src/common/utility.cpp" line="442"/>
<source>in the future</source>
<translation>в будущем</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="437"/>
+ <location filename="../src/common/utility.cpp" line="438"/>
<source>%n day(s) ago</source>
<translation><numerusform>%n день назад</numerusform><numerusform>%n дня назад</numerusform><numerusform>%n дней назад</numerusform><numerusform>%n дней назад</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="445"/>
+ <location filename="../src/common/utility.cpp" line="446"/>
<source>%n hour(s) ago</source>
<translation><numerusform>%n час назад</numerusform><numerusform>%n часа назад</numerusform><numerusform>%n часов назад</numerusform><numerusform>%n часов назад</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="450"/>
+ <location filename="../src/common/utility.cpp" line="451"/>
<source>now</source>
<translation>сейчас</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="452"/>
+ <location filename="../src/common/utility.cpp" line="453"/>
<source>Less than a minute ago</source>
<translation>Меньше минуты назад</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="455"/>
+ <location filename="../src/common/utility.cpp" line="456"/>
<source>%n minute(s) ago</source>
<translation><numerusform>%n минута назад</numerusform><numerusform>%n минуты назад</numerusform><numerusform>%n минут назад</numerusform><numerusform>%n минут назад</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="458"/>
+ <location filename="../src/common/utility.cpp" line="459"/>
<source>Some time ago</source>
<translation>Некоторое время назад</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="129"/>
+ <location filename="../src/common/utility.cpp" line="130"/>
<source>%L1 GB</source>
<translation>%L1 ГБ</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="133"/>
+ <location filename="../src/common/utility.cpp" line="134"/>
<source>%L1 MB</source>
<translation>%L1 МБ</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="137"/>
+ <location filename="../src/common/utility.cpp" line="138"/>
<source>%L1 KB</source>
<translation>%L1 КБ</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="140"/>
+ <location filename="../src/common/utility.cpp" line="141"/>
<source>%L1 B</source>
<translation>%L1 Б</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="309"/>
+ <location filename="../src/common/utility.cpp" line="310"/>
<source>%n year(s)</source>
<translation><numerusform>%n год</numerusform><numerusform>%n года</numerusform><numerusform>%n лет</numerusform><numerusform>%n лет</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="310"/>
+ <location filename="../src/common/utility.cpp" line="311"/>
<source>%n month(s)</source>
<translation><numerusform>%n месяц</numerusform><numerusform>%n месяца</numerusform><numerusform>%3 месяцев</numerusform><numerusform>%n месяцев</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="311"/>
+ <location filename="../src/common/utility.cpp" line="312"/>
<source>%n day(s)</source>
<translation><numerusform>%n день</numerusform><numerusform>%n дня</numerusform><numerusform>%n дней</numerusform><numerusform>%n дней</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="312"/>
+ <location filename="../src/common/utility.cpp" line="313"/>
<source>%n hour(s)</source>
<translation><numerusform>%n час</numerusform><numerusform>%n часа</numerusform><numerusform>%n часов</numerusform><numerusform>%n часов</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="313"/>
+ <location filename="../src/common/utility.cpp" line="314"/>
<source>%n minute(s)</source>
<translation><numerusform>%n минута</numerusform><numerusform>%n минуты</numerusform><numerusform>%n минут</numerusform><numerusform>%n минут</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="314"/>
+ <location filename="../src/common/utility.cpp" line="315"/>
<source>%n second(s)</source>
<translation><numerusform>%n секунда</numerusform><numerusform>%n секунды</numerusform><numerusform>%n секунд</numerusform><numerusform>%n секунд</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="338"/>
+ <location filename="../src/common/utility.cpp" line="339"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<message>
<location filename="../src/gui/folderwizardtargetpage.ui" line="110"/>
<source>TextLabel</source>
- <translation>TextLabel</translation>
+ <translation>Štítok</translation>
</message>
</context>
<context>
<message>
<location filename="../src/libsync/abstractnetworkjob.cpp" line="242"/>
<source>Unknown error: network reply was deleted</source>
- <translation type="unfinished"/>
+ <translation>Neznáma chyba: odpoveď siete bola odstránená</translation>
</message>
<message>
<location filename="../src/libsync/abstractnetworkjob.cpp" line="385"/>
<source>Server replied "%1 %2" to "%3 %4"</source>
- <translation type="unfinished"/>
+ <translation>Server odpovedal "%1 %2" na "%3 %4"</translation>
</message>
</context>
<context>
<message>
<location filename="../src/gui/accountsettings.ui" line="198"/>
<source>Synchronize all</source>
- <translation type="unfinished"/>
+ <translation>Synchronizovať všetky</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="205"/>
<source>Synchronize none</source>
- <translation type="unfinished"/>
+ <translation>Synchronizovať žiadny</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="212"/>
<source>Apply manual changes</source>
- <translation type="unfinished"/>
+ <translation>Aplikovať manuálne zmeny</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="260"/>
<message>
<location filename="../src/gui/accountsettings.cpp" line="306"/>
<source>Force sync now</source>
- <translation type="unfinished"/>
+ <translation>Vynútiť synchronizáciu teraz</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="308"/>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="184"/>
+ <location filename="../src/gui/sharedialog.cpp" line="192"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Tento súbor nemožno zdieľať, lebo bol vyzdieľaný bez možnosti ďalšieho zdieľania.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="198"/>
+ <location filename="../src/gui/sharedialog.cpp" line="206"/>
<source>Users and Groups</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="205"/>
+ <location filename="../src/gui/sharedialog.cpp" line="213"/>
<source>Public Links</source>
<translation type="unfinished"/>
</message>
<translation>Zdieľať s %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="507"/>
+ <location filename="../src/gui/socketapi.cpp" line="555"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="516"/>
+ <location filename="../src/gui/socketapi.cpp" line="563"/>
<source>Share...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="518"/>
+ <location filename="../src/gui/socketapi.cpp" line="565"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="519"/>
+ <location filename="../src/gui/socketapi.cpp" line="566"/>
<source>Send private link by email...</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="482"/>
+ <location filename="../src/libsync/syncengine.cpp" line="491"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="753"/>
+ <location filename="../src/libsync/syncengine.cpp" line="769"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="788"/>
+ <location filename="../src/libsync/syncengine.cpp" line="804"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1261"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1277"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1284"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1570"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1586"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1577"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1593"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<translation>Meno súboru je veľmi dlhé.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="488"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
+ <source>Unresolved conflict.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="498"/>
<source>Stat failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="515"/>
+ <location filename="../src/libsync/syncengine.cpp" line="525"/>
<source>Filename encoding is not valid</source>
<translation>Kódovanie znakov názvu súboru je neplatné</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="683"/>
+ <location filename="../src/libsync/syncengine.cpp" line="699"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Neplatné znaky, premenujte prosím "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="807"/>
+ <location filename="../src/libsync/syncengine.cpp" line="823"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="848"/>
+ <location filename="../src/libsync/syncengine.cpp" line="864"/>
<source>Unable to read from the sync journal.</source>
<translation>Nemožno čítať zo synchronizačného žurnálu</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="897"/>
+ <location filename="../src/libsync/syncengine.cpp" line="913"/>
<source>Cannot open the sync journal</source>
<translation>Nemožno otvoriť sync žurnál</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="951"/>
+ <location filename="../src/libsync/syncengine.cpp" line="967"/>
<source>File name contains at least one invalid character</source>
<translation>Názov súboru obsahuje nevhodný znak</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1187"/>
- <location filename="../src/libsync/syncengine.cpp" line="1227"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorované podľa nastavenia "vybrať čo synchronizovať"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1246"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1262"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Nie je dovolené, lebo nemáte oprávnenie pridávať podpriečinky do tohto priečinka</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1293"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1309"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Nie je dovolené tento súbor nahrať, pretože je na serveri iba na čítanie. Obnovuje sa.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1309"/>
- <location filename="../src/libsync/syncengine.cpp" line="1328"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1325"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1344"/>
<source>Not allowed to remove, restoring</source>
<translation>Nie je dovolené odstrániť. Obnovuje sa.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1341"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1357"/>
<source>Local files and share folder removed.</source>
<translation>Lokálne súbory a zdieľaný priečinok boli odstránené.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1411"/>
<source>Move not allowed, item restored</source>
<translation>Presunutie nie je dovolené. Položka obnovená.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Presunutie nie je dovolené, pretože %1 je na serveri iba na čítanie</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the destination</source>
<translation>cieľ</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the source</source>
<translation>zdroj</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/common/utility.cpp" line="441"/>
+ <location filename="../src/common/utility.cpp" line="442"/>
<source>in the future</source>
<translation>v budúcnosti</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="437"/>
+ <location filename="../src/common/utility.cpp" line="438"/>
<source>%n day(s) ago</source>
<translation><numerusform>pred %n dňom</numerusform><numerusform>pred %n dňami</numerusform><numerusform>pred %n dňami</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="445"/>
+ <location filename="../src/common/utility.cpp" line="446"/>
<source>%n hour(s) ago</source>
<translation><numerusform>pred %n hodinou</numerusform><numerusform>pred %n hodinami</numerusform><numerusform>pred %n hodinami</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="450"/>
+ <location filename="../src/common/utility.cpp" line="451"/>
<source>now</source>
<translation>teraz</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="452"/>
+ <location filename="../src/common/utility.cpp" line="453"/>
<source>Less than a minute ago</source>
<translation>Menej ako pred minútou</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="455"/>
+ <location filename="../src/common/utility.cpp" line="456"/>
<source>%n minute(s) ago</source>
<translation><numerusform>pred %n minútou</numerusform><numerusform>pred %n minútami</numerusform><numerusform>pred %n minútami</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="458"/>
+ <location filename="../src/common/utility.cpp" line="459"/>
<source>Some time ago</source>
<translation>Pred istým časom</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="129"/>
+ <location filename="../src/common/utility.cpp" line="130"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="133"/>
+ <location filename="../src/common/utility.cpp" line="134"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="137"/>
+ <location filename="../src/common/utility.cpp" line="138"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="140"/>
+ <location filename="../src/common/utility.cpp" line="141"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="309"/>
+ <location filename="../src/common/utility.cpp" line="310"/>
<source>%n year(s)</source>
<translation><numerusform>%n rok</numerusform><numerusform>%n roky</numerusform><numerusform>%n rokov</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="310"/>
+ <location filename="../src/common/utility.cpp" line="311"/>
<source>%n month(s)</source>
<translation><numerusform>%n mesiac</numerusform><numerusform>%n mesiace</numerusform><numerusform>%n mesiacov</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="311"/>
+ <location filename="../src/common/utility.cpp" line="312"/>
<source>%n day(s)</source>
<translation><numerusform>%n deň</numerusform><numerusform>%n dni</numerusform><numerusform>%n dní</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="312"/>
+ <location filename="../src/common/utility.cpp" line="313"/>
<source>%n hour(s)</source>
<translation><numerusform>%n hodina</numerusform><numerusform>%n hodiny</numerusform><numerusform>%n hodín</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="313"/>
+ <location filename="../src/common/utility.cpp" line="314"/>
<source>%n minute(s)</source>
<translation><numerusform>%n minúta</numerusform><numerusform>%n minúty</numerusform><numerusform>%n minút</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="314"/>
+ <location filename="../src/common/utility.cpp" line="315"/>
<source>%n second(s)</source>
<translation><numerusform>%n sekunda</numerusform><numerusform>%n sekundy</numerusform><numerusform>%n sekúnd</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="338"/>
+ <location filename="../src/common/utility.cpp" line="339"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<translation>Pridobivanje največjega mogočega števila dovoljenj za souporabo prek strežnika ...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="184"/>
+ <location filename="../src/gui/sharedialog.cpp" line="192"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Datoteke ni mogoče dodeliti v souporabo, ker ni navedenih ustreznih dovoljenj.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="198"/>
+ <location filename="../src/gui/sharedialog.cpp" line="206"/>
<source>Users and Groups</source>
<translation>Uporabnik in skupine</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="205"/>
+ <location filename="../src/gui/sharedialog.cpp" line="213"/>
<source>Public Links</source>
<translation>Javne povezave</translation>
</message>
<translation>Omogoči souporabo z %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="507"/>
+ <location filename="../src/gui/socketapi.cpp" line="555"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="516"/>
+ <location filename="../src/gui/socketapi.cpp" line="563"/>
<source>Share...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="518"/>
+ <location filename="../src/gui/socketapi.cpp" line="565"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="519"/>
+ <location filename="../src/gui/socketapi.cpp" line="566"/>
<source>Send private link by email...</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="482"/>
+ <location filename="../src/libsync/syncengine.cpp" line="491"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="753"/>
+ <location filename="../src/libsync/syncengine.cpp" line="769"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Le %1 je na voljo, zahtevanih pa je vaj %2 za zagon</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="788"/>
+ <location filename="../src/libsync/syncengine.cpp" line="804"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1261"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1277"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Dejanje ni dovoljeno, ker ni ustreznih dovoljenj za dodajanje starševske mape</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1284"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Dejanje ni dovoljeno, ker ni ustreznih dovoljenj za dodajanje datotek v to mapo</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1570"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1586"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1577"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1593"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<translation>Ime datoteke je predolgo.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="488"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
+ <source>Unresolved conflict.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="498"/>
<source>Stat failed.</source>
<translation>Določanje statističnih podatkov je spodletelo.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="515"/>
+ <location filename="../src/libsync/syncengine.cpp" line="525"/>
<source>Filename encoding is not valid</source>
<translation>Kodni zapis imena datoteke ni veljaven.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="683"/>
+ <location filename="../src/libsync/syncengine.cpp" line="699"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Uporabljen je neveljaven znak; preimenujte "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="807"/>
+ <location filename="../src/libsync/syncengine.cpp" line="823"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Ni mogoče prebrati črnega seznama iz krajevne mape</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="848"/>
+ <location filename="../src/libsync/syncengine.cpp" line="864"/>
<source>Unable to read from the sync journal.</source>
<translation>Ni mogoče brati iz dnevnika usklajevanja</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="897"/>
+ <location filename="../src/libsync/syncengine.cpp" line="913"/>
<source>Cannot open the sync journal</source>
<translation>Ni mogoče odpreti dnevnika usklajevanja</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="951"/>
+ <location filename="../src/libsync/syncengine.cpp" line="967"/>
<source>File name contains at least one invalid character</source>
<translation>Ime datoteke vsebuje vsaj en neveljaven znak.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1187"/>
- <location filename="../src/libsync/syncengine.cpp" line="1227"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Prezrto, ker je predmet označen na črni listi za usklajevanje</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1246"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1262"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Dejanje ni dovoljeno! Ni ustreznih dovoljenj za dodajanje podmap v to mapo.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1293"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1309"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Ni dovoljeno pošiljati te datoteke, ker ima določena dovoljenja le za branje. Datoteka bo obnovljena na izvorno različico.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1309"/>
- <location filename="../src/libsync/syncengine.cpp" line="1328"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1325"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1344"/>
<source>Not allowed to remove, restoring</source>
<translation>Odstranitev ni dovoljena, datoteka bo obnovljena.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1341"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1357"/>
<source>Local files and share folder removed.</source>
<translation>Krajevne datoteke in mape v souporabi so odstranjene.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1411"/>
<source>Move not allowed, item restored</source>
<translation>Premikanje ni dovoljeno, datoteka bo obnovljena.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Premikanje ni dovoljeno, ker je nastavljeno določilo %1 le za branje.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the destination</source>
<translation>cilj</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the source</source>
<translation>vir</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/common/utility.cpp" line="441"/>
+ <location filename="../src/common/utility.cpp" line="442"/>
<source>in the future</source>
<translation>v prihodnje</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="437"/>
+ <location filename="../src/common/utility.cpp" line="438"/>
<source>%n day(s) ago</source>
<translation><numerusform>pred %n dnevom</numerusform><numerusform>pred %n dnevoma</numerusform><numerusform>pred %n dnevi</numerusform><numerusform>pred %n dnevi</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="445"/>
+ <location filename="../src/common/utility.cpp" line="446"/>
<source>%n hour(s) ago</source>
<translation><numerusform>pred %n uro</numerusform><numerusform>pred %n urama</numerusform><numerusform>pred %n urami</numerusform><numerusform>pred %n urami</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="450"/>
+ <location filename="../src/common/utility.cpp" line="451"/>
<source>now</source>
<translation>zdaj</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="452"/>
+ <location filename="../src/common/utility.cpp" line="453"/>
<source>Less than a minute ago</source>
<translation>Pred manj kot minuto</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="455"/>
+ <location filename="../src/common/utility.cpp" line="456"/>
<source>%n minute(s) ago</source>
<translation><numerusform>pred %n minuto</numerusform><numerusform>pred %n minutama</numerusform><numerusform>pred %n minutami</numerusform><numerusform>pred %n minutami</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="458"/>
+ <location filename="../src/common/utility.cpp" line="459"/>
<source>Some time ago</source>
<translation>Pred nekaj časa</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="129"/>
+ <location filename="../src/common/utility.cpp" line="130"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="133"/>
+ <location filename="../src/common/utility.cpp" line="134"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="137"/>
+ <location filename="../src/common/utility.cpp" line="138"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="140"/>
+ <location filename="../src/common/utility.cpp" line="141"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="309"/>
+ <location filename="../src/common/utility.cpp" line="310"/>
<source>%n year(s)</source>
<translation><numerusform>%n leto</numerusform><numerusform>%n leti</numerusform><numerusform>%n leta</numerusform><numerusform>%n let</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="310"/>
+ <location filename="../src/common/utility.cpp" line="311"/>
<source>%n month(s)</source>
<translation><numerusform>%n mesec</numerusform><numerusform>%n meseca</numerusform><numerusform>%n meseci</numerusform><numerusform>%n mesecev</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="311"/>
+ <location filename="../src/common/utility.cpp" line="312"/>
<source>%n day(s)</source>
<translation><numerusform>%n dan</numerusform><numerusform>%n dneva</numerusform><numerusform>%n dnevi</numerusform><numerusform>%n dni</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="312"/>
+ <location filename="../src/common/utility.cpp" line="313"/>
<source>%n hour(s)</source>
<translation><numerusform>%n ura</numerusform><numerusform>%n uri</numerusform><numerusform>%n ure</numerusform><numerusform>%n ur</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="313"/>
+ <location filename="../src/common/utility.cpp" line="314"/>
<source>%n minute(s)</source>
<translation><numerusform>%n minuta</numerusform><numerusform>%n minuti</numerusform><numerusform>%n minute</numerusform><numerusform>%n minut</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="314"/>
+ <location filename="../src/common/utility.cpp" line="315"/>
<source>%n second(s)</source>
<translation><numerusform>%n sekunda</numerusform><numerusform>%n sekundi</numerusform><numerusform>%n sekunde</numerusform><numerusform>%n sekund</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="338"/>
+ <location filename="../src/common/utility.cpp" line="339"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="184"/>
+ <location filename="../src/gui/sharedialog.cpp" line="192"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Фајл се не може делити јер је подељен без дозволе за поновно дељење.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="198"/>
+ <location filename="../src/gui/sharedialog.cpp" line="206"/>
<source>Users and Groups</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="205"/>
+ <location filename="../src/gui/sharedialog.cpp" line="213"/>
<source>Public Links</source>
<translation type="unfinished"/>
</message>
<translation>Подели са %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="507"/>
+ <location filename="../src/gui/socketapi.cpp" line="555"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="516"/>
+ <location filename="../src/gui/socketapi.cpp" line="563"/>
<source>Share...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="518"/>
+ <location filename="../src/gui/socketapi.cpp" line="565"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="519"/>
+ <location filename="../src/gui/socketapi.cpp" line="566"/>
<source>Send private link by email...</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="482"/>
+ <location filename="../src/libsync/syncengine.cpp" line="491"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="753"/>
+ <location filename="../src/libsync/syncengine.cpp" line="769"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="788"/>
+ <location filename="../src/libsync/syncengine.cpp" line="804"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1261"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1277"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1284"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1570"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1586"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1577"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1593"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<translation>Назив фајла је предугачак.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="488"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
+ <source>Unresolved conflict.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="498"/>
<source>Stat failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="515"/>
+ <location filename="../src/libsync/syncengine.cpp" line="525"/>
<source>Filename encoding is not valid</source>
<translation>Кодирање назива фајла није исправно</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="683"/>
+ <location filename="../src/libsync/syncengine.cpp" line="699"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="807"/>
+ <location filename="../src/libsync/syncengine.cpp" line="823"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="848"/>
+ <location filename="../src/libsync/syncengine.cpp" line="864"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="897"/>
+ <location filename="../src/libsync/syncengine.cpp" line="913"/>
<source>Cannot open the sync journal</source>
<translation>Не могу да отворим дневник синхронизације</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="951"/>
+ <location filename="../src/libsync/syncengine.cpp" line="967"/>
<source>File name contains at least one invalid character</source>
<translation>Назив садржи бар један недозвољен карактер</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1187"/>
- <location filename="../src/libsync/syncengine.cpp" line="1227"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Игнорисано јер се не налази на листи за синхронизацију</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1246"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1262"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1293"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1309"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Није могуће отпремити овај фајл јер је на серверу само за читање. Враћам</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1309"/>
- <location filename="../src/libsync/syncengine.cpp" line="1328"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1325"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1344"/>
<source>Not allowed to remove, restoring</source>
<translation>Није могуће уклањање. Враћам</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1341"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1357"/>
<source>Local files and share folder removed.</source>
<translation>Локални фајлови и дељена фасцикла су уклоњени.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1411"/>
<source>Move not allowed, item restored</source>
<translation>Премештање није дозвољено. Ставка је враћена</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Премештање није дозвољено јер %1 је само за читање</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the destination</source>
<translation>одредиште</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the source</source>
<translation>извор</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/common/utility.cpp" line="441"/>
+ <location filename="../src/common/utility.cpp" line="442"/>
<source>in the future</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="437"/>
+ <location filename="../src/common/utility.cpp" line="438"/>
<source>%n day(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="445"/>
+ <location filename="../src/common/utility.cpp" line="446"/>
<source>%n hour(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="450"/>
+ <location filename="../src/common/utility.cpp" line="451"/>
<source>now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="452"/>
+ <location filename="../src/common/utility.cpp" line="453"/>
<source>Less than a minute ago</source>
<translation>пре мање од минут</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="455"/>
+ <location filename="../src/common/utility.cpp" line="456"/>
<source>%n minute(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="458"/>
+ <location filename="../src/common/utility.cpp" line="459"/>
<source>Some time ago</source>
<translation>пре неког времена</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="129"/>
+ <location filename="../src/common/utility.cpp" line="130"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="133"/>
+ <location filename="../src/common/utility.cpp" line="134"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="137"/>
+ <location filename="../src/common/utility.cpp" line="138"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="140"/>
+ <location filename="../src/common/utility.cpp" line="141"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="309"/>
+ <location filename="../src/common/utility.cpp" line="310"/>
<source>%n year(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="310"/>
+ <location filename="../src/common/utility.cpp" line="311"/>
<source>%n month(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="311"/>
+ <location filename="../src/common/utility.cpp" line="312"/>
<source>%n day(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="312"/>
+ <location filename="../src/common/utility.cpp" line="313"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="313"/>
+ <location filename="../src/common/utility.cpp" line="314"/>
<source>%n minute(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="314"/>
+ <location filename="../src/common/utility.cpp" line="315"/>
<source>%n second(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="338"/>
+ <location filename="../src/common/utility.cpp" line="339"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<translation>Tar emot maximal delningsbehörighet från servern...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="184"/>
+ <location filename="../src/gui/sharedialog.cpp" line="192"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Filen kan inte delas eftersom den delades utan delningsrättigheter.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="198"/>
+ <location filename="../src/gui/sharedialog.cpp" line="206"/>
<source>Users and Groups</source>
<translation>Användare och grupper</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="205"/>
+ <location filename="../src/gui/sharedialog.cpp" line="213"/>
<source>Public Links</source>
<translation>Publika länkar</translation>
</message>
<translation>Dela med %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="507"/>
+ <location filename="../src/gui/socketapi.cpp" line="555"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="516"/>
+ <location filename="../src/gui/socketapi.cpp" line="563"/>
<source>Share...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="518"/>
+ <location filename="../src/gui/socketapi.cpp" line="565"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="519"/>
+ <location filename="../src/gui/socketapi.cpp" line="566"/>
<source>Send private link by email...</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="482"/>
+ <location filename="../src/libsync/syncengine.cpp" line="491"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="753"/>
+ <location filename="../src/libsync/syncengine.cpp" line="769"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Endast %1 tillgängligt, behöver minst %2 för att starta</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="788"/>
+ <location filename="../src/libsync/syncengine.cpp" line="804"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1261"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1277"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Otillåtet eftersom du inte har rättigheter att lägga till övermappar</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1284"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Otillåtet eftersom du inte har rättigheter att lägga till filer i den mappen.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1570"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1586"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1577"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1593"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<translation>Filnamnet är för långt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="488"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
+ <source>Unresolved conflict.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="498"/>
<source>Stat failed.</source>
<translation>Stat misslyckades.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="515"/>
+ <location filename="../src/libsync/syncengine.cpp" line="525"/>
<source>Filename encoding is not valid</source>
<translation>Filnamnskodning är inte giltig</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="683"/>
+ <location filename="../src/libsync/syncengine.cpp" line="699"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Otillåtna tecken, var vänlig byt namn på "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="807"/>
+ <location filename="../src/libsync/syncengine.cpp" line="823"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Kunde inte läsa svartlistan från den lokala databasen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="848"/>
+ <location filename="../src/libsync/syncengine.cpp" line="864"/>
<source>Unable to read from the sync journal.</source>
<translation>Kunde inte läsa från synk-journalen.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="897"/>
+ <location filename="../src/libsync/syncengine.cpp" line="913"/>
<source>Cannot open the sync journal</source>
<translation>Kunde inte öppna synk journalen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="951"/>
+ <location filename="../src/libsync/syncengine.cpp" line="967"/>
<source>File name contains at least one invalid character</source>
<translation>Filnamnet innehåller minst ett ogiltigt tecken</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1187"/>
- <location filename="../src/libsync/syncengine.cpp" line="1227"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorerad eftersom den är svartlistad i "välj vad som ska synkas" </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1246"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1262"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Otillåtet eftersom du inte har rättigheter att lägga till undermappar i den mappen.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1293"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1309"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Inte behörig att ladda upp denna fil då den är skrivskyddad på servern, återställer </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1309"/>
- <location filename="../src/libsync/syncengine.cpp" line="1328"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1325"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1344"/>
<source>Not allowed to remove, restoring</source>
<translation>Inte behörig att radera, återställer</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1341"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1357"/>
<source>Local files and share folder removed.</source>
<translation>Lokala filer och mappar som är delade är borttagna.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1411"/>
<source>Move not allowed, item restored</source>
<translation>Det gick inte att genomföra flytten, objektet återställs</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Det gick inte att genomföra flytten då %1 är skrivskyddad</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the destination</source>
<translation>destinationen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the source</source>
<translation>källan</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/common/utility.cpp" line="441"/>
+ <location filename="../src/common/utility.cpp" line="442"/>
<source>in the future</source>
<translation>i framtiden</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="437"/>
+ <location filename="../src/common/utility.cpp" line="438"/>
<source>%n day(s) ago</source>
<translation><numerusform>%n dag sedan</numerusform><numerusform>%n dag(ar) sedan</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="445"/>
+ <location filename="../src/common/utility.cpp" line="446"/>
<source>%n hour(s) ago</source>
<translation><numerusform>%n timme sedan</numerusform><numerusform>%n timmar sedan</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="450"/>
+ <location filename="../src/common/utility.cpp" line="451"/>
<source>now</source>
<translation>nu</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="452"/>
+ <location filename="../src/common/utility.cpp" line="453"/>
<source>Less than a minute ago</source>
<translation>Mindre än en minut sedan</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="455"/>
+ <location filename="../src/common/utility.cpp" line="456"/>
<source>%n minute(s) ago</source>
<translation><numerusform>%n minut sedan</numerusform><numerusform>%n minut(er) sedan</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="458"/>
+ <location filename="../src/common/utility.cpp" line="459"/>
<source>Some time ago</source>
<translation>En stund sedan</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="129"/>
+ <location filename="../src/common/utility.cpp" line="130"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="133"/>
+ <location filename="../src/common/utility.cpp" line="134"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="137"/>
+ <location filename="../src/common/utility.cpp" line="138"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="140"/>
+ <location filename="../src/common/utility.cpp" line="141"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="309"/>
+ <location filename="../src/common/utility.cpp" line="310"/>
<source>%n year(s)</source>
<translation><numerusform>%n år</numerusform><numerusform>%n år</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="310"/>
+ <location filename="../src/common/utility.cpp" line="311"/>
<source>%n month(s)</source>
<translation><numerusform>%n månad(er)</numerusform><numerusform>%n månad(er)</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="311"/>
+ <location filename="../src/common/utility.cpp" line="312"/>
<source>%n day(s)</source>
<translation><numerusform>%n dag(ar)</numerusform><numerusform>%n dag(ar)</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="312"/>
+ <location filename="../src/common/utility.cpp" line="313"/>
<source>%n hour(s)</source>
<translation><numerusform>%n timme/timmar</numerusform><numerusform>%n timme/timmar</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="313"/>
+ <location filename="../src/common/utility.cpp" line="314"/>
<source>%n minute(s)</source>
<translation><numerusform>%n minut(er)</numerusform><numerusform>%n minut(er)</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="314"/>
+ <location filename="../src/common/utility.cpp" line="315"/>
<source>%n second(s)</source>
<translation><numerusform>%n sekund(er)</numerusform><numerusform>%n sekund(er)</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="338"/>
+ <location filename="../src/common/utility.cpp" line="339"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<translation>คุณใช้สิทธิ์การเรียกข้อมูลจากเซิฟเวอร์สูงสุดแล้ว</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="184"/>
+ <location filename="../src/gui/sharedialog.cpp" line="192"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>ไม่สามารถแชร์ไฟล์เพราะไม่ได้รับอนุญาต</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="198"/>
+ <location filename="../src/gui/sharedialog.cpp" line="206"/>
<source>Users and Groups</source>
<translation>ผู้ใช้และกลุ่ม</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="205"/>
+ <location filename="../src/gui/sharedialog.cpp" line="213"/>
<source>Public Links</source>
<translation>ลิงค์สาธารณะ</translation>
</message>
<translation>แชร์กับ %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="507"/>
+ <location filename="../src/gui/socketapi.cpp" line="555"/>
<source>I shared something with you</source>
<translation>ฉันแชร์บางอย่างกับคุณ</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="516"/>
+ <location filename="../src/gui/socketapi.cpp" line="563"/>
<source>Share...</source>
<translation>แชร์...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="518"/>
+ <location filename="../src/gui/socketapi.cpp" line="565"/>
<source>Copy private link to clipboard</source>
<translation>คัดลอกลิงค์ส่วนตัวไปยังคลิปบอร์ด</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="519"/>
+ <location filename="../src/gui/socketapi.cpp" line="566"/>
<source>Send private link by email...</source>
<translation>ส่งลิงค์ส่วนตัวทางอีเมล...</translation>
</message>
<translation>โฟลเดอร์มีโฟลเดอร์ย่อยเกินไป</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="482"/>
+ <location filename="../src/libsync/syncengine.cpp" line="491"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>เกิดปัญหาความขัดแย้ง: สำเนาที่อยู่ในเครื่องถูกเปลี่ยนชื่อและไม่ได้ถูกอัพโหลด เลยไม่ตรงกับข้อมูลที่เคยอัพโหลดไว้ในเซิฟเวอร์</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="753"/>
+ <location filename="../src/libsync/syncengine.cpp" line="769"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>มีเพียง %1 ที่พร้อมใช้งาน คุณจำเป็นต้องมีไม่น้อยกว่า %2 เพื่อเริ่มใช้งาน</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="788"/>
+ <location filename="../src/libsync/syncengine.cpp" line="804"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation>
ไม่สามารถเปิดหรือสร้างฐานข้อมูลการประสานข้อมูลในเครื่อง ตรวจสอบว่าคุณมีสิทธิ์การเขียนในโฟลเดอร์ซิงค์</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1261"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1277"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>ไม่ได้รับอนุญาต เพราะคุณไม่มีสิทธิ์ที่จะเพิ่มโฟลเดอร์หลัก</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1284"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>ไม่ได้รับอนุญาต เพราะคุณไม่มีสิทธิ์ที่จะเพิ่มไฟล์ในโฟลเดอร์นั้น</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1570"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1586"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation>พื้นที่จัดเก็บเหลือน้อย: การดาวน์โหลดจะช่วยลดพื้นที่ว่างด้านล่าง %1 ที่ถูกข้ามไป</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1577"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1593"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation>มีพื้นที่ว่างไม่เพียงพอบนเซิร์ฟเวอร์สำหรับการอัพโหลดบางรายการ</translation>
</message>
<translation>ชื่อไฟล์ยาวเกินไป</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="488"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
+ <source>Unresolved conflict.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="498"/>
<source>Stat failed.</source>
<translation>สถิติความล้มเหลว</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="515"/>
+ <location filename="../src/libsync/syncengine.cpp" line="525"/>
<source>Filename encoding is not valid</source>
<translation>การเข้ารหัสชื่อไฟล์ไม่ถูกต้อง</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="683"/>
+ <location filename="../src/libsync/syncengine.cpp" line="699"/>
<source>Invalid characters, please rename "%1"</source>
<translation>ตัวอักษรไม่ถูกต้อง โปรดเปลี่ยนชื่อ "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="807"/>
+ <location filename="../src/libsync/syncengine.cpp" line="823"/>
<source>Unable to read the blacklist from the local database</source>
<translation>ไม่สามารถอ่านบัญชีดำจากฐานข้อมูลต้นทาง</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="848"/>
+ <location filename="../src/libsync/syncengine.cpp" line="864"/>
<source>Unable to read from the sync journal.</source>
<translation>ไม่สามารถอ่านจากบันทึกการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="897"/>
+ <location filename="../src/libsync/syncengine.cpp" line="913"/>
<source>Cannot open the sync journal</source>
<translation>ไม่สามารถเปิดการผสานข้อมูลเจอร์นัล</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="951"/>
+ <location filename="../src/libsync/syncengine.cpp" line="967"/>
<source>File name contains at least one invalid character</source>
<translation>มีชื่อแฟ้มอย่างน้อยหนึ่งตัวอักษรที่ไม่ถูกต้อง</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1187"/>
- <location filename="../src/libsync/syncengine.cpp" line="1227"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>ถูกละเว้นเพราะ "ข้อมูลที่เลือกประสาน" ติดบัญชีดำ</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1246"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1262"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>ไม่อนุญาติเพราะคุณไม่มีสิทธิ์ที่จะเพิ่มโฟลเดอร์ย่อยของโฟลเดอร์นั้น</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1293"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1309"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>ไม่อนุญาตให้อัพโหลดไฟล์นี้เพราะมันจะอ่านได้เพียงอย่างเดียวบนเซิร์ฟเวอร์ กำลังฟื้นฟู</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1309"/>
- <location filename="../src/libsync/syncengine.cpp" line="1328"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1325"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1344"/>
<source>Not allowed to remove, restoring</source>
<translation>ไม่อนุญาตให้ลบเพราะกำลังฟื้นฟู</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1341"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1357"/>
<source>Local files and share folder removed.</source>
<translation>ไฟล์ต้นทางและโฟลเดอร์ที่แชร์ถูกลบออก</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1411"/>
<source>Move not allowed, item restored</source>
<translation>ไม่ได้รับอนุญาตให้ย้าย เพราะกำลังกู้คืนรายการ</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>Move not allowed because %1 is read-only</source>
<translation>ไม่อนุญาตให้ย้ายเพราะ %1 จะอ่านได้เพียงอย่างเดียว</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the destination</source>
<translation>ปลายทาง</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the source</source>
<translation>แหล่งที่มา</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/common/utility.cpp" line="441"/>
+ <location filename="../src/common/utility.cpp" line="442"/>
<source>in the future</source>
<translation>ในอนาคต</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="437"/>
+ <location filename="../src/common/utility.cpp" line="438"/>
<source>%n day(s) ago</source>
<translation><numerusform>%n วันที่ผ่านมา</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="445"/>
+ <location filename="../src/common/utility.cpp" line="446"/>
<source>%n hour(s) ago</source>
<translation><numerusform>%n ชั่วโมงที่ผ่านมา</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="450"/>
+ <location filename="../src/common/utility.cpp" line="451"/>
<source>now</source>
<translation>ตอนนี้</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="452"/>
+ <location filename="../src/common/utility.cpp" line="453"/>
<source>Less than a minute ago</source>
<translation>ไม่กี่นาทีที่ผ่านมา</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="455"/>
+ <location filename="../src/common/utility.cpp" line="456"/>
<source>%n minute(s) ago</source>
<translation><numerusform>%n นาทีที่ผ่านมา</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="458"/>
+ <location filename="../src/common/utility.cpp" line="459"/>
<source>Some time ago</source>
<translation>บางเวลาที่ผ่านมา</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="129"/>
+ <location filename="../src/common/utility.cpp" line="130"/>
<source>%L1 GB</source>
<translation>%L1 กิกะไบต์</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="133"/>
+ <location filename="../src/common/utility.cpp" line="134"/>
<source>%L1 MB</source>
<translation>%L1 เมกะไบต์</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="137"/>
+ <location filename="../src/common/utility.cpp" line="138"/>
<source>%L1 KB</source>
<translation>%L1 กิโลไบต์</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="140"/>
+ <location filename="../src/common/utility.cpp" line="141"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="309"/>
+ <location filename="../src/common/utility.cpp" line="310"/>
<source>%n year(s)</source>
<translation><numerusform>%n ปี</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="310"/>
+ <location filename="../src/common/utility.cpp" line="311"/>
<source>%n month(s)</source>
<translation><numerusform>%n เดือน</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="311"/>
+ <location filename="../src/common/utility.cpp" line="312"/>
<source>%n day(s)</source>
<translation><numerusform>%n วัน</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="312"/>
+ <location filename="../src/common/utility.cpp" line="313"/>
<source>%n hour(s)</source>
<translation><numerusform>%n ชั่วโมง</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="313"/>
+ <location filename="../src/common/utility.cpp" line="314"/>
<source>%n minute(s)</source>
<translation><numerusform>%n นาที</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="314"/>
+ <location filename="../src/common/utility.cpp" line="315"/>
<source>%n second(s)</source>
<translation><numerusform>%n วินาที</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="338"/>
+ <location filename="../src/common/utility.cpp" line="339"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<translation>Sunucudan mümkün olan en fazla paylaşım hakları alınıyor...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="184"/>
+ <location filename="../src/gui/sharedialog.cpp" line="192"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Dosya paylaşılamaz, çünkü sizinle paylaşım izni olmaksızın paylaşılmış.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="198"/>
+ <location filename="../src/gui/sharedialog.cpp" line="206"/>
<source>Users and Groups</source>
<translation>Kullanıcılar ve Gruplar</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="205"/>
+ <location filename="../src/gui/sharedialog.cpp" line="213"/>
<source>Public Links</source>
<translation>Herkese açık bağlantılar</translation>
</message>
<translation>%1 ile paylaş</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="507"/>
+ <location filename="../src/gui/socketapi.cpp" line="555"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="516"/>
+ <location filename="../src/gui/socketapi.cpp" line="563"/>
<source>Share...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="518"/>
+ <location filename="../src/gui/socketapi.cpp" line="565"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="519"/>
+ <location filename="../src/gui/socketapi.cpp" line="566"/>
<source>Send private link by email...</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="482"/>
+ <location filename="../src/libsync/syncengine.cpp" line="491"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="753"/>
+ <location filename="../src/libsync/syncengine.cpp" line="769"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Sadece %1 mevcut, Çalıştırmak için en az %2 gerekmektedir</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="788"/>
+ <location filename="../src/libsync/syncengine.cpp" line="804"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1261"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1277"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Üst dizin ekleme yetkiniz olmadığından izin verilmedi</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1284"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Bu klasöre dosya ekleme yetkiniz olmadığından izin verilmedi</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1570"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1586"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1577"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1593"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<translation>Dosya adı çok uzun.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="488"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
+ <source>Unresolved conflict.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="498"/>
<source>Stat failed.</source>
<translation>Durum alma başarısız.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="515"/>
+ <location filename="../src/libsync/syncengine.cpp" line="525"/>
<source>Filename encoding is not valid</source>
<translation>Dosya adı kodlaması geçerli değil</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="683"/>
+ <location filename="../src/libsync/syncengine.cpp" line="699"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Geçersiz karakterler, lütfen "%1" yerine yeni bir isim girin</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="807"/>
+ <location filename="../src/libsync/syncengine.cpp" line="823"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Yerel veritabanından kara liste okunamadı</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="848"/>
+ <location filename="../src/libsync/syncengine.cpp" line="864"/>
<source>Unable to read from the sync journal.</source>
<translation>Eşitleme günlüğünden okunamadı.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="897"/>
+ <location filename="../src/libsync/syncengine.cpp" line="913"/>
<source>Cannot open the sync journal</source>
<translation>Eşitleme günlüğü açılamıyor</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="951"/>
+ <location filename="../src/libsync/syncengine.cpp" line="967"/>
<source>File name contains at least one invalid character</source>
<translation>Dosya adı en az bir geçersiz karakter içeriyor</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1187"/>
- <location filename="../src/libsync/syncengine.cpp" line="1227"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>"Eşitlenecekleri seçin" kara listesinde olduğundan yoksayıldı.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1246"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1262"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Bu dizine alt dizin ekleme yetkiniz olmadığından izin verilmedi</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1293"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1309"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Sunucuda salt okunur olduğundan, bu dosya yüklenemedi, geri alınıyor</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1309"/>
- <location filename="../src/libsync/syncengine.cpp" line="1328"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1325"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1344"/>
<source>Not allowed to remove, restoring</source>
<translation>Kaldırmaya izin verilmedi, geri alınıyor</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1341"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1357"/>
<source>Local files and share folder removed.</source>
<translation>Yerel dosyalar ve paylaşım klasörü kaldırıldı.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1411"/>
<source>Move not allowed, item restored</source>
<translation>Taşımaya izin verilmedi, öge geri alındı</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>Move not allowed because %1 is read-only</source>
<translation>%1 salt okunur olduğundan taşımaya izin verilmedi</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the destination</source>
<translation>hedef</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the source</source>
<translation>kaynak</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/common/utility.cpp" line="441"/>
+ <location filename="../src/common/utility.cpp" line="442"/>
<source>in the future</source>
<translation>gelecekte</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="437"/>
+ <location filename="../src/common/utility.cpp" line="438"/>
<source>%n day(s) ago</source>
<translation><numerusform>%n gün önce</numerusform><numerusform>%n gün önce</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="445"/>
+ <location filename="../src/common/utility.cpp" line="446"/>
<source>%n hour(s) ago</source>
<translation><numerusform>%n saat önce</numerusform><numerusform>%n saat önce</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="450"/>
+ <location filename="../src/common/utility.cpp" line="451"/>
<source>now</source>
<translation>şimdi</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="452"/>
+ <location filename="../src/common/utility.cpp" line="453"/>
<source>Less than a minute ago</source>
<translation>1 dakika önce</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="455"/>
+ <location filename="../src/common/utility.cpp" line="456"/>
<source>%n minute(s) ago</source>
<translation><numerusform>%n dakika önce</numerusform><numerusform>%n dakika önce</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="458"/>
+ <location filename="../src/common/utility.cpp" line="459"/>
<source>Some time ago</source>
<translation>Bir süre önce</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="129"/>
+ <location filename="../src/common/utility.cpp" line="130"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="133"/>
+ <location filename="../src/common/utility.cpp" line="134"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="137"/>
+ <location filename="../src/common/utility.cpp" line="138"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="140"/>
+ <location filename="../src/common/utility.cpp" line="141"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="309"/>
+ <location filename="../src/common/utility.cpp" line="310"/>
<source>%n year(s)</source>
<translation><numerusform>%n yıl</numerusform><numerusform>%n yıl</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="310"/>
+ <location filename="../src/common/utility.cpp" line="311"/>
<source>%n month(s)</source>
<translation><numerusform>%n ay</numerusform><numerusform>%n ay</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="311"/>
+ <location filename="../src/common/utility.cpp" line="312"/>
<source>%n day(s)</source>
<translation><numerusform>%n gün</numerusform><numerusform>%n gün</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="312"/>
+ <location filename="../src/common/utility.cpp" line="313"/>
<source>%n hour(s)</source>
<translation><numerusform>%n saat</numerusform><numerusform>%n saat</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="313"/>
+ <location filename="../src/common/utility.cpp" line="314"/>
<source>%n minute(s)</source>
<translation><numerusform>%n dakika</numerusform><numerusform>%n dakika</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="314"/>
+ <location filename="../src/common/utility.cpp" line="315"/>
<source>%n second(s)</source>
<translation><numerusform>%n saniye</numerusform><numerusform>%n saniye</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="338"/>
+ <location filename="../src/common/utility.cpp" line="339"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="184"/>
+ <location filename="../src/gui/sharedialog.cpp" line="192"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Цей файл неможливо поширити, бо ним поділилися без права на поширення.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="198"/>
+ <location filename="../src/gui/sharedialog.cpp" line="206"/>
<source>Users and Groups</source>
<translation>Користувачі та групи</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="205"/>
+ <location filename="../src/gui/sharedialog.cpp" line="213"/>
<source>Public Links</source>
<translation type="unfinished"/>
</message>
<translation>Поділитися з %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="507"/>
+ <location filename="../src/gui/socketapi.cpp" line="555"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="516"/>
+ <location filename="../src/gui/socketapi.cpp" line="563"/>
<source>Share...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="518"/>
+ <location filename="../src/gui/socketapi.cpp" line="565"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="519"/>
+ <location filename="../src/gui/socketapi.cpp" line="566"/>
<source>Send private link by email...</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="482"/>
+ <location filename="../src/libsync/syncengine.cpp" line="491"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="753"/>
+ <location filename="../src/libsync/syncengine.cpp" line="769"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Доступно лише %1, для початку необхідно хоча б %2</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="788"/>
+ <location filename="../src/libsync/syncengine.cpp" line="804"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1261"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1277"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1284"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1570"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1586"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1577"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1593"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<translation>Шлях до файлу занадто довгий.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="488"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
+ <source>Unresolved conflict.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="498"/>
<source>Stat failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="515"/>
+ <location filename="../src/libsync/syncengine.cpp" line="525"/>
<source>Filename encoding is not valid</source>
<translation>Кодування файлу не припустиме</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="683"/>
+ <location filename="../src/libsync/syncengine.cpp" line="699"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="807"/>
+ <location filename="../src/libsync/syncengine.cpp" line="823"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="848"/>
+ <location filename="../src/libsync/syncengine.cpp" line="864"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="897"/>
+ <location filename="../src/libsync/syncengine.cpp" line="913"/>
<source>Cannot open the sync journal</source>
<translation>Не вдається відкрити протокол синхронізації</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="951"/>
+ <location filename="../src/libsync/syncengine.cpp" line="967"/>
<source>File name contains at least one invalid character</source>
<translation>Ім’я файлу містить принаймні один некоректний символ</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1187"/>
- <location filename="../src/libsync/syncengine.cpp" line="1227"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ігнорується через чорний список в "обрати що синхронізувати"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1246"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1262"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Заборонено через відсутність прав додавання підкаталогів в цю теку.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1293"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1309"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Не дозволено завантажувати цей файл, оскільки він має дозвіл лише на перегляд, відновлюємо</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1309"/>
- <location filename="../src/libsync/syncengine.cpp" line="1328"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1325"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1344"/>
<source>Not allowed to remove, restoring</source>
<translation>Не дозволено видаляти, відновлюємо</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1341"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1357"/>
<source>Local files and share folder removed.</source>
<translation>Локальні файли та теки в загальному доступі було видалено.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1411"/>
<source>Move not allowed, item restored</source>
<translation>Переміщення не дозволено, елемент відновлено </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Переміщення не дозволено, оскільки %1 помічений тільки для перегляду</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the destination</source>
<translation>призначення</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the source</source>
<translation>джерело</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/common/utility.cpp" line="441"/>
+ <location filename="../src/common/utility.cpp" line="442"/>
<source>in the future</source>
<translation>у майбутньому</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="437"/>
+ <location filename="../src/common/utility.cpp" line="438"/>
<source>%n day(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="445"/>
+ <location filename="../src/common/utility.cpp" line="446"/>
<source>%n hour(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="450"/>
+ <location filename="../src/common/utility.cpp" line="451"/>
<source>now</source>
<translation>зараз</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="452"/>
+ <location filename="../src/common/utility.cpp" line="453"/>
<source>Less than a minute ago</source>
<translation>Менше хвилини тому</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="455"/>
+ <location filename="../src/common/utility.cpp" line="456"/>
<source>%n minute(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="458"/>
+ <location filename="../src/common/utility.cpp" line="459"/>
<source>Some time ago</source>
<translation>Деякий час тому</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="129"/>
+ <location filename="../src/common/utility.cpp" line="130"/>
<source>%L1 GB</source>
<translation>%L1 ГБ</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="133"/>
+ <location filename="../src/common/utility.cpp" line="134"/>
<source>%L1 MB</source>
<translation>%L1 МБ</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="137"/>
+ <location filename="../src/common/utility.cpp" line="138"/>
<source>%L1 KB</source>
<translation>%L1 КБ </translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="140"/>
+ <location filename="../src/common/utility.cpp" line="141"/>
<source>%L1 B</source>
<translation>%L1 Б</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="309"/>
+ <location filename="../src/common/utility.cpp" line="310"/>
<source>%n year(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="310"/>
+ <location filename="../src/common/utility.cpp" line="311"/>
<source>%n month(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="311"/>
+ <location filename="../src/common/utility.cpp" line="312"/>
<source>%n day(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="312"/>
+ <location filename="../src/common/utility.cpp" line="313"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="313"/>
+ <location filename="../src/common/utility.cpp" line="314"/>
<source>%n minute(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="314"/>
+ <location filename="../src/common/utility.cpp" line="315"/>
<source>%n second(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="338"/>
+ <location filename="../src/common/utility.cpp" line="339"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<translation>从服务器获取最大可能的共享权限...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="184"/>
+ <location filename="../src/gui/sharedialog.cpp" line="192"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>未分配共享权限，无法共享文件。</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="198"/>
+ <location filename="../src/gui/sharedialog.cpp" line="206"/>
<source>Users and Groups</source>
<translation>用户和组</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="205"/>
+ <location filename="../src/gui/sharedialog.cpp" line="213"/>
<source>Public Links</source>
<translation>公共链接</translation>
</message>
<translation>使用 %1 共享</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="507"/>
+ <location filename="../src/gui/socketapi.cpp" line="555"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="516"/>
+ <location filename="../src/gui/socketapi.cpp" line="563"/>
<source>Share...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="518"/>
+ <location filename="../src/gui/socketapi.cpp" line="565"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="519"/>
+ <location filename="../src/gui/socketapi.cpp" line="566"/>
<source>Send private link by email...</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="482"/>
+ <location filename="../src/libsync/syncengine.cpp" line="491"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="753"/>
+ <location filename="../src/libsync/syncengine.cpp" line="769"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>仅有 %1 有效，至少需要 %2 才能开始</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="788"/>
+ <location filename="../src/libsync/syncengine.cpp" line="804"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1261"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1277"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>你没有权限增加父目录</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1284"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>你没有权限增加文件</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1570"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1586"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1577"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1593"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<translation>文件名过长。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="488"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
+ <source>Unresolved conflict.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="498"/>
<source>Stat failed.</source>
<translation>状态失败。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="515"/>
+ <location filename="../src/libsync/syncengine.cpp" line="525"/>
<source>Filename encoding is not valid</source>
<translation>文件名编码无效</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="683"/>
+ <location filename="../src/libsync/syncengine.cpp" line="699"/>
<source>Invalid characters, please rename "%1"</source>
<translation>无效的字符，请更改为 “%1”</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="807"/>
+ <location filename="../src/libsync/syncengine.cpp" line="823"/>
<source>Unable to read the blacklist from the local database</source>
<translation>无法从本地数据库读取黑名单</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="848"/>
+ <location filename="../src/libsync/syncengine.cpp" line="864"/>
<source>Unable to read from the sync journal.</source>
<translation>无法读取同步日志。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="897"/>
+ <location filename="../src/libsync/syncengine.cpp" line="913"/>
<source>Cannot open the sync journal</source>
<translation>无法打开同步日志</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="951"/>
+ <location filename="../src/libsync/syncengine.cpp" line="967"/>
<source>File name contains at least one invalid character</source>
<translation>文件名中存在至少一个非法字符</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1187"/>
- <location filename="../src/libsync/syncengine.cpp" line="1227"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>已忽略（“选择同步内容”黑名单）</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1246"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1262"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>你没有权限增加子目录</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1293"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1309"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>无法上传文件，因为服务器端此文件为只读，正在回退</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1309"/>
- <location filename="../src/libsync/syncengine.cpp" line="1328"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1325"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1344"/>
<source>Not allowed to remove, restoring</source>
<translation>无法删除，正在回退</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1341"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1357"/>
<source>Local files and share folder removed.</source>
<translation>本地文件和共享文件夹已被删除。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1411"/>
<source>Move not allowed, item restored</source>
<translation>无法移动，正在回退</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>Move not allowed because %1 is read-only</source>
<translation>无法移动，%1为是只读的</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the destination</source>
<translation>目标</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the source</source>
<translation>源</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/common/utility.cpp" line="441"/>
+ <location filename="../src/common/utility.cpp" line="442"/>
<source>in the future</source>
<translation>将来</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="437"/>
+ <location filename="../src/common/utility.cpp" line="438"/>
<source>%n day(s) ago</source>
<translation><numerusform>%n 天前</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="445"/>
+ <location filename="../src/common/utility.cpp" line="446"/>
<source>%n hour(s) ago</source>
<translation><numerusform>%n 小时前</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="450"/>
+ <location filename="../src/common/utility.cpp" line="451"/>
<source>now</source>
<translation>现在</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="452"/>
+ <location filename="../src/common/utility.cpp" line="453"/>
<source>Less than a minute ago</source>
<translation>刚刚</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="455"/>
+ <location filename="../src/common/utility.cpp" line="456"/>
<source>%n minute(s) ago</source>
<translation><numerusform>%n 分钟前</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="458"/>
+ <location filename="../src/common/utility.cpp" line="459"/>
<source>Some time ago</source>
<translation>之前</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="129"/>
+ <location filename="../src/common/utility.cpp" line="130"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="133"/>
+ <location filename="../src/common/utility.cpp" line="134"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="137"/>
+ <location filename="../src/common/utility.cpp" line="138"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="140"/>
+ <location filename="../src/common/utility.cpp" line="141"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="309"/>
+ <location filename="../src/common/utility.cpp" line="310"/>
<source>%n year(s)</source>
<translation><numerusform>%n 年</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="310"/>
+ <location filename="../src/common/utility.cpp" line="311"/>
<source>%n month(s)</source>
<translation><numerusform>%n 月</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="311"/>
+ <location filename="../src/common/utility.cpp" line="312"/>
<source>%n day(s)</source>
<translation><numerusform>%n 天</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="312"/>
+ <location filename="../src/common/utility.cpp" line="313"/>
<source>%n hour(s)</source>
<translation><numerusform>%n 小时</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="313"/>
+ <location filename="../src/common/utility.cpp" line="314"/>
<source>%n minute(s)</source>
<translation><numerusform>%n 分</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="314"/>
+ <location filename="../src/common/utility.cpp" line="315"/>
<source>%n second(s)</source>
<translation><numerusform>%n 秒</numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="338"/>
+ <location filename="../src/common/utility.cpp" line="339"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="184"/>
+ <location filename="../src/gui/sharedialog.cpp" line="192"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>這個檔案無法被分享，並沒有分享此檔案的權限。</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="198"/>
+ <location filename="../src/gui/sharedialog.cpp" line="206"/>
<source>Users and Groups</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="205"/>
+ <location filename="../src/gui/sharedialog.cpp" line="213"/>
<source>Public Links</source>
<translation type="unfinished"/>
</message>
<translation>與 %1 分享</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="507"/>
+ <location filename="../src/gui/socketapi.cpp" line="555"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="516"/>
+ <location filename="../src/gui/socketapi.cpp" line="563"/>
<source>Share...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="518"/>
+ <location filename="../src/gui/socketapi.cpp" line="565"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="519"/>
+ <location filename="../src/gui/socketapi.cpp" line="566"/>
<source>Send private link by email...</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="482"/>
+ <location filename="../src/libsync/syncengine.cpp" line="491"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="753"/>
+ <location filename="../src/libsync/syncengine.cpp" line="769"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>目前僅有 %1 可以使用，至少需要 %2 才能開始</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="788"/>
+ <location filename="../src/libsync/syncengine.cpp" line="804"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1261"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1277"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>拒絕此操作，您沒有新增母資料夾的權限。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1284"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>拒絕此操作，您沒有新增檔案在此資料夾的權限。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1570"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1586"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1577"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1593"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<translation>檔案名稱太長了。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="488"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
+ <source>Unresolved conflict.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="498"/>
<source>Stat failed.</source>
<translation>狀態失敗。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="515"/>
+ <location filename="../src/libsync/syncengine.cpp" line="525"/>
<source>Filename encoding is not valid</source>
<translation>檔案名稱編碼是無效的</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="683"/>
+ <location filename="../src/libsync/syncengine.cpp" line="699"/>
<source>Invalid characters, please rename "%1"</source>
<translation>無效的字元，請您重新命名 "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="807"/>
+ <location filename="../src/libsync/syncengine.cpp" line="823"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="848"/>
+ <location filename="../src/libsync/syncengine.cpp" line="864"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="897"/>
+ <location filename="../src/libsync/syncengine.cpp" line="913"/>
<source>Cannot open the sync journal</source>
<translation>同步處理日誌無法開啟</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="951"/>
+ <location filename="../src/libsync/syncengine.cpp" line="967"/>
<source>File name contains at least one invalid character</source>
<translation>檔案名稱含有不合法的字元</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1187"/>
- <location filename="../src/libsync/syncengine.cpp" line="1227"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1243"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>已忽略。根據 "選擇要同步的項目"的黑名單</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1246"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1262"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>拒絕此操作，您沒有在此新增子資料夾的權限。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1293"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1309"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>拒絕上傳此檔案，此檔案在伺服器是唯讀檔，復原中</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1309"/>
- <location filename="../src/libsync/syncengine.cpp" line="1328"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1325"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1344"/>
<source>Not allowed to remove, restoring</source>
<translation>不允許刪除，復原中</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1341"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1357"/>
<source>Local files and share folder removed.</source>
<translation>本地端檔案和共享資料夾已被刪除。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1411"/>
<source>Move not allowed, item restored</source>
<translation>不允許移動，物件復原中</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>Move not allowed because %1 is read-only</source>
<translation>不允許移動，因為 %1 是唯讀的</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the destination</source>
<translation>目標</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1406"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1422"/>
<source>the source</source>
<translation>來源</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/common/utility.cpp" line="441"/>
+ <location filename="../src/common/utility.cpp" line="442"/>
<source>in the future</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="437"/>
+ <location filename="../src/common/utility.cpp" line="438"/>
<source>%n day(s) ago</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="445"/>
+ <location filename="../src/common/utility.cpp" line="446"/>
<source>%n hour(s) ago</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="450"/>
+ <location filename="../src/common/utility.cpp" line="451"/>
<source>now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="452"/>
+ <location filename="../src/common/utility.cpp" line="453"/>
<source>Less than a minute ago</source>
<translation>不到一分鐘前</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="455"/>
+ <location filename="../src/common/utility.cpp" line="456"/>
<source>%n minute(s) ago</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="458"/>
+ <location filename="../src/common/utility.cpp" line="459"/>
<source>Some time ago</source>
<translation>前一段時間</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/common/utility.cpp" line="129"/>
+ <location filename="../src/common/utility.cpp" line="130"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="133"/>
+ <location filename="../src/common/utility.cpp" line="134"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="137"/>
+ <location filename="../src/common/utility.cpp" line="138"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="140"/>
+ <location filename="../src/common/utility.cpp" line="141"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="309"/>
+ <location filename="../src/common/utility.cpp" line="310"/>
<source>%n year(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="310"/>
+ <location filename="../src/common/utility.cpp" line="311"/>
<source>%n month(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="311"/>
+ <location filename="../src/common/utility.cpp" line="312"/>
<source>%n day(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="312"/>
+ <location filename="../src/common/utility.cpp" line="313"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="313"/>
+ <location filename="../src/common/utility.cpp" line="314"/>
<source>%n minute(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/common/utility.cpp" line="314"/>
+ <location filename="../src/common/utility.cpp" line="315"/>
<source>%n second(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/common/utility.cpp" line="338"/>
+ <location filename="../src/common/utility.cpp" line="339"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
projects / nextcloud-desktop.git / commitdiff