</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Неопределено състояние.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Изчакване на сихронизиране.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Подготвяне за синхронизиране.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>Синхронизиране на файлове.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>Последното синхронизиране завърши успешно.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>Синхронизирането е на пауза.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Синхронизирането е на пауза)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>Не сте избрали валидна папка!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>Избраният път не е папка!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Нямате права за писане в избраната папка.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation type="unfinished"/>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>Локален файл е променен по време на синхронизирането.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>Dibosupl adlaket d'ar stad orin an teuliad</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Ar gazetenn kemprenn kozh '%1' a zo bet kavet, mes n'eo ket bet posupl lemel anezhañ. Grit sur n'eo implijet gant meziant ebet.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation>(backup)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation>(backup %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Stad dianavezet.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>O gortoz e krogfe ar gemprenn.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>O prientiñ evit ar gemprenn.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>Kemprenn o treiñ</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Graet met eo bet ar gemprenn, sturmoù n'int ket bet diskoulmet.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>Kemprenn divezhañ graet mat.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Fazi Staliadur.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Arest Implijer.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>Kemprenn ehañaet</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (kemprenn ehañaet)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>Teuliad mat choazet ebet !</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>An hent choazet n'eo ket un teuliad !</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>N'ho peus aotre ebet evit skrivañ en teuliad choazet !</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>An teuliad diabarzh %1 en deus dija un teuliad implijet er genstagadenn kemprennañ teuliad. Choazit unan all !</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>An teuliad diabarzh %1 a zo dija en teuliad implijet er genstagadenn kemprennañ teuliad. Choazit unan all !</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Un gemprennadenn eus ar servijour d'an teuliad diabarzh ez eus dija. Choazit un teuliad diabarzh all !</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
<translation>Lec'h dieub : %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation>ur fazi a zo bet en ur skrivañ ar metadata er roadenn-diaz</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>Rest diabarzh cheñchet e pad ar gemprenn.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
This action will abort any currently running synchronization.</source>
- <translation>Aquesta acció inhabilitarà la compatibilitat amb els fitxers virtuals. Com a conseqüència, es baixarà el contingut de les carpetes marcades actualment com a «Disponible només en línia».
-
-L'únic avantatge d'inhabilitar la compatibilitat amb els fitxers virtuals és que la característica de sincronització selectiva tornarà a estar disponible.
-
-Aquesta acció anul·larà qualsevol sincronització en execució.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="788"/>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>No s'ha pogut restaurar l'estat de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>S'ha trobat un diari de sincronització antic «%1», però no s'ha pogut suprimir. Assegureu-vos que no hi hagi cap aplicació que l'estigui utilitzant.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation> (còpia de seguretat)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation> (còpia de seguretat %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Estat indefinit.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>S'està esperant per a iniciar la sincronització.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>S'està preparant la sincronització.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>S'està sincronitzant.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>La sincronització s'ha realitzat correctament; hi ha conflictes sense resoldre.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>La darrera sincronització s'ha realitzat correctament.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Error de configuració.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>L'usuari ho ha cancel·lat.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>La sincronització està en pausa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (la sincronització està en pausa)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>No s'ha seleccionat cap carpeta vàlida.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation>El camí seleccionat no existeix.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>El camí seleccionat no és una carpeta.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>No teniu permís per a escriure a la carpeta seleccionada.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>La carpeta local %1 ja conté una carpeta utilitzada en una connexió de sincronització de carpetes. Trieu-ne una altra.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>La carpeta local %1 ja forma part d'una carpeta utilitzada en una connexió de sincronització de carpetes. Trieu-ne una altra.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Ja hi ha una sincronització entre el servidor i aquesta carpeta local. Trieu una altra carpeta local.</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
- <translation>Utilitza fitxers virtuals en comptes de baixar el contingut immediatament%1</translation>
+ <source>Use virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
- <translation> (experimental)</translation>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="548"/>
<translation>Espai lliure: %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Els fitxers virtuals no estan disponibles per la carpeta seleccionada</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>S'ha ignorat perquè es troba a la llista de prohibicions «Trieu què voleu sincronitzar»</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>No es permet perquè no teniu permís per a afegir subcarpetes en aquesta carpeta</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>No es permet perquè no teniu permís per a afegir fitxers en aquesta carpeta</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>No es permet carregar aquest fitxer perquè és de només lectura en el servidor; s'està restaurant</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation>S'ha mogut a una destinació no vàlida; s'està restaurant</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation>No es permet suprimir; s'està restaurant</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation>Error while reading the database</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation>El servidor ha respost amb un error en llegir la carpeta «%1»: %2</translation>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation>No s'ha pogut canviar el nom de «%1» a «%2»; error: %3</translation>
</message>
<translation>S'ha produït un error en escriure les metadades a la base de dades</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation>Error en establir l'estat d'ancoratge</translation>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>El fitxer local ha canviat durant la sincronització.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
- <translation>No s'ha pogut actualitzar el fitxer: %1</translation>
+ <source>Could not update file: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="362"/>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
- <translation>S&incronitza-ho tot des del servidor (recomanat)</translation>
+ <source>S&ynchronize everything from server</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>Nelze obnovit stav složky</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Byl nalezen starý záznam synchronizace „%1“, ale nebylo možné jej odebrat. Ujistěte se, že není aktuálně používán jinou aplikací.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation> (záloha)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation> (záloha %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Nedefinovaný stav.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Čeká na spuštění synchronizace.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Příprava na synchronizaci.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>Synchronizace probíhá.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Synchronizace byla úspěšná, nevyřešené konflikty.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>Poslední synchronizace byla úspěšná.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Chyba nastavení.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Zrušeno uživatelem.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>Synchronizace pozastavena.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (synchronizace je pozastavena)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>Nebyla vybrána platná složka!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation>Vybraný popis umístění neexistuje!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>Vybraný popis umístění není složka!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Nemáte oprávnění pro zápis do zvolené složky!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Místní složka %1 už obsahuje podsložku použitou pro synchronizaci odesílání. Zvolte jinou!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Místní složka %1 už je obsažena ve složce, použité pro synchronizaci. Zvolte jinou!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Ze serveru se do tohoto umístění už synchronizuje. Zvolte jinou místní složku!</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
- <translation> (experimentální)</translation>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="548"/>
<translation>Volné místo: %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation>server nahlásil žádné %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation>Přesunuto do neplatného cíle, obnovuje se</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation>Chyba při čtení databáze</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation>Server vrátil chybu při čtení adresáře „%1“: %2</translation>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation>%1 není možné přejmenovat na %2, chyba: %3</translation>
</message>
<translation>Chyba zápisu metadat do databáze</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>Místní soubor byl změněn během synchronizace.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
- <translation>Ses&ynchronizovat vše ze serveru (doporučeno)</translation>
+ <source>S&ynchronize everything from server</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>Kunne ikke nulstille oprette mappetilstand</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>En gammel sync journal '%1' fundet, men kunne ikke fjernes. Kontroller venligst at intet program benytter den.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation> (backup)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation> (backup %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Udefineret tilstand.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Venter på at begynde synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Forbereder synkronisering.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>Synkronisering er i gang.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Synk var vellykket, uafgjorte konflikter.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>Sidste Synk var vellykket.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Fejl ved opsætning.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Bruger Afbrydelse.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>Synkronisering er pauset.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sync er sat på pause)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>Ingen gyldig mappe valgt!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>Den valgte sti er ikke en mappe!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Du har ikke tilladelse til at skrive til denne mappe.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Den lokale mappe %1 indeholder allerede en mappe opsat som sync forbindelse. Vælg venligst en anden!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Den lokale mappe %1 er allerede indeholdt i en mappe opsat som sync forbindelse. Vælg venligst en anden!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Der er allerede sync fra serveren til denne lokale mappe. Vælg venligst en anden mappe!</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
<translation>Ledig plads: %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation>Fejl ved skrivning af metadata til databasen</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>Lokal fil ændret under sync.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
This action will abort any currently running synchronization.</source>
- <translation>Durch diese Aktion wird die Unterstützung für virtuelle Dateien deaktiviert. Infolgedessen werden Inhalte von Ordnern, die derzeit als "nur online verfügbar" markiert sind, heruntergeladen.
-
-Der einzige Vorteil der Deaktivierung der Unterstützung für virtuelle Dateien besteht darin, dass die ausgewählte Synchronisierungsfunktion wieder verfügbar wird.
-
-Diese Aktion bricht jede derzeit laufende Synchronisierung ab.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="788"/>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>Konnte Ordner-Zustand nicht zurücksetzen</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Ein altes Synchronisierungsprotokoll '%1' wurde gefunden, konnte jedoch nicht entfernt werden. Bitte stellen Sie sicher, dass keine Anwendung es verwendet.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation>(Sicherung)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation>(Sicherung %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Undefinierter Zustand.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Wartet auf Beginn der Synchronisierung.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Synchronisierung wird vorbereitet.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>Synchronisierung läuft.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Synchronisierung erfolgreich, ungelöste Konflikte vorhanden.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>Die letzte Synchronisierung war erfolgreich.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Einrichtungsfehler.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Benutzerabbruch.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>Synchronisierung ist pausiert.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisierung ist pausiert)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>Kein gültiger Ordner gewählt!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation>Der gewählte Pfad existiert nicht!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>Der gewählte Pfad ist kein Ordner!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Sie haben keine Schreibberechtigung für den ausgewählten Ordner!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Der lokale Ordner %1 liegt innerhalb eines synchronisierten Ordners. Bitte wählen Sie einen anderen aus!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Der lokale Ordner %1 liegt in einem Ordner, der bereits synchronisiert wird. Bitte wählen Sie einen anderen aus!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Es existiert bereits eine Synchronisierung vom Server zu diesem lokalen Ordner. Bitte wählen Sie einen anderen lokalen Ordner!</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
- <translation>Virtuelle Dateien verwenden, anstatt den Inhalt sofort herunterzuladen%1</translation>
+ <source>Use virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
- <translation>(experimentell)</translation>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="548"/>
<translation>Freier Platz: %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Virtuelle Dateien sind für den ausgewählten Ordner nicht verfügbar</translation>
</message>
<translation>Server meldet kein %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignoriert wegen der "Choose what to sync"-Blacklist</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Nicht erlaubt, da Sie nicht die Berechtigung haben, Unterordner zu diesem Ordner hinzuzufügen.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Nicht erlaubt, da Sie keine Berechtigung zum Hinzufügen von Dateien in diesen Ordner haben.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Das Hochladen dieser Datei ist nicht erlaubt, da die Datei auf dem Server schreibgeschützt ist. Wiederherstellen.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation>Auf ungültiges Ziel verschoben, wiederherstellen.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation>Entfernen nicht erlaubt, wiederherstellen.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation>Fehler beim Lesen der Datenbank</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation>Der Server hat während des Lesens des Verzeichnisses '%1' mit einem Fehler geantwortet: %2</translation>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation>Konnte %1 nicht nach %2 umbenennen. Fehler: %3</translation>
</message>
<translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation>Fehler beim Setzen des PIN-Status</translation>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>Eine lokale Datei wurde während der Synchronisierung geändert.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
- <translation>Datei konnte nicht aktualisiert werden: %1</translation>
+ <source>Could not update file: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="362"/>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
- <translation>Alles vom Server s&ynchronisieren (empfohlen)</translation>
+ <source>S&ynchronize everything from server</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
This action will abort any currently running synchronization.</source>
- <translation>Αυτή η ενέργεια θα απενεργοποιήσει την υποστήριξη εικονικών αρχείων. Κατά συνέπεια, θα ληφθούν τα περιεχόμενα των φακέλων που επισημαίνονται ως «διαθέσιμα μόνο στο διαδίκτυο». Το μόνο πλεονέκτημα της απενεργοποίησης της εικονικής υποστήριξης αρχείων είναι ότι η δυνατότητα επιλεκτικού συγχρονισμού θα είναι ξανά διαθέσιμη. Αυτή η ενέργεια θα ακυρώσει οποιονδήποτε τρέχοντα συγχρονισμό.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="788"/>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>Δεν ήταν δυνατό να επαναφερθεί η κατάσταση του φακέλου</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Βρέθηκε ένα παλαιότερο αρχείο συγχρονισμού '%1', αλλά δεν μπόρεσε να αφαιρεθεί. Παρακαλώ βεβαιωθείτε ότι καμμία εφαρμογή δεν το χρησιμοποιεί αυτή τη στιγμή.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation>(αντίγραφο ασφαλείας)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation>(αντίγραοφ ασφαλέιας %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Απροσδιόριστη Κατάσταση.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Αναμονή έναρξης συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Προετοιμασία για συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>Ο συγχρονισμός εκτελείται.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Ο συγχρονισμός ήταν επιτυχής, μη διευθετημένες διενέξεις.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Σφάλμα Ρύθμισης.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Ματαίωση από Χρήστη.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>Παύση συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Παύση συγχρονισμού)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>Δεν επιλέχθηκε έγκυρος φάκελος!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation>Η επιλεγμένη διαδρομή δεν υπάρχει!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>Η επιλεγμένη διαδρομή δεν είναι φάκελος!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Δεν έχετε δικαιώματα εγγραφής στον επιλεγμένο φάκελο!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Ο τοπικός φάκελος %1 περιέχει ήδη ένα φάκελο που χρησιμοποιείται σε μια σύνδεση συγχρονισμού φακέλου. Παρακαλώ επιλέξτε άλλον!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Ο τοπικός φάκελος %1 περιέχεται ήδη σε φάκελο που χρησιμοποιείται σε μια σύνδεση συγχρονισμού. Παρακαλώ επιλέξτε άλλον!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Υπάρχει ήδη συγχρονισμός από το διακομιστή σε αυτόν τον τοπικό φάκελο. Επιλέξτε έναν άλλο τοπικό φάκελο!</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
- <translation>Χρησιμοποιήστε εικονικά αρχεία αντί να κατεβάσετε το περιεχόμενο άμεσα% 1.</translation>
+ <source>Use virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
- <translation>(πειραματικός)</translation>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="548"/>
<translation>Ελεύθερος χώρος: %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Τα εικονικά αρχεία δεν είναι διαθέσιμα για τον επιλεγμένο φάκελο.</translation>
</message>
<translation>ο διακομιστής δεν ανέφερε %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Αγνοήθηκε λόγω της μαύρης λίστας "επιλέξτε τι να συγχρονίσετε".</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Δεν επιτρέπεται επειδή δεν έχετε άδεια να προσθέσετε υποφακέλους σε αυτόν το φάκελο.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Δεν επιτρέπεται επειδή δεν έχετε άδεια να προσθέσετε φακέλους σε αυτόν το φάκελο.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Δεν επιτρέπεται η μεταφόρτωση αυτού του αρχείου επειδή είναι μόνο για ανάγνωση στον διακομιστή, γίνεται επαναφορά.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation>Μετακινήθηκε σε μη έγκυρο στόχο, επαναφορά.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation>Δεν επιτρέπεται η κατάργηση, επαναφορά.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation>Σφάλμα κατά την ανάγνωση της βάσης δεδομένων.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation>Ο διακομιστής απάντησε με σφάλμα κατά την ανάγνωση της διεύθυνσης ΄%1' : %2</translation>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation>Δεν ήταν δυνατή η μετονομασία % 1 σε %2, σφάλμα: %3.</translation>
</message>
<translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>Το τοπικό αρχείο τροποποιήθηκε κατά τον συγχρονισμό.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
- <translation>Δεν ήταν δυνατή η ενημέρωση του αρχείου: %1.</translation>
+ <source>Could not update file: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="362"/>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
- <translation>Συγχρονισμός όλων από το διακομιστή (συνιστάται).</translation>
+ <source>S&ynchronize everything from server</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>Could not reset folder state</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation> (backup)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation> (backup %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Undefined State.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Waiting to start syncing.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Preparing for sync.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>Sync is running.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Sync was successful, unresolved conflicts.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>Last Sync was successful.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Setup Error.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>User Abort.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>Sync is paused.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sync is paused)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>No valid folder selected!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>The selected path is not a folder!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>You have no permission to write to the selected folder!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>There is already a sync from the server to this local folder. Please pick another local folder!</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
<translation>Free space: %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation>Error writing metadata to the database</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>Local file changed during sync.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>Ne eblis restarigi la staton de la dosierujo</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Malnova protokoldosiero „%1“ estis trovita, se ĝi ne estas forigebla. Bv. certigi, ke neniu aplikaĵo estas nuntempe uzanta ĝin.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation>(savkopio)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation>(savkopio %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Nedifinita stato.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Atendo de eksinkronigo.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Pretigado de la sinkronigo.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>Sinkronigo ruliĝanta.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Sinkronigo sukcesis, estas nesolvitaj konfliktoj.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>La lasta sinkronigo sukcesis.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Eraro de instalaĵo.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Haltigita de la uzanto.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>Sinkronigo estas paŭzigita.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sinkronigo estas paŭzigita)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>Nevalida dosierujo elektita!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>La elektita vojo ne estas dosierujo!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Vi ne rajtas skribi en la elektitan dosierujon!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>La loka dosierujo %1 jam enhavas dosierujon uzitan en alia dosieruja sinkronigo. Bv. elekti alian dosierujon!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>La loka dosierujo %1 jam troviĝas en dosierujo uzita en alia dosieruja sinkronigo. Bv. elekti alian dosierujon!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Jam ekzistas sinkronigo el la servilo al tiu ĉi loka dosierujo. Bv. elekti alian lokan dosierujon!</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
<translation>Libera spaco: %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation>Eraro dum konservado de pridatumoj en la datumbazo</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>Loka dosiero ŝanĝiĝis dum sinkronigo.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
This action will abort any currently running synchronization.</source>
- <translation>Esta acción desactivará el soporte para archivos virtuales. Al hacerlo, el contenido de las carpetas actualmente marcado como «disponible solo en línea» será descargado.
-
-La única ventaja de desactivar el soporte para archivos virtuales es que la sincronización selectiva volverá a estar disponible.
-
-Esta acción detendrá cualquier sincronización en proceso.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="788"/>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>No se ha podido restablecer el estado de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Se ha encontrado un antiguo registro de sincronización '%1'; pero no se ha podido eliminar. Por favor, asegúrese de que ninguna aplicación la esté utilizando.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation>(copia de seguridad)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation>(copia de seguridad %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Estado no definido.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Esperando para comenzar la sincronización.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Preparándose para sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>Sincronización en funcionamiento.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>La sincronización ha tenido éxito, pero hay conflictos sin resolver.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>La última sincronización se ha realizado con éxito.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Error de configuración.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Interrumpido por el usuario.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>La sincronización está en pausa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sincronización en pausa)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>¡La carpeta seleccionada no es válida!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation>¡La ruta seleccionada no existe!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>¡La ruta seleccionada no es una carpeta!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>¡No tiene permiso para escribir en la carpeta seleccionada!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>El directorio local %1 ya contiene un directorio usado en una conexión de sincronización de directorios. Por favor, elija otro.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>El directorio local %1 está dentro de un directorio usado en una conexión de sincronización de directorios. Por favor, elija otro.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Ya existe una tarea de sincronización entre el servidor y esta carpeta. Por favor elija otra carpeta local.</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
- <translation>Usar archivos virtuales en vez de descargar el contenido inmediatamente%1</translation>
+ <source>Use virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
- <translation>(experimental)</translation>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="548"/>
<translation>Espacio libre: %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Los archivos virtuales no están disponiblespara la carpeta seleccionada</translation>
</message>
<translation>el servidor informó de no %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorado porque se encuentra en la lista negra de «elija qué va a sincronizar»</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>No permitido porque no tienes permiso para añadir subcarpetas a esa carpeta.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>No permitido porque no tienes permiso para añadir archivos a esa carpeta.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>No está permitido subir este archivo porque es de solo lectura en el servidor, restaurando.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation>Movido a un lugar no válido, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation>No está permitido borrar, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation>Error mientras se leía la base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation>El servidor contestó con un error al leer el directorio «%1» : %2</translation>
</message>
<message>
<location filename="../src/libsync/propagateremotedelete.cpp" line="152"/>
<source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source>
- <translation>El código HTTP devuelto por el servidor es erróneo. Esperado 204, pero recibido "%1 %2".</translation>
+ <translation>El código HTTP devuelto por el servidor es erróneo. Se esperaba 204, pero se recibió "%1 %2".</translation>
</message>
</context>
<context>
<message>
<location filename="../src/libsync/propagateremotedeleteencryptedrootfolder.cpp" line="143"/>
<source>Wrong HTTP code returned by server. Expected 204, but received "%1 %2".</source>
- <translation>El código HTTP devuelto por el servidor es erróneo. Se esperaba 204, pero recibido "%1 %2".</translation>
+ <translation>El código HTTP devuelto por el servidor es erróneo. Se esperaba 204, pero se recibió "%1 %2".</translation>
</message>
</context>
<context>
<message>
<location filename="../src/libsync/propagateremotemkdir.cpp" line="209"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
- <translation>El código HTTP devuelto por el servidor es erróneo. Esperado 201, pero recibido "%1 %2".</translation>
+ <translation>El código HTTP devuelto por el servidor es erróneo. Se esperaba 201, pero se recibió "%1 %2".</translation>
</message>
<message>
<location filename="../src/libsync/propagateremotemkdir.cpp" line="284"/>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation>No se puede renombrar %1 a %2, error: %3</translation>
</message>
<translation>Error al escribir los metadatos en la base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation>Error al configurar el estado fijado</translation>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>Un archivo local ha sido modificado durante la sincronización.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
- <translation>No se pudo actualizar el archivo : %1</translation>
+ <source>Could not update file: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="362"/>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
- <translation>S&incroniza todo desde el servidor (recomendado)</translation>
+ <source>S&ynchronize everything from server</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>No se pudo </translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Una antigua sincronización con journaling '%1' fue encontrada, pero no se pudo eliminar. Por favor, asegurate que ninguna aplicación la está utilizando.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation>(Copia de seguridad)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation>(Copia de seguridad %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Estado no definido.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Esperando para comenzar sincronización.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Preparando la sincronización.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>Sincronización en funcionamiento.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>La última sincronización fue exitosa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Error de configuración.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Interrumpir.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>La sincronización está en pausa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sincronización en pausa)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>Carpeta válida no seleccionada! </translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>¡No tenés permisos para escribir el directorio seleccionado!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation type="unfinished"/>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation>Error escribiendo metadatos a la base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>No fue posible restablecer el estado de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Un diario antiguo de sincronización '%1' fue encontrado, pero no pudo ser eliminado. Por favor asegurate que ninguna aplicación lo esté usando actualmente.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation>(respaldo)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation>(respaldo %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Estado no definido.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Agurardando para iniciar la sincronización.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Preparando para sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>La Sincronización está en curso.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>La última Sincronización fue exitosa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Error de Configuración.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Abortado por el Usuario.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>La sincronización está pausada.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (La sincronización está pausada)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>¡No se ha seleccionado una carpeta válida!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>¡La ruta seleccionada no es de una carpeta!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>¡No tienes permisos para escribir en la carpeta seleccionada!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>La carpeta local %1 contiene una carpeta ya usada en una conexión de sincronización de carpeta. ¡Por favor elige otra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>La carpeta local %1 ya está contenida en una carpeta usada en una conexión de sincronización de carpeta. ¡Por favor elige otra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Ya existe una sincronización desde el servidor a esta carpeta local. ¡Por favor elige otra carpeta local!</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation>Error al escribir los metadatos a la base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>El archivo local cambio durante la sincronización.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>No fue posible restablecer el estado de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Un diario antiguo de sincronización '%1' fue encontrado, pero no pudo ser eliminado. Por favor asegurate que ninguna aplicación lo esté usando actualmente.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation>(respaldo)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation>(respaldo %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Estado no definido.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Agurardando para iniciar la sincronización.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Preparando para sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>La Sincronización está en curso.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>La última Sincronización fue exitosa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Error de Configuración.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Abortado por el Usuario.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>La sincronización está pausada.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (La sincronización está pausada)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>¡No se ha seleccionado una carpeta válida!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>¡La ruta seleccionada no es de una carpeta!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>¡No tienes permisos para escribir en la carpeta seleccionada!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>La carpeta local %1 contiene una carpeta ya usada en una conexión de sincronización de carpeta. ¡Por favor elige otra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>La carpeta local %1 ya está contenida en una carpeta usada en una conexión de sincronización de carpeta. ¡Por favor elige otra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Ya existe una sincronización desde el servidor a esta carpeta local. ¡Por favor elige otra carpeta local!</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation>Error al escribir los metadatos a la base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>El archivo local cambio durante la sincronización.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>No fue posible restablecer el estado de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Un diario antiguo de sincronización '%1' fue encontrado, pero no pudo ser eliminado. Por favor asegurate que ninguna aplicación lo esté usando actualmente.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation>(respaldo)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation>(respaldo %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Estado no definido.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Agurardando para iniciar la sincronización.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Preparando para sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>La Sincronización está en curso.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>La última Sincronización fue exitosa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Error de Configuración.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Abortado por el Usuario.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>La sincronización está pausada.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (La sincronización está pausada)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>¡No se ha seleccionado una carpeta válida!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>¡La ruta seleccionada no es de una carpeta!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>¡No tienes permisos para escribir en la carpeta seleccionada!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>La carpeta local %1 contiene una carpeta ya usada en una conexión de sincronización de carpeta. ¡Por favor elige otra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>La carpeta local %1 ya está contenida en una carpeta usada en una conexión de sincronización de carpeta. ¡Por favor elige otra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Ya existe una sincronización desde el servidor a esta carpeta local. ¡Por favor elige otra carpeta local!</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation>Error al escribir los metadatos a la base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>El archivo local cambio durante la sincronización.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>No fue posible restablecer el estado de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Un diario antiguo de sincronización '%1' fue encontrado, pero no pudo ser eliminado. Por favor asegurate que ninguna aplicación lo esté usando actualmente.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation>(respaldo)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation>(respaldo %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Estado no definido.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Agurardando para iniciar la sincronización.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Preparando para sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>La Sincronización está en curso.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>La última Sincronización fue exitosa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Error de Configuración.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Abortado por el Usuario.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>La sincronización está pausada.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (La sincronización está pausada)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>¡No se ha seleccionado una carpeta válida!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>¡La ruta seleccionada no es de una carpeta!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>¡No tienes permisos para escribir en la carpeta seleccionada!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>La carpeta local %1 contiene una carpeta ya usada en una conexión de sincronización de carpeta. ¡Por favor elige otra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>La carpeta local %1 ya está contenida en una carpeta usada en una conexión de sincronización de carpeta. ¡Por favor elige otra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Ya existe una sincronización desde el servidor a esta carpeta local. ¡Por favor elige otra carpeta local!</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation>Error al escribir los metadatos a la base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>El archivo local cambio durante la sincronización.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>No fue posible restablecer el estado de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Un diario antiguo de sincronización '%1' fue encontrado, pero no pudo ser eliminado. Por favor asegurate que ninguna aplicación lo esté usando actualmente.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation>(respaldo)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation>(respaldo %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Estado no definido.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Agurardando para iniciar la sincronización.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Preparando para sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>La Sincronización está en curso.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>La última Sincronización fue exitosa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Error de Configuración.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Abortado por el Usuario.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>La sincronización está pausada.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (La sincronización está pausada)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>¡No se ha seleccionado una carpeta válida!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>¡La ruta seleccionada no es de una carpeta!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>¡No tienes permisos para escribir en la carpeta seleccionada!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>La carpeta local %1 contiene una carpeta ya usada en una conexión de sincronización de carpeta. ¡Por favor elige otra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>La carpeta local %1 ya está contenida en una carpeta usada en una conexión de sincronización de carpeta. ¡Por favor elige otra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Ya existe una sincronización desde el servidor a esta carpeta local. ¡Por favor elige otra carpeta local!</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation>Error al escribir los metadatos a la base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>El archivo local cambio durante la sincronización.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>No fue posible restablecer el estado de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Un diario antiguo de sincronización '%1' fue encontrado, pero no pudo ser eliminado. Por favor asegurate que ninguna aplicación lo esté usando actualmente.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation>(respaldo)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation>(respaldo %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Estado no definido.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Agurardando para iniciar la sincronización.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Preparando para sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>La Sincronización está en curso.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>La última Sincronización fue exitosa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Error de Configuración.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Abortado por el Usuario.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>La sincronización está pausada.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (La sincronización está pausada)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>¡No se ha seleccionado una carpeta válida!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>¡La ruta seleccionada no es de una carpeta!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>¡No tienes permisos para escribir en la carpeta seleccionada!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>La carpeta local %1 contiene una carpeta ya usada en una conexión de sincronización de carpeta. ¡Por favor elige otra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>La carpeta local %1 ya está contenida en una carpeta usada en una conexión de sincronización de carpeta. ¡Por favor elige otra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Ya existe una sincronización desde el servidor a esta carpeta local. ¡Por favor elige otra carpeta local!</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation>Error al escribir los metadatos a la base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>El archivo local cambio durante la sincronización.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>No fue posible restablecer el estado de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Un diario antiguo de sincronización '%1' fue encontrado, pero no pudo ser eliminado. Por favor asegurate que ninguna aplicación lo esté usando actualmente.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation>(respaldo)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation>(respaldo %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Estado no definido.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Agurardando para iniciar la sincronización.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Preparando para sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>La Sincronización está en curso.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>La última Sincronización fue exitosa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Error de Configuración.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Abortado por el Usuario.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>La sincronización está pausada.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (La sincronización está pausada)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>¡No se ha seleccionado una carpeta válida!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>¡La ruta seleccionada no es de una carpeta!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>¡No tienes permisos para escribir en la carpeta seleccionada!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>La carpeta local %1 contiene una carpeta ya usada en una conexión de sincronización de carpeta. ¡Por favor elige otra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>La carpeta local %1 ya está contenida en una carpeta usada en una conexión de sincronización de carpeta. ¡Por favor elige otra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Ya existe una sincronización desde el servidor a esta carpeta local. ¡Por favor elige otra carpeta local!</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation>Error al escribir los metadatos a la base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>El archivo local cambio durante la sincronización.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>No fue posible restablecer el estado de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Un diario antiguo de sincronización '%1' fue encontrado, pero no pudo ser eliminado. Por favor asegurate que ninguna aplicación lo esté usando actualmente.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation>(respaldo)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation>(respaldo %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Estado no definido.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Agurardando para iniciar la sincronización.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Preparando para sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>La Sincronización está en curso.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>La última Sincronización fue exitosa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Error de Configuración.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Abortado por el Usuario.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>La sincronización está pausada.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (La sincronización está pausada)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>¡No se ha seleccionado una carpeta válida!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>¡La ruta seleccionada no es de una carpeta!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>¡No tienes permisos para escribir en la carpeta seleccionada!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>La carpeta local %1 contiene una carpeta ya usada en una conexión de sincronización de carpeta. ¡Por favor elige otra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>La carpeta local %1 ya está contenida en una carpeta usada en una conexión de sincronización de carpeta. ¡Por favor elige otra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Ya existe una sincronización desde el servidor a esta carpeta local. ¡Por favor elige otra carpeta local!</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation>Error al escribir los metadatos a la base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>El archivo local cambio durante la sincronización.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>No fue posible restablecer el estado de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Un diario antiguo de sincronización '%1' fue encontrado, pero no pudo ser eliminado. Por favor asegurate que ninguna aplicación lo esté usando actualmente.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation>(respaldo)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation>(respaldo %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Estado no definido.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Agurardando para iniciar la sincronización.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Preparando para sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>La Sincronización está en curso.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>La última Sincronización fue exitosa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Error de Configuración.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Abortado por el Usuario.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>La sincronización está pausada.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (La sincronización está pausada)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>¡No se ha seleccionado una carpeta válida!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>¡La ruta seleccionada no es de una carpeta!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>¡No tienes permisos para escribir en la carpeta seleccionada!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>La carpeta local %1 contiene una carpeta ya usada en una conexión de sincronización de carpeta. ¡Por favor elige otra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>La carpeta local %1 ya está contenida en una carpeta usada en una conexión de sincronización de carpeta. ¡Por favor elige otra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Ya existe una sincronización desde el servidor a esta carpeta local. ¡Por favor elige otra carpeta local!</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation>Error al escribir los metadatos a la base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>El archivo local cambio durante la sincronización.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>Ei suutnud tühistada kataloogi staatust</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Leiti vana sünkroniseeringu zurnaal '%1', kuid selle eemaldamine ebaõnnenstus. Palun veendu, et seda kasutaks ükski programm.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation>(varukoopia)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation> (varukoopia %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Määramata staatus.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Oodatakse sünkroonimise alustamist.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Valmistun sünkroniseerima.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>Sünkroniseerimine on käimas.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>Viimane sünkroniseerimine oli edukas.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Seadistamise viga.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Kasutaja tühistamine.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>Sünkroniseerimine on peatatud.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sünkroniseerimine on peatatud)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>Sobilikku kausta pole valitud!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>Valitud asukoht pole kaust!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Sul puuduvad õigused valitud kataloogi kirjutamiseks!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation type="unfinished"/>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>Kohalik fail muutus sünkroniseeringu käigus.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>Ezin izan da karpetaren egoera berrezarri</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Aurkitu da '%1' sinkronizazio erregistro zaharra, baina ezin da ezabatu. Ziurtatu aplikaziorik ez dela erabiltzen ari.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation> (backup)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation> (backup %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Definitu gabeko egoera.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Itxoiten sinkronizazioa hasteko.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Sinkronizazioa prestatzen.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>Sinkronizazioa martxan da.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Sinkronizazioa behar bezala burutu da, konpondu gabeko gatazkak.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>Azkeneko sinkronizazioa behar bezala burutu da.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Konfigurazio errorea.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Erabiltzaileak bertan behera utzi du.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>Sinkronizazioa pausatuta dago.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sinkronizazioa pausatuta dago)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>Ez da baliozko karpetarik hautatu!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>Hautatutako bidea ez da karpeta bat!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Ez daukazu hautatutako karpetan idazteko baimenik!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Tokiko '%1' karpetak badu dagoeneko sinkronizatutako karpeta bat. Hautatu beste bat!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Tokiko '%1' karpeta dagoeneko sinkronizatutako karpeta batean dago. Hautatu beste bat!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Dagoeneko sinkronizazio bat dago zerbitzaritik karpeta lokal honetara. Aukeratu tokiko beste karpeta bat!</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
- <translation>(esperimentala)</translation>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="548"/>
<translation>Toki librea: %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Fitxategi birtualak ez daude hautatutako karpetarentzako eskuragarri</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ez ikusi egin zaio, "aukeratu zer sinkronizatu" zerrenda beltzagatik.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Ez da onartu, ez daukazulako baimenik karpeta horretan azpikarpetak gehitzeko</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Ez da onartu, ez daukazulako baimenik karpeta horretan fitxategiak gehitzeko</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Ez dago baimenik fitxategi hau kargatzek zerbitzarian irakurtzeko soilik delako, leheneratzen.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation>Ezabatzeko baimenik gabe, berrezartzen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation>Errorea metadatuak datu-basean idaztean</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation>Errorea pin egoera ezartzean</translation>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>Fitxategi lokala aldatu da sinkronizazioan.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>نمی تواند حالت پوشه را تنظیم مجدد کند</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>یک مجله همگام قدیمی '1%' پیدا شد، اما حذف نمی شود. لطفا مطمئن شوید که هیچ برنامه ای در حال حاضر از آن استفاده نمی کند.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation> (backup)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation> (پشتیبان %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>موقعیت تعریف نشده</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>انتظار برای شروع همگامسازی</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>آماده سازی برای همگام سازی کردن.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>همگام سازی در حال اجراست</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>آخرین همگام سازی موفقیت آمیز بود</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>خطا در پیکر بندی.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>خارج کردن کاربر.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>همگام سازی فعلا متوقف شده است</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (همگامسازی موقتا متوقف شده است)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>هیچ پوشهی معتبری انتخاب نشده است!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>مسیر انتخاب شده یک پوشه نیست!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>شما اجازه نوشتن در پوشه های انتخاب شده را ندارید!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>پوشه محلی 1% از قبل شامل یک پوشه استفاده شده در یک اتصال همگام سازی پوشه است. لطفا یکی دیگر را انتخاب کنید!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>پوشه محلی 1% از قبل یک پوشه استفاده شده در یک اتصال همگام سازی پوشه دارد. لطفا یکی دیگر را انتخاب کنید!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>در حال حاضر یک همگام سازی از سرور به این پوشه محلی وجود دارد. لطفا یک پوشه محلی دیگر را انتخاب کنید!</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
<translation>فضای خالی: %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation>خطا در نوشتن متادیتا در پایگاه داده</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>فایل محلی در حین همگامسازی تغییر کرده است.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>Kansion tilaa ei voitu alustaa</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation> (varmuuskopio)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation> (varmuuskopio %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Määrittelemätön tila.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Odotetaan synkronoinnin aloitusta.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Valmistellaan synkronointia.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>Synkronointi on meneillään.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>Viimeisin synkronointi suoritettiin onnistuneesti.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Asetusvirhe.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Käyttäjän keskeyttämä.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>Synkronointi on keskeytetty.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synkronointi on keskeytetty)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>Kelvollista kansiota ei ole valittu!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>Valittu polku ei ole kansio!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Sinulla ei ole kirjoitusoikeutta valittuun kansioon!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Paikallinen kansio %1 sisältää kansion, jota käytetään kansion synkronointiyhteydessä. Valitse toinen kansio!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation type="unfinished"/>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
- <translation> (kokeellinen)</translation>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="548"/>
<translation>Vapaata tilaa: %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation>Virhe kirjoittaessa metadataa tietokantaan</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>Paikallinen tiedosto muuttui synkronoinnin aikana.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
This action will abort any currently running synchronization.</source>
- <translation>Cette action désactivera le support du fichier virtuel. Par conséquent, les contenus des dossiers habituellement marqués comme "disponibles en lignes seulement" seront téléchargés.
-Le seul avantage de cette désactivation est que les fonctionnalités de synchronisation sélective seront de nouveau disponibles.
-Cette action entraînera la perte de toute synchronisation en cours.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="788"/>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>Impossible de réinitialiser l'état du dossier</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Un ancien fichier journal '%1' a été trouvé, mais ne peut être supprimé. Veuillez vous assurer qu’aucune application ne l'utilise en ce moment.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation>(sauvegarde)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation>(sauvegarde %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Statut indéfini.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>En attente de synchronisation.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Préparation de la synchronisation.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>Synchronisation en cours</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>La synchronisation a réussi avec des conflits non résolus.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>Synchronisation terminée avec succès</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Erreur d'installation.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Abandon par l'utilisateur.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>La synchronisation est en pause.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisation en pause)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>Aucun dossier valable sélectionné !</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation>Le chemin sélectionné n'existe pas !</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>Le chemin sélectionné n'est pas un dossier !</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Vous n'avez pas la permission d'écrire dans le dossier sélectionné !</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Le dossier local %1 contient un dossier déjà utilisé pour une synchronisation de dossiers. Veuillez en choisir un autre !</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Le dossier local %1 se trouve dans un dossier déjà configuré pour une synchronisation de dossier. Veuillez en choisir un autre !</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Il y a déjà une synchronisation depuis le serveur vers ce dossier local. Merci de choisir un autre dossier local !</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
- <translation> (expérimental)</translation>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="548"/>
<translation>Espace libre : %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation>Erreur de lecture de la base de données</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation>Erreur à l'écriture des métadonnées dans la base de données</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>Fichier local modifié pendant la synchronisation.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
- <translation>Impossible de mettre à jour le fichier : %1</translation>
+ <source>Could not update file: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="362"/>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
This action will abort any currently running synchronization.</source>
- <translation>Esta acción desactivará a compatibilidade cos ficheiros virtuais. Como consecuencia, descargaranse os contidos dos cartafoles que están marcados actualmente como «só dispoñíbeis en liña».
-
-A única vantaxe de desactivar a compatibilidade con ficheiros virtuais é que volverá dispoñíbel a función de sincronización selectiva.
-
-Esta acción interromperá calquera sincronización que estea a executarse actualmente.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="788"/>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>Non foi posíbel restabelecer o estado do cartafol</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Atopouse un diario de sincronización antigo en «%1» máis non pode ser retirado. Asegúrese de que non o está a usar ningunha aplicación.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation> (copia de seguridade)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation> (copia de seguridade %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Estado sen definir.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Agardando para iniciar a sincronización.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Preparando para sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>Estase sincronizando.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>A sincronización foi stifactoria, hai conflitos sen resolver.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>A última sincronización fíxose correctamente.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Produciuse un erro de configuración.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Interrompido polo usuario.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>Sincronización en pausa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (sincronización en pausa)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>Non seleccionou ningún cartafol correcto!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation>A ruta seleccionada non éexiste!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>A ruta seleccionada non é un cartafol!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Vostede non ten permiso para escribir neste cartafol!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>O cartafol local %1 xa contén un cartafol usado nunha conexión de sincronización de cartafoles. Escolla outro!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>O cartafol local %1 está dentro dun cartafol usado nunha conexión de sincronización de cartafoles. Escolla outro!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Xa existe unha tarefa de sincronización entre o servidor e este cartafol. Escolla outro cartafol local!</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
- <translation>Use ficheiros virtuais no canto de descargar contido inmediatamente%1</translation>
+ <source>Use virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
- <translation> (experimental)</translation>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="548"/>
<translation>Espazo libre: %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Os ficheiros virtuais non están dispoñíbeis para o cartafol seleccionado</translation>
</message>
<translation>o servidor non informou de %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorado por mor da lista de bloqueo de «escolla que sincronizar»</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Non se lle permite porque vostede non ten permiso para engadir subcartafoles neste cartafol</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Non se lle permite porque vostede non ten permiso para engadir ficheiros neste cartafol</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Non está permitido o envío xa que o ficheiro é só de lectura no servidor, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation>Moveuse a un destino non válido, restaurándo</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation>Non está permitido retiralo, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation>Produciuse un erro ao ler a base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation>O servidor respondeu cun erro ao ler o directorio «%1» : %2</translation>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation>Non foi posíbel renomear %1 a %2, erro: %3</translation>
</message>
<translation>Produciuse un erro ao escribir os metadatos na base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation>Produciuse un erro ao definir o estado do pin</translation>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>O ficheiro local cambiou durante a sincronización.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
- <translation>Non foi posíbel actualizar o ficheiro: %1</translation>
+ <source>Could not update file: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="362"/>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
- <translation>Sincronizar &todo dende o servidor (recomendado)</translation>
+ <source>S&ynchronize everything from server</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>לא ניתן לאפס את מצב התיקיים</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation>(גיבוי)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation>(גיבוי %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>מצב בלתי מוגדר.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>בהמתנה להתחלת סנכרון.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>בהכנות לסנכרון.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>מתבצע סנכרון.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>הסנכרון לא הצליח, יש סתירות בלתי פתורות.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>הסנכרון האחרון הצליח.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>שגיאת הגדרה.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>ביטול מצד המשתמש.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>הסנכרון מושהה.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (הסנכרון מושהה)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>לא נבחרה תיקיית תקנית!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>הנתיב שנבחר אינו מצביע על תיקייה!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>אין לך הרשאות לכתוב לתיקייה הנבחרת!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation type="unfinished"/>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
<translation>מקום פנוי: %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation>שגיאה בכתיבת נתוני על למסד הנתונים</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>הקובץ המקומי השתנה במהלך הסנכרון.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>Stanje mape nije moguće vratiti</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Pronađen je stari sinkronizacijski dnevnik ‘%1’ ali ga nije moguće ukloniti. Provjerite koristi li ga trenutno neka druga aplikacija.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation> (sigurnosna kopija)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation> (sigurnosna kopija %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Nedefinirano stanje.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Čeka se početak sinkronizacije.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Priprema za sinkronizaciju.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>Sinkronizacija je pokrenuta.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Sinkronizacija je bila uspješna, postoje neriješena nepodudaranja.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>Zadnja sinkronizacija bila je uspješna.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Pogreška pri postavljanju.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Prekinuo korisnik.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>Sinkronizacija je pauzirana.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sinkronizacija je pauzirana)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>Nije odabrana nijedna valjana mapa!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>Odabran put nije mapa!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Nemate dopuštenje za pisanje u odabranu mapu!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Lokalna mapa %1 već sadrži mapu koja se upotrebljava u poveznici za sinkronizaciju mape. Odaberite drugu mapu!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Lokalna mapa %1 već je sadržana u mapi koja se upotrebljava u poveznici za sinkronizaciju mape. Odaberite drugu mapu!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Već postoji sinkronizacija između poslužitelja i te lokalne mape. Odaberite drugu lokalnu mapu!</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
<translation>Slobodan prostor: %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation>Pogreška pri pisanju metapodataka u bazu podataka</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>Lokalna datoteka je izmijenjena tijekom sinkronizacije.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>A mappa állapotát nem lehet visszállítani</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Egy régi szinkronizálási naplófájl található: „%1”, de az nem törölhető. Győződjön meg róla, hogy jelenleg egy alkalmazás sem használja.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation>(biztonsági mentés)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation>(biztonsági mentés: %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Ismeretlen állapot.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Várakozás a szinkronizálás elindítására.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Előkészítés a szinkronizáláshoz.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>A szinkronizálás fut.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>A szinkronizálás sikeres, feloldatlan ütközések vannak.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>A legutolsó szinkronizálás sikeres volt.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Beállítási hiba.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Felhasználó megszakította.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>Szinkronizálás megállítva.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (szinkronizálás megállítva)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>Nincs érvényes mappa kiválasztva!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>A kiválasztott elérési út nem mappa!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Nincs joga a kiválasztott mappa írásához!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>A(z) %1 helyi mappa már tartalmaz olyan mappát, amely mappa szinkronizálási kapcsolathoz használt. Válasszon egy másikat.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>A(z) %1 helyi mappa már egy olyan mappában van, amely mappa szinkronizálási kapcsolathoz használt. Válasszon egy másikat.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Már van egy szinkronizálási mappa a kiszolgálóról ebben a helyi mappában. Válasszon egy másik mappát.</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
<translation>Szabad terület: %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation>Hiba a metaadatok adatbázisba írásakor</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>A helyi fájl megváltozott szinkronizáció közben.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>Tidak dapat mereset keadaan folder</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Sebuah jurnal sinkronisasi lama '%1' telah ditemukan, namun tidak dapat menghapusnya. Mohon untuk memastikan bahwa tida ada aplikasi yang sedang menggunakannya.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation>(cadangan)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation>(cadangkan %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Kondisi Yang Tidak Ditentukan</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Menunggu untuk memulai sinkronisasi.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Persiapan untuk sinkronisasi.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>Sinkronisasi sedang berjalan.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Sinkronisasi berhasi, konflik belum diselesaikan.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>Sinkronisasi terakhir sukses.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Kesalahan Persiapan.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Pengguna Batalkan.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>Sinkronisasi dijeda.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sinkronisasi dijeda)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>Tidak ada folder yang valid dipilih!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>Jalur yang dipilih bukanlah sebuah folder!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Anda tidak memiliki ijin untuk menulis ke folder yang dipilih!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Folder lokal %1 sudah terdapat sebuah folder yang digunakan di dalam sebuah koneksi sinkronisasi folder. Mohon pilih yang lainnya!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Folder lokal %1 sudah terdapat sebuah folder yang digunakan di dalam sebuah koneksi sinkronisasi folder. Mohon pilih yang lainnya!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Sudah ada sinkronisasi dari server ke folder lokal ini. Mohon pilih folder lokal lainnya!</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
<translation>Ruang bebas: %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>Gat ekki núllstillt stöðu á möppu</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Gömul atvikaskrá samstillingar '%1' fannst, en var ekki hægt að fjarlægja.
Vertu viss um að ekkert annað forrit sé ekki að nota hana.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation> (öryggisafrit)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation> (öryggisafrita %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Óskilgreind staða.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Bíð eftir að samstilling ræsist.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Undirbý samstillingu.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>Samstilling er keyrandi.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Samstilling tókst, óleystir árekstrar</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>Síðasta samstilling tókst.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Villa í uppsetningu.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Notandi hætti við.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>Samstilling er í bið.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (samstilling er í bið)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>Engin gild mappa valin!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>Valin slóð er ekki mappa! </translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Þú hefur ekki réttindi til að skrifa í valda möppu!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation type="unfinished"/>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
<translation>Laust pláss: %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation>Villa við ritun lýsigagna í gagnagrunninn</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>Staðværu skránni var breytt við samstillingu.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
This action will abort any currently running synchronization.</source>
- <translation>Questa azione disabiliterà il supporto dei file virtuali. Di conseguenza, i contenuti delle cartelle attualmente contrassegnati come 'disponibili solo in linea' saranno scaricati.
-
-L'unico vantaggio di disabilitare il supporto dei file virtuali è che la funzione di sincronizzazione selettiva sarà nuovamente disponibile.
-
-Questa azione interromperà qualsiasi sincronizzazione attualmente in esecuzione.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="788"/>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>Impossibile ripristinare lo stato della cartella</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>È stato trovato un vecchio registro di sincronizzazione '%1', ma non può essere rimosso. Assicurati che nessuna applicazione lo stia utilizzando.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation>(copia di sicurezza)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation>(copia di sicurezza %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Stato non definito.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>In attesa di iniziare la sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Preparazione della sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>La sincronizzazione è in corso.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Sincronizzazione avvenuta, conflitti non risolti.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>L'ultima sincronizzazione è stata completata correttamente.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Errore di configurazione.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Interrotto dall'utente.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>La sincronizzazione è sospesa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation> %1 (La sincronizzazione è sospesa)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>Nessuna cartella valida selezionata!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation>Il percorso selezionato non esiste!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>Il percorso selezionato non è una cartella!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Non hai i permessi di scrittura per la cartella selezionata!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>La cartella locale %1 contiene già una cartella utilizzata in una connessione di sincronizzazione delle cartelle. Selezionane un'altra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>La cartella locale %1 è già contenuta in una cartella utilizzata in una connessione di sincronizzazione delle cartelle. Selezionane un'altra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Esiste già una sincronizzazione dal server a questa cartella locale. Seleziona un'altra cartella locale!</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
- <translation>Usa file virtuali invece di scaricare immediatamente il contenuto%1</translation>
+ <source>Use virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
- <translation>(sperimentale)</translation>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="548"/>
<translation>Spazio libero: %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation>I file virtuali non sono disponibili per la cartella selezionata</translation>
</message>
<translation>il server non ha restituito alcun %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorato in base alla lista nera per la scelta di cosa sincronizzare</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Non consentito perché non sei autorizzato ad aggiungere sottocartelle a quella cartella</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Non ti è consentito perché non hai i permessi per aggiungere file in quella cartella </translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Non ti è permesso caricare questo file perché hai l'accesso in sola lettura sul server, ripristino</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation>Spostato su una destinazione non valida, ripristino</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation>Rimozione non consentita, ripristino</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation>Errore durante la lettura del database</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation>Il server ha risposto con un errore durante la lettura della cartella '% 1' : %2</translation>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation>Impossibile rinominare %1 in %2, errore: %3</translation>
</message>
<translation>Errore durante la scrittura dei metadati nel database</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation>Errore durante l'impostazione dello stato del PIN</translation>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>Un file locale è cambiato durante la sincronizzazione.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
- <translation>Impossibile aggiornare il file: %1</translation>
+ <source>Could not update file: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="362"/>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
- <translation>Sincroni&zza tutto dal server (consigliato)</translation>
+ <source>S&ynchronize everything from server</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>フォルダーの状態をリセットできませんでした</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>古い同期ジャーナル '%1' が見つかりましたが、削除できませんでした。それを現在使用しているアプリケーションが存在しないか確認してください。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation>(バックアップ)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation>(%1をバックアップ)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>未定義の状態。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>同期開始を待機中</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>同期の準備中。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>同期を実行中です。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>同期は成功し、解決されなかった競合です。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>最後の同期は成功しました。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>設定エラー。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>ユーザーによる中止。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>同期を一時停止しました。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (同期を一時停止)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>有効なフォルダーが選択されていません！</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>指定のパスは、フォルダーではありません！</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>選択されたフォルダーに書き込み権限がありません</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>ローカルフォルダー %1 にはすでに同期フォルダーとして利用されてるフォルダーを含んでいます。他のフォルダーを選択してください。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>ローカルフォルダー %1 には同期フォルダーとして利用されているフォルダーがあります。他のフォルダーを選択してください。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>すでに同期されたフォルダーがあります。別のフォルダーを選択してください！</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
<translation>空き容量: %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation>メタデータのデータベースへの書き込みに失敗</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>ローカルのファイルが同期中に変更されました。</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>폴더 상태를 초기화할 수 없습니다.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>오래된 동기화 저널 '%1'을 찾았지만 제거 할 수 없습니다. 현재 사용중인 응용 프로그램이 없는지 확인하십시오.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation>(백업)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation>(백업 %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>정의되지 않은 상태</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>동기화 시작을 기다리는 중</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>동기화 준비 중</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>동기화 진행 중</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>동기화 성공, 해결되지 않은 충돌</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>최근 동기화에 성공</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>설치 오류</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>사용자 중단</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>동기화 일시 정지됨</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (동기화 일시 정지됨)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>올바른 폴더가 선택되지 않았습니다!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>선택된 경로는 폴더가 아닙니다!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>선택된 폴더에 쓸 권한이 없습니다.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>로컬 폴더 %1에 폴더 동기화 연결에 사용된 폴더가 이미 있습니다. 다른 폴더를 선택해주세요!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>로컬 폴더 %1에 폴더 동기화 연결에 사용된 폴더에 이미 포함되어 있습니다. 다른 폴더를 선택해주세요!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>서버에서 이 로컬 폴더로의 동기화가 이미 있습니다. 다른 로컬 폴더를 선택하십시오!</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
<translation>남은 공간: %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation>데이터베이스에 메타데이터를 쓰는 중 오류가 발생했습니다.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>동기화 중 로컬 파일이 변경되었습니다.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>Nepavyko atstatyti aplanko būsenos</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Senas sinchronizavimo žurnalas '% 1' buvo surastas, tačiau jo nepavyko pašalinti. Įsitikinkite, kad šiuo metu jo nenaudoja jokia programa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation>(atsarginė kopija)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation>(atsarginė kopija %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Neapibrėžta būsena.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Laukiama pradėti sinchronizavimą.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Ruošiamasi sinchronizavimui.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>Vyksta sinchronizacija</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Sinchronizacija sėkmingai pavyko.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>Paskutinis sinchronizavimas buvo sėkmingas.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Sąrankos klaida.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Naudotojo atšaukimas</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>Sinchronizavimas yra pristabdytas.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sinchronizavimas pristabdytas)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>Nepasirinktas galiojantis failas!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation>Pasirinkto kelio nėra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>Pasirinktas kelias nėra aplankas!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Jūs neturite leidimų rašyti į pasirinktą aplanką!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Vietiniame aplanke %1 jau yra aplankas, kuris naudojamas aplanko sinchronizavimo ryšyje. Prašome pasirinkti kitą!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Vietinis aplankas %1 jau yra aplanke, naudojamame aplanko sinchronizavimo ryšyje. Prašome pasirinkti kitą!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Šis lokalus aplankas jau turi sinchronizaciją su serveriu. Pasirinkite kitą aplanką.</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
<translation>Laisva vieta: %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation>Klaida skaitant duomenų bazę</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation>Nepavyko pervadinti %1 į %2, klaida: %3</translation>
</message>
<translation>Klaida rašant metaduomenis į duomenų bazę</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>Failas kompiuteryje sinchronizavimo metu buvo pakeistas.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>Nevarēja atiestatīt mapju statusu</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation>(dublējums)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation>(dublējums %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Sagatavojas sinhronizācijai.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>Notiek sinhronizācija.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>Pēdējā sinhronizācija bija izdevusies.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Uzstādījumu kļūda.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>Sinhronizācija ir apturēta.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sinhronizācija ir apturēta)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>Nav izvēlēta derīga mape!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>Atlasītais ceļš nav mape!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Tev nav rakstīšanas piekļuves izvēlētai mapei!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation type="unfinished"/>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation> (backup)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation> (backup %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Недефинирана состојба.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Чекање за почеток на синхронизација.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Подготовка за синхронизација.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>Синхронизацијата е стартувана.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Синхронизацијата е успешна, нерешени конфликти.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>Последната синхронизација е успешна.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Откажано од корисник.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>Синхронизацијата е паузирана.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Синхронизацијата е паузирана)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>Не е избрана папка!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>Избраната патека не е папка!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Немате дозвола за запишување во избраната папка!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Локалната папка %1 веќе е во папка која се синхронизира. Изберете друга папка!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Локалната папка %1 веќе е во папка која се синхронизира. Изберете друга папка!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Веќе постои синхронизација од серверот до оваа локална папка. Изберете друга локална папка!</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
- <translation> (експериментално)</translation>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="548"/>
<translation>Слободен простор: %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation>Грешка при запишување на метаподатоци во базата со податоци</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>Локална датотека е променета додека траеше синхронизацијата.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>Klarte ikke å tilbakestille mappetilstand</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>En gammel synkroniseringsjournal '%1' ble funnet men kunne ikke fjernes. Pass på at ingen applikasjoner bruker den.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation> (sikkerhetskopi)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation> (sikkerhetskopi %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Udefinert tilstand.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Venter på å starte synkronisering.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Forbereder synkronisering.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>Synkronisering kjører.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Synkronisering var vellykket, men det finnes uløste konflikter.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>Siste synkronisering var vellykket.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Feil med oppsett.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Brukeravbrudd.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>Synkronisering er satt på pause.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synkronisering er satt på pause)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>Ingen gyldig mappe valgt!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>Den valgte stien er ikke en mappe!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Du har ikke skrivetilgang til den valgte mappen!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Den lokale mappen %1 inneholder allerede en mappe brukt i en mappe-synkronisering. Velg en annen!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Den lokale mappen %1 er allerede en undermappe av en mappe brukt i en mappe-synkronisering. Velg en annen!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Det er allerede en synkronisering fra serveren til denne lokale mappen. Velg en annen mappe!</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
<translation>Ledig plass: %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation>Feil ved skriving av metadata til databasen</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>Lokal fil endret under synkronisering.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
This action will abort any currently running synchronization.</source>
- <translation>Deze handeling zet ondersteuning voor virtuele bestanden uit. Als gevolg zullen mappen die nu 'alleen online beschikbaar' zijn, gedownload worden.
-
-Het enige voordeel van het uitschakelen van ondersteuning voor virtuele bestanden is dat de selectieve synchronisatieoptie weer beschikbaar komt.
-
-Deze handeling zal alle synchronisatie die op dit moment loopt afbreken.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="788"/>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>Kan de beginstaat van de map niet terugzetten</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Een oud synchronisatieverslag '%1' is gevonden maar kan niet worden verwijderd. Zorg ervoor dat geen applicatie dit bestand gebruikt.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation>(backup)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation>(backup %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Ongedefiniëerde staat</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>In afwachting van synchronisatie.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Synchronisatie wordt voorbereid</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>Bezig met synchroniseren.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Synchronisatie geslaagd, niet opgeloste conflicten.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>Laatste synchronisatie was geslaagd.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Installatiefout.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Afgebroken door gebruiker.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>Synchronisatie gepauzeerd.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisatie onderbroken)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>Geen geldige map geselecteerd!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation>Het geselecteerde pad bestaat niet!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>Het geselecteerde pad is geen map!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>U heeft geen permissie om te schrijven naar de geselecteerde map!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Lokale map %1 bevat al een map die wordt gebruikt voor een mapsync verbinding. Kies een andere!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Lokale map %1 zit al in een map die wordt gebruikt voor een mapsync verbinding. Kies een andere!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Er wordt vanaf de server al naar deze lokale map gesynchroniseerd. Kies een andere lokale map!</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
- <translation>Gebruik virtuele bestanden in plaats van de content direct te downloaden%1</translation>
+ <source>Use virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
- <translation> (experimenteel)</translation>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="548"/>
<translation>Vrije ruimte: %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Virtuele bestanden zijn niet beschikbaar voor de geselecteerde map</translation>
</message>
<translation>Server meldde geen %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Genegeerd vanwege de "wat synchroniseren" negeerlijst</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<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/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Niet toegestaan omdat je geen rechten hebt om bestanden in die map toe te voegen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Niet toegestaan om dit bestand te uploaden, omdat het alleen-lezen is op de server, herstellen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation>Verplaatst naar ongeldig doel, herstellen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation>Niet toegestaan om te verwijderen, herstellen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation>Fout bij lezen database</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation>Server gaf een foutmelding bij lezen directory '%1' : %2</translation>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation>Kon niet %1 hernoemen naar %2, fout: %3</translation>
</message>
<translation>Fout bij schrijven van Metadata naar de database</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation>
Fout bij instellen pin status
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>Lokaal bestand gewijzigd bij sync.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
- <translation>Kon bestand bijwerken: %1</translation>
+ <source>Could not update file: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="362"/>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
- <translation>S&ynchroniseer alles vanaf de server (aanbevolen)</translation>
+ <source>S&ynchronize everything from server</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation>(salvagarda)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Preparacion per sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>Sincronizacion en cors.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>L’utilizaire a abandonat.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>La sincronizacion es suspenduda.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation type="unfinished"/>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
<translation>Espaci liure : %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
This action will abort any currently running synchronization.</source>
- <translation>Ta czynność wyłączy obsługę plików wirtualnych. W rezultacie pobrana zostanie zawartość katalogów, które są obecnie oznaczone jako "dostępne tylko online".
-
-Jedyną zaletą wyłączenia obsługi plików wirtualnych jest to, że funkcja selektywnej synchronizacji będzie ponownie dostępna.
-
-Ta czynność spowoduje przerwanie aktualnie uruchomionej synchronizacji.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="788"/>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>Nie można zresetować stanu folderu</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Znaleziono stary dziennik synchronizacji '%1', ale nie można go usunąć. Upewnij się, że żadna aplikacja go nie używa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation> (kopia zapasowa)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation> (kopia zapasowa %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Niezdefiniowany stan.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Oczekiwanie na rozpoczęcie synchronizacji.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Przygotowanie do synchronizacji.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>Synchronizacja jest uruchomiona.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Synchronizacja przebiegła pomyślnie, nierozwiązane konflikty.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>Ostatnia synchronizacja zakończona powodzeniem.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Błąd ustawień.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Użytkownik anulował.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>Synchronizacja wstrzymana.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronizacja wstrzymana)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>Nie wybrano prawidłowego folderu!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation>Wybrana ścieżka nie istnieje!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>Wybrana ścieżka nie jest folderem!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Nie masz uprawnień do zapisu w wybranym folderze!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Folder lokalny %1 zawiera już folder używany w połączeniu do synchronizacji folderów. Wybierz inny!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>W folderze lokalnym %1 jest już zawarty folder używany w obsłudze do synchronizacji folderów. Wybierz inny!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Ten folder jest już wybrany do synchronizacji z serwerem. Wybierz inny folder lokalny!</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
- <translation>Użyj plików wirtualnych zamiast bezpośrednio pobierać ich zawartość%1</translation>
+ <source>Use virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
- <translation> (eksperymentalne)</translation>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="548"/>
<translation>Wolna przestrzeń: %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Pliki wirtualne nie są dostępne dla wybranego folderu</translation>
</message>
<translation>serwer zgłosił brak %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorowane z powodu czarnej listy "Wybierz co synchronizować"</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Niedozwolone, ponieważ nie masz uprawnień do dodawania podfolderów do tego folderu</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<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 folderze</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Przesyłanie niedozwolone, ponieważ plik jest "tylko do odczytu" na serwerze, przywracanie</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation>Przeniesiono do nieprawidłowego obiektu, przywracanie</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation>Brak uprawnień by usunąć, przywracanie</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation>Błąd podczas odczytu bazy danych</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation>Serwer odpowiedział z błędem podczas odczytu katalogu '%1' : %2</translation>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation>Nie można zmienić nazwy %1 na %2, błąd: %3</translation>
</message>
<translation>Błąd zapisu metadanych do bazy danych</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation>Błąd podczas ustawiania stanu przypięcia</translation>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>Plik lokalny zmieniony podczas synchronizacji.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
- <translation>Nie można zaktualizować pliku: %1</translation>
+ <source>Could not update file: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="362"/>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
- <translation>S&ynchronizuj wszystko z serwera (zalecane)</translation>
+ <source>S&ynchronize everything from server</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>Não foi possível reiniciar o estado da pasta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Foi encontrado um 'journal' de sincronização, mas não foi possível removê-lo. Por favor, certifique-se que nenhuma aplicação o está a utilizar.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation>(cópia de segurança)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation>(cópia de segurança %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Estado indefinido.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>A aguardar para iniciar a sincronização.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>A preparar para sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>A sincronização está em execução.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Sincronizado com sucesso, conflitos por resolver.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>A última sincronização foi bem sucedida.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Erro de instalação.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Abortado pelo utilizador.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>A sincronização está pausada.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (A sincronização está pausada)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>Não foi selecionada nenhuma pasta válida!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>O caminho selecionado não é uma pasta!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Não tem permissão para gravar para a pasta selecionada!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>A pasta local %1 já contém uma pasta utilizada numa ligação de sincronização de pasta. Por favor, escolha outra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>A pasta local %1 já contém uma pasta usada numa ligação de sincronização de pasta. Por favor, escolha outra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Já existe uma sincronização do servidor para esta pasta local. Por favor escolha outra pasta local!</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
<translation>Espaço disponível: %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation>Erro ao escrever a meta-informação par a base de dados</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>Ficheiro local alterado durante a sincronização.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>Não foi possível redefinir o estado da pasta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Uma antiga atividade de sincronização '%1' foi encontrada, mas não pôde ser removida. Por favor, certifique-se de que nenhuma aplicação está usando-a.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation> (backup)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation> (backup %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Estado indefinido.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>À espera do início da sincronização.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Preparando para a sincronização.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>A sincronização está ocorrendo.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Sincronização com sucesso, conflitos não resolvidos.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>A última sincronização foi finalizada.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Erro de Configuração.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Interrompido pelo Usuário.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>Sincronização pausada.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Pausa na sincronização) </translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>Nenhuma pasta válida selecionada!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation>O caminho selecionado não existe!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>O caminho selecionado não é uma pasta!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Voce não tem permissão para escrita na pasta selecionada!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>A pasta local %1 já contém uma pasta utilizada numa ligação de sincronização de pasta. Por favor, escolha outra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>A pasta local %1 já está contida em uma pasta usada em uma conexão de sincronização de pastas. Por favor, escolha outra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Já existe uma sincronização do servidor para esta pasta local. Por favor, escolha outra pasta local!</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
<translation>Espaço livre: %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation>Ocorreu um erro ao escrever metadados no banco de dados</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>Arquivo local modificado durante a sincronização.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>Невозможно сбросить состояние папки</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Найден старый журнал синхронизации '%1', и он не может быть удалён. Убедитесь что он не открыт в другом приложении.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation>(резервная копия)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation>(резервная копия %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Неопределенное состояние.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Ожидание запуска синхронизации.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Подготовка к синхронизации.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>Идет синхронизация.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Синхронизация прошла успешно, но обнаружены неразрешённые конфликты.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>Последняя синхронизация прошла успешно.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Ошибка установки.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Отмена пользователем.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>Синхронизация приостановлена.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (синхронизация приостановлена)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>Не выбрана допустимая папка.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>Выбранный путь не является папкой.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Отсутствуют права записи в выбранную папку.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Локальная папка «%1» уже содержит вложенную папку, которая синхронизируется с сервером. Выберите другую папку.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Локальная папка «%1» является вложенной в папку, которая уже синхронизируется с сервером. Выберите другую папку.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Синхронизация этой локальной папки с сервером уже настроена. Выберите другую локальную папку.</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
<translation>Свободно: %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation>Ошибка записи метаданных в базу данных</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>Локальный файл был изменён во время синхронизации.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>Nemožno resetovať stav priečinka</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Starý synchronizačný žurnál '%1' nájdený, avšak neodstrániteľný. Prosím uistite sa, že žiadna aplikácia ho práve nevyužíva.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation> (záloha)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation> (záloha %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Nedefinovaný stav.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Čaká sa na začiatok synchronizácie</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Príprava na synchronizáciu.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>Synchronizácia prebieha.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Synchronizácia bola úspešná s nevyriešenými konfliktmi.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>Posledná synchronizácia sa úspešne skončila.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Chyba pri inštalácii.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Zrušené používateľom.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>Synchronizácia je pozastavená.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronizácia je pozastavená)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>Nebol zvolený platný priečinok.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>Zvolená cesta nie je priečinok.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Nemáte oprávnenia pre zápis do daného priečinka!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Lokálny priečinok %1 už obsahuje podpriečinok použitý pre synchronizáciu. Vyberte prosím iný priečinok.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Lokálny priečinok %1 už obsahuje podpriečinok použitý pre synchronizáciu. Vyberte prosím iný priečinok.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Do tohto lokálneho priečinka sa už synchronizuje. Vyberte prosím iný priečinok.</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
<translation>Voľné miesto: %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation>Chyba pri zápise metadát do databázy</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>Lokálny súbor bol zmenený počas synchronizácie.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
This action will abort any currently running synchronization.</source>
- <translation>S tem dejanjem boste onemogočili navidezno podporo datotek. Kot posledica bo vsebina map, ki so trenutno označene kot »na voljo le na spletu«, prejeta tudi na napravo.
-
-Edina prednost onemogočanja te podpore je, da bo spet na voljo izbirno usklajevanje.
-
-S tem dejanjem prav tako prekinete vsa trenutno potekajoča usklajevanja.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="788"/>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>Ni mogoče ponastaviti stanja mape</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Obstaja star dnevnik usklajevanja »%1«, ki pa ga ni mogoče odstraniti. Preverite, ali je datoteka morda v uporabi.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation>(varnostna kopija)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation>(varnostna kopija %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Nedoločeno stanje.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Čakanje začetek usklajevanja</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Poteka priprava na usklajevanje.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>Usklajevanje je v teku.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Usklajevanje je bilo uspešno končano, so pa zaznani nerešeni spori.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>Zadnje usklajevanje je bilo uspešno končano.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Napaka nastavitve.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Uporabniška prekinitev.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>Usklajevanje je začasno v premoru.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (usklajevanje je v premoru)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>Ni izbrane veljavne mape!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation>Izbrana pot ne obstaja!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>Izbrana pot ni mapa!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Ni ustreznih dovoljenj za pisanje v izbrano mapo!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Krajevna mapa %1 že vključuje mapo, ki je določena za usklajevanje. Izbrati je treba drugo.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Krajevna mapa %1 je že v določena za usklajevanje. Izbrati je treba drugo.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Za to krajevno pot je že ustvarjeno mesto za usklajevanje. Izbrati je treba drugo.</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
- <translation>Uporabi navidezne datoteke namesto prejemanja celotne vsebine %1</translation>
+ <source>Use virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
- <translation>(preizkusno)</translation>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="548"/>
<translation>Prostor: %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Navidezne datoteke niso na voljo za izbrano mapo</translation>
</message>
<translation>prejet je odziv strežnika %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Predmet ni usklajevan, ker je na »črnem seznamu datotek« za usklajevanje</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Dejanje ni dovoljeno! Ni ustreznih dovoljenj za dodajanje podmap v to mapo.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Dejanje ni dovoljeno, ker ni ustreznih dovoljenj za dodajanje datotek v to mapo</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Te datoteke ni dovoljeno poslati, ker ima določena dovoljenja le za branje. Datoteka bo obnovljena na izvorno različico.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation>Predmet je premaknjen na neveljaven cilj, vsebina bo obnovljena.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation>Odstranjevanje ni dovoljeno, vsebina bo obnovljena.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation>Napaka branja podatkovne zbirke</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation>Odziv strežnika vključuje napako med branjem mape »%1«: %2</translation>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation>Ni mogoče preimenovati %1 v %2, napaka: %3</translation>
</message>
<translation>Napaka zapisovanja metapodatkov v podatkovno zbirko</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation>Napaka nastavljanja pripetega staja</translation>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>Krajevna datoteka je bila med usklajevanjem spremenjena.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
- <translation>Ni mogoče posodobiti datoteke : %1</translation>
+ <source>Could not update file: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="362"/>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
- <translation>&Uskladi celotno vsebino strežnika (priporočeno)</translation>
+ <source>S&ynchronize everything from server</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>Не могу да ресетујем стање фасцикле</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Пронађен је стари журнал синхронизације „%1“ али се не може уклонити. Проверите да га нека апликација тренутно не користи.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation> (резерва)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation> (резерва %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Неодређено стање.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Чекам на почетак синхронизације.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Припремам синхронизацију.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>Синхронизација у току.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Синхронизација је била успешна, има неразрешених конфликата.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>Последња синхронизација је била успешна.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Грешка подешавања.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Корисник прекинуо.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>Синхронизација је паузирана.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (синхронизација паузирана)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>Није изабран ниједна исправна фасцикла!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>Одабрана путања није фасцикла!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Немате дозволе за упис у изабрану фасциклу!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Локална фасцикла %1 већ садржи фасциклу која се користи за синхронизацију. Одаберите неку другу!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Локална фасцикла %1 је већ унутар фасцикле која се користи за синхронизацију. Одаберите неку другу!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Већ постоји синхронизација са сервера у ову локалну фасциклу. Одаберите другу локалну фасциклу!</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
<translation>Слободан простор: %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation>Грешка при упису мета података у базу</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>Локални фајл измењен током синхронизације.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>Kunde inte återställa mappens skick</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>En gammal synkroniseringsjournal '%1' hittades, men kunde inte raderas. Vänligen se till att inga program för tillfället använder den.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation>(säkerhetskopia)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation>(säkerhetkopia %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Okänt tillstånd.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Väntar på att starta synkronisering.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Förbereder synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>Synkronisering pågår.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Synkroniseringen lyckades men olösta konflikter.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>Senaste synkronisering lyckades.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Inställningsfel.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Användare Avbryt</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>Synkronisering är pausad.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (synkronisering pausad)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>Ingen giltig mapp markerad!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>Den markerade sökvägen är inte en mapp!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Du har inga skrivrättigheter till den valda mappen!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Den lokala mappen %1 innehåller redan en mapp som synkroniseras. Vänligen välj en annan!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Den lokala mappen %1 finns redan inuti en mapp som synkroniseras. Vänligen välj en annan!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Det pågår redan en synkronisering från servern till denna lokala mappen. Vänligen välj en annan lokal mapp.</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
- <translation>(experimentell)</translation>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="548"/>
<translation>Ledigt utrymme: %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation>Fel vid skrivning av metadata till databasen</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>Lokal fil ändrades under synkronisering.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>ไม่สามารถรีเซ็ตสถานะโฟลเดอร์</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>บนบันทึกการประสานข้อมูลเก่า '%1' แต่ไม่สามารถลบออกได้ กรุณาตรวจสอบให้แน่ใจว่าไม่มีแอพฯ หรือการทำงานใดๆที่ใช้มันอยู่</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation>(สำรองข้อมูล)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation>(สำรองข้อมูล %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>สถานะที่ยังไม่ได้ถูกกำหนด</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>กำลังรอเริ่มต้นการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>กำลังเตรียมการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>การประสานข้อมูลกำลังทำงาน</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>ประสานข้อมูลครั้งล่าสุดเสร็จเรียบร้อยแล้ว</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>เกิดข้อผิดพลาดในการติดตั้ง</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>ยกเลิกผู้ใช้</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>การประสานข้อมูลถูกหยุดไว้ชั่วคราว</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (การประสานข้อมูลถูกหยุดชั่วคราว)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>เลือกโฟลเดอร์ไม่ถูกต้อง!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>เส้นทางที่เลือกไม่ใช่โฟลเดอร์!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>คุณมีสิทธิ์ที่จะเขียนโฟลเดอร์ที่เลือกนี้!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>เนื้อหาโฟลเดอร์ต้นทาง %1 ได้ถูกใช้ไปแล้วในโฟลเดอร์ที่ประสานข้อมูล กรุณาเลือกอีกอันหนึ่ง!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>เนื้อหาของโฟลเดอร์ต้นทาง %1 ไดถูกใช้ไปแล้วในโฟลเดอร์ที่ประสานข้อมูล กรุณาเลือกอีกอันหนึ่ง!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>โฟลเดอร์ต้นทางนี้ได้ถูกประสานข้อมูลกับเซิร์ฟเวอร์แล้ว โปรดเลือกโฟลเดอร์ต้นทางอื่นๆ!</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation>ข้อผิดพลาดในการเขียนข้อมูลเมตาไปยังฐานข้อมูล</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>ไฟล์ต้นทางถูกเปลี่ยนแปลงขณะกำลังประสานข้อมูล</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
This action will abort any currently running synchronization.</source>
- <translation>Bu işlem sanal dosya desteğini devre dışı bırakır. Bunun sonucunda şu anda 'yalnız çevrimiçi kullanılabilir' olarak işaretlenmiş klasörlerin içeriği indirilir.
-
-Sanal dosya desteğini devre dışı bırakmanın tek faydası isteğe bağlı eşitleme özelliğinin yeniden kullanılabilmesidir.
-
-Bu işlem şu anda yürütülmekte olan eşitleme işlemlerini durdurur.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="788"/>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>Klasör durumu sıfırlanamadı</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Eski bir '%1' eşitleme günlüğü bulundu ancak kaldırılamadı. Günlüğün Başka bir uygulama tarafından kullanılmadığından emin olun.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation> (yedek)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation> (yedek %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Tanımlanmamış Durum.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Eşitlemenin başlatılması bekleniyor.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Eşitleme için hazırlanılıyor.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>Eşitleme çalışıyor.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Eşitlendi, çakışmalar çözülüyor.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>Son Eşitleme başarılıydı.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Kurulum Sorunu.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Kullanıcı İptal Etti.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>Eşitleme duraklatıldı.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Eşitleme duraklatıldı)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>Geçerli bir klasör seçilmemiş!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation>Seçilmiş yol bulunamadı!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>Seçilmiş yol bir klasör değil!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Seçilmiş klasöre yazma izniniz yok!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>%1 yerel klasöründe eşitleme için kullanılan bir klasör zaten var. Lütfen başka bir klasör seçin!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>%1 yerel klasörü zaten eşitleme için kullanılan bir klasörün içinde. Lütfen başka bir klasör seçin!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>Sunucu ile bu yerel klasör zaten eşitleniyor. Lütfen başka bir yerel klasör seçin!</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
- <translation>İçerik hemen indirilmesin yerine sanal dosyalar kullanılsın%1</translation>
+ <source>Use virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
- <translation>(deneysel)</translation>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="548"/>
<translation>Boş alan: %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation>Sanal dosyalar seçilmiş klasör için kullanılamaz</translation>
</message>
<translation>sunucu numarası %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>"Eşitlenecek ögeleri seçin" kara listesinde olduğundan yok sayıldı</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Bu klasöre alt klasör ekleme izniniz olmadığından izin verilmedi</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Bu klasöre dosya ekleme izniniz olmadığından izin verilmedi</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Sunucu üzerinde salt okunur olduğundan, bu dosya yüklenemedi, geri yükleniyor</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation>Geçersiz bir hedefe taşındı, geri yükleniyor</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation>Silmeye izin verilmedi, geri yükleniyor</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation>Veritabanı okunurken sorun çıktı</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation>!%1' klasörü okunurken sunucu bir hata yanıtı verdi: %2</translation>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation>%1, %2 olarak yeniden adlandırılamadı, hata: %3</translation>
</message>
<translation>Üst veri veritabanına yazılırken sorun çıktı</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation>Sabitleme durumu ayarlanırken sorun çıktı</translation>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>Yerel dosya eşitleme sırasında değişti.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
- <translation>Dosya güncellenemedi: %1</translation>
+ <source>Could not update file: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="362"/>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
- <translation>Her şe&y sunucudan eşitlensin (önerilir)</translation>
+ <source>S&ynchronize everything from server</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>Не вдалося скинути стан теки</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Знайдено старий журнал синхронізації '%1', який неможливо вилучити. Будь ласка, впевніться що його не відкрито ув іншому застосунку.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation>(Резервна копія)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation>(Резервна копія %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>Невизначений стан.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>Очікування початку синхронізації.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>Підготовка до синхронізації</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>Синхронізація запущена.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>Успішно синхронізовано, нерозв'язані конфлікти.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>Остання синхронізація була успішною.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>Помилка встановлення.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>Скасовано користувачем.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>Синхронізація призупинена.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Синхронізація призупинена)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>Не вибрано прийнятної теки!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>Вибраний шлях не є текою!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>У вас немає прав на запис в цю теку!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Локальна тека %1 вже містить теку, яка використовується для синхронізації теки. Будь ласка, виберіть іншу!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Локальна тека %1 вже у теці, яка використовується для синхронізації теки. Будь ласка, виберіть іншу!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>З цією локальною текою вже встановлено синхронізацію з боку сервера. Будь ласка, виберіть іншу!</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
+ <source>Use virtual files instead of downloading content immediately %1</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
<translation>Вільне місце: %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation>Помилка із записом метаданих до бази даних</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>Локальний файл змінився під час синхронізації.</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
This action will abort any currently running synchronization.</source>
- <translation>此操作将禁用虚拟文件支持。其结果是，当前标记为“仅在线可用”的文件夹的内容将被下载。禁用虚拟文件支持的唯一好处是，选择性同步功能将再次可用。此操作将中断任何当前正在运行的同步。</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="788"/>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>不能重置文件夹状态</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>一个旧的同步日志 '%1' 被找到，但是不能被移除。请确定没有应用程序正在使用它。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation>（备份）</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation>（备份 %1）</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>未知状态。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>等待启动同步。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>准备同步。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>同步正在运行。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>同步成功，冲突未解决。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>最后一次同步成功。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>安装失败</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>用户撤销。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>同步已暂停。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1（同步已暂停）</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>没有选择有效的文件夹！</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation>所选路径不存在！</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>选择的路径不是一个文件夹！</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>您没有写入所选文件夹的权限！</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>本地文件夹 %1 包含有正在使用的同步文件夹，请选择另一个！</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>本地文件夹 %1 是正在使用的同步文件夹，请选择另一个！</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>已经有一个从服务器到此文件夹的同步设置。请选择其他本地文件夹！</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
- <translation>使用虚拟文件而不是立即下载内容%1</translation>
+ <source>Use virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
- <translation>(实验性)</translation>
+ <source>(experimental)</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="548"/>
<translation>可用空间：%1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation>虚拟文件对所选文件夹不可用</translation>
</message>
<translation>服务器报告无 %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>因“选择要同步的内容”黑名单而被忽略</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>不被允许，因为您没有向该文件夹添加子文件夹的权限。</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>不被允许，因为您没有在该文件夹中添加文件的权限。</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>不允许上传这个文件，因为它在这台服务器上是只读的，恢复中。</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation>移动到无效目标，恢复中。</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation>不允许移除，恢复中。</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation>读取数据库时出错</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation>服务器在读取目录 '%1' 时回复了一个错误：%2</translation>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation>无法将 %1 重命名为 %2，错误：%3</translation>
</message>
<translation>向数据库写入元数据错误</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation>设置固定状态出错</translation>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>本地文件在同步时已修改。</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
- <translation>无法更新文件： %1</translation>
+ <source>Could not update file: %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="362"/>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
- <translation>从服务器同步一切 (推荐)</translation>
+ <source>S&ynchronize everything from server</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="781"/>
- <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
+ <source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as "available online only" will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="306"/>
+ <location filename="../src/gui/folderman.cpp" line="309"/>
<source>Could not reset folder state</source>
<translation>無法重置資料夾狀態</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="307"/>
+ <location filename="../src/gui/folderman.cpp" line="310"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>發現較舊的同步處理日誌'%1'，但無法移除。請確認沒有應用程式正在使用它。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1056"/>
+ <location filename="../src/gui/folderman.cpp" line="1107"/>
<source> (backup)</source>
<translation>（備份）</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1061"/>
+ <location filename="../src/gui/folderman.cpp" line="1112"/>
<source> (backup %1)</source>
<translation>(備份 %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1306"/>
+ <location filename="../src/gui/folderman.cpp" line="1357"/>
<source>Undefined State.</source>
<translation>未知狀態</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1309"/>
+ <location filename="../src/gui/folderman.cpp" line="1360"/>
<source>Waiting to start syncing.</source>
<translation>正在等待同步開始</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1312"/>
+ <location filename="../src/gui/folderman.cpp" line="1363"/>
<source>Preparing for sync.</source>
<translation>正在準備同步。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1315"/>
+ <location filename="../src/gui/folderman.cpp" line="1366"/>
<source>Sync is running.</source>
<translation>同步執行中</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1320"/>
+ <location filename="../src/gui/folderman.cpp" line="1371"/>
<source>Sync was successful, unresolved conflicts.</source>
<translation>同步成功，衝突未解決</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1322"/>
+ <location filename="../src/gui/folderman.cpp" line="1373"/>
<source>Last Sync was successful.</source>
<translation>最後一次同步成功</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1328"/>
+ <location filename="../src/gui/folderman.cpp" line="1379"/>
<source>Setup Error.</source>
<translation>安裝失敗</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1331"/>
+ <location filename="../src/gui/folderman.cpp" line="1382"/>
<source>User Abort.</source>
<translation>使用者中斷。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1334"/>
+ <location filename="../src/gui/folderman.cpp" line="1385"/>
<source>Sync is paused.</source>
<translation>同步已暫停</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1340"/>
+ <location filename="../src/gui/folderman.cpp" line="1391"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (同步暫停)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1348"/>
+ <location filename="../src/gui/folderman.cpp" line="1399"/>
<source>No valid folder selected!</source>
<translation>沒有選擇有效的資料夾</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1469"/>
+ <location filename="../src/gui/folderman.cpp" line="1520"/>
<source>The selected path does not exist!</source>
<translation>所選的路徑不存在！</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1358"/>
+ <location filename="../src/gui/folderman.cpp" line="1409"/>
<source>The selected path is not a folder!</source>
<translation>所選的路徑並非資料夾!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1362"/>
+ <location filename="../src/gui/folderman.cpp" line="1413"/>
<source>You have no permission to write to the selected folder!</source>
<translation>您沒有權限來寫入被選取的資料夾!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1398"/>
+ <location filename="../src/gui/folderman.cpp" line="1449"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>本地資料夾 %1 裡已經有被資料夾同步功能使用的資料夾，請選擇其他資料夾！</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1404"/>
+ <location filename="../src/gui/folderman.cpp" line="1455"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>本地資料夾 %1 是被包含在一個已經被資料夾同步功能使用的資料夾，請選擇其他資料夾！</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1418"/>
+ <location filename="../src/gui/folderman.cpp" line="1469"/>
<source>There is already a sync from the server to this local folder. Please pick another local folder!</source>
<translation>此資料夾已與Server設定同步，請選擇其他資料夾</translation>
</message>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source>Use virtual files instead of downloading content immediately%1</source>
- <translation>使用虛擬檔案取代立即下載內容%1</translation>
+ <source>Use virtual files instead of downloading content immediately %1</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="512"/>
- <source> (experimental)</source>
+ <source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
<translation>剩餘空間：%1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="274"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="275"/>
<source>Virtual files are not available for the selected folder</source>
<translation>選取的資料夾無法使用虛擬檔案</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1192"/>
+ <location filename="../src/libsync/discovery.cpp" line="1197"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1225"/>
+ <location filename="../src/libsync/discovery.cpp" line="1230"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1230"/>
+ <location filename="../src/libsync/discovery.cpp" line="1235"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1243"/>
+ <location filename="../src/libsync/discovery.cpp" line="1248"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1265"/>
+ <location filename="../src/libsync/discovery.cpp" line="1270"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1278"/>
+ <location filename="../src/libsync/discovery.cpp" line="1283"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1392"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1448"/>
+ <location filename="../src/libsync/discovery.cpp" line="1453"/>
<source>Server replied with an error while reading directory '%1' : %2</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="170"/>
<source>Could not rename %1 to %2, error: %3</source>
<translation type="unfinished"/>
</message>
<translation>寫入後設資料(metadata) 時發生錯誤</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="233"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="261"/>
<source>Error setting pin state</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::PropagateUploadFileCommon</name>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="242"/>
+ <source>Failed to upload encrypted file.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="281"/>
<source>File %1 cannot be uploaded because another file with the same name, differing only in case, exists</source>
<source>Local file changed during sync.</source>
<translation>本地端的檔案在同步過程中被更改。</translation>
</message>
+ <message>
+ <location filename="../src/libsync/propagateupload.cpp" line="420"/>
+ <source>Failed to unlock encrypted folder.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="758"/>
<source>Error writing metadata to the database</source>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="352"/>
- <source>Could not update file : %1</source>
+ <source>Could not update file: %1</source>
<translation type="unfinished"/>
</message>
<message>
<name>OwncloudAdvancedSetupPage</name>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="90"/>
- <source>S&ynchronize everything from server (recommended)</source>
+ <source>S&ynchronize everything from server</source>
<translation type="unfinished"/>
</message>
<message>
projects / nextcloud-desktop.git / commitdiff