# Translations
+# Translations
+
+
# Translations
Comment[oc]=@APPLICATION_NAME@ sincronizacion del client
GenericName[oc]=Dorsièr de Sincronizacion
<message>
<location filename="../src/gui/accountsettings.ui" line="238"/>
<location filename="../src/gui/accountsettings.cpp" line="371"/>
- <location filename="../src/gui/accountsettings.cpp" line="728"/>
+ <location filename="../src/gui/accountsettings.cpp" line="733"/>
<source>Cancel</source>
<translation>Cancel·la</translation>
</message>
<translation>Inici de sessió</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="678"/>
- <source>There are new folders that were not synchronized because they are too big: </source>
- <translation>Hi ha carpetes noves que no s'han sincronitzat perquè són massa grans:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="680"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="681"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="720"/>
+ <location filename="../src/gui/accountsettings.cpp" line="725"/>
<source>Confirm Account Removal</source>
<translation>Confirmeu l'eliminació del compte</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="721"/>
+ <location filename="../src/gui/accountsettings.cpp" line="726"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>Segur que voleu eliminar la connexió al compte <i>%1</i>?</p><p><b>Nota:</b> això <b>no</b> esborrarà cap fitxer.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="727"/>
+ <location filename="../src/gui/accountsettings.cpp" line="732"/>
<source>Remove connection</source>
<translation>Elimina la connexió</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="600"/>
<source>Aborted by the user</source>
<translation>Aturat per l'usuari</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="139"/>
<source>Local folder %1 does not exist.</source>
<translation>El fitxer local %1 no existeix.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="142"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 hauria de ser una carpeta, però no ho és.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="144"/>
+ <location filename="../src/gui/folder.cpp" line="145"/>
<source>%1 is not readable.</source>
<translation>No es pot llegir %1.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="367"/>
+ <location filename="../src/gui/folder.cpp" line="368"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>S'ha esborrat '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="374"/>
+ <location filename="../src/gui/folder.cpp" line="375"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>S'ha descarregat %1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="382"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>S'ha actualitzat %1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="388"/>
+ <location filename="../src/gui/folder.cpp" line="389"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 s'ha reanomenat a %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="395"/>
+ <location filename="../src/gui/folder.cpp" line="396"/>
<source>%1 has been moved to %2.</source>
<translation>%1 s'ha mogut a %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="365"/>
+ <location filename="../src/gui/folder.cpp" line="366"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 i %n altre fitxer s'ha esborrat.</numerusform><numerusform>%1 i %n altres fitxers s'han esborrat.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="372"/>
+ <location filename="../src/gui/folder.cpp" line="373"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 i %n altre fitxer s'han descarregat.</numerusform><numerusform>%1 i %n altres fitxers s'han descarregat.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="379"/>
+ <location filename="../src/gui/folder.cpp" line="380"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 i %n altre fitxer s'han actualitzat.</numerusform><numerusform>%1 i %n altres fitxers s'han actualitzat.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="386"/>
+ <location filename="../src/gui/folder.cpp" line="387"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 s'ha reanomenat a %2 i %n altre fitxer s'ha reanomenat.</numerusform><numerusform>%1 s'ha reanomenat a %2 i %n altres fitxers s'han reanomenat.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="393"/>
+ <location filename="../src/gui/folder.cpp" line="394"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 s'ha mogut a %2 i %n altre fitxer s'ha mogut.</numerusform><numerusform>%1 s'ha mogut a %2 i %n altres fitxers s'han mogut.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="400"/>
+ <location filename="../src/gui/folder.cpp" line="401"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 i %n altre fitxer tenen conflictes de sincronització</numerusform><numerusform>%1 i %n altres fitxers tenen conflictes de sincronització</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="402"/>
+ <location filename="../src/gui/folder.cpp" line="403"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 té conflictes de sincronització. Comproveu el fitxer conflictiu!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="407"/>
+ <location filename="../src/gui/folder.cpp" line="408"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 i %n altre fitxer no s'han sincronitzat per errors.
Consulteu el registre per obtenir més informació.</numerusform><numerusform>%1 i %n altres fitxers no s'han sincronitzat per errors.
Consulteu el registre per obtenir més informació.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="409"/>
+ <location filename="../src/gui/folder.cpp" line="410"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 no s'ha pogut sincronitzar degut a un error. Mireu el registre per més detalls.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="415"/>
+ <location filename="../src/gui/folder.cpp" line="416"/>
<source>Sync Activity</source>
<translation>Activitat de sincronització</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="642"/>
+ <location filename="../src/gui/folder.cpp" line="643"/>
<source>Could not read system exclude file</source>
<translation>No s'ha pogut llegir el fitxer d'exclusió del sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="850"/>
+ <location filename="../src/gui/folder.cpp" line="854"/>
<source>A new folder larger than %1 MB has been added: %2.
-Please go in the settings to select it if you wish to download it.</source>
- <translation>S'ha afegit una carpeta nova de més de %1 MB: %2.
-Aneu a arranjament per seleccionar-la si voleu descarregar-la.</translation>
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="856"/>
+ <source>A folder from an external storage has been added.
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="857"/>
+ <source>Please go in the settings to select it if you wish to download it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="888"/>
+ <location filename="../src/gui/folder.cpp" line="893"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="892"/>
+ <location filename="../src/gui/folder.cpp" line="897"/>
<source>Remove All Files?</source>
<translation>Esborra tots els fitxers?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="894"/>
+ <location filename="../src/gui/folder.cpp" line="899"/>
<source>Remove all files</source>
<translation>Esborra tots els fitxers</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="895"/>
+ <location filename="../src/gui/folder.cpp" line="900"/>
<source>Keep files</source>
<translation>Mantén els fitxers</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="911"/>
+ <location filename="../src/gui/folder.cpp" line="916"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="916"/>
+ <location filename="../src/gui/folder.cpp" line="921"/>
<source>Backup detected</source>
<translation>Copia de seguretat detectada</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="918"/>
+ <location filename="../src/gui/folder.cpp" line="923"/>
<source>Normal Synchronisation</source>
<translation>Sincronització normal</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="919"/>
+ <location filename="../src/gui/folder.cpp" line="924"/>
<source>Keep Local Files as Conflict</source>
<translation>Manté els fitxers locals com a conflicte</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="140"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="148"/>
<source>You need to be connected to add a folder</source>
<translation>Cal que tingueu connexió per afegir una carpeta</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="150"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="158"/>
<source>Click this button to add a folder to synchronize.</source>
<translation>Cliqueu aquest botó per afegir una carpeta per sincronitzar.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
<source>%1 (%2)</source>
<extracomment>Example text: "File.txt (23KB)"</extracomment>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="180"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="188"/>
<source>Error while loading the list of folders from the server.</source>
<translation>Error en carregar la llista de carpetes del servidor.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="218"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="226"/>
<source>Signed out</source>
<translation>S'ha desconnectat</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="145"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="153"/>
<source>Adding folder is disabled because you are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="183"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="191"/>
<source>Fetching folder list from server...</source>
<translation>Obtenint la llista de carpetes del servidor...</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>Checking for changes in '%1'</source>
<translation>S'està comprovant els canvis a '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="868"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
<source>, '%1'</source>
<extracomment>Build a list of file names</extracomment>
<translation>, '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="871"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="900"/>
<source>'%1'</source>
<extracomment>Argument is a file name</extracomment>
<translation>'%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="896"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="925"/>
<source>Syncing %1</source>
<extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment>
<translation>S'està sincronitzant %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="908"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="927"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="937"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="931"/>
<source>download %1/s</source>
<extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>descarrega %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="933"/>
<source>u2193 %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="911"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>upload %1/s</source>
<extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>pujada %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="913"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="942"/>
<source>u2191 %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="918"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 de %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="922"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="951"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%5 pendent, %1 de %2, fitxer %3 de %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="948"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 de %2, fitxer %3 de %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="954"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="983"/>
<source>file %1 of %2</source>
<translation>fitxer %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/>
<source>Waiting...</source>
<translation>S'està esperant...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="998"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1027"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>S'està esperant %n altra carpeta...</numerusform><numerusform>S'està esperant %n altres carpetes</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1033"/>
<source>Preparing to sync...</source>
<translation>S'està preparant per sincronitzar...</translation>
</message>
<translation>Avançat</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="101"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
+ <source>Ask for confirmation before synchronizing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="105"/>
<source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/generalsettings.ui" line="26"/>
<source>&Launch on System Startup</source>
<translation>Usa icones en &monocrom</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="59"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit &Ignored Files</source>
<translation>Editeu els fitxers &ignorats</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
- <source>Ask &confirmation before downloading folders larger than</source>
- <translation>Demana la &confirmació abans de descarregar carpetes més grans de</translation>
- </message>
- <message>
- <location filename="../src/gui/generalsettings.ui" line="129"/>
+ <location filename="../src/gui/generalsettings.ui" line="140"/>
<source>S&how crash reporter</source>
<translation>Mostra l'informe de &fallades</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="150"/>
<location filename="../src/gui/generalsettings.ui" line="156"/>
- <location filename="../src/gui/generalsettings.ui" line="162"/>
<source>About</source>
<translation>Quant a</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="172"/>
+ <location filename="../src/gui/generalsettings.ui" line="166"/>
<source>Updates</source>
<translation>Actualitzacions</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="197"/>
+ <location filename="../src/gui/generalsettings.ui" line="191"/>
<source>&Restart && Update</source>
<translation>&Reiniciar && Actualitzar</translation>
</message>
<translation>Connecta...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="144"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="159"/>
<source>%1 folder '%2' is synced to local folder '%3'</source>
<translation>%1 carpeta '%2' està sincronitzat amb la carpeta local '%3'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="162"/>
<source>Sync the folder '%1'</source>
<translation>Sincronitzar el directori '%1'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="152"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="167"/>
<source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
<translation><p><small><strong>Atenció:</strong> La carpeta local no està buida. Trieu una resolució!</small></p></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="251"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/>
<source>Local Sync Folder</source>
<translation>Fitxer local de sincronització</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="311"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="317"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
<translation>No es pot esborrar i restaurar la carpeta perquè una carpeta o un fitxer de dins està obert en un altre programa. Tanqueu la carpeta o el fitxer i intenteu-ho de nou o cancel·leu la configuració.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="540"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>la carpeta de sincronització %1 s'ha creat correctament!</b></font></translation>
</message>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="120"/>
<source>Success.</source>
<translation>Èxit.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="127"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSync ha fallat en carregar el fitxer del registre de transaccions. El fitxer està corromput.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="130"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>No s'ha pogut carregar el connector %1 per csync.<br/>Comproveu la instal·lació!</p></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync ha patit un error mentre processava els àrbres interns.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync ha fallat en reservar memòria.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync fatal parameter error.</source>
<translation>Error fatal de paràmetre en CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync processing step update failed.</source>
<translation>El pas d'actualització del processat de CSync ha fallat.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync processing step reconcile failed.</source>
<translation>El pas de reconciliació del processat de CSync ha fallat.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync no s'ha pogut acreditar amb el proxy.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync ha fallat en cercar el proxy o el servidor.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>L'autenticació de CSync ha fallat al servidor %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync ha fallat en connectar-se a la xarxa.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>A network connection timeout happened.</source>
<translation>Temps excedit en la connexió.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>A HTTP transmission error happened.</source>
<translation>S'ha produït un error en la transmissió HTTP.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>An error occurred while opening a folder</source>
<translation>S'ha produït un error en obrir una carpeta</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="197"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Error while reading folder.</source>
<translation>Error en llegir la carpeta.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="477"/>
+ <location filename="../src/libsync/syncengine.cpp" line="476"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>El fitxer/carpeta s'ha ignorat perquè és ocult.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="738"/>
+ <location filename="../src/libsync/syncengine.cpp" line="737"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1206"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1213"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: No hi ha espai disponible al servidor %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>Error inespecífic de CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Aturat per l'usuari</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>CSync failed to access</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="123"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>The service is temporarily unavailable</source>
<translation>El servei no està disponible temporalment</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>Access is forbidden</source>
<translation>Accés prohibit</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="202"/>
+ <location filename="../src/libsync/syncengine.cpp" line="201"/>
<source>An internal error number %1 occurred.</source>
<translation>S'ha produït l'error intern número %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="266"/>
+ <location filename="../src/libsync/syncengine.cpp" line="265"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>L'element no s'ha sincronitzat degut a errors previs: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="445"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>La sincronització d'enllaços simbòlics no està implementada.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="449"/>
+ <location filename="../src/libsync/syncengine.cpp" line="448"/>
<source>File is listed on the ignore list.</source>
<translation>El fitxer està a la llista d'ignorats.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="453"/>
+ <location filename="../src/libsync/syncengine.cpp" line="452"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="463"/>
+ <location filename="../src/libsync/syncengine.cpp" line="462"/>
<source>File names containing the character '%1' are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="466"/>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
<source>The file name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="471"/>
+ <location filename="../src/libsync/syncengine.cpp" line="470"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="474"/>
+ <location filename="../src/libsync/syncengine.cpp" line="473"/>
<source>Filename is too long.</source>
<translation>El nom de fitxer és massa llarg.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="483"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Stat failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="510"/>
+ <location filename="../src/libsync/syncengine.cpp" line="509"/>
<source>Filename encoding is not valid</source>
<translation>La codificació del nom de fitxer no és vàlida</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="678"/>
+ <location filename="../src/libsync/syncengine.cpp" line="677"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Caràcters no vàlids. Reanomeneu "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="774"/>
+ <location filename="../src/libsync/syncengine.cpp" line="773"/>
<source>Unable to initialize a sync journal.</source>
<translation>No es pot inicialitzar un periòdic de sincronització</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="793"/>
+ <location filename="../src/libsync/syncengine.cpp" line="792"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="830"/>
+ <location filename="../src/libsync/syncengine.cpp" line="829"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="875"/>
+ <location filename="../src/libsync/syncengine.cpp" line="874"/>
<source>Cannot open the sync journal</source>
<translation>No es pot obrir el diari de sincronització</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="933"/>
+ <location filename="../src/libsync/syncengine.cpp" line="932"/>
<source>File name contains at least one invalid character</source>
<translation>El nom del fitxer conté al menys un caràcter invàlid</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
- <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1172"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>S'ignora degut al filtre a «Trieu què sincronitzar»</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1191"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1232"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>No es permet pujar aquest fitxer perquè només és de lectura en el servidor, es restaura</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1249"/>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1267"/>
<source>Not allowed to remove, restoring</source>
<translation>No es permet l'eliminació, es restaura</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1280"/>
<source>Local files and share folder removed.</source>
<translation>Fitxers locals i carpeta compartida esborrats.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1336"/>
<source>Move not allowed, item restored</source>
<translation>No es permet moure'l, l'element es restaura</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1347"/>
<source>Move not allowed because %1 is read-only</source>
<translation>No es permet moure perquè %1 només és de lectura</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the destination</source>
<translation>el destí</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the source</source>
<translation>l'origen</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="300"/>
+ <location filename="../src/libsync/theme.cpp" line="309"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Versió %1. Per més informació visiteu <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="304"/>
+ <location filename="../src/libsync/theme.cpp" line="313"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation><p>Copyright ownCloud GmbH</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="305"/>
+ <location filename="../src/libsync/theme.cpp" line="314"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Distribuït per %1 i amb llicència GNU General Public License (GPL) Versió 2.0.<br/>%2 i el %2 logo són marques registrades de %1 als Estats Units, altres països, o ambdós.</p></translation>
</message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="250"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="352"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="379"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="402"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<translation>Comença una sin&cronització des de zero (esborra la carpeta local!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="295"/>
+ <source>Ask for confirmation before synchroni&zing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="321"/>
+ <source>Ask for confirmation before synchronizing e&xternal storages</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="345"/>
<source>Choose what to sync</source>
<translation>Trieu què sincronitzar</translation>
</message>
<translation>&Mantén les dades locals</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>S&ync everything from server</source>
<translation>Sincronitza-ho tot des del servidor</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
<source>Status message</source>
<translation>Missatge d'estat</translation>
</message>
<location filename="../src/gui/owncloudsetuppage.ui" line="129"/>
<location filename="../src/gui/owncloudsetuppage.ui" line="156"/>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="190"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="83"/>
- <source>Server &Address</source>
- <translation>&Adreça del servidor</translation>
+ <source>Ser&ver Address</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="99"/>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="286"/>
+ <location filename="../src/libsync/theme.cpp" line="295"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Construït de la revisió de Git <a href="%1">%2</a> el %4 de %3 usant Qt %5, %6</small></p></translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="238"/>
<location filename="../src/gui/accountsettings.cpp" line="371"/>
- <location filename="../src/gui/accountsettings.cpp" line="728"/>
+ <location filename="../src/gui/accountsettings.cpp" line="733"/>
<source>Cancel</source>
<translation>Zrušit</translation>
</message>
<translation>Přihlásit</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="678"/>
- <source>There are new folders that were not synchronized because they are too big: </source>
- <translation>Jsou dostupné nové adresáře, které nebyly synchronizovány z důvodu jejich nadměrné velikosti:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="680"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="681"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="720"/>
+ <location filename="../src/gui/accountsettings.cpp" line="725"/>
<source>Confirm Account Removal</source>
<translation>Potvrdit odstranění účtu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="721"/>
+ <location filename="../src/gui/accountsettings.cpp" line="726"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>Opravdu chcete odstranit připojení k účtu <i>%1</i>?</p><p><b>Poznámka:</b> Toto <b>neodstraní</b> žádné soubory.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="727"/>
+ <location filename="../src/gui/accountsettings.cpp" line="732"/>
<source>Remove connection</source>
<translation>Odstranit připojení</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="600"/>
<source>Aborted by the user</source>
<translation>Zrušeno uživatelem</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="139"/>
<source>Local folder %1 does not exist.</source>
<translation>Místní adresář %1 neexistuje.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="142"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 by měl být adresář, ale není.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="144"/>
+ <location filename="../src/gui/folder.cpp" line="145"/>
<source>%1 is not readable.</source>
<translation>%1 není čitelný.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="367"/>
+ <location filename="../src/gui/folder.cpp" line="368"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 byl odebrán.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="374"/>
+ <location filename="../src/gui/folder.cpp" line="375"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 byl stažen.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="382"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 byl aktualizován.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="388"/>
+ <location filename="../src/gui/folder.cpp" line="389"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 byl přejmenován na %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="395"/>
+ <location filename="../src/gui/folder.cpp" line="396"/>
<source>%1 has been moved to %2.</source>
<translation>%1 byl přemístěn do %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="365"/>
+ <location filename="../src/gui/folder.cpp" line="366"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 soubor bude smazán.</numerusform><numerusform>%1 a %n další soubory budou smazány.</numerusform><numerusform>%1 a %n další soubory budou smazány.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="372"/>
+ <location filename="../src/gui/folder.cpp" line="373"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 soubor byl stažen.</numerusform><numerusform>%1 a %n další soubory byly staženy.</numerusform><numerusform>%1 a %n další soubory byly staženy.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="379"/>
+ <location filename="../src/gui/folder.cpp" line="380"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 soubor byl aktualizován.</numerusform><numerusform>%1 a %n další soubory byly aktualizovány.</numerusform><numerusform>%1 a %n další soubory byly aktualizovány.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="386"/>
+ <location filename="../src/gui/folder.cpp" line="387"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 byl přejmenován na %2.</numerusform><numerusform>%1 byl přejmenován na %2 a %n další soubory byly přejmenovány.</numerusform><numerusform>%1 byl přejmenován na %2 a %n další soubory byly přejmenovány.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="393"/>
+ <location filename="../src/gui/folder.cpp" line="394"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 byl přesunut do %2.</numerusform><numerusform>%1 byl přesunut do %2 a %n dalších souborů bylo přesunuto.</numerusform><numerusform>%1 byl přesunut do %2 a %n dalších souborů bylo přesunuto.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="400"/>
+ <location filename="../src/gui/folder.cpp" line="401"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 má problém se synchronizací.</numerusform><numerusform>%1 a %n dalších souborů má problém se synchronizací.</numerusform><numerusform>%1 a %n dalších souborů má problém se synchronizací.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="402"/>
+ <location filename="../src/gui/folder.cpp" line="403"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 má problém se synchronizací. Prosím zkontrolujte chybový soubor.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="407"/>
+ <location filename="../src/gui/folder.cpp" line="408"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 soubor nemůže být synchronizován kvůli chybám. Shlédněte log pro detaily.</numerusform><numerusform>%1 a %n dalších souborů nemohou být synchronizovány kvůli chybám. Shlédněte log pro detaily.</numerusform><numerusform>%1 a %n dalších souborů nemohou být synchronizovány kvůli chybám. Shlédněte log pro detaily.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="409"/>
+ <location filename="../src/gui/folder.cpp" line="410"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 nebyl kvůli chybě synchronizován. Detaily jsou k nalezení v logu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="415"/>
+ <location filename="../src/gui/folder.cpp" line="416"/>
<source>Sync Activity</source>
<translation>Průběh synchronizace</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="642"/>
+ <location filename="../src/gui/folder.cpp" line="643"/>
<source>Could not read system exclude file</source>
<translation>Nezdařilo se přečtení systémového exclude souboru</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="850"/>
+ <location filename="../src/gui/folder.cpp" line="854"/>
<source>A new folder larger than %1 MB has been added: %2.
-Please go in the settings to select it if you wish to download it.</source>
- <translation>Byl přidán nový adresář %2 větší než %1 MB.
-Pokud ho chcete stáhnout, přejděte prosím do nastavení a označte ho.</translation>
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="856"/>
+ <source>A folder from an external storage has been added.
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="857"/>
+ <source>Please go in the settings to select it if you wish to download it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="888"/>
+ <location filename="../src/gui/folder.cpp" line="893"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
Opravdu chcete provést tuto akci?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="892"/>
+ <location filename="../src/gui/folder.cpp" line="897"/>
<source>Remove All Files?</source>
<translation>Odstranit všechny soubory?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="894"/>
+ <location filename="../src/gui/folder.cpp" line="899"/>
<source>Remove all files</source>
<translation>Odstranit všechny soubory</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="895"/>
+ <location filename="../src/gui/folder.cpp" line="900"/>
<source>Keep files</source>
<translation>Ponechat soubory</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="911"/>
+ <location filename="../src/gui/folder.cpp" line="916"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
Pokračováním v synchronizaci způsobí přepsání všech vašich souborů staršími soubory z dřívějšího stavu. Přejete si ponechat své místní nejaktuálnější soubory jako konfliktní soubory?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="916"/>
+ <location filename="../src/gui/folder.cpp" line="921"/>
<source>Backup detected</source>
<translation>Záloha nalezena</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="918"/>
+ <location filename="../src/gui/folder.cpp" line="923"/>
<source>Normal Synchronisation</source>
<translation>Normální synchronizace</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="919"/>
+ <location filename="../src/gui/folder.cpp" line="924"/>
<source>Keep Local Files as Conflict</source>
<translation>Ponechat místní soubory jako konflikt</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="140"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="148"/>
<source>You need to be connected to add a folder</source>
<translation>Pro přidání adresáře musíte být připojeni</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="150"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="158"/>
<source>Click this button to add a folder to synchronize.</source>
<translation>Stlačením tlačítka přidáte adresář k synchronizaci.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
<source>%1 (%2)</source>
<extracomment>Example text: "File.txt (23KB)"</extracomment>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="180"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="188"/>
<source>Error while loading the list of folders from the server.</source>
<translation>Chyba při načítání seznamu adresářů ze serveru.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="218"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="226"/>
<source>Signed out</source>
<translation>Odhlášeno</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="145"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="153"/>
<source>Adding folder is disabled because you are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
<translation>Přidání adresáře je vypnuto, protože již synchronizujete všechny své soubory. Pokud chcete synchronizovat pouze některé adresáře, odstraňte aktuálně nastavený kořenový adresář.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="183"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="191"/>
<source>Fetching folder list from server...</source>
<translation>Načítání seznamu adresářů ze serveru...</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>Checking for changes in '%1'</source>
<translation>Kontrola změn v '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="868"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
<source>, '%1'</source>
<extracomment>Build a list of file names</extracomment>
<translation>, '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="871"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="900"/>
<source>'%1'</source>
<extracomment>Argument is a file name</extracomment>
<translation>'%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="896"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="925"/>
<source>Syncing %1</source>
<extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment>
<translation>Synchronizuji %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="908"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="927"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="937"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="931"/>
<source>download %1/s</source>
<extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>stahování %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="933"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="911"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>upload %1/s</source>
<extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>nahrávání %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="913"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="942"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="918"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 ze %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="922"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="951"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%5 zbývá, %1 ze %2, soubor %3 z %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="948"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 z %2, soubor %3 z %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="954"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="983"/>
<source>file %1 of %2</source>
<translation>soubor %1 z %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/>
<source>Waiting...</source>
<translation>Chvíli strpení...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="998"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1027"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>Čeká se na %n další adresář...</numerusform><numerusform>Čeká se na %n další adresáře...</numerusform><numerusform>Čeká se na %n dalších adresářů...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1033"/>
<source>Preparing to sync...</source>
<translation>Synchronizace se připravuje...</translation>
</message>
<translation>Pokročilé</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="101"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
+ <source>Ask for confirmation before synchronizing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="105"/>
<source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/generalsettings.ui" line="26"/>
<source>&Launch on System Startup</source>
<translation>Používat čer&nobílé ikony</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="59"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit &Ignored Files</source>
<translation>Upravit &ignorované soubory</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
- <source>Ask &confirmation before downloading folders larger than</source>
- <translation>&Potvrzovat stahování adresářů větších než</translation>
- </message>
- <message>
- <location filename="../src/gui/generalsettings.ui" line="129"/>
+ <location filename="../src/gui/generalsettings.ui" line="140"/>
<source>S&how crash reporter</source>
<translation>Z&obrazit hlášení o pádech</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="150"/>
<location filename="../src/gui/generalsettings.ui" line="156"/>
- <location filename="../src/gui/generalsettings.ui" line="162"/>
<source>About</source>
<translation>O aplikaci</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="172"/>
+ <location filename="../src/gui/generalsettings.ui" line="166"/>
<source>Updates</source>
<translation>Aktualizace</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="197"/>
+ <location filename="../src/gui/generalsettings.ui" line="191"/>
<source>&Restart && Update</source>
<translation>&Restart && aktualizace</translation>
</message>
<translation>Připojit...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="144"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="159"/>
<source>%1 folder '%2' is synced to local folder '%3'</source>
<translation>%1 adresář '%2' je synchronizován do místního adresáře '%3'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="162"/>
<source>Sync the folder '%1'</source>
<translation>Synchronizovat adresář '%1'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="152"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="167"/>
<source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
<translation><p><small><strong>Varování:</strong> Místní adresář není prázdný. Zvolte další postup!</small></p></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="251"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/>
<source>Local Sync Folder</source>
<translation>Místní synchronizovaný adresář</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="311"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="317"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
<translation>Nelze odstranit a zazálohovat adresář, protože adresář nebo soubor v něm je otevřen v jiném programu. Prosím zavřete adresář nebo soubor a zkuste znovu nebo zrušte akci.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="540"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Místní synchronizovaný adresář %1 byl úspěšně vytvořen!</b></font></translation>
</message>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="120"/>
<source>Success.</source>
<translation>Úspěch.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="127"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>Nezdařilo se načtení žurnálovacího souboru CSync. Žurnálovací soubor je poškozený.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="130"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>Plugin %1 pro csync nelze načíst.<br/>Zkontrolujte prosím instalaci!</p></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync obdrželo chybu při zpracování vnitřních struktur.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync se nezdařilo rezervovat paměť.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync fatal parameter error.</source>
<translation>CSync: kritická chyba parametrů.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync processing step update failed.</source>
<translation>CSync se nezdařilo zpracovat krok aktualizace.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync se nezdařilo zpracovat krok sladění.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync se nemohlo přihlásit k proxy.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync se nezdařilo najít proxy server nebo cílový server.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync se nezdařilo přihlásit k serveru %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync se nezdařilo připojit k síti.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>A network connection timeout happened.</source>
<translation>Došlo k vypršení časového limitu síťového spojení.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>A HTTP transmission error happened.</source>
<translation>Nastala chyba HTTP přenosu.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation>Připojený adresář je na serveru dočasně nedostupný</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>An error occurred while opening a folder</source>
<translation>Došlo k chybě při otvírání adresáře</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="197"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Error while reading folder.</source>
<translation>Chyba při čtení adresáře.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="477"/>
+ <location filename="../src/libsync/syncengine.cpp" line="476"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>Soubor/adresář je ignorován, protože je skrytý.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="738"/>
+ <location filename="../src/libsync/syncengine.cpp" line="737"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Je dostupných pouze %1, pro spuštění je potřeba alespoň %2</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1206"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Není povoleno, protože nemáte oprávnění vytvořit nadřazený adresář</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1213"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Není povoleno, protože nemáte oprávnění přidávat soubory do tohoto adresáře</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: Nedostatek volného místa na serveru %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>Nespecifikovaná chyba CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Zrušeno uživatelem</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>CSync failed to access</source>
<translation>Selhal přístup pro CSync</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="123"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation>CSync se nepodařilo načíst či vytvořit soubor žurnálu. Ujistěte se, že máte oprávnění pro čtení a zápis do místního adresáře synchronizace.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation>CSync selhalo z důvodu nezpracovaného zamítnutí oprávnění.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync tried to create a folder that already exists.</source>
<translation>CSync se pokusil vytvořit adresář, který již existuje.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>The service is temporarily unavailable</source>
<translation>Služba je dočasně nedostupná</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>Access is forbidden</source>
<translation>Přístup je zakázán</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="202"/>
+ <location filename="../src/libsync/syncengine.cpp" line="201"/>
<source>An internal error number %1 occurred.</source>
<translation>Došlo k interní chybě číslo %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="266"/>
+ <location filename="../src/libsync/syncengine.cpp" line="265"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Položka nebyla synchronizována kvůli předchozí chybě: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="445"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symbolické odkazy nejsou při synchronizaci podporovány.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="449"/>
+ <location filename="../src/libsync/syncengine.cpp" line="448"/>
<source>File is listed on the ignore list.</source>
<translation>Soubor se nachází na seznamu ignorovaných.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="453"/>
+ <location filename="../src/libsync/syncengine.cpp" line="452"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="463"/>
+ <location filename="../src/libsync/syncengine.cpp" line="462"/>
<source>File names containing the character '%1' are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="466"/>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
<source>The file name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="471"/>
+ <location filename="../src/libsync/syncengine.cpp" line="470"/>
<source>Filename contains trailing spaces.</source>
<translation>Jméno souboru obsahuje mezery na konci řádky.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="474"/>
+ <location filename="../src/libsync/syncengine.cpp" line="473"/>
<source>Filename is too long.</source>
<translation>Jméno souboru je moc dlouhé.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="483"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Stat failed.</source>
<translation>Stat selhal.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="510"/>
+ <location filename="../src/libsync/syncengine.cpp" line="509"/>
<source>Filename encoding is not valid</source>
<translation>Kódování znaků jména soubor je neplatné</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="678"/>
+ <location filename="../src/libsync/syncengine.cpp" line="677"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Neplatné znaky, prosím přejmenujte "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="774"/>
+ <location filename="../src/libsync/syncengine.cpp" line="773"/>
<source>Unable to initialize a sync journal.</source>
<translation>Nemohu inicializovat synchronizační žurnál.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="793"/>
+ <location filename="../src/libsync/syncengine.cpp" line="792"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Nelze načíst blacklist z místní databáze</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="830"/>
+ <location filename="../src/libsync/syncengine.cpp" line="829"/>
<source>Unable to read from the sync journal.</source>
<translation>Nelze číst ze žurnálu synchronizace.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="875"/>
+ <location filename="../src/libsync/syncengine.cpp" line="874"/>
<source>Cannot open the sync journal</source>
<translation>Nelze otevřít synchronizační žurnál</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="933"/>
+ <location filename="../src/libsync/syncengine.cpp" line="932"/>
<source>File name contains at least one invalid character</source>
<translation>Jméno souboru obsahuje aelspoň jeden neplatný znak</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
- <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1172"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorováno podle nastavení "vybrat co synchronizovat"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1191"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Není povoleno, protože nemáte oprávnění přidávat podadresáře do tohoto adresáře</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1232"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Není povoleno nahrát tento soubor, protože je na serveru uložen pouze pro čtení, obnovuji</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1249"/>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1267"/>
<source>Not allowed to remove, restoring</source>
<translation>Odstranění není povoleno, obnovuji</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1280"/>
<source>Local files and share folder removed.</source>
<translation>Místní soubory a sdílený adresář byly odstraněny.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1336"/>
<source>Move not allowed, item restored</source>
<translation>Přesun není povolen, položka obnovena</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1347"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Přesun není povolen, protože %1 je pouze pro čtení</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the destination</source>
<translation>cílové umístění</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the source</source>
<translation>zdroj</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="300"/>
+ <location filename="../src/libsync/theme.cpp" line="309"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Verze %1. Více informací na <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="304"/>
+ <location filename="../src/libsync/theme.cpp" line="313"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation><p>Copyright ownCloud GmbH</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="305"/>
+ <location filename="../src/libsync/theme.cpp" line="314"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Šíří %1 pod licencí GNU General Public License (GPL) Verze 2.0.<br/>%2 a %2 logo jsou registrované známky %1 ve Spojených Státech, ostatních zemích, nebo obojí.</p></translation>
</message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="250"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="352"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="379"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="402"/>
<source>TextLabel</source>
<translation>Textový štítek</translation>
</message>
<translation>Spustit novou synchroniza&ci (Smaže lokální data!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="295"/>
+ <source>Ask for confirmation before synchroni&zing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="321"/>
+ <source>Ask for confirmation before synchronizing e&xternal storages</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="345"/>
<source>Choose what to sync</source>
<translation>Vybrat co sesynchronizovat</translation>
</message>
<translation>&Ponechat místní data</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>S&ync everything from server</source>
<translation>Ses&ynchronizovat vše ze serveru</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
<source>Status message</source>
<translation>Stavová zpráva</translation>
</message>
<location filename="../src/gui/owncloudsetuppage.ui" line="129"/>
<location filename="../src/gui/owncloudsetuppage.ui" line="156"/>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="190"/>
<source>TextLabel</source>
<translation>Textový popisek</translation>
</message>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="83"/>
- <source>Server &Address</source>
- <translation>&Adresa serveru</translation>
+ <source>Ser&ver Address</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="99"/>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="286"/>
+ <location filename="../src/libsync/theme.cpp" line="295"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Sestaveno na Git revizi <a href="%1">%2</a> na %3, %4 s použitím Qt %5, %6</small></p></translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="238"/>
<location filename="../src/gui/accountsettings.cpp" line="371"/>
- <location filename="../src/gui/accountsettings.cpp" line="728"/>
+ <location filename="../src/gui/accountsettings.cpp" line="733"/>
<source>Cancel</source>
<translation>Abbrechen</translation>
</message>
<translation>Einloggen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="678"/>
- <source>There are new folders that were not synchronized because they are too big: </source>
- <translation>Einige neue Ordner konnten nicht synchronisiert werden, da sie zu groß sind:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="680"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="720"/>
+ <location filename="../src/gui/accountsettings.cpp" line="681"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="725"/>
<source>Confirm Account Removal</source>
<translation>Konto wirklich entfernen?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="721"/>
+ <location filename="../src/gui/accountsettings.cpp" line="726"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>Wollen Sie wirklich die Verbindung zum Konto <i>%1</i> lösen?</p><p><b>Anmerkung:</b> Dieser Vorgang wird <b>keine</b> Dateien löschen.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="727"/>
+ <location filename="../src/gui/accountsettings.cpp" line="732"/>
<source>Remove connection</source>
<translation>Verbindung entfernen</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="600"/>
<source>Aborted by the user</source>
<translation>Abbruch durch den Benutzer</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="139"/>
<source>Local folder %1 does not exist.</source>
<translation>Lokales Verzeichnis %1 existiert nicht.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="142"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 sollte ein Ordner sein, ist es aber nicht.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="144"/>
+ <location filename="../src/gui/folder.cpp" line="145"/>
<source>%1 is not readable.</source>
<translation>%1 ist nicht lesbar.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="367"/>
+ <location filename="../src/gui/folder.cpp" line="368"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 wurde gelöscht.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="374"/>
+ <location filename="../src/gui/folder.cpp" line="375"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 wurde heruntergeladen.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="382"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 wurde aktualisiert.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="388"/>
+ <location filename="../src/gui/folder.cpp" line="389"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 wurde in %2 umbenannt.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="395"/>
+ <location filename="../src/gui/folder.cpp" line="396"/>
<source>%1 has been moved to %2.</source>
<translation>%1 wurde in %2 verschoben.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="365"/>
+ <location filename="../src/gui/folder.cpp" line="366"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 und %n andere Datei wurde gelöscht.</numerusform><numerusform>%1 und %n andere Dateien wurden gelöscht.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="372"/>
+ <location filename="../src/gui/folder.cpp" line="373"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 und %n andere Datei wurde heruntergeladen.</numerusform><numerusform>%1 und %n andere Dateien wurden heruntergeladen.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="379"/>
+ <location filename="../src/gui/folder.cpp" line="380"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 und %n andere Datei wurde aktualisiert.</numerusform><numerusform>%1 und %n andere Dateien wurden aktualisiert.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="386"/>
+ <location filename="../src/gui/folder.cpp" line="387"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 wurde in %2 umbenannt und %n andere Datei wurde umbenannt.</numerusform><numerusform>%1 wurde in %2 umbenannt und %n andere Dateien wurden umbenannt.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="393"/>
+ <location filename="../src/gui/folder.cpp" line="394"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 wurde in %2 verschoben und %n andere Datei wurde verschoben.</numerusform><numerusform>%1 wurde in %2 verschoben und %n andere Dateien wurden verschoben.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="400"/>
+ <location filename="../src/gui/folder.cpp" line="401"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 und %n andere Datei haben Konflikte beim Abgleichen.</numerusform><numerusform>%1 und %n andere Dateien haben Konflikte beim Abgleichen.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="402"/>
+ <location filename="../src/gui/folder.cpp" line="403"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>Es gab einen Konflikt bei der Synchronisierung von %1. Bitte prüfen Sie die Konfliktdatei!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="407"/>
+ <location filename="../src/gui/folder.cpp" line="408"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 und %n weitere Datei konnten aufgrund von Fehlern nicht synchronisiert werden. Schauen Sie in das Protokoll für Details.</numerusform><numerusform>%1 und %n weitere Dateien konnten aufgrund von Fehlern nicht synchronisiert werden. Schauen Sie in das Protokoll für Details.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="409"/>
+ <location filename="../src/gui/folder.cpp" line="410"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 konnte aufgrund eines Fehlers nicht synchronisiert werden. Schauen Sie in das Protokoll für Details.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="415"/>
+ <location filename="../src/gui/folder.cpp" line="416"/>
<source>Sync Activity</source>
<translation>Synchronisierungsaktivität</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="642"/>
+ <location filename="../src/gui/folder.cpp" line="643"/>
<source>Could not read system exclude file</source>
<translation>Systemeigene Ausschlussdatei kann nicht gelesen werden</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="850"/>
+ <location filename="../src/gui/folder.cpp" line="854"/>
<source>A new folder larger than %1 MB has been added: %2.
-Please go in the settings to select it if you wish to download it.</source>
- <translation>Ein neue Order größer als %1 MB wurde hinzugefügt: %2. Bitte besuchen Sie die Einstellungen, falls sie ihn herunterladen wollen.</translation>
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="856"/>
+ <source>A folder from an external storage has been added.
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="857"/>
+ <source>Please go in the settings to select it if you wish to download it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="888"/>
+ <location filename="../src/gui/folder.cpp" line="893"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
Sind Sie sicher, dass Sie diese Operation durchführen möchten?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="892"/>
+ <location filename="../src/gui/folder.cpp" line="897"/>
<source>Remove All Files?</source>
<translation>Alle Dateien löschen?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="894"/>
+ <location filename="../src/gui/folder.cpp" line="899"/>
<source>Remove all files</source>
<translation>Lösche alle Dateien</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="895"/>
+ <location filename="../src/gui/folder.cpp" line="900"/>
<source>Keep files</source>
<translation>Dateien behalten</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="911"/>
+ <location filename="../src/gui/folder.cpp" line="916"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
Wenn diese Synchronisation fortgesetzt wird, werden Dateien eventuell von älteren Versionen überschrieben. Möchten Sie die neueren Dateien als Konflikt-Dateien behalten?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="916"/>
+ <location filename="../src/gui/folder.cpp" line="921"/>
<source>Backup detected</source>
<translation>Backup erkannt</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="918"/>
+ <location filename="../src/gui/folder.cpp" line="923"/>
<source>Normal Synchronisation</source>
<translation>Normale Synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="919"/>
+ <location filename="../src/gui/folder.cpp" line="924"/>
<source>Keep Local Files as Conflict</source>
<translation>Lokale Konfliktdateien behalten</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="140"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="148"/>
<source>You need to be connected to add a folder</source>
<translation>Sie müssen verbunden sein, um einen Ordner hinzuzufügen</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="150"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="158"/>
<source>Click this button to add a folder to synchronize.</source>
<translation>Wählen Sie diese Schaltfläche, um einen zu synchronisierenden Ordner hinzuzufügen.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
<source>%1 (%2)</source>
<extracomment>Example text: "File.txt (23KB)"</extracomment>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="180"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="188"/>
<source>Error while loading the list of folders from the server.</source>
<translation>Fehler beim Empfang der Ordnerliste vom Server.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="218"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="226"/>
<source>Signed out</source>
<translation>Abgemeldet</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="145"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="153"/>
<source>Adding folder is disabled because you are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
<translation>Sie können keinen weiteren Ordner hinzufügen, da Sie bereits alle Dateien synchronisieren. Falls sie mehrere Ordner synchronisieren wollen, entferen Sie zunächst den konfigurierten Wurzel-Ordner.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="183"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="191"/>
<source>Fetching folder list from server...</source>
<translation>Empfange Orderliste vom Server...</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>Checking for changes in '%1'</source>
<translation>Nach Änderungen suchen in '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="868"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
<source>, '%1'</source>
<extracomment>Build a list of file names</extracomment>
<translation>, '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="871"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="900"/>
<source>'%1'</source>
<extracomment>Argument is a file name</extracomment>
<translation>'%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="896"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="925"/>
<source>Syncing %1</source>
<extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment>
<translation>Synchronisiere %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="908"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="927"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="937"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="931"/>
<source>download %1/s</source>
<extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>Download %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="933"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="911"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>upload %1/s</source>
<extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>Upload %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="913"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="942"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="918"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 von %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="922"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="951"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%5 übrig, %1 von %2, Datei %3 von %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="948"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 of %2, Datei %3 von %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="954"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="983"/>
<source>file %1 of %2</source>
<translation>Datei %1 von %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/>
<source>Waiting...</source>
<translation>Warte...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="998"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1027"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>Warte auf einen anderen Ordner</numerusform><numerusform>Warte auf %n andere Ordner</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1033"/>
<source>Preparing to sync...</source>
<translation>Bereite Synchronisation vor...</translation>
</message>
<translation>Erweitert</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="101"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
+ <source>Ask for confirmation before synchronizing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="105"/>
<source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/generalsettings.ui" line="26"/>
<source>&Launch on System Startup</source>
<translation>&Monochrome Icons verwenden</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="59"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit &Ignored Files</source>
<translation>I&gnorierte Dateien bearbeiten</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
- <source>Ask &confirmation before downloading folders larger than</source>
- <translation>&Bestätigung erfragen, bevor große Ordner heruntergeladen werden. Grenze:</translation>
- </message>
- <message>
- <location filename="../src/gui/generalsettings.ui" line="129"/>
+ <location filename="../src/gui/generalsettings.ui" line="140"/>
<source>S&how crash reporter</source>
<translation>&Crash-Reporter anzeigen</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="150"/>
<location filename="../src/gui/generalsettings.ui" line="156"/>
- <location filename="../src/gui/generalsettings.ui" line="162"/>
<source>About</source>
<translation>Über</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="172"/>
+ <location filename="../src/gui/generalsettings.ui" line="166"/>
<source>Updates</source>
<translation>Updates</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="197"/>
+ <location filename="../src/gui/generalsettings.ui" line="191"/>
<source>&Restart && Update</source>
<translation>&Neustarten && aktualisieren</translation>
</message>
<translation>Verbinden…</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="144"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="159"/>
<source>%1 folder '%2' is synced to local folder '%3'</source>
<translation>%1 Ordner '%2' wird mit dem lokalen Ordner '%3' synchronisiert</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="162"/>
<source>Sync the folder '%1'</source>
<translation>Ordner '%1' synchronisieren</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="152"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="167"/>
<source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
<translation><p><small><strong>Achtung:</strong> Der lokale Ordner ist nicht leer. Bitte wählen Sie eine entsprechende Lösung!</small></p></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="251"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/>
<source>Local Sync Folder</source>
<translation>Lokaler Ordner für die Synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="311"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="317"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
<translation>Der Ordner kann nicht entfernt und gesichert werden, da der Ordner oder einer seiner Dateien in einem anderen Programm geöffnet ist. Bitte schließen Sie den Ordner oder die Datei oder beenden Sie die Installation.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="540"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Lokaler Sync-Ordner %1 erfolgreich erstellt!</b></font></translation>
</message>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="120"/>
<source>Success.</source>
<translation>Erfolgreich</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="127"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSync konnte die Journaldatei nicht laden. Die Journaldatei ist beschädigt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="130"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>Das %1-Plugin für csync konnte nicht geladen werden.<br/>Bitte überprüfen Sie die Installation!</p></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync hatte einen Fehler bei der Verarbeitung von internen Strukturen.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync konnte keinen Speicher reservieren.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync fatal parameter error.</source>
<translation>CSync hat einen schwerwiegender Parameterfehler festgestellt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync processing step update failed.</source>
<translation>CSync Verarbeitungsschritt "Aktualisierung" fehlgeschlagen.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync Verarbeitungsschritt "Abgleich" fehlgeschlagen.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync konnte sich nicht am Proxy authentifizieren.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync konnte den Proxy oder Server nicht auflösen.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync konnte sich nicht am Server %1 authentifizieren.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync konnte sich nicht mit dem Netzwerk verbinden.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>A network connection timeout happened.</source>
<translation>Eine Zeitüberschreitung der Netzwerkverbindung ist aufgetreten.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>A HTTP transmission error happened.</source>
<translation>Es hat sich ein HTTP-Übertragungsfehler ereignet.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation>Der auf dem Server eingehängte Ordner ist vorübergehend nicht verfügbar</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>An error occurred while opening a folder</source>
<translation>Beim Öffnen eines Ordners ist ein Fehler aufgetreten.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="197"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Error while reading folder.</source>
<translation>Fehler beim Lesen eines Ordners.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="477"/>
+ <location filename="../src/libsync/syncengine.cpp" line="476"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>Datei wird ignoriert, weil sie versteckt ist.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="738"/>
+ <location filename="../src/libsync/syncengine.cpp" line="737"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Nur %1 sind verfügbar. Zum Beginnen werden mindestens %2 benötigt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1206"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Nicht erlaubt, da Sie keine Rechte zur Erstellung von Unterordnern haben</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1213"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Nicht erlaubt, da Sie keine Rechte zum Hinzufügen von Dateien in diesen Ordner haben</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: Kein Platz auf Server %1 frei.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>CSync unbekannter Fehler.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Abbruch durch den Benutzer</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>CSync failed to access</source>
<translation>CSync-Zugriff fehlgeschlagen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="123"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation>CSync konnte das Journal nicht laden oder erstellen. Stellen Sie bitte sicher, dass Sie Lese- und Schreibrechte im lokalen Synchronisationsordner haben.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation>CSync wegen fehlender Berechtigung fehlgeschlagen.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync tried to create a folder that already exists.</source>
<translation>CSync versuchte einen Ordner anzulegen, der schon existiert.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>The service is temporarily unavailable</source>
<translation>Der Dienst ist vorübergehend nicht erreichbar</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>Access is forbidden</source>
<translation>Zugriff verboten</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="202"/>
+ <location filename="../src/libsync/syncengine.cpp" line="201"/>
<source>An internal error number %1 occurred.</source>
<translation>Ein interner Fehler mit der Fehlernummer %1 ist aufgetreten.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="266"/>
+ <location filename="../src/libsync/syncengine.cpp" line="265"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Das Element ist aufgrund vorheriger Fehler nicht synchronisiert: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="445"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symbolische Verknüpfungen werden bei der Synchronisation nicht unterstützt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="449"/>
+ <location filename="../src/libsync/syncengine.cpp" line="448"/>
<source>File is listed on the ignore list.</source>
<translation>Die Datei ist in der Ignorierliste geführt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="453"/>
+ <location filename="../src/libsync/syncengine.cpp" line="452"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation>Dateinamen enden mit einem Punkt, die in diesem Dateisystem nicht unterstützt wird.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="463"/>
+ <location filename="../src/libsync/syncengine.cpp" line="462"/>
<source>File names containing the character '%1' are not supported on this file system.</source>
<translation>Dateinamen beinhalten das Zeichen '%1' und diese werden in diesem Dateisystems nicht unterstützt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="466"/>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
<source>The file name is a reserved name on this file system.</source>
<translation>Der Dateiname ist ein reservierter Name in diesem Dateisystem.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="471"/>
+ <location filename="../src/libsync/syncengine.cpp" line="470"/>
<source>Filename contains trailing spaces.</source>
<translation>Dateiname enthält Leerzeichen.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="474"/>
+ <location filename="../src/libsync/syncengine.cpp" line="473"/>
<source>Filename is too long.</source>
<translation>Der Dateiname ist zu lang.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="483"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Stat failed.</source>
<translation>Stat fehlgeschlagen.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="510"/>
+ <location filename="../src/libsync/syncengine.cpp" line="509"/>
<source>Filename encoding is not valid</source>
<translation>Dateikodierung ist ungültig</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="678"/>
+ <location filename="../src/libsync/syncengine.cpp" line="677"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Ungültige Zeichenm bitte benennen Sie "%1" um</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="774"/>
+ <location filename="../src/libsync/syncengine.cpp" line="773"/>
<source>Unable to initialize a sync journal.</source>
<translation>Synchronisationsbericht konnte nicht initialisiert werden.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="793"/>
+ <location filename="../src/libsync/syncengine.cpp" line="792"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Fehler beim Einlesen der Blacklist aus der lokalen Datenbank</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="830"/>
+ <location filename="../src/libsync/syncengine.cpp" line="829"/>
<source>Unable to read from the sync journal.</source>
<translation>Fehler beim Einlesen des Synchronisierungsprotokolls.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="875"/>
+ <location filename="../src/libsync/syncengine.cpp" line="874"/>
<source>Cannot open the sync journal</source>
<translation>Synchronisationsbericht kann nicht geöffnet werden</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="933"/>
+ <location filename="../src/libsync/syncengine.cpp" line="932"/>
<source>File name contains at least one invalid character</source>
<translation>Der Dateiname enthält mindestens ein ungültiges Zeichen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
- <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1172"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Aufgrund der »Zu synchronisierende Elemente auswählen«-Sperrliste ignoriert</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1191"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Nicht erlaubt, da Sie keine Rechte zur Erstellung von Unterordnern haben</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1232"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Das Hochladen dieser Datei ist nicht erlaubt, da die Datei auf dem Server schreibgeschützt ist, Wiederherstellung</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1249"/>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1267"/>
<source>Not allowed to remove, restoring</source>
<translation>Löschen nicht erlaubt, Wiederherstellung</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1280"/>
<source>Local files and share folder removed.</source>
<translation>Lokale Dateien und Freigabeordner wurden entfernt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1336"/>
<source>Move not allowed, item restored</source>
<translation>Verschieben nicht erlaubt, Element wiederhergestellt</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1347"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Verschieben nicht erlaubt, da %1 schreibgeschützt ist</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the destination</source>
<translation>Das Ziel</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the source</source>
<translation>Die Quelle</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="300"/>
+ <location filename="../src/libsync/theme.cpp" line="309"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Version %1. Für weitere Informationen besuchen Sie bitte <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="304"/>
+ <location filename="../src/libsync/theme.cpp" line="313"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation><p>Copyright ownCloud GmbH</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="305"/>
+ <location filename="../src/libsync/theme.cpp" line="314"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Zur Verfügung gestellt durch %1 und lizenziert unter der GNU General Public License (GPL) Version 2.0.<br>%2 und das %2 Logo sind eingetragene Warenzeichen von %1 in den Vereinigten Staaten, anderen Ländern oder beides.</p></translation>
</message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="250"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="352"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="379"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="402"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<translation>Saubere Syn&chronisation beginnen (entfernt lokalen Ordner!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="295"/>
+ <source>Ask for confirmation before synchroni&zing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="321"/>
+ <source>Ask for confirmation before synchronizing e&xternal storages</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="345"/>
<source>Choose what to sync</source>
<translation>Zu synchronisierende Elemente auswählen</translation>
</message>
<translation>&Lokale Daten behalten</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>S&ync everything from server</source>
<translation>Alle Daten vom Server s&ynchronisieren</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
<source>Status message</source>
<translation>Statusnachricht</translation>
</message>
<location filename="../src/gui/owncloudsetuppage.ui" line="129"/>
<location filename="../src/gui/owncloudsetuppage.ui" line="156"/>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="190"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="83"/>
- <source>Server &Address</source>
- <translation>&Serveradresse</translation>
+ <source>Ser&ver Address</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="99"/>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="286"/>
+ <location filename="../src/libsync/theme.cpp" line="295"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Gebaut von der GIT-Revision <a href="%1">%2</a> auf %3, %4 verwendet Qt %5, %6</small></p></translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="238"/>
<location filename="../src/gui/accountsettings.cpp" line="371"/>
- <location filename="../src/gui/accountsettings.cpp" line="728"/>
+ <location filename="../src/gui/accountsettings.cpp" line="733"/>
<source>Cancel</source>
<translation>Άκυρο</translation>
</message>
<translation>Είσοδος</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="678"/>
- <source>There are new folders that were not synchronized because they are too big: </source>
- <translation>Υπάρχουν νέοι φάκελοι που δεν συγχρονίστηκαν καθώς είναι πολύ μεγάλοι:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="680"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="681"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="720"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="725"/>
<source>Confirm Account Removal</source>
<translation>Επιβεβαίωση Αφαίρεσης Λογαριασμού</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="721"/>
+ <location filename="../src/gui/accountsettings.cpp" line="726"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>Θέλετε πραγματικά να αφαιρέσετε τη σύνδεση με το λογαριασμό <i>%1</i>;</p><p><b>Σημείωση:</b> Αυτό <b>δεν</b> θα διαγράψει κανένα αρχείο.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="727"/>
+ <location filename="../src/gui/accountsettings.cpp" line="732"/>
<source>Remove connection</source>
<translation>Αφαίρεση σύνδεσης</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="600"/>
<source>Aborted by the user</source>
<translation>Ματαιώθηκε από το χρήστη</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="139"/>
<source>Local folder %1 does not exist.</source>
<translation>Δεν υπάρχει ο τοπικός φάκελος %1.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="142"/>
<source>%1 should be a folder but is not.</source>
<translation>Το %1 θα έπρεπε να είναι φάκελος αλλά δεν είναι.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="144"/>
+ <location filename="../src/gui/folder.cpp" line="145"/>
<source>%1 is not readable.</source>
<translation> Το %1 δεν είναι αναγνώσιμο. </translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="367"/>
+ <location filename="../src/gui/folder.cpp" line="368"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>Το %1 αφαιρέθηκε.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="374"/>
+ <location filename="../src/gui/folder.cpp" line="375"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>Το %1 έχει ληφθεί.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="382"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>Το %1 έχει ενημερωθεί.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="388"/>
+ <location filename="../src/gui/folder.cpp" line="389"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>Το %1 έχει μετονομαστεί σε %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="395"/>
+ <location filename="../src/gui/folder.cpp" line="396"/>
<source>%1 has been moved to %2.</source>
<translation>Το %1 έχει μετακινηθεί στο %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="365"/>
+ <location filename="../src/gui/folder.cpp" line="366"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="372"/>
+ <location filename="../src/gui/folder.cpp" line="373"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="379"/>
+ <location filename="../src/gui/folder.cpp" line="380"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="386"/>
+ <location filename="../src/gui/folder.cpp" line="387"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="393"/>
+ <location filename="../src/gui/folder.cpp" line="394"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="400"/>
+ <location filename="../src/gui/folder.cpp" line="401"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="402"/>
+ <location filename="../src/gui/folder.cpp" line="403"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="407"/>
+ <location filename="../src/gui/folder.cpp" line="408"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="409"/>
+ <location filename="../src/gui/folder.cpp" line="410"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 δεν ήταν δυνατό να συγχρονιστεί εξαιτίας ενός σφάλματος. Δείτε το αρχείο καταγραφής για λεπτομέρειες.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="415"/>
+ <location filename="../src/gui/folder.cpp" line="416"/>
<source>Sync Activity</source>
<translation>Δραστηριότητα Συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="642"/>
+ <location filename="../src/gui/folder.cpp" line="643"/>
<source>Could not read system exclude file</source>
<translation>Αδυναμία ανάγνωσης αρχείου αποκλεισμού συστήματος</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="850"/>
+ <location filename="../src/gui/folder.cpp" line="854"/>
<source>A new folder larger than %1 MB has been added: %2.
-Please go in the settings to select it if you wish to download it.</source>
- <translation>Ένας νέος φάκελος μεγαλύτερος από %1 MB έχει προστεθεί: %2.
-Παρακαλούμε πηγαίνετε στις ρυθμίσεις για να επιλέξετε αν επιθυμείτε να τον κατεβάσετε.</translation>
+</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="888"/>
+ <location filename="../src/gui/folder.cpp" line="856"/>
+ <source>A folder from an external storage has been added.
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="857"/>
+ <source>Please go in the settings to select it if you wish to download it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="893"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
Είστε σίγουροι ότι θέλετε να εκτελέσετε αυτή τη λειτουργία;</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="892"/>
+ <location filename="../src/gui/folder.cpp" line="897"/>
<source>Remove All Files?</source>
<translation>Αφαίρεση Όλων των Αρχείων;</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="894"/>
+ <location filename="../src/gui/folder.cpp" line="899"/>
<source>Remove all files</source>
<translation>Αφαίρεση όλων των αρχείων</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="895"/>
+ <location filename="../src/gui/folder.cpp" line="900"/>
<source>Keep files</source>
<translation>Διατήρηση αρχείων</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="911"/>
+ <location filename="../src/gui/folder.cpp" line="916"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="916"/>
+ <location filename="../src/gui/folder.cpp" line="921"/>
<source>Backup detected</source>
<translation>Ανιχνεύθηκε αντίγραφο ασφαλείας</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="918"/>
+ <location filename="../src/gui/folder.cpp" line="923"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="919"/>
+ <location filename="../src/gui/folder.cpp" line="924"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="140"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="148"/>
<source>You need to be connected to add a folder</source>
<translation>Πρέπει να έχετε συνδεθεί για να προσθέσετε φάκελο</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="150"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="158"/>
<source>Click this button to add a folder to synchronize.</source>
<translation>Κάντε κλικ σε αυτό το κουμπί για να προσθέσετε ένα φάκελο προς συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
<source>%1 (%2)</source>
<extracomment>Example text: "File.txt (23KB)"</extracomment>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="180"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="188"/>
<source>Error while loading the list of folders from the server.</source>
<translation>Σφάλμα κατά τη φόρτωση της λίστας φακέλων από το διακομιστή.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="218"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="226"/>
<source>Signed out</source>
<translation>Αποσύνδεση</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="145"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="153"/>
<source>Adding folder is disabled because you are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
<translation>Η επιλογή προσθήκης φακέλου δεν είναι διαθέσιμη καθώς συγχρονίζονται ήδη όλα τα αρχεία. Για να επιλέξετε συγχρονισμό φακέλων, αφαιρέστε τον αρχικό φάκελο που έχει ρυθμιστεί.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="183"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="191"/>
<source>Fetching folder list from server...</source>
<translation>Λήψη λίστας φακέλων από το διακομιστή...</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>Checking for changes in '%1'</source>
<translation>Έλεγχος αλλαγών στο '%1'.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="868"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
<source>, '%1'</source>
<extracomment>Build a list of file names</extracomment>
<translation>, '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="871"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="900"/>
<source>'%1'</source>
<extracomment>Argument is a file name</extracomment>
<translation>'%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="896"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="925"/>
<source>Syncing %1</source>
<extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment>
<translation>Συγχρονισμός %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="908"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="927"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="937"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="931"/>
<source>download %1/s</source>
<extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>λήψη %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="933"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="911"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>upload %1/s</source>
<extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>μεταφόρτωση %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="913"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="942"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="918"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 από %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="922"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="951"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="948"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 από %2, αρχείο %3 από %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="954"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="983"/>
<source>file %1 of %2</source>
<translation>αρχείο %1 από %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/>
<source>Waiting...</source>
<translation>Αναμονή...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="998"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1027"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>Αναμονή για %n άλλο φάκελο...</numerusform><numerusform>Αναμονή για %n άλλους φακέλους...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1033"/>
<source>Preparing to sync...</source>
<translation>Προετοιμασία για συγχρονισμό...</translation>
</message>
<translation>Για προχωρημένους</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="101"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
+ <source>Ask for confirmation before synchronizing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="105"/>
<source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>ΜΒ</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/generalsettings.ui" line="26"/>
<source>&Launch on System Startup</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="59"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit &Ignored Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
- <source>Ask &confirmation before downloading folders larger than</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/generalsettings.ui" line="129"/>
+ <location filename="../src/gui/generalsettings.ui" line="140"/>
<source>S&how crash reporter</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="150"/>
<location filename="../src/gui/generalsettings.ui" line="156"/>
- <location filename="../src/gui/generalsettings.ui" line="162"/>
<source>About</source>
<translation>Σχετικά</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="172"/>
+ <location filename="../src/gui/generalsettings.ui" line="166"/>
<source>Updates</source>
<translation>Ενημερώσεις</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="197"/>
+ <location filename="../src/gui/generalsettings.ui" line="191"/>
<source>&Restart && Update</source>
<translation>&Επανεκκίνηση && Ενημέρωση</translation>
</message>
<translation>Σύνδεση...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="144"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="159"/>
<source>%1 folder '%2' is synced to local folder '%3'</source>
<translation>Ο %1 φάκελος '%2' είναι συγχρονισμένος με τον τοπικό φάκελο '%3'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="162"/>
<source>Sync the folder '%1'</source>
<translation>Συγχρονισμός φακέλου '%1'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="152"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="167"/>
<source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
<translation><p><small><strong>Προσοχή:</strong> Ο τοπικός φάκελος δεν είναι άδειος. Επιλέξτε μια επίλυση!</small></p></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="251"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/>
<source>Local Sync Folder</source>
<translation>Τοπικός Φάκελος Συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="311"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="317"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
<translation>Αδυναμία αφαίρεσης και δημιουργίας αντιγράφου ασφαλείας του φακέλου διότι ο φάκελος ή ένα αρχείο του είναι ανοικτό από άλλο πρόγραμμα. Παρακαλώ κλείστε τον φάκελο ή το αρχείο και πατήστε επανάληψη ή ακυρώστε την ρύθμιση.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="540"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Επιτυχής δημιουργία τοπικού φακέλου %1 για συγχρονισμό!</b></font></translation>
</message>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="120"/>
<source>Success.</source>
<translation>Επιτυχία.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="127"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>Το CSync απέτυχε να φορτώσει ο αρχείο καταλόγου. Το αρχείο καταλόγου έχει καταστραφεί.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="130"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>Το πρόσθετο του %1 για το csync δεν μπόρεσε να φορτωθεί.<br/>Παρακαλούμε επαληθεύσετε την εγκατάσταση!</p></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<source>CSync got an error while processing internal trees.</source>
<translation>Το CSync έλαβε κάποιο μήνυμα λάθους κατά την επεξεργασία της εσωτερικής διεργασίας.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<source>CSync failed to reserve memory.</source>
<translation>Το CSync απέτυχε να δεσμεύσει μνήμη.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync fatal parameter error.</source>
<translation>Μοιραίο σφάλμα παράμετρου CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync processing step update failed.</source>
<translation>Η ενημέρωση του βήματος επεξεργασίας του CSync απέτυχε.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync στάδιο επεξεργασίας συμφιλίωση απέτυχε. </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>Το CSync δεν μπόρεσε να πιστοποιηθεί στο διακομιστή μεσολάβησης.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>Το CSync απέτυχε να διερευνήσει το διαμεσολαβητή ή το διακομιστή.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>Το CSync απέτυχε να πιστοποιηθεί στο διακομιστή 1%. </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to connect to the network.</source>
<translation>Το CSync απέτυχε να συνδεθεί με το δίκτυο.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>A network connection timeout happened.</source>
<translation>Διακοπή σύνδεσης δικτύου λόγω παρέλευσης χρονικού ορίου.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>A HTTP transmission error happened.</source>
<translation>Ένα σφάλμα μετάδοσης HTTP συνέβη.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation>Ο προσαρτημένος φάκελος δεν είναι διαθέσιμος στον δικομιστή προσωρινά</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>An error occurred while opening a folder</source>
<translation>Παρουσιάστηκε σφάλμα κατά το άνοιγμα του φακέλου</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="197"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Error while reading folder.</source>
<translation>Σφάλμα κατά την ανάγνωση του φακέλου.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="477"/>
+ <location filename="../src/libsync/syncengine.cpp" line="476"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>Το Αρχείο/ο Φάκελος αγνοήθηκε επειδή είναι κρυφό.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="738"/>
+ <location filename="../src/libsync/syncengine.cpp" line="737"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Μόνο %1 είναι διαθέσιμα, απαιτούνται τουλάχιστον %2 για την εκκίνηση</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1206"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε γονικό κατάλογο</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1213"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε αρχεία σε αυτόν τον φάκελο</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: Δεν υπάρχει διαθέσιμος χώρος στο διακομιστή 1%.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>Άγνωστο σφάλμα CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Ματαιώθηκε από το χρήστη</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>CSync failed to access</source>
<translation>Το CSync απέτυχε να αποκτήσει πρόσβαση</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="123"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation>Το CSync απέτυχε να φορτώσει ή να δημιουργήσει το αρχείο καταγραφής. Βεβαιωθείτε ότι έχετε άδεια ανάγνωσης και εγγραφής στον τοπικό κατάλογο συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation>Το CSync απέτυχε λόγω κατάστασης "permission denied"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync tried to create a folder that already exists.</source>
<translation>Το CSync προσπάθησε να δημιουργήσει φάκελο που υπάρχει ήδη.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>The service is temporarily unavailable</source>
<translation>Η υπηρεσία δεν είναι διαθέσιμη προσωρινά</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>Access is forbidden</source>
<translation>Δεν επιτρέπεται η πρόσβαση</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="202"/>
+ <location filename="../src/libsync/syncengine.cpp" line="201"/>
<source>An internal error number %1 occurred.</source>
<translation>Προέκυψε ένα εσωτερικό σφάλμα με αριθμό %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="266"/>
+ <location filename="../src/libsync/syncengine.cpp" line="265"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Το αντικείμενο δεν είναι συγχρονισμένο λόγω προηγούμενων σφαλμάτων: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="445"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Οι συμβολικού σύνδεσμοι δεν υποστηρίζονται για το συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="449"/>
+ <location filename="../src/libsync/syncengine.cpp" line="448"/>
<source>File is listed on the ignore list.</source>
<translation>Το αρχείο περιέχεται στη λίστα αρχείων προς αγνόηση.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="453"/>
+ <location filename="../src/libsync/syncengine.cpp" line="452"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="463"/>
+ <location filename="../src/libsync/syncengine.cpp" line="462"/>
<source>File names containing the character '%1' are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="466"/>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
<source>The file name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="471"/>
+ <location filename="../src/libsync/syncengine.cpp" line="470"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="474"/>
+ <location filename="../src/libsync/syncengine.cpp" line="473"/>
<source>Filename is too long.</source>
<translation>Το όνομα αρχείου είνια πολύ μεγάλο.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="483"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Stat failed.</source>
<translation>Απέτυχε.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="510"/>
+ <location filename="../src/libsync/syncengine.cpp" line="509"/>
<source>Filename encoding is not valid</source>
<translation>Η κωδικοποίηση του ονόματος αρχείου δεν είναι έγκυρη</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="678"/>
+ <location filename="../src/libsync/syncengine.cpp" line="677"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Μη έγκυροι χαρακτήρες, παρακαλώ μετονομάστε το "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="774"/>
+ <location filename="../src/libsync/syncengine.cpp" line="773"/>
<source>Unable to initialize a sync journal.</source>
<translation>Αδυναμία προετοιμασίας αρχείου συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="793"/>
+ <location filename="../src/libsync/syncengine.cpp" line="792"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Αδυναμία ανάγνωσης της μαύρης λίστας από την τοπική βάση δεδομένων</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="830"/>
+ <location filename="../src/libsync/syncengine.cpp" line="829"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="875"/>
+ <location filename="../src/libsync/syncengine.cpp" line="874"/>
<source>Cannot open the sync journal</source>
<translation>Αδυναμία ανοίγματος του αρχείου συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="933"/>
+ <location filename="../src/libsync/syncengine.cpp" line="932"/>
<source>File name contains at least one invalid character</source>
<translation>Το όνομα αρχείου περιέχει έναν τουλάχιστον μη έγκυρο χαρακτήρα</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
- <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1172"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Αγνοήθηκε εξαιτίας της μαύρης λίστας "διάλεξε τι να συγχρονιστεί"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1191"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε υποφακέλους σε αυτό τον φάκελο</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1232"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Δεν επιτρέπεται να μεταφορτώσετε αυτό το αρχείο επειδή είναι μόνο για ανάγνωση στο διακομιστή, αποκατάσταση σε εξέλιξη</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1249"/>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1267"/>
<source>Not allowed to remove, restoring</source>
<translation>Δεν επιτρέπεται η αφαίρεση, αποκατάσταση σε εξέλιξη</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1280"/>
<source>Local files and share folder removed.</source>
<translation>Οι τοπικοί φάκελοι και ο φάκελος κοινής χρήσης αφαιρέθηκαν.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1336"/>
<source>Move not allowed, item restored</source>
<translation>Η μετακίνηση δεν επιτρέπεται, το αντικείμενο αποκαταστάθηκε</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1347"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Η μετακίνηση δεν επιτρέπεται επειδή το %1 είναι μόνο για ανάγνωση</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the destination</source>
<translation>ο προορισμός</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the source</source>
<translation>η προέλευση</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="300"/>
+ <location filename="../src/libsync/theme.cpp" line="309"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Έκδοση %1. Για περισσότερες πληροφορίες δείτε <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="304"/>
+ <location filename="../src/libsync/theme.cpp" line="313"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="305"/>
+ <location filename="../src/libsync/theme.cpp" line="314"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Διανέμεται από 1% και υπό την άδεια GNU General Public License (GPL) έκδοση 2.0.<br/>% 2 και το 2% το λογότυπο είναι σήματα κατατεθέντα της 1% στις Ηνωμένες Πολιτείες, άλλες χώρες, ή και τα δύο.</ p></translation>
</message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="250"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="352"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="379"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="402"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<translation>&Έναρξη καθαρού συγχρονισμού (Διαγράφει τον τοπικό φάκελο!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="295"/>
+ <source>Ask for confirmation before synchroni&zing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="321"/>
+ <source>Ask for confirmation before synchronizing e&xternal storages</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="345"/>
<source>Choose what to sync</source>
<translation>Επιλέξτε τι θα συγχρονιστεί</translation>
</message>
<translation>&Διατήρηση τοπικών δεδομένων</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>S&ync everything from server</source>
<translation>Σ&υγχρονισμός όλων από τον διακομιστή</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
<source>Status message</source>
<translation>Μήνυμα κατάστασης</translation>
</message>
<location filename="../src/gui/owncloudsetuppage.ui" line="129"/>
<location filename="../src/gui/owncloudsetuppage.ui" line="156"/>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="190"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="83"/>
- <source>Server &Address</source>
- <translation>Διακομιστής και &Διεύθυνση </translation>
+ <source>Ser&ver Address</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="99"/>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="286"/>
+ <location filename="../src/libsync/theme.cpp" line="295"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Δημιουργήθηκε από την διασκευή Git <a href="%1">%2</a> στο %3, %4 χρησιμοποιώντας Qt %5, %6</small></p></translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="238"/>
<location filename="../src/gui/accountsettings.cpp" line="371"/>
- <location filename="../src/gui/accountsettings.cpp" line="728"/>
+ <location filename="../src/gui/accountsettings.cpp" line="733"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="678"/>
- <source>There are new folders that were not synchronized because they are too big: </source>
+ <location filename="../src/gui/accountsettings.cpp" line="680"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="720"/>
+ <location filename="../src/gui/accountsettings.cpp" line="681"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="725"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="721"/>
+ <location filename="../src/gui/accountsettings.cpp" line="726"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="727"/>
+ <location filename="../src/gui/accountsettings.cpp" line="732"/>
<source>Remove connection</source>
<translation type="unfinished"></translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="600"/>
<source>Aborted by the user</source>
<translation type="unfinished"></translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="139"/>
<source>Local folder %1 does not exist.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="142"/>
<source>%1 should be a folder but is not.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="144"/>
+ <location filename="../src/gui/folder.cpp" line="145"/>
<source>%1 is not readable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="367"/>
+ <location filename="../src/gui/folder.cpp" line="368"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="374"/>
+ <location filename="../src/gui/folder.cpp" line="375"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="382"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="388"/>
+ <location filename="../src/gui/folder.cpp" line="389"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="395"/>
+ <location filename="../src/gui/folder.cpp" line="396"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="365"/>
+ <location filename="../src/gui/folder.cpp" line="366"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="372"/>
+ <location filename="../src/gui/folder.cpp" line="373"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="379"/>
+ <location filename="../src/gui/folder.cpp" line="380"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="386"/>
+ <location filename="../src/gui/folder.cpp" line="387"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="393"/>
+ <location filename="../src/gui/folder.cpp" line="394"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="400"/>
+ <location filename="../src/gui/folder.cpp" line="401"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="402"/>
+ <location filename="../src/gui/folder.cpp" line="403"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="407"/>
+ <location filename="../src/gui/folder.cpp" line="408"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="409"/>
+ <location filename="../src/gui/folder.cpp" line="410"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="415"/>
+ <location filename="../src/gui/folder.cpp" line="416"/>
<source>Sync Activity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="642"/>
+ <location filename="../src/gui/folder.cpp" line="643"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="850"/>
+ <location filename="../src/gui/folder.cpp" line="854"/>
<source>A new folder larger than %1 MB has been added: %2.
-Please go in the settings to select it if you wish to download it.</source>
+</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="888"/>
+ <location filename="../src/gui/folder.cpp" line="856"/>
+ <source>A folder from an external storage has been added.
+</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="857"/>
+ <source>Please go in the settings to select it if you wish to download it.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="893"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="892"/>
+ <location filename="../src/gui/folder.cpp" line="897"/>
<source>Remove All Files?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="894"/>
+ <location filename="../src/gui/folder.cpp" line="899"/>
<source>Remove all files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="895"/>
+ <location filename="../src/gui/folder.cpp" line="900"/>
<source>Keep files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="911"/>
+ <location filename="../src/gui/folder.cpp" line="916"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="916"/>
+ <location filename="../src/gui/folder.cpp" line="921"/>
<source>Backup detected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="918"/>
+ <location filename="../src/gui/folder.cpp" line="923"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="919"/>
+ <location filename="../src/gui/folder.cpp" line="924"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"></translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="140"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="148"/>
<source>You need to be connected to add a folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="150"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="158"/>
<source>Click this button to add a folder to synchronize.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
<source>%1 (%2)</source>
<extracomment>Example text: "File.txt (23KB)"</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="180"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="188"/>
<source>Error while loading the list of folders from the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="218"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="226"/>
<source>Signed out</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="145"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="153"/>
<source>Adding folder is disabled because you are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="183"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="191"/>
<source>Fetching folder list from server...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>Checking for changes in '%1'</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="868"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
<source>, '%1'</source>
<extracomment>Build a list of file names</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="871"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="900"/>
<source>'%1'</source>
<extracomment>Argument is a file name</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="896"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="925"/>
<source>Syncing %1</source>
<extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="908"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="927"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="937"/>
<source>, </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="931"/>
<source>download %1/s</source>
<extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="933"/>
<source>u2193 %1/s</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="911"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>upload %1/s</source>
<extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="913"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="942"/>
<source>u2191 %1/s</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="918"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="922"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="951"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="948"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="954"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="983"/>
<source>file %1 of %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/>
<source>Waiting...</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="998"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1027"/>
<source>Waiting for %n other folder(s)...</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1033"/>
<source>Preparing to sync...</source>
<translation type="unfinished"></translation>
</message>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="101"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
+ <source>Ask for confirmation before synchronizing folders larger than</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="105"/>
<source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
<translation type="unfinished"></translation>
</message>
<message>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="59"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit &Ignored Files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
- <source>Ask &confirmation before downloading folders larger than</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/generalsettings.ui" line="129"/>
+ <location filename="../src/gui/generalsettings.ui" line="140"/>
<source>S&how crash reporter</source>
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="150"/>
<location filename="../src/gui/generalsettings.ui" line="156"/>
- <location filename="../src/gui/generalsettings.ui" line="162"/>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="172"/>
+ <location filename="../src/gui/generalsettings.ui" line="166"/>
<source>Updates</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="197"/>
+ <location filename="../src/gui/generalsettings.ui" line="191"/>
<source>&Restart && Update</source>
<translation type="unfinished"></translation>
</message>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="144"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="159"/>
<source>%1 folder '%2' is synced to local folder '%3'</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="162"/>
<source>Sync the folder '%1'</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="152"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="167"/>
<source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="251"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/>
<source>Local Sync Folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="311"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="317"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/>
<source>(%1)</source>
<translation type="unfinished"></translation>
</message>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="540"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation type="unfinished"></translation>
</message>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="120"/>
<source>Success.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="127"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="130"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<source>CSync got an error while processing internal trees.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<source>CSync failed to reserve memory.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync fatal parameter error.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync processing step update failed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync processing step reconcile failed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync could not authenticate at the proxy.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync failed to lookup proxy or server.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to connect to the network.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>A network connection timeout happened.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>A HTTP transmission error happened.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>An error occurred while opening a folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="197"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Error while reading folder.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="477"/>
+ <location filename="../src/libsync/syncengine.cpp" line="476"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="738"/>
+ <location filename="../src/libsync/syncengine.cpp" line="737"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1206"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1213"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>Aborted by the user</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>CSync failed to access</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="123"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>The service is temporarily unavailable</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>Access is forbidden</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="202"/>
+ <location filename="../src/libsync/syncengine.cpp" line="201"/>
<source>An internal error number %1 occurred.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="266"/>
+ <location filename="../src/libsync/syncengine.cpp" line="265"/>
<source>The item is not synced because of previous errors: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="445"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="449"/>
+ <location filename="../src/libsync/syncengine.cpp" line="448"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="453"/>
+ <location filename="../src/libsync/syncengine.cpp" line="452"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="463"/>
+ <location filename="../src/libsync/syncengine.cpp" line="462"/>
<source>File names containing the character '%1' are not supported on this file system.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="466"/>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
<source>The file name is a reserved name on this file system.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="471"/>
+ <location filename="../src/libsync/syncengine.cpp" line="470"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="474"/>
+ <location filename="../src/libsync/syncengine.cpp" line="473"/>
<source>Filename is too long.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="483"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Stat failed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="510"/>
+ <location filename="../src/libsync/syncengine.cpp" line="509"/>
<source>Filename encoding is not valid</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="678"/>
+ <location filename="../src/libsync/syncengine.cpp" line="677"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="774"/>
+ <location filename="../src/libsync/syncengine.cpp" line="773"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="793"/>
+ <location filename="../src/libsync/syncengine.cpp" line="792"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="830"/>
+ <location filename="../src/libsync/syncengine.cpp" line="829"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="875"/>
+ <location filename="../src/libsync/syncengine.cpp" line="874"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="933"/>
+ <location filename="../src/libsync/syncengine.cpp" line="932"/>
<source>File name contains at least one invalid character</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
- <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1172"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1191"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1232"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1249"/>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1267"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1280"/>
<source>Local files and share folder removed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1336"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1347"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the destination</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the source</source>
<translation type="unfinished"></translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="300"/>
+ <location filename="../src/libsync/theme.cpp" line="309"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="304"/>
+ <location filename="../src/libsync/theme.cpp" line="313"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="305"/>
+ <location filename="../src/libsync/theme.cpp" line="314"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation type="unfinished"></translation>
</message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="250"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="352"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="379"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="402"/>
<source>TextLabel</source>
<translation type="unfinished"></translation>
</message>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="295"/>
+ <source>Ask for confirmation before synchroni&zing folders larger than</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="321"/>
+ <source>Ask for confirmation before synchronizing e&xternal storages</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="345"/>
<source>Choose what to sync</source>
<translation type="unfinished"></translation>
</message>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>S&ync everything from server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
<source>Status message</source>
<translation type="unfinished"></translation>
</message>
<location filename="../src/gui/owncloudsetuppage.ui" line="129"/>
<location filename="../src/gui/owncloudsetuppage.ui" line="156"/>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="190"/>
<source>TextLabel</source>
<translation type="unfinished"></translation>
</message>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="83"/>
- <source>Server &Address</source>
+ <source>Ser&ver Address</source>
<translation type="unfinished"></translation>
</message>
<message>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="286"/>
+ <location filename="../src/libsync/theme.cpp" line="295"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="238"/>
<location filename="../src/gui/accountsettings.cpp" line="371"/>
- <location filename="../src/gui/accountsettings.cpp" line="728"/>
+ <location filename="../src/gui/accountsettings.cpp" line="733"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<translation>Iniciar sesión</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="678"/>
- <source>There are new folders that were not synchronized because they are too big: </source>
- <translation>Hay carpetas nuevas que no fueron sincronizadas porque son demasiado grandes:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="680"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="681"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="720"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="725"/>
<source>Confirm Account Removal</source>
<translation>Confirmar eliminación de cuenta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="721"/>
+ <location filename="../src/gui/accountsettings.cpp" line="726"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>¿De verdad quiere eliminar la conexión a la cuenta <i>%1</i>?</p><p><b>Nota:</b> Esto <b>no</b> eliminará los archivos.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="727"/>
+ <location filename="../src/gui/accountsettings.cpp" line="732"/>
<source>Remove connection</source>
<translation>Eliminar conexión</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="600"/>
<source>Aborted by the user</source>
<translation>Interrumpido por el usuario</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="139"/>
<source>Local folder %1 does not exist.</source>
<translation>La carpeta local %1 no existe.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="142"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 debería ser un directorio, pero no lo es.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="144"/>
+ <location filename="../src/gui/folder.cpp" line="145"/>
<source>%1 is not readable.</source>
<translation>%1 es ilegible.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="367"/>
+ <location filename="../src/gui/folder.cpp" line="368"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido eliminado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="374"/>
+ <location filename="../src/gui/folder.cpp" line="375"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido descargado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="382"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido actualizado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="388"/>
+ <location filename="../src/gui/folder.cpp" line="389"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 ha sido renombrado a %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="395"/>
+ <location filename="../src/gui/folder.cpp" line="396"/>
<source>%1 has been moved to %2.</source>
<translation>%1 ha sido movido a %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="365"/>
+ <location filename="../src/gui/folder.cpp" line="366"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 y otro archivo han sido borrados.</numerusform><numerusform>%1 y otros %n archivos han sido borrados.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="372"/>
+ <location filename="../src/gui/folder.cpp" line="373"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 y otro archivo han sido descargados.</numerusform><numerusform>%1 y otros %n archivos han sido descargados.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="379"/>
+ <location filename="../src/gui/folder.cpp" line="380"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 y otro archivo han sido actualizados.</numerusform><numerusform>%1 y otros %n archivos han sido actualizados.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="386"/>
+ <location filename="../src/gui/folder.cpp" line="387"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 ha sido renombrado a %2 y otro archivo ha sido renombrado.</numerusform><numerusform>%1 ha sido renombrado a %2 y otros %n archivos han sido renombrado.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="393"/>
+ <location filename="../src/gui/folder.cpp" line="394"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 ha sido movido a %2 y otro archivo ha sido movido.</numerusform><numerusform>%1 ha sido movido a %2 y otros %n archivos han sido movidos.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="400"/>
+ <location filename="../src/gui/folder.cpp" line="401"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 y otro archivo han tenido conflictos al sincronizar.</numerusform><numerusform>%1 y otros %n archivos han tenido conflictos al sincronizar.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="402"/>
+ <location filename="../src/gui/folder.cpp" line="403"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>Conflicto al sincronizar %1. Por favor compruebe el archivo!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="407"/>
+ <location filename="../src/gui/folder.cpp" line="408"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 y otro archivo no pudieron ser sincronizados debido a errores. Para más detalles vea el registro.</numerusform><numerusform>%1 y otros %n archivos no pudieron ser sincronizados debido a errores. Para más detalles vea el registro.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="409"/>
+ <location filename="../src/gui/folder.cpp" line="410"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 no pudo ser sincronizado debido a un error. Para más detalles, vea el registro.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="415"/>
+ <location filename="../src/gui/folder.cpp" line="416"/>
<source>Sync Activity</source>
<translation>Actividad de la sincronización</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="642"/>
+ <location filename="../src/gui/folder.cpp" line="643"/>
<source>Could not read system exclude file</source>
<translation>No se ha podido leer el archivo de exclusión del sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="850"/>
+ <location filename="../src/gui/folder.cpp" line="854"/>
<source>A new folder larger than %1 MB has been added: %2.
-Please go in the settings to select it if you wish to download it.</source>
- <translation>Se ha añadido una nueva carpeta más grande de %1 MB: %2.
-Por favor diríjase a los ajustes para seleccionarlo si desea descargarlo.</translation>
+</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="888"/>
+ <location filename="../src/gui/folder.cpp" line="856"/>
+ <source>A folder from an external storage has been added.
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="857"/>
+ <source>Please go in the settings to select it if you wish to download it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="893"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
¿Está seguro de que desea realizar esta operación?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="892"/>
+ <location filename="../src/gui/folder.cpp" line="897"/>
<source>Remove All Files?</source>
<translation>¿Eliminar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="894"/>
+ <location filename="../src/gui/folder.cpp" line="899"/>
<source>Remove all files</source>
<translation>Eliminar todos los archivos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="895"/>
+ <location filename="../src/gui/folder.cpp" line="900"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="911"/>
+ <location filename="../src/gui/folder.cpp" line="916"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
Si continua con la sincronización todos los archivos serán remplazados por su versión previa. ¿Desea mantener los archivos locales en su versión actual como archivos en conflicto?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="916"/>
+ <location filename="../src/gui/folder.cpp" line="921"/>
<source>Backup detected</source>
<translation>Backup detectado</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="918"/>
+ <location filename="../src/gui/folder.cpp" line="923"/>
<source>Normal Synchronisation</source>
<translation>Sincronización Normal</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="919"/>
+ <location filename="../src/gui/folder.cpp" line="924"/>
<source>Keep Local Files as Conflict</source>
<translation>Mantener los archivos locales en caso de conflicto</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="140"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="148"/>
<source>You need to be connected to add a folder</source>
<translation>Necesita estar conectado para añadir una carpeta</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="150"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="158"/>
<source>Click this button to add a folder to synchronize.</source>
<translation>Haga clic en este botón para añadir una carpeta a sincronizar</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
<source>%1 (%2)</source>
<extracomment>Example text: "File.txt (23KB)"</extracomment>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="180"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="188"/>
<source>Error while loading the list of folders from the server.</source>
<translation>Error mientras se cargaba la lista de carpetas desde el servidor.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="218"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="226"/>
<source>Signed out</source>
<translation>Cerrar sesión</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="145"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="153"/>
<source>Adding folder is disabled because you are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
<translation>Añadir carpetas está deshabilitado debido a que ya están sincronizándose todos sus archivos. Si desea sincronizar múltiples carpeta, elimine la carpeta raíz actualmente configurada.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="183"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="191"/>
<source>Fetching folder list from server...</source>
<translation>Obtención de lista de carpetas del servidor...</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>Checking for changes in '%1'</source>
<translation>Buscando cambios en '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="868"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
<source>, '%1'</source>
<extracomment>Build a list of file names</extracomment>
<translation>, '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="871"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="900"/>
<source>'%1'</source>
<extracomment>Argument is a file name</extracomment>
<translation>'%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="896"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="925"/>
<source>Syncing %1</source>
<extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment>
<translation>Sincronizando %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="908"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="927"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="937"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="931"/>
<source>download %1/s</source>
<extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>descargando: %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="933"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="911"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>upload %1/s</source>
<extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>cargar %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="913"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="942"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="918"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 de %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="922"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="951"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%5 restantes, %1 de %2, archivo %3 de %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="948"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 de %2, archivo %3 de %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="954"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="983"/>
<source>file %1 of %2</source>
<translation>archivo %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/>
<source>Waiting...</source>
<translation>Esperando...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="998"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1027"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>Esperando por %n carpeta...</numerusform><numerusform>Esperando por %n otras carpetas...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1033"/>
<source>Preparing to sync...</source>
<translation>Preparando para sincronizar...</translation>
</message>
<translation>Avanzado</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="101"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
+ <source>Ask for confirmation before synchronizing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="105"/>
<source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/generalsettings.ui" line="26"/>
<source>&Launch on System Startup</source>
<translation>Usar Iconos &Monocromáticos</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="59"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit &Ignored Files</source>
<translation>Editar archivos &ignorados</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
- <source>Ask &confirmation before downloading folders larger than</source>
- <translation>&Preguntar antes de descargar carpetas de más de</translation>
- </message>
- <message>
- <location filename="../src/gui/generalsettings.ui" line="129"/>
+ <location filename="../src/gui/generalsettings.ui" line="140"/>
<source>S&how crash reporter</source>
<translation>M&ostrar el informe de fallos</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="150"/>
<location filename="../src/gui/generalsettings.ui" line="156"/>
- <location filename="../src/gui/generalsettings.ui" line="162"/>
<source>About</source>
<translation>Acerca de</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="172"/>
+ <location filename="../src/gui/generalsettings.ui" line="166"/>
<source>Updates</source>
<translation>Actualizaciones</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="197"/>
+ <location filename="../src/gui/generalsettings.ui" line="191"/>
<source>&Restart && Update</source>
<translation>&Reiniciar && Actualizar</translation>
</message>
<translation>Conectar...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="144"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="159"/>
<source>%1 folder '%2' is synced to local folder '%3'</source>
<translation>La carpeta %1 '%2' está sincronizada con la carpeta local '%3'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="162"/>
<source>Sync the folder '%1'</source>
<translation>Sincronizar el directorio '%1'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="152"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="167"/>
<source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
<translation><p><small><strong>Advertencia:</strong> El directorio local no está vacío. ¡Seleccione una resolución!</small></p></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="251"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/>
<source>Local Sync Folder</source>
<translation>Carpeta local de sincronización</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="311"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="317"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
<translation>No se puede eliminar y respaldar la carpeta porque la misma o un fichero en ella está abierto por otro programa. Por favor, cierre la carpeta o el fichero y reintente, o cancele la instalación.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="540"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Carpeta de sincronización local %1 creada con éxito</b></font></translation>
</message>
<message>
<location filename="../src/gui/selectivesyncdialog.cpp" line="71"/>
<source>Deselect remote folders you do not wish to synchronize.</source>
- <translation type="unfinished"/>
+ <translation>Deseleccione las carpetas remotas que no desea sincronizar.</translation>
</message>
<message>
<location filename="../src/gui/selectivesyncdialog.cpp" line="91"/>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="120"/>
<source>Success.</source>
<translation>Completado con éxito.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="127"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSync falló al cargar el archivo de diaro. El darchivo de diario se encuentra corrupto.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="130"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>El %1 complemento para csync no se ha podido cargar.<br/>Por favor, verifique la instalación</p></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync encontró un error mientras procesaba los árboles de datos internos.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<source>CSync failed to reserve memory.</source>
<translation>Hubo un fallo al reservar memoria para Csync</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync fatal parameter error.</source>
<translation>Error fatal de parámetro en CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync processing step update failed.</source>
<translation>El proceso de actualización de CSync ha fallado.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync processing step reconcile failed.</source>
<translation>Falló el proceso de composición de CSync</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync no pudo autenticar el proxy.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync falló al realizar la búsqueda del proxy</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync: Falló la autenticación con el servidor %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync: Falló la conexión con la red.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>A network connection timeout happened.</source>
<translation>Se sobrepasó el tiempo de espera de la conexión de red.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>A HTTP transmission error happened.</source>
<translation>Se ha producido un error de transmisión HTTP.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation>El directorio montado no está disponible temporalmente en el servidor</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>An error occurred while opening a folder</source>
<translation>Se produjo un error al abrir un directorio</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="197"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Error while reading folder.</source>
<translation>Error al leer el directorio.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="477"/>
+ <location filename="../src/libsync/syncengine.cpp" line="476"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>Se ignoran los Archivos/Carpetas ocultos.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="738"/>
+ <location filename="../src/libsync/syncengine.cpp" line="737"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Solo %1 disponible, se necesita por lo menos %2 para comenzar</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1206"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>No permitido porque no tienes permiso para añadir un directorio padre</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1213"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>No permitido porque no tienes permiso para añadir archivos a ese directorio</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: No queda espacio disponible en el servidor %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>Error no especificado de CSync</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Interrumpido por el usuario</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>CSync failed to access</source>
<translation>CSync ha fallado al acceder</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="123"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation>CSync falló al cargar o crear el archivo de diario. Asegúrese de tener permisos de lectura y escritura en el directorio local de sincronización.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation>CSync falló debido a un permiso denegado.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync tried to create a folder that already exists.</source>
<translation>CSync trató de crear un directorio que ya existe.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>The service is temporarily unavailable</source>
<translation>El servicio no está disponible temporalmente </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>Access is forbidden</source>
<translation>Acceso prohibido</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="202"/>
+ <location filename="../src/libsync/syncengine.cpp" line="201"/>
<source>An internal error number %1 occurred.</source>
<translation>Ocurrió un error interno número %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="266"/>
+ <location filename="../src/libsync/syncengine.cpp" line="265"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>El elemento no está sincronizado por errores previos: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="445"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>No se admiten enlaces simbólicos en la sincronización.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="449"/>
+ <location filename="../src/libsync/syncengine.cpp" line="448"/>
<source>File is listed on the ignore list.</source>
<translation>El fichero está en la lista de ignorados</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="453"/>
+ <location filename="../src/libsync/syncengine.cpp" line="452"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation>Los nombres de archivo que terminan con un punto no son compatibles con este sistema de archivos.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="463"/>
+ <location filename="../src/libsync/syncengine.cpp" line="462"/>
<source>File names containing the character '%1' are not supported on this file system.</source>
<translation>Los nombres de archivo que contengan el caracter '%1' no son compatibles con este sistema de archivos.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="466"/>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
<source>The file name is a reserved name on this file system.</source>
<translation>El nombre del archivo es una palabra reservada del sistema de archivos.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="471"/>
+ <location filename="../src/libsync/syncengine.cpp" line="470"/>
<source>Filename contains trailing spaces.</source>
<translation>El nombre del archivo contiene espacios finales.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="474"/>
+ <location filename="../src/libsync/syncengine.cpp" line="473"/>
<source>Filename is too long.</source>
<translation>El nombre del archivo es demasiado largo.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="483"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Stat failed.</source>
<translation>Stat ha fallado.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="510"/>
+ <location filename="../src/libsync/syncengine.cpp" line="509"/>
<source>Filename encoding is not valid</source>
<translation>Los caracteres del nombre de fichero no son válidos</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="678"/>
+ <location filename="../src/libsync/syncengine.cpp" line="677"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Caracteres inválidos, por favor renombre "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="774"/>
+ <location filename="../src/libsync/syncengine.cpp" line="773"/>
<source>Unable to initialize a sync journal.</source>
<translation>No se pudo inicializar un registro (journal) de sincronización.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="793"/>
+ <location filename="../src/libsync/syncengine.cpp" line="792"/>
<source>Unable to read the blacklist from the local database</source>
<translation>No se pudo leer la lista de bloqueo de la base de datos local</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="830"/>
+ <location filename="../src/libsync/syncengine.cpp" line="829"/>
<source>Unable to read from the sync journal.</source>
<translation>No se ha podido leer desde el registro de sincronización</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="875"/>
+ <location filename="../src/libsync/syncengine.cpp" line="874"/>
<source>Cannot open the sync journal</source>
<translation>No es posible abrir el diario de sincronización</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="933"/>
+ <location filename="../src/libsync/syncengine.cpp" line="932"/>
<source>File name contains at least one invalid character</source>
<translation>Nombre de archivo contiene al menos un caracter no válido</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
- <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1172"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorado porque se encuentra en la lista negra de "elija qué va a sincronizar"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1191"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>No permitido porque no tienes permiso para añadir subdirectorios a ese directorio</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1232"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>No está permitido subir este archivo porque es de solo lectura en el servidor, restaurando.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1249"/>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1267"/>
<source>Not allowed to remove, restoring</source>
<translation>No está permitido borrar, restaurando.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1280"/>
<source>Local files and share folder removed.</source>
<translation>Se han eliminado los archivos locales y la carpeta compartida.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1336"/>
<source>Move not allowed, item restored</source>
<translation>No está permitido mover, elemento restaurado.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1347"/>
<source>Move not allowed because %1 is read-only</source>
<translation>No está permitido mover, porque %1 es de sólo lectura.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the destination</source>
<translation>destino</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the source</source>
<translation>origen</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="300"/>
+ <location filename="../src/libsync/theme.cpp" line="309"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>La versión %1. Para obtener más información, visite<a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="304"/>
+ <location filename="../src/libsync/theme.cpp" line="313"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation><p>Copyright ownCloud GmbH</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="305"/>
+ <location filename="../src/libsync/theme.cpp" line="314"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Distribuido por %1 y bajo la licencia GNU General Public License (GPL) versión 2.0.<br/>%2 y el logotipo de %2 son marcas registradas de %1 en los Estados Unidos y otros países, o ambos.</p></translation>
</message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="250"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="352"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="379"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="402"/>
<source>TextLabel</source>
<translation>Etiqueta de texto</translation>
</message>
<translation>Empezar con una sincronización &limpia (¡Elimina la carpeta local!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="295"/>
+ <source>Ask for confirmation before synchroni&zing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="321"/>
+ <source>Ask for confirmation before synchronizing e&xternal storages</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="345"/>
<source>Choose what to sync</source>
<translation>Elija qué sincronizar</translation>
</message>
<translation>&Mantener datos locales</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>S&ync everything from server</source>
<translation>Sincronizar todo desde el servidor</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
<source>Status message</source>
<translation>Mensaje de estado</translation>
</message>
<location filename="../src/gui/owncloudsetuppage.ui" line="129"/>
<location filename="../src/gui/owncloudsetuppage.ui" line="156"/>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="190"/>
<source>TextLabel</source>
<translation>Etiqueta</translation>
</message>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="83"/>
- <source>Server &Address</source>
- <translation>&Dirección del servidor</translation>
+ <source>Ser&ver Address</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="99"/>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="286"/>
+ <location filename="../src/libsync/theme.cpp" line="295"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Revisión Git <a href="%1">%2</a> en %3, %4 compilada usando Qt %5, %6</small></p></translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="238"/>
<location filename="../src/gui/accountsettings.cpp" line="371"/>
- <location filename="../src/gui/accountsettings.cpp" line="728"/>
+ <location filename="../src/gui/accountsettings.cpp" line="733"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<translation>Iniciar sesión</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="678"/>
- <source>There are new folders that were not synchronized because they are too big: </source>
+ <location filename="../src/gui/accountsettings.cpp" line="680"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="720"/>
+ <location filename="../src/gui/accountsettings.cpp" line="681"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="725"/>
<source>Confirm Account Removal</source>
<translation>Confirmar la eliminación de la cuenta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="721"/>
+ <location filename="../src/gui/accountsettings.cpp" line="726"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="727"/>
+ <location filename="../src/gui/accountsettings.cpp" line="732"/>
<source>Remove connection</source>
<translation>Eliminar conexión</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="600"/>
<source>Aborted by the user</source>
<translation>Interrumpido por el usuario</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="139"/>
<source>Local folder %1 does not exist.</source>
<translation>El directorio local %1 no existe.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="142"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 debé ser una carpeta pero no lo es.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="144"/>
+ <location filename="../src/gui/folder.cpp" line="145"/>
<source>%1 is not readable.</source>
<translation>No se puede leer %1.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="367"/>
+ <location filename="../src/gui/folder.cpp" line="368"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido eliminado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="374"/>
+ <location filename="../src/gui/folder.cpp" line="375"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido descargado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="382"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido actualizado</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="388"/>
+ <location filename="../src/gui/folder.cpp" line="389"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="395"/>
+ <location filename="../src/gui/folder.cpp" line="396"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="365"/>
+ <location filename="../src/gui/folder.cpp" line="366"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="372"/>
+ <location filename="../src/gui/folder.cpp" line="373"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="379"/>
+ <location filename="../src/gui/folder.cpp" line="380"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="386"/>
+ <location filename="../src/gui/folder.cpp" line="387"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="393"/>
+ <location filename="../src/gui/folder.cpp" line="394"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="400"/>
+ <location filename="../src/gui/folder.cpp" line="401"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="402"/>
+ <location filename="../src/gui/folder.cpp" line="403"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="407"/>
+ <location filename="../src/gui/folder.cpp" line="408"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="409"/>
+ <location filename="../src/gui/folder.cpp" line="410"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="415"/>
+ <location filename="../src/gui/folder.cpp" line="416"/>
<source>Sync Activity</source>
<translation>Actividad de Sync</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="642"/>
+ <location filename="../src/gui/folder.cpp" line="643"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="850"/>
+ <location filename="../src/gui/folder.cpp" line="854"/>
<source>A new folder larger than %1 MB has been added: %2.
-Please go in the settings to select it if you wish to download it.</source>
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="856"/>
+ <source>A folder from an external storage has been added.
+</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="888"/>
+ <location filename="../src/gui/folder.cpp" line="857"/>
+ <source>Please go in the settings to select it if you wish to download it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="893"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="892"/>
+ <location filename="../src/gui/folder.cpp" line="897"/>
<source>Remove All Files?</source>
<translation>¿Borrar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="894"/>
+ <location filename="../src/gui/folder.cpp" line="899"/>
<source>Remove all files</source>
<translation>Borrar todos los archivos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="895"/>
+ <location filename="../src/gui/folder.cpp" line="900"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="911"/>
+ <location filename="../src/gui/folder.cpp" line="916"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="916"/>
+ <location filename="../src/gui/folder.cpp" line="921"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="918"/>
+ <location filename="../src/gui/folder.cpp" line="923"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="919"/>
+ <location filename="../src/gui/folder.cpp" line="924"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="140"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="148"/>
<source>You need to be connected to add a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="150"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="158"/>
<source>Click this button to add a folder to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
<source>%1 (%2)</source>
<extracomment>Example text: "File.txt (23KB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="180"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="188"/>
<source>Error while loading the list of folders from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="218"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="226"/>
<source>Signed out</source>
<translation>Desautentificado</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="145"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="153"/>
<source>Adding folder is disabled because you are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="183"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="191"/>
<source>Fetching folder list from server...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>Checking for changes in '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="868"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
<source>, '%1'</source>
<extracomment>Build a list of file names</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="871"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="900"/>
<source>'%1'</source>
<extracomment>Argument is a file name</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="896"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="925"/>
<source>Syncing %1</source>
<extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment>
<translation>Sincronizando %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="908"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="927"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="937"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="931"/>
<source>download %1/s</source>
<extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="933"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="911"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>upload %1/s</source>
<extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>Cargado %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="913"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="942"/>
<source>u2191 %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="918"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="922"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="951"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="948"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 de %2, archivo %3 de %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="954"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="983"/>
<source>file %1 of %2</source>
<translation>Archivo %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/>
<source>Waiting...</source>
<translation>Esperando...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="998"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1027"/>
<source>Waiting for %n other folder(s)...</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1033"/>
<source>Preparing to sync...</source>
<translation>Preparando para sincronizar...</translation>
</message>
<translation>Avanzado</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="101"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
+ <source>Ask for confirmation before synchronizing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="105"/>
<source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
<translation type="unfinished"/>
</message>
<message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="59"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit &Ignored Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
- <source>Ask &confirmation before downloading folders larger than</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/generalsettings.ui" line="129"/>
+ <location filename="../src/gui/generalsettings.ui" line="140"/>
<source>S&how crash reporter</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="150"/>
<location filename="../src/gui/generalsettings.ui" line="156"/>
- <location filename="../src/gui/generalsettings.ui" line="162"/>
<source>About</source>
<translation>Acerca de</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="172"/>
+ <location filename="../src/gui/generalsettings.ui" line="166"/>
<source>Updates</source>
<translation>Actualizaciones</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="197"/>
+ <location filename="../src/gui/generalsettings.ui" line="191"/>
<source>&Restart && Update</source>
<translation type="unfinished"/>
</message>
<translation>Conectar...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="144"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="159"/>
<source>%1 folder '%2' is synced to local folder '%3'</source>
<translation>El directorio %1 '%2' está sincronizado con el directorio local '%3'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="162"/>
<source>Sync the folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="152"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="167"/>
<source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="251"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/>
<source>Local Sync Folder</source>
<translation>Directorio local de sincronización</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="311"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="317"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/>
<source>(%1)</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="540"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Directorio local %1 creado</b></font></translation>
</message>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="120"/>
<source>Success.</source>
<translation>Éxito.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="127"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="130"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>No fue posible cargar el plugin de %1 para csync.<br/>Por favor, verificá la instalación</p></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync tuvo un error mientras procesaba los árboles de datos internos.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync falló al reservar memoria.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync fatal parameter error.</source>
<translation>Error fatal de parámetro en CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync processing step update failed.</source>
<translation>Falló el proceso de actualización de CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync processing step reconcile failed.</source>
<translation>Falló el proceso de composición de CSync</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync no pudo autenticar el proxy.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync falló al realizar la busqueda del proxy.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync: fallo al autenticarse en el servidor %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync: fallo al conectarse a la red</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>A network connection timeout happened.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>A HTTP transmission error happened.</source>
<translation>Ha ocurrido un error de transmisión HTTP.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>An error occurred while opening a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="197"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Error while reading folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="477"/>
+ <location filename="../src/libsync/syncengine.cpp" line="476"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="738"/>
+ <location filename="../src/libsync/syncengine.cpp" line="737"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1206"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1213"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: No hay más espacio disponible en el servidor %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>Error no especificado de CSync</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Interrumpido por el usuario</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>CSync failed to access</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="123"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>The service is temporarily unavailable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>Access is forbidden</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="202"/>
+ <location filename="../src/libsync/syncengine.cpp" line="201"/>
<source>An internal error number %1 occurred.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="266"/>
+ <location filename="../src/libsync/syncengine.cpp" line="265"/>
<source>The item is not synced because of previous errors: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="445"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Los vínculos simbólicos no está soportados al sincronizar.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="449"/>
+ <location filename="../src/libsync/syncengine.cpp" line="448"/>
<source>File is listed on the ignore list.</source>
<translation>El archivo está en la lista de ignorados.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="453"/>
+ <location filename="../src/libsync/syncengine.cpp" line="452"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="463"/>
+ <location filename="../src/libsync/syncengine.cpp" line="462"/>
<source>File names containing the character '%1' are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="466"/>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
<source>The file name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="471"/>
+ <location filename="../src/libsync/syncengine.cpp" line="470"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="474"/>
+ <location filename="../src/libsync/syncengine.cpp" line="473"/>
<source>Filename is too long.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="483"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Stat failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="510"/>
+ <location filename="../src/libsync/syncengine.cpp" line="509"/>
<source>Filename encoding is not valid</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="678"/>
+ <location filename="../src/libsync/syncengine.cpp" line="677"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="774"/>
+ <location filename="../src/libsync/syncengine.cpp" line="773"/>
<source>Unable to initialize a sync journal.</source>
<translation>Imposible inicializar un diario de sincronización.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="793"/>
+ <location filename="../src/libsync/syncengine.cpp" line="792"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="830"/>
+ <location filename="../src/libsync/syncengine.cpp" line="829"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="875"/>
+ <location filename="../src/libsync/syncengine.cpp" line="874"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="933"/>
+ <location filename="../src/libsync/syncengine.cpp" line="932"/>
<source>File name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
- <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1172"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1191"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1232"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1249"/>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1267"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1280"/>
<source>Local files and share folder removed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1336"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1347"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the destination</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the source</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="300"/>
+ <location filename="../src/libsync/theme.cpp" line="309"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="304"/>
+ <location filename="../src/libsync/theme.cpp" line="313"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="305"/>
+ <location filename="../src/libsync/theme.cpp" line="314"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="250"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="352"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="379"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="402"/>
<source>TextLabel</source>
<translation>EtiquetaDeTexto</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="295"/>
+ <source>Ask for confirmation before synchroni&zing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="321"/>
+ <source>Ask for confirmation before synchronizing e&xternal storages</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="345"/>
<source>Choose what to sync</source>
<translation type="unfinished"/>
</message>
<translation>&Mantener datos locales</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>S&ync everything from server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
<source>Status message</source>
<translation>Mensaje de estado</translation>
</message>
<location filename="../src/gui/owncloudsetuppage.ui" line="129"/>
<location filename="../src/gui/owncloudsetuppage.ui" line="156"/>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="190"/>
<source>TextLabel</source>
<translation>EtiquetaDeTexto</translation>
</message>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="83"/>
- <source>Server &Address</source>
- <translation>&Dirección del servidor:</translation>
+ <source>Ser&ver Address</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="99"/>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="286"/>
+ <location filename="../src/libsync/theme.cpp" line="295"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="238"/>
<location filename="../src/gui/accountsettings.cpp" line="371"/>
- <location filename="../src/gui/accountsettings.cpp" line="728"/>
+ <location filename="../src/gui/accountsettings.cpp" line="733"/>
<source>Cancel</source>
<translation>Loobu</translation>
</message>
<translation>Logi sisse</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="678"/>
- <source>There are new folders that were not synchronized because they are too big: </source>
+ <location filename="../src/gui/accountsettings.cpp" line="680"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="720"/>
+ <location filename="../src/gui/accountsettings.cpp" line="681"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="725"/>
<source>Confirm Account Removal</source>
<translation>Kinnita konto eemaldamine</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="721"/>
+ <location filename="../src/gui/accountsettings.cpp" line="726"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="727"/>
+ <location filename="../src/gui/accountsettings.cpp" line="732"/>
<source>Remove connection</source>
<translation>Eemalda ühendus</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="600"/>
<source>Aborted by the user</source>
<translation>Kasutaja poolt tühistatud</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="139"/>
<source>Local folder %1 does not exist.</source>
<translation>Kohalikku kausta %1 pole olemas.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="142"/>
<source>%1 should be a folder but is not.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="144"/>
+ <location filename="../src/gui/folder.cpp" line="145"/>
<source>%1 is not readable.</source>
<translation>%1 pole loetav.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="367"/>
+ <location filename="../src/gui/folder.cpp" line="368"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 on eemaldatud.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="374"/>
+ <location filename="../src/gui/folder.cpp" line="375"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 on alla laaditud.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="382"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 on uuendatud.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="388"/>
+ <location filename="../src/gui/folder.cpp" line="389"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 on ümber nimetatud %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="395"/>
+ <location filename="../src/gui/folder.cpp" line="396"/>
<source>%1 has been moved to %2.</source>
<translation>%1 on tõstetud %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="365"/>
+ <location filename="../src/gui/folder.cpp" line="366"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="372"/>
+ <location filename="../src/gui/folder.cpp" line="373"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="379"/>
+ <location filename="../src/gui/folder.cpp" line="380"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="386"/>
+ <location filename="../src/gui/folder.cpp" line="387"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="393"/>
+ <location filename="../src/gui/folder.cpp" line="394"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="400"/>
+ <location filename="../src/gui/folder.cpp" line="401"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="402"/>
+ <location filename="../src/gui/folder.cpp" line="403"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="407"/>
+ <location filename="../src/gui/folder.cpp" line="408"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="409"/>
+ <location filename="../src/gui/folder.cpp" line="410"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 sünkroniseerimine ebaõnnestus tõrke tõttu. Lisainfot vaata logist.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="415"/>
+ <location filename="../src/gui/folder.cpp" line="416"/>
<source>Sync Activity</source>
<translation>Sünkroniseerimise tegevus</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="642"/>
+ <location filename="../src/gui/folder.cpp" line="643"/>
<source>Could not read system exclude file</source>
<translation>Süsteemi väljajätmiste faili lugemine ebaõnnestus</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="850"/>
+ <location filename="../src/gui/folder.cpp" line="854"/>
<source>A new folder larger than %1 MB has been added: %2.
-Please go in the settings to select it if you wish to download it.</source>
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="856"/>
+ <source>A folder from an external storage has been added.
+</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="888"/>
+ <location filename="../src/gui/folder.cpp" line="857"/>
+ <source>Please go in the settings to select it if you wish to download it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="893"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="892"/>
+ <location filename="../src/gui/folder.cpp" line="897"/>
<source>Remove All Files?</source>
<translation>Kustutada kõik failid?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="894"/>
+ <location filename="../src/gui/folder.cpp" line="899"/>
<source>Remove all files</source>
<translation>Kustutada kõik failid</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="895"/>
+ <location filename="../src/gui/folder.cpp" line="900"/>
<source>Keep files</source>
<translation>Säilita failid</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="911"/>
+ <location filename="../src/gui/folder.cpp" line="916"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="916"/>
+ <location filename="../src/gui/folder.cpp" line="921"/>
<source>Backup detected</source>
<translation>Leiti varukoopia</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="918"/>
+ <location filename="../src/gui/folder.cpp" line="923"/>
<source>Normal Synchronisation</source>
<translation>Tavaline sünkroonimine</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="919"/>
+ <location filename="../src/gui/folder.cpp" line="924"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="140"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="148"/>
<source>You need to be connected to add a folder</source>
<translation>Kausta lisamiseks pead sa olema ühendatud</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="150"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="158"/>
<source>Click this button to add a folder to synchronize.</source>
<translation>Sünkroniseeritava kausta lisamiseks kliki sellele nupule.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
<source>%1 (%2)</source>
<extracomment>Example text: "File.txt (23KB)"</extracomment>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="180"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="188"/>
<source>Error while loading the list of folders from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="218"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="226"/>
<source>Signed out</source>
<translation>Välja logitud</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="145"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="153"/>
<source>Adding folder is disabled because you are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="183"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="191"/>
<source>Fetching folder list from server...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>Checking for changes in '%1'</source>
<translation>Kontrollitakse muudatusi kaustas '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="868"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
<source>, '%1'</source>
<extracomment>Build a list of file names</extracomment>
<translation>, '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="871"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="900"/>
<source>'%1'</source>
<extracomment>Argument is a file name</extracomment>
<translation>'%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="896"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="925"/>
<source>Syncing %1</source>
<extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment>
<translation>Sünkroniseerimine %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="908"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="927"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="937"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="931"/>
<source>download %1/s</source>
<extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>allalaadimine %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="933"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="911"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>upload %1/s</source>
<extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>üleslaadimine %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="913"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="942"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="918"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 / %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="922"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="951"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="948"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 / %2, fail %3 / %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="954"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="983"/>
<source>file %1 of %2</source>
<translation>fail %1 / %2-st</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/>
<source>Waiting...</source>
<translation>Ootamine...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="998"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1027"/>
<source>Waiting for %n other folder(s)...</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1033"/>
<source>Preparing to sync...</source>
<translation>Sünkroniseerimiseks valmistumine...</translation>
</message>
<translation>Täpsem</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="101"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
+ <source>Ask for confirmation before synchronizing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="105"/>
<source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/generalsettings.ui" line="26"/>
<source>&Launch on System Startup</source>
<translation>Kasuta ühevärvilisi ikoone</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="59"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit &Ignored Files</source>
<translation>Muuda &ignoreeritud faile</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
- <source>Ask &confirmation before downloading folders larger than</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/generalsettings.ui" line="129"/>
+ <location filename="../src/gui/generalsettings.ui" line="140"/>
<source>S&how crash reporter</source>
<translation>&Näita kokkujooksmise teavitajat</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="150"/>
<location filename="../src/gui/generalsettings.ui" line="156"/>
- <location filename="../src/gui/generalsettings.ui" line="162"/>
<source>About</source>
<translation>Info</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="172"/>
+ <location filename="../src/gui/generalsettings.ui" line="166"/>
<source>Updates</source>
<translation>Uuendused</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="197"/>
+ <location filename="../src/gui/generalsettings.ui" line="191"/>
<source>&Restart && Update</source>
<translation>&Taaskäivita && Uuenda</translation>
</message>
<translation>Ühenda...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="144"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="159"/>
<source>%1 folder '%2' is synced to local folder '%3'</source>
<translation>%1 kataloog '%2' on sünkroniseeritud kohalikku kataloogi '%3'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="162"/>
<source>Sync the folder '%1'</source>
<translation>Sünkrooni kaust '%1'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="152"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="167"/>
<source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="251"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/>
<source>Local Sync Folder</source>
<translation>Kohalik Sync Kataloog</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="311"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="317"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
<translation>Ei suuda eemaldada ning varundada kataloogi kuna kataloog või selles asuv fail on avatud mõne teise programmi poolt. Palun sulge kataloog või fail ning proovi uuesti või katkesta paigaldus.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="540"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Kohalik kataloog %1 edukalt loodud!</b></font></translation>
</message>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="120"/>
<source>Success.</source>
<translation>Korras.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="127"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="130"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>Ei suuda laadida csync lisa %1.<br/>Palun kontrolli paigaldust!</p></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync sai vea sisemiste andmestruktuuride töötlemisel.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync ei suutnud mälu reserveerida.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync fatal parameter error.</source>
<translation>CSync parameetri saatuslik viga.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync processing step update failed.</source>
<translation>CSync uuendusprotsess ebaõnnestus.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync tasakaalustuse protsess ebaõnnestus.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync ei suutnud puhverserveris autoriseerida.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>Csync ei suuda leida puhverserverit.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync autoriseering serveris %1 ebaõnnestus.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync võrguga ühendumine ebaõnnestus.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>A network connection timeout happened.</source>
<translation>Toimus võrgukatkestus.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>A HTTP transmission error happened.</source>
<translation>HTTP ülekande viga.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>An error occurred while opening a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="197"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Error while reading folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="477"/>
+ <location filename="../src/libsync/syncengine.cpp" line="476"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="738"/>
+ <location filename="../src/libsync/syncengine.cpp" line="737"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1206"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1213"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: Serveris %1 on ruum otsas.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>CSync tuvastamatu viga.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Kasutaja poolt tühistatud</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>CSync failed to access</source>
<translation>CSyncile ligipääs ebaõnnestus</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="123"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>The service is temporarily unavailable</source>
<translation>Teenus pole ajutiselt saadaval</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>Access is forbidden</source>
<translation>Ligipääs on keelatud</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="202"/>
+ <location filename="../src/libsync/syncengine.cpp" line="201"/>
<source>An internal error number %1 occurred.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="266"/>
+ <location filename="../src/libsync/syncengine.cpp" line="265"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Üksust ei sünkroniseeritud eelnenud vigade tõttu: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="445"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Sümboolsed lingid ei ole sünkroniseerimisel toetatud.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="449"/>
+ <location filename="../src/libsync/syncengine.cpp" line="448"/>
<source>File is listed on the ignore list.</source>
<translation>Fail on märgitud ignoreeritavate nimistus.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="453"/>
+ <location filename="../src/libsync/syncengine.cpp" line="452"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="463"/>
+ <location filename="../src/libsync/syncengine.cpp" line="462"/>
<source>File names containing the character '%1' are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="466"/>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
<source>The file name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="471"/>
+ <location filename="../src/libsync/syncengine.cpp" line="470"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="474"/>
+ <location filename="../src/libsync/syncengine.cpp" line="473"/>
<source>Filename is too long.</source>
<translation>Faili nimi on liiga pikk.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="483"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Stat failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="510"/>
+ <location filename="../src/libsync/syncengine.cpp" line="509"/>
<source>Filename encoding is not valid</source>
<translation>Failinime kodeering pole kehtiv</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="678"/>
+ <location filename="../src/libsync/syncengine.cpp" line="677"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="774"/>
+ <location filename="../src/libsync/syncengine.cpp" line="773"/>
<source>Unable to initialize a sync journal.</source>
<translation>Ei suuda lähtestada sünkroniseeringu zurnaali.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="793"/>
+ <location filename="../src/libsync/syncengine.cpp" line="792"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="830"/>
+ <location filename="../src/libsync/syncengine.cpp" line="829"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="875"/>
+ <location filename="../src/libsync/syncengine.cpp" line="874"/>
<source>Cannot open the sync journal</source>
<translation>Ei suuda avada sünkroniseeringu zurnaali</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="933"/>
+ <location filename="../src/libsync/syncengine.cpp" line="932"/>
<source>File name contains at least one invalid character</source>
<translation>Faili nimesonvähemalt üks keelatud märk</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
- <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1172"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>"Vali, mida sünkroniseerida" musta nimekirja tõttu vahele jäetud</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1191"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1232"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Pole lubatud üles laadida, kuna tegemist on ainult-loetava serveriga, taastan</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1249"/>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1267"/>
<source>Not allowed to remove, restoring</source>
<translation>Eemaldamine pole lubatud, taastan</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1280"/>
<source>Local files and share folder removed.</source>
<translation>Kohalikud failid ja jagatud kaustad eemaldatud.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1336"/>
<source>Move not allowed, item restored</source>
<translation>Liigutamine pole lubatud, üksus taastatud</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1347"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Liigutamien pole võimalik kuna %1 on ainult lugemiseks</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the destination</source>
<translation>sihtkoht</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the source</source>
<translation>allikas</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="300"/>
+ <location filename="../src/libsync/theme.cpp" line="309"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="304"/>
+ <location filename="../src/libsync/theme.cpp" line="313"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="305"/>
+ <location filename="../src/libsync/theme.cpp" line="314"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="250"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="352"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="379"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="402"/>
<source>TextLabel</source>
<translation>Tekstisilt</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="295"/>
+ <source>Ask for confirmation before synchroni&zing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="321"/>
+ <source>Ask for confirmation before synchronizing e&xternal storages</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="345"/>
<source>Choose what to sync</source>
<translation>Vali, mida sünkroniseerida</translation>
</message>
<translation>&Säilita kohalikud andmed</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>S&ync everything from server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
<source>Status message</source>
<translation>Staatuse teade</translation>
</message>
<location filename="../src/gui/owncloudsetuppage.ui" line="129"/>
<location filename="../src/gui/owncloudsetuppage.ui" line="156"/>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="190"/>
<source>TextLabel</source>
<translation>Tekstisilt</translation>
</message>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="83"/>
- <source>Server &Address</source>
- <translation>Serveri &Aadress</translation>
+ <source>Ser&ver Address</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="99"/>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="286"/>
+ <location filename="../src/libsync/theme.cpp" line="295"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="238"/>
<location filename="../src/gui/accountsettings.cpp" line="371"/>
- <location filename="../src/gui/accountsettings.cpp" line="728"/>
+ <location filename="../src/gui/accountsettings.cpp" line="733"/>
<source>Cancel</source>
<translation>Ezeztatu</translation>
</message>
<translation>Hasi saioa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="678"/>
- <source>There are new folders that were not synchronized because they are too big: </source>
- <translation>Sinkronizatuko ez diren oso handiak diren karpeta berriak daude:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="680"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="681"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="720"/>
+ <location filename="../src/gui/accountsettings.cpp" line="725"/>
<source>Confirm Account Removal</source>
<translation>Baieztatu Kontuaren Ezabatzea</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="721"/>
+ <location filename="../src/gui/accountsettings.cpp" line="726"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="727"/>
+ <location filename="../src/gui/accountsettings.cpp" line="732"/>
<source>Remove connection</source>
<translation>Ezabatu konexioa</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="600"/>
<source>Aborted by the user</source>
<translation>Erabiltzaileak bertan behera utzita</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="139"/>
<source>Local folder %1 does not exist.</source>
<translation>Bertako %1 karpeta ez da existitzen.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="142"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 karpeta bat izan behar zen baina ez da.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="144"/>
+ <location filename="../src/gui/folder.cpp" line="145"/>
<source>%1 is not readable.</source>
<translation>%1 ezin da irakurri.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="367"/>
+ <location filename="../src/gui/folder.cpp" line="368"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ezabatua izan da.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="374"/>
+ <location filename="../src/gui/folder.cpp" line="375"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 deskargatu da.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="382"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 kargatu da.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="388"/>
+ <location filename="../src/gui/folder.cpp" line="389"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 %2-(e)ra berrizendatu da.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="395"/>
+ <location filename="../src/gui/folder.cpp" line="396"/>
<source>%1 has been moved to %2.</source>
<translation>%1 %2-(e)ra mugitu da.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="365"/>
+ <location filename="../src/gui/folder.cpp" line="366"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="372"/>
+ <location filename="../src/gui/folder.cpp" line="373"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="379"/>
+ <location filename="../src/gui/folder.cpp" line="380"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="386"/>
+ <location filename="../src/gui/folder.cpp" line="387"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="393"/>
+ <location filename="../src/gui/folder.cpp" line="394"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="400"/>
+ <location filename="../src/gui/folder.cpp" line="401"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="402"/>
+ <location filename="../src/gui/folder.cpp" line="403"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="407"/>
+ <location filename="../src/gui/folder.cpp" line="408"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="409"/>
+ <location filename="../src/gui/folder.cpp" line="410"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 ezin izan da sinkronizatu akats bat dela eta. Ikusi egunerkoa zehaztapen gehiago izateko.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="415"/>
+ <location filename="../src/gui/folder.cpp" line="416"/>
<source>Sync Activity</source>
<translation>Sinkronizazio Jarduerak</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="642"/>
+ <location filename="../src/gui/folder.cpp" line="643"/>
<source>Could not read system exclude file</source>
<translation>Ezin izan da sistemako baztertutakoen fitxategia irakurri</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="850"/>
+ <location filename="../src/gui/folder.cpp" line="854"/>
<source>A new folder larger than %1 MB has been added: %2.
-Please go in the settings to select it if you wish to download it.</source>
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="856"/>
+ <source>A folder from an external storage has been added.
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="857"/>
+ <source>Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="888"/>
+ <location filename="../src/gui/folder.cpp" line="893"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="892"/>
+ <location filename="../src/gui/folder.cpp" line="897"/>
<source>Remove All Files?</source>
<translation>Ezabatu Fitxategi Guztiak?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="894"/>
+ <location filename="../src/gui/folder.cpp" line="899"/>
<source>Remove all files</source>
<translation>Ezabatu fitxategi guztiak</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="895"/>
+ <location filename="../src/gui/folder.cpp" line="900"/>
<source>Keep files</source>
<translation>Mantendu fitxategiak</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="911"/>
+ <location filename="../src/gui/folder.cpp" line="916"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="916"/>
+ <location filename="../src/gui/folder.cpp" line="921"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="918"/>
+ <location filename="../src/gui/folder.cpp" line="923"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="919"/>
+ <location filename="../src/gui/folder.cpp" line="924"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="140"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="148"/>
<source>You need to be connected to add a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="150"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="158"/>
<source>Click this button to add a folder to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
<source>%1 (%2)</source>
<extracomment>Example text: "File.txt (23KB)"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="180"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="188"/>
<source>Error while loading the list of folders from the server.</source>
<translation>Errorea zerbitzaritik karpeten zerrenda eskuratzean.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="218"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="226"/>
<source>Signed out</source>
<translation>Saioa bukatuta</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="145"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="153"/>
<source>Adding folder is disabled because you are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="183"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="191"/>
<source>Fetching folder list from server...</source>
<translation>Zerbitzaritik karpeta zerrenda eskuratzen...</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>Checking for changes in '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="868"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
<source>, '%1'</source>
<extracomment>Build a list of file names</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="871"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="900"/>
<source>'%1'</source>
<extracomment>Argument is a file name</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="896"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="925"/>
<source>Syncing %1</source>
<extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment>
<translation>%1 Sinkronizatzen</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="908"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="927"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="937"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="931"/>
<source>download %1/s</source>
<extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>Deskargatu %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="933"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="911"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>upload %1/s</source>
<extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>igo %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="913"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="942"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="918"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment>
<translation>%1 %2 (%4 - %3tik)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="922"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="951"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="948"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="954"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="983"/>
<source>file %1 of %2</source>
<translation>%1. fitxategia %2tik</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/>
<source>Waiting...</source>
<translation>Itxoiten...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="998"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1027"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>Itxoiten beste karpeta %n...</numerusform><numerusform>Itxoiten beste %n karpeta...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1033"/>
<source>Preparing to sync...</source>
<translation>Sinkronizatzeko prestatzen...</translation>
</message>
<translation>Aurreratua</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="101"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
+ <source>Ask for confirmation before synchronizing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="105"/>
<source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/generalsettings.ui" line="26"/>
<source>&Launch on System Startup</source>
<translation>Erabili &Kolore Bakarreko Ikonoak</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="59"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit &Ignored Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
- <source>Ask &confirmation before downloading folders larger than</source>
- <translation>Eskatu &baieztapena hau baiono karpeta handiagoak deskargatzeko</translation>
- </message>
- <message>
- <location filename="../src/gui/generalsettings.ui" line="129"/>
+ <location filename="../src/gui/generalsettings.ui" line="140"/>
<source>S&how crash reporter</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="150"/>
<location filename="../src/gui/generalsettings.ui" line="156"/>
- <location filename="../src/gui/generalsettings.ui" line="162"/>
<source>About</source>
<translation>Honi buruz</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="172"/>
+ <location filename="../src/gui/generalsettings.ui" line="166"/>
<source>Updates</source>
<translation>Eguneraketak</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="197"/>
+ <location filename="../src/gui/generalsettings.ui" line="191"/>
<source>&Restart && Update</source>
<translation>Be&rrabiarazi eta Eguneratu</translation>
</message>
<translation>Konektatu...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="144"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="159"/>
<source>%1 folder '%2' is synced to local folder '%3'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="162"/>
<source>Sync the folder '%1'</source>
<translation>'%1' karpeta sinkronizatu</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="152"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="167"/>
<source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="251"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/>
<source>Local Sync Folder</source>
<translation>Sinkronizazio karpeta lokala</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="311"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="317"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
<translation>Ezin da karpeta ezabatu eta kopia egin, karpeta edo barruko fitxategiren bat beste programa batean irekita dagoelako. Mesedez itxi karpeta edo fitxategia eta sakatu berrekin edo ezeztatu konfigurazioa.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="540"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Bertako sinkronizazio %1 karpeta ongi sortu da!</b></font></translation>
</message>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="120"/>
<source>Success.</source>
<translation>Arrakasta.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="127"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="130"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>csyncen %1 plugina ezin da kargatu.<br/>Mesedez egiaztatu instalazioa!</p></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSyncek errorea izan du barne zuhaitzak prozesatzerakoan.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<source>CSync failed to reserve memory.</source>
<translation>CSyncek huts egin du memoria alokatzean.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync fatal parameter error.</source>
<translation>CSync parametro larri errorea.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync processing step update failed.</source>
<translation>CSync prozesatzearen eguneratu urratsak huts egin du.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync prozesatzearen berdinkatze urratsak huts egin du.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSyncek ezin izan du proxya autentikatu.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSyncek huts egin du zerbitzaria edo proxia bilatzean.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSyncek huts egin du %1 zerbitzarian autentikatzean.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to connect to the network.</source>
<translation>CSyncek sarera konektatzean huts egin du.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>A network connection timeout happened.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>A HTTP transmission error happened.</source>
<translation>HTTP transmisio errore bat gertatu da.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>An error occurred while opening a folder</source>
<translation>Errore bat egon da karpeta bat irekitzearkoan</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="197"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Error while reading folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="477"/>
+ <location filename="../src/libsync/syncengine.cpp" line="476"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="738"/>
+ <location filename="../src/libsync/syncengine.cpp" line="737"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1206"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1213"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: Ez dago lekurik %1 zerbitzarian.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>CSyncen zehaztugabeko errorea.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Erabiltzaileak bertan behera utzita</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>CSync failed to access</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="123"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>The service is temporarily unavailable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>Access is forbidden</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="202"/>
+ <location filename="../src/libsync/syncengine.cpp" line="201"/>
<source>An internal error number %1 occurred.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="266"/>
+ <location filename="../src/libsync/syncengine.cpp" line="265"/>
<source>The item is not synced because of previous errors: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="445"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Esteka sinbolikoak ezin dira sinkronizatu.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="449"/>
+ <location filename="../src/libsync/syncengine.cpp" line="448"/>
<source>File is listed on the ignore list.</source>
<translation>Fitxategia baztertutakoen zerrendan dago.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="453"/>
+ <location filename="../src/libsync/syncengine.cpp" line="452"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="463"/>
+ <location filename="../src/libsync/syncengine.cpp" line="462"/>
<source>File names containing the character '%1' are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="466"/>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
<source>The file name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="471"/>
+ <location filename="../src/libsync/syncengine.cpp" line="470"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="474"/>
+ <location filename="../src/libsync/syncengine.cpp" line="473"/>
<source>Filename is too long.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="483"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Stat failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="510"/>
+ <location filename="../src/libsync/syncengine.cpp" line="509"/>
<source>Filename encoding is not valid</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="678"/>
+ <location filename="../src/libsync/syncengine.cpp" line="677"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="774"/>
+ <location filename="../src/libsync/syncengine.cpp" line="773"/>
<source>Unable to initialize a sync journal.</source>
<translation>Ezin izan da sinkronizazio egunerokoa hasieratu.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="793"/>
+ <location filename="../src/libsync/syncengine.cpp" line="792"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="830"/>
+ <location filename="../src/libsync/syncengine.cpp" line="829"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="875"/>
+ <location filename="../src/libsync/syncengine.cpp" line="874"/>
<source>Cannot open the sync journal</source>
<translation>Ezin da sinkronizazio egunerokoa ireki</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="933"/>
+ <location filename="../src/libsync/syncengine.cpp" line="932"/>
<source>File name contains at least one invalid character</source>
<translation>Fitxategi izenak behintzat baliogabeko karaktere bat du</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
- <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1172"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1191"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1232"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1249"/>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1267"/>
<source>Not allowed to remove, restoring</source>
<translation>Ezabatzeko baimenik gabe, berrezartzen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1280"/>
<source>Local files and share folder removed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1336"/>
<source>Move not allowed, item restored</source>
<translation>Mugitzea ez dago baimenduta, elementua berrezarri da</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1347"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Mugitzea ez dago baimenduta %1 irakurtzeko bakarrik delako</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the destination</source>
<translation>helburua</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the source</source>
<translation>jatorria</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="300"/>
+ <location filename="../src/libsync/theme.cpp" line="309"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>%1 Bertsioa. Informazio gehiago eskuratzeko ikusi <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="304"/>
+ <location filename="../src/libsync/theme.cpp" line="313"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="305"/>
+ <location filename="../src/libsync/theme.cpp" line="314"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="250"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="352"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="379"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="402"/>
<source>TextLabel</source>
<translation>TestuEtiketa</translation>
</message>
<translation>Hasi sinkronizazio &garbia (Bertako karpeta ezabatzen du!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="295"/>
+ <source>Ask for confirmation before synchroni&zing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="321"/>
+ <source>Ask for confirmation before synchronizing e&xternal storages</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="345"/>
<source>Choose what to sync</source>
<translation>Hautatu zer sinkronizatu</translation>
</message>
<translation>Mantendu datu lo&kalak</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>S&ync everything from server</source>
<translation>&Sinkronizatu zerbitzarian dagoen guztia</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
<source>Status message</source>
<translation>Egoera mezua</translation>
</message>
<location filename="../src/gui/owncloudsetuppage.ui" line="129"/>
<location filename="../src/gui/owncloudsetuppage.ui" line="156"/>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="190"/>
<source>TextLabel</source>
<translation>TestuEtiketa</translation>
</message>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="83"/>
- <source>Server &Address</source>
- <translation>Zerbitzari &Helbidea</translation>
+ <source>Ser&ver Address</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="99"/>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="286"/>
+ <location filename="../src/libsync/theme.cpp" line="295"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Giteko <a href="%1">%2</a>. errebisiotik konpilatuta %3-an, %4etan Qt %5, %6 erabiliz</small></p></translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="238"/>
<location filename="../src/gui/accountsettings.cpp" line="371"/>
- <location filename="../src/gui/accountsettings.cpp" line="728"/>
+ <location filename="../src/gui/accountsettings.cpp" line="733"/>
<source>Cancel</source>
<translation>منصرف شدن</translation>
</message>
<translation>ورود</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="678"/>
- <source>There are new folders that were not synchronized because they are too big: </source>
+ <location filename="../src/gui/accountsettings.cpp" line="680"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="720"/>
+ <location filename="../src/gui/accountsettings.cpp" line="681"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="725"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="721"/>
+ <location filename="../src/gui/accountsettings.cpp" line="726"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="727"/>
+ <location filename="../src/gui/accountsettings.cpp" line="732"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="600"/>
<source>Aborted by the user</source>
<translation>متوقف شده توسط کاربر</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="139"/>
<source>Local folder %1 does not exist.</source>
<translation>پوشه محلی %1 موجود نیست.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="142"/>
<source>%1 should be a folder but is not.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="144"/>
+ <location filename="../src/gui/folder.cpp" line="145"/>
<source>%1 is not readable.</source>
<translation>%1 قابل خواندن نیست.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="367"/>
+ <location filename="../src/gui/folder.cpp" line="368"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 حذف شده است.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="374"/>
+ <location filename="../src/gui/folder.cpp" line="375"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 بارگزاری شد.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="382"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 بروز رسانی شده است.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="388"/>
+ <location filename="../src/gui/folder.cpp" line="389"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 به %2 تغییر نام داده شده است.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="395"/>
+ <location filename="../src/gui/folder.cpp" line="396"/>
<source>%1 has been moved to %2.</source>
<translation>%1 به %2 انتقال داده شده است.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="365"/>
+ <location filename="../src/gui/folder.cpp" line="366"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="372"/>
+ <location filename="../src/gui/folder.cpp" line="373"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="379"/>
+ <location filename="../src/gui/folder.cpp" line="380"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="386"/>
+ <location filename="../src/gui/folder.cpp" line="387"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="393"/>
+ <location filename="../src/gui/folder.cpp" line="394"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="400"/>
+ <location filename="../src/gui/folder.cpp" line="401"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="402"/>
+ <location filename="../src/gui/folder.cpp" line="403"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="407"/>
+ <location filename="../src/gui/folder.cpp" line="408"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="409"/>
+ <location filename="../src/gui/folder.cpp" line="410"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="415"/>
+ <location filename="../src/gui/folder.cpp" line="416"/>
<source>Sync Activity</source>
<translation>فعالیت همگام سازی</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="642"/>
+ <location filename="../src/gui/folder.cpp" line="643"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="850"/>
+ <location filename="../src/gui/folder.cpp" line="854"/>
<source>A new folder larger than %1 MB has been added: %2.
-Please go in the settings to select it if you wish to download it.</source>
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="856"/>
+ <source>A folder from an external storage has been added.
+</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="888"/>
+ <location filename="../src/gui/folder.cpp" line="857"/>
+ <source>Please go in the settings to select it if you wish to download it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="893"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="892"/>
+ <location filename="../src/gui/folder.cpp" line="897"/>
<source>Remove All Files?</source>
<translation>حذف تمام فایل ها؟</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="894"/>
+ <location filename="../src/gui/folder.cpp" line="899"/>
<source>Remove all files</source>
<translation>حذف تمام فایل ها</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="895"/>
+ <location filename="../src/gui/folder.cpp" line="900"/>
<source>Keep files</source>
<translation>نگه داشتن فایل ها</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="911"/>
+ <location filename="../src/gui/folder.cpp" line="916"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="916"/>
+ <location filename="../src/gui/folder.cpp" line="921"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="918"/>
+ <location filename="../src/gui/folder.cpp" line="923"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="919"/>
+ <location filename="../src/gui/folder.cpp" line="924"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="140"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="148"/>
<source>You need to be connected to add a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="150"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="158"/>
<source>Click this button to add a folder to synchronize.</source>
<translation>برای افزودن پوشه به همگامسازی روی این دکمه کلیک کنید.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
<source>%1 (%2)</source>
<extracomment>Example text: "File.txt (23KB)"</extracomment>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="180"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="188"/>
<source>Error while loading the list of folders from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="218"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="226"/>
<source>Signed out</source>
<translation>خارج شد</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="145"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="153"/>
<source>Adding folder is disabled because you are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="183"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="191"/>
<source>Fetching folder list from server...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>Checking for changes in '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="868"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
<source>, '%1'</source>
<extracomment>Build a list of file names</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="871"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="900"/>
<source>'%1'</source>
<extracomment>Argument is a file name</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="896"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="925"/>
<source>Syncing %1</source>
<extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment>
<translation>همگامسازی %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="908"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="927"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="937"/>
<source>, </source>
<translation>رشته های ترجمه نشده</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="931"/>
<source>download %1/s</source>
<extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>دانلود %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="933"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="911"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>upload %1/s</source>
<extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>آپلود %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="913"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="942"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="918"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 از %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="922"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="951"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="948"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="954"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="983"/>
<source>file %1 of %2</source>
<translation>فایل %1 از %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/>
<source>Waiting...</source>
<translation>درحال انتظار...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="998"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1027"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>در انتظار برای %n پوشهی دیگر ...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1033"/>
<source>Preparing to sync...</source>
<translation>آمادهسازی همگامسازی ...</translation>
</message>
<translation>پیشرفته</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="101"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
+ <source>Ask for confirmation before synchronizing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="105"/>
<source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/generalsettings.ui" line="26"/>
<source>&Launch on System Startup</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="59"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit &Ignored Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
- <source>Ask &confirmation before downloading folders larger than</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/generalsettings.ui" line="129"/>
+ <location filename="../src/gui/generalsettings.ui" line="140"/>
<source>S&how crash reporter</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="150"/>
<location filename="../src/gui/generalsettings.ui" line="156"/>
- <location filename="../src/gui/generalsettings.ui" line="162"/>
<source>About</source>
<translation>درباره</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="172"/>
+ <location filename="../src/gui/generalsettings.ui" line="166"/>
<source>Updates</source>
<translation>به روز رسانی ها</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="197"/>
+ <location filename="../src/gui/generalsettings.ui" line="191"/>
<source>&Restart && Update</source>
<translation type="unfinished"/>
</message>
<translation>اتصال...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="144"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="159"/>
<source>%1 folder '%2' is synced to local folder '%3'</source>
<translation>%1 پوشه '%2' با پوشه محلی همگام شده است '%3'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="162"/>
<source>Sync the folder '%1'</source>
<translation>همگامسازی پوشهی '%1'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="152"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="167"/>
<source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="251"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/>
<source>Local Sync Folder</source>
<translation>پوشه همگام سازی محلی</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="311"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="317"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="540"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b> پوشه همگام سازی محلی %1 با موفقیت ساخته شده است!</b></font></translation>
</message>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="120"/>
<source>Success.</source>
<translation>موفقیت</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="127"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="130"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>ماژول %1 برای csync نمی تواند بارگذاری شود.<br/>لطفا نصب را بررسی کنید!</p></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync هنگام پردازش درختان داخلی یک خطا دریافت نمود.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync موفق به رزرو حافظه نشد است.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync fatal parameter error.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync processing step update failed.</source>
<translation>مرحله به روز روسانی پردازش CSync ناموفق بود.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync processing step reconcile failed.</source>
<translation>مرحله تطبیق پردازش CSync ناموفق بود.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync could not authenticate at the proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>عدم موفقیت CSync برای مراجعه به پروکسی یا سرور.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>عدم موفقیت CSync برای اعتبار دادن در %1 سرور.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to connect to the network.</source>
<translation>عدم موفقیت CSync برای اتصال به شبکه.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>A network connection timeout happened.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>A HTTP transmission error happened.</source>
<translation>خطا در انتقال HTTP اتفاق افتاده است.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>An error occurred while opening a folder</source>
<translation>یک خطا در هنگام باز کردن یک پوشه رخ داده است</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="197"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Error while reading folder.</source>
<translation>خطا در هنگام خواندن پوشه</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="477"/>
+ <location filename="../src/libsync/syncengine.cpp" line="476"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="738"/>
+ <location filename="../src/libsync/syncengine.cpp" line="737"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1206"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1213"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: فضا در %1 سرور در دسترس نیست.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>خطای نامشخص CSync </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>متوقف شده توسط کاربر</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>CSync failed to access</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="123"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>The service is temporarily unavailable</source>
<translation>سرویس بصورت موقت خارج از دسترس است</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>Access is forbidden</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="202"/>
+ <location filename="../src/libsync/syncengine.cpp" line="201"/>
<source>An internal error number %1 occurred.</source>
<translation>یک خطای داخلی با شماره خطای %1 رخ داده است.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="266"/>
+ <location filename="../src/libsync/syncengine.cpp" line="265"/>
<source>The item is not synced because of previous errors: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="445"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="449"/>
+ <location filename="../src/libsync/syncengine.cpp" line="448"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="453"/>
+ <location filename="../src/libsync/syncengine.cpp" line="452"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="463"/>
+ <location filename="../src/libsync/syncengine.cpp" line="462"/>
<source>File names containing the character '%1' are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="466"/>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
<source>The file name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="471"/>
+ <location filename="../src/libsync/syncengine.cpp" line="470"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="474"/>
+ <location filename="../src/libsync/syncengine.cpp" line="473"/>
<source>Filename is too long.</source>
<translation>نام فایل خیلی طولانی است.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="483"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Stat failed.</source>
<translation>وضعیت ناموفق</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="510"/>
+ <location filename="../src/libsync/syncengine.cpp" line="509"/>
<source>Filename encoding is not valid</source>
<translation>رمزگذاری نام فایل معتبر نیست</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="678"/>
+ <location filename="../src/libsync/syncengine.cpp" line="677"/>
<source>Invalid characters, please rename "%1"</source>
<translation>کاراکتر نامعتبر، لطفا "%1" را تغییر نام دهید</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="774"/>
+ <location filename="../src/libsync/syncengine.cpp" line="773"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="793"/>
+ <location filename="../src/libsync/syncengine.cpp" line="792"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="830"/>
+ <location filename="../src/libsync/syncengine.cpp" line="829"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="875"/>
+ <location filename="../src/libsync/syncengine.cpp" line="874"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="933"/>
+ <location filename="../src/libsync/syncengine.cpp" line="932"/>
<source>File name contains at least one invalid character</source>
<translation>نام فایل دارای حداقل یک کاراکتر نامعتبر است</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
- <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1172"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1191"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>با توجه به عدم اجازهی شما به ایجاد زیرپوشه به پوشه مجاز نیست</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1232"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>آپلود این فایل با توجه به فقط-خواندنی بودن آن در سرور مجاز نیست، در حال بازگرداندن</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1249"/>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1267"/>
<source>Not allowed to remove, restoring</source>
<translation>حذف مجاز نیست، در حال بازگردادن</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1280"/>
<source>Local files and share folder removed.</source>
<translation>فایلهای محلی و پوشهی اشتراک حذف شد.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1336"/>
<source>Move not allowed, item restored</source>
<translation>انتقال مجاز نیست، مورد بازگردانده شد</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1347"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the destination</source>
<translation>مقصد</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the source</source>
<translation>مبدا</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="300"/>
+ <location filename="../src/libsync/theme.cpp" line="309"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>نسخه %1. برای اطلاعات بیشتر لطفا اینجا را مشاهده کنید t <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="304"/>
+ <location filename="../src/libsync/theme.cpp" line="313"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="305"/>
+ <location filename="../src/libsync/theme.cpp" line="314"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="250"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="352"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="379"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="402"/>
<source>TextLabel</source>
<translation>برچسب متنی</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="295"/>
+ <source>Ask for confirmation before synchroni&zing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="321"/>
+ <source>Ask for confirmation before synchronizing e&xternal storages</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="345"/>
<source>Choose what to sync</source>
<translation>انتخاب موارد همگامسازی</translation>
</message>
<translation>& نگهداری داده محلی</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>S&ync everything from server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
<source>Status message</source>
<translation>پیغام وضعیت</translation>
</message>
<location filename="../src/gui/owncloudsetuppage.ui" line="129"/>
<location filename="../src/gui/owncloudsetuppage.ui" line="156"/>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="190"/>
<source>TextLabel</source>
<translation>برچسب متنی</translation>
</message>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="83"/>
- <source>Server &Address</source>
- <translation>سرور& آدرس</translation>
+ <source>Ser&ver Address</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="99"/>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="286"/>
+ <location filename="../src/libsync/theme.cpp" line="295"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="238"/>
<location filename="../src/gui/accountsettings.cpp" line="371"/>
- <location filename="../src/gui/accountsettings.cpp" line="728"/>
+ <location filename="../src/gui/accountsettings.cpp" line="733"/>
<source>Cancel</source>
<translation>Peruuta</translation>
</message>
<translation>Kirjaudu sisään</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="678"/>
- <source>There are new folders that were not synchronized because they are too big: </source>
- <translation>Havaittiin uusia kansioita, joita ei synkronoitu niiden suuren koon vuoksi:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="680"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="681"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="720"/>
+ <location filename="../src/gui/accountsettings.cpp" line="725"/>
<source>Confirm Account Removal</source>
<translation>Vahvista tilin poistaminen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="721"/>
+ <location filename="../src/gui/accountsettings.cpp" line="726"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>Haluatko varmasti poistaa tilin <i>%1</i>?</p><p><b>Huomio:</b> Tämä toimenpide <b>ei</b> poista mitään tiedostoja.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="727"/>
+ <location filename="../src/gui/accountsettings.cpp" line="732"/>
<source>Remove connection</source>
<translation>Poista yhteys</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="600"/>
<source>Aborted by the user</source>
<translation>Keskeytetty käyttäjän toimesta</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="139"/>
<source>Local folder %1 does not exist.</source>
<translation>Paikallista kansiota %1 ei ole olemassa.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="142"/>
<source>%1 should be a folder but is not.</source>
<translation>Kohteen %1 pitäisi olla kansio, mutta se ei kuitenkaan ole kansio.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="144"/>
+ <location filename="../src/gui/folder.cpp" line="145"/>
<source>%1 is not readable.</source>
<translation>%1 ei ole luettavissa.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="367"/>
+ <location filename="../src/gui/folder.cpp" line="368"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 on poistettu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="374"/>
+ <location filename="../src/gui/folder.cpp" line="375"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 on ladattu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="382"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 on päivitetty.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="388"/>
+ <location filename="../src/gui/folder.cpp" line="389"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 on nimetty uudeelleen muotoon %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="395"/>
+ <location filename="../src/gui/folder.cpp" line="396"/>
<source>%1 has been moved to %2.</source>
<translation>%1 on siirretty kohteeseen %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="365"/>
+ <location filename="../src/gui/folder.cpp" line="366"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="372"/>
+ <location filename="../src/gui/folder.cpp" line="373"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="379"/>
+ <location filename="../src/gui/folder.cpp" line="380"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="386"/>
+ <location filename="../src/gui/folder.cpp" line="387"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="393"/>
+ <location filename="../src/gui/folder.cpp" line="394"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="400"/>
+ <location filename="../src/gui/folder.cpp" line="401"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="402"/>
+ <location filename="../src/gui/folder.cpp" line="403"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="407"/>
+ <location filename="../src/gui/folder.cpp" line="408"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="409"/>
+ <location filename="../src/gui/folder.cpp" line="410"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>Kohdetta %1 ei voi synkronoida virheen vuoksi. Katso tarkemmat tiedot lokista.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="415"/>
+ <location filename="../src/gui/folder.cpp" line="416"/>
<source>Sync Activity</source>
<translation>Synkronointiaktiviteetti</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="642"/>
+ <location filename="../src/gui/folder.cpp" line="643"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="850"/>
+ <location filename="../src/gui/folder.cpp" line="854"/>
<source>A new folder larger than %1 MB has been added: %2.
-Please go in the settings to select it if you wish to download it.</source>
- <translation>Uusi kansio, joka on suurempi kuin %1 Mt, on lisätty: %2.
-Siirry asetuksiin valitaksesi sen, jos haluat ladata kyseisen kansion.</translation>
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="856"/>
+ <source>A folder from an external storage has been added.
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="857"/>
+ <source>Please go in the settings to select it if you wish to download it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="888"/>
+ <location filename="../src/gui/folder.cpp" line="893"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="892"/>
+ <location filename="../src/gui/folder.cpp" line="897"/>
<source>Remove All Files?</source>
<translation>Poistetaanko kaikki tiedostot?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="894"/>
+ <location filename="../src/gui/folder.cpp" line="899"/>
<source>Remove all files</source>
<translation>Poista kaikki tiedostot</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="895"/>
+ <location filename="../src/gui/folder.cpp" line="900"/>
<source>Keep files</source>
<translation>Säilytä tiedostot</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="911"/>
+ <location filename="../src/gui/folder.cpp" line="916"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="916"/>
+ <location filename="../src/gui/folder.cpp" line="921"/>
<source>Backup detected</source>
<translation>Varmuuskopio poistettu</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="918"/>
+ <location filename="../src/gui/folder.cpp" line="923"/>
<source>Normal Synchronisation</source>
<translation>Normaali synkronointi</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="919"/>
+ <location filename="../src/gui/folder.cpp" line="924"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="140"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="148"/>
<source>You need to be connected to add a folder</source>
<translation>Yhteyden tulee olla muodostettu, jotta voit lisätä kansion</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="150"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="158"/>
<source>Click this button to add a folder to synchronize.</source>
<translation>Napsauta valitaksesi synkronoitavan kansion.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
<source>%1 (%2)</source>
<extracomment>Example text: "File.txt (23KB)"</extracomment>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="180"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="188"/>
<source>Error while loading the list of folders from the server.</source>
<translation>Virhe ladatessa kansiolistausta palvelimelta.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="218"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="226"/>
<source>Signed out</source>
<translation>Kirjauduttu ulos</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="145"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="153"/>
<source>Adding folder is disabled because you are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
<translation>Kansion lisääminen on poistettu käytöstä, koska synkronoit jo kaikki tiedostot. Jos haluat synkronoida useita kansioita, poista nykyisen juurikansion synkronointiyhteys.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="183"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="191"/>
<source>Fetching folder list from server...</source>
<translation>Haetaan kansioluetteloa palvelimelta...</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>Checking for changes in '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="868"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
<source>, '%1'</source>
<extracomment>Build a list of file names</extracomment>
<translation>, '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="871"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="900"/>
<source>'%1'</source>
<extracomment>Argument is a file name</extracomment>
<translation>'%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="896"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="925"/>
<source>Syncing %1</source>
<extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment>
<translation>Synkronoidaan %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="908"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="927"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="937"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="931"/>
<source>download %1/s</source>
<extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="933"/>
<source>u2193 %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="911"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>upload %1/s</source>
<extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="913"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="942"/>
<source>u2191 %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="918"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment>
<translation>%1 %2 (%3/%4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="922"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="951"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%5 jäljellä, %1/%2, tiedosto %3/%4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="948"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1/%2, tiedosto %3/%4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="954"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="983"/>
<source>file %1 of %2</source>
<translation>tiedosto %1/%2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/>
<source>Waiting...</source>
<translation>Odotetaan...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="998"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1027"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>Odotetaan %n muuta kansiota...</numerusform><numerusform>Odotetaan %n muuta kansiota...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1033"/>
<source>Preparing to sync...</source>
<translation>Valmistaudutaan synkronointiin...</translation>
</message>
<translation>Lisäasetukset</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="101"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
+ <source>Ask for confirmation before synchronizing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="105"/>
<source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>Mt</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/generalsettings.ui" line="26"/>
<source>&Launch on System Startup</source>
<translation>Käytä &mustavalkoisia kuvakkeita</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="59"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit &Ignored Files</source>
<translation>Muokkaa &ohitettavia tiedostoja</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
- <source>Ask &confirmation before downloading folders larger than</source>
- <translation>Kysy &vahvistus, ennen kuin ladataan kansiot suurempia kuin</translation>
- </message>
- <message>
- <location filename="../src/gui/generalsettings.ui" line="129"/>
+ <location filename="../src/gui/generalsettings.ui" line="140"/>
<source>S&how crash reporter</source>
<translation>N&äytä kaatumisraportoija</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="150"/>
<location filename="../src/gui/generalsettings.ui" line="156"/>
- <location filename="../src/gui/generalsettings.ui" line="162"/>
<source>About</source>
<translation>Tietoja</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="172"/>
+ <location filename="../src/gui/generalsettings.ui" line="166"/>
<source>Updates</source>
<translation>Päivitykset</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="197"/>
+ <location filename="../src/gui/generalsettings.ui" line="191"/>
<source>&Restart && Update</source>
<translation>&Käynnistä uudelleen && päivitä</translation>
</message>
<translation>Yhdistä...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="144"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="159"/>
<source>%1 folder '%2' is synced to local folder '%3'</source>
<translation>%1-kansio '%2' on synkronoitu paikalliseen kansioon '%3'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="162"/>
<source>Sync the folder '%1'</source>
<translation>Synkronoi kansio '%1'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="152"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="167"/>
<source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
<translation><p><small><strong>Varoitus:</strong> Paikallinen kansio ei ole tyhjä. Valitse jatkotoimenpide!</small></p></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="251"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/>
<source>Local Sync Folder</source>
<translation>Paikallinen synkronointikansio</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="311"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="317"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="540"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Paikallinen synkronointikansio %1 luotu onnistuneesti!</b></font></translation>
</message>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="120"/>
<source>Success.</source>
<translation>Onnistui.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="127"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="130"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>%1-liitännäistä csyncia varten ei voitu ladata.<br/>Varmista asennuksen toimivuus!</p></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<source>CSync got an error while processing internal trees.</source>
<translation>Csync-synkronointipalvelussa tapahtui virhe sisäisten puurakenteiden prosessoinnissa.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync ei onnistunut varaamaan muistia.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync fatal parameter error.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync processing step update failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync processing step reconcile failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync could not authenticate at the proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync failed to lookup proxy or server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync ei onnistunut yhdistämään verkkoon.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>A network connection timeout happened.</source>
<translation>Tapahtui verkon aikakatkaisu.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>A HTTP transmission error happened.</source>
<translation>Tapahtui HTTP-välitysvirhe.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation>Liitetty kansio on väliaikaisesti pois käytöstä tällä palvelimella</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>An error occurred while opening a folder</source>
<translation>Kansiota avatessa tapahtui virhe</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="197"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Error while reading folder.</source>
<translation>Kansiota lukiessa tapahtui virhe</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="477"/>
+ <location filename="../src/libsync/syncengine.cpp" line="476"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>Tiedosto/kansi ohitetaan, koska se on piilotettu.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="738"/>
+ <location filename="../src/libsync/syncengine.cpp" line="737"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Vain %1 on käytettävissä, käynnistymiseen tarvitaan %2</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1206"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Ei sallittu, koska käyttöoikeutesi eivät riitä ylätason kansion lisäämiseen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1213"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Ei sallittu, koska käyttöoikeutesi eivät riitä tiedostojen lisäämiseen kyseiseen kansioon</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: %1-palvelimella ei ole tilaa vapaana.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>CSync - määrittämätön virhe.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Keskeytetty käyttäjän toimesta</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>CSync failed to access</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="123"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>The service is temporarily unavailable</source>
<translation>Palvelu ei ole juuri nyt käytettävissä</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>Access is forbidden</source>
<translation>Pääsy estetty</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="202"/>
+ <location filename="../src/libsync/syncengine.cpp" line="201"/>
<source>An internal error number %1 occurred.</source>
<translation>Sisäinen virhe, numero %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="266"/>
+ <location filename="../src/libsync/syncengine.cpp" line="265"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Kohdetta ei synkronoitu aiempien virheiden vuoksi: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="445"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symboliset linkit eivät ole tuettuja synkronoinnissa.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="449"/>
+ <location filename="../src/libsync/syncengine.cpp" line="448"/>
<source>File is listed on the ignore list.</source>
<translation>Tiedosto on ohituslistalla.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="453"/>
+ <location filename="../src/libsync/syncengine.cpp" line="452"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="463"/>
+ <location filename="../src/libsync/syncengine.cpp" line="462"/>
<source>File names containing the character '%1' are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="466"/>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
<source>The file name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="471"/>
+ <location filename="../src/libsync/syncengine.cpp" line="470"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="474"/>
+ <location filename="../src/libsync/syncengine.cpp" line="473"/>
<source>Filename is too long.</source>
<translation>Tiedoston nimi on liian pitkä.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="483"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Stat failed.</source>
<translation>Stat epäonnistui.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="510"/>
+ <location filename="../src/libsync/syncengine.cpp" line="509"/>
<source>Filename encoding is not valid</source>
<translation>Tiedostonimen merkistökoodaus ei ole kelvollista</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="678"/>
+ <location filename="../src/libsync/syncengine.cpp" line="677"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Virheellisiä merkkejä, anna uusi nimi kohteelle "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="774"/>
+ <location filename="../src/libsync/syncengine.cpp" line="773"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="793"/>
+ <location filename="../src/libsync/syncengine.cpp" line="792"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="830"/>
+ <location filename="../src/libsync/syncengine.cpp" line="829"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="875"/>
+ <location filename="../src/libsync/syncengine.cpp" line="874"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="933"/>
+ <location filename="../src/libsync/syncengine.cpp" line="932"/>
<source>File name contains at least one invalid character</source>
<translation>Tiedoston nimi sisältää ainakin yhden virheellisen merkin</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
- <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1172"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1191"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Ei sallittu, koska oikeutesi eivät riitä alikansioiden lisäämiseen kyseiseen kansioon</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1232"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1249"/>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1267"/>
<source>Not allowed to remove, restoring</source>
<translation>Poistaminen ei ole sallittua, palautetaan</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1280"/>
<source>Local files and share folder removed.</source>
<translation>Paikalliset tiedostot ja jakokansio poistettu.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1336"/>
<source>Move not allowed, item restored</source>
<translation>Siirtäminen ei ole sallittua, kohde palautettu</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1347"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Siirto ei ole sallittu, koska %1 on "vain luku"-tilassa</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the destination</source>
<translation>kohde</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the source</source>
<translation>lähde</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="300"/>
+ <location filename="../src/libsync/theme.cpp" line="309"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Versio %1. Lisätietoja osoitteessa <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="304"/>
+ <location filename="../src/libsync/theme.cpp" line="313"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation><p>Tekijänoikeus ownCloud GmbH</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="305"/>
+ <location filename="../src/libsync/theme.cpp" line="314"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="250"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="352"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="379"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="402"/>
<source>TextLabel</source>
<translation>TekstiLeima</translation>
</message>
<translation>Aloita &puhdas synkronointi (poistaa paikallisen kansion!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="295"/>
+ <source>Ask for confirmation before synchroni&zing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="321"/>
+ <source>Ask for confirmation before synchronizing e&xternal storages</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="345"/>
<source>Choose what to sync</source>
<translation>Valitse synkronoitavat tiedot</translation>
</message>
<translation>&Säilytä paikallinen data</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>S&ync everything from server</source>
<translation>S&ynkronoi kaikki palvelimelta</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
<source>Status message</source>
<translation>Tilaviesti</translation>
</message>
<location filename="../src/gui/owncloudsetuppage.ui" line="129"/>
<location filename="../src/gui/owncloudsetuppage.ui" line="156"/>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="190"/>
<source>TextLabel</source>
<translation>TekstiLeima</translation>
</message>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="83"/>
- <source>Server &Address</source>
- <translation>Palvelimen &osoite</translation>
+ <source>Ser&ver Address</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="99"/>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="286"/>
+ <location filename="../src/libsync/theme.cpp" line="295"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Koostettu Git-revisiosta <a href="%1">%2</a> %3, %4 käyttäen Qt:n versiota %5, %6</small></p></translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="238"/>
<location filename="../src/gui/accountsettings.cpp" line="371"/>
- <location filename="../src/gui/accountsettings.cpp" line="728"/>
+ <location filename="../src/gui/accountsettings.cpp" line="733"/>
<source>Cancel</source>
<translation>Annuler</translation>
</message>
<translation>Se connecter</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="678"/>
- <source>There are new folders that were not synchronized because they are too big: </source>
- <translation>Certains dossiers n'ont pas été synchronisés en raison de leur taille trop importante :</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="680"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="681"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="720"/>
+ <location filename="../src/gui/accountsettings.cpp" line="725"/>
<source>Confirm Account Removal</source>
<translation>Confirmer la suppression du compte</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="721"/>
+ <location filename="../src/gui/accountsettings.cpp" line="726"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>Êtes-vous sûr de vouloir enlever le compte <i>%1</i>?</p><p><b>Note :</b> Aucun fichier ne sera supprimé</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="727"/>
+ <location filename="../src/gui/accountsettings.cpp" line="732"/>
<source>Remove connection</source>
<translation>Supprimer la connexion</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="600"/>
<source>Aborted by the user</source>
<translation>Interrompu par l'utilisateur</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="139"/>
<source>Local folder %1 does not exist.</source>
<translation>Le dossier local %1 n'existe pas.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="142"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 devrait être un dossier mais ne l'est pas.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="144"/>
+ <location filename="../src/gui/folder.cpp" line="145"/>
<source>%1 is not readable.</source>
<translation>%1 ne peut pas être lu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="367"/>
+ <location filename="../src/gui/folder.cpp" line="368"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 a été supprimé.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="374"/>
+ <location filename="../src/gui/folder.cpp" line="375"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 a été téléchargé.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="382"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 a été mis à jour.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="388"/>
+ <location filename="../src/gui/folder.cpp" line="389"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 a été renommé en %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="395"/>
+ <location filename="../src/gui/folder.cpp" line="396"/>
<source>%1 has been moved to %2.</source>
<translation>%1 a été déplacé vers %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="365"/>
+ <location filename="../src/gui/folder.cpp" line="366"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 a été supprimé.</numerusform><numerusform>%1 et %n autres fichiers ont été supprimés.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="372"/>
+ <location filename="../src/gui/folder.cpp" line="373"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 a été téléchargé.</numerusform><numerusform>%1 et %n autres fichiers ont été téléchargés.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="379"/>
+ <location filename="../src/gui/folder.cpp" line="380"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 a été mis à jour.</numerusform><numerusform>%1 et %n autres fichiers ont été mis à jour.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="386"/>
+ <location filename="../src/gui/folder.cpp" line="387"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 a été renommé en %2.</numerusform><numerusform>%1 a été renommé en %2 et %n autres fichiers ont été renommés.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="393"/>
+ <location filename="../src/gui/folder.cpp" line="394"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 a été déplacé vers %2.</numerusform><numerusform>%1 a été déplacé vers %2 et %n autres fichiers ont été déplacés.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="400"/>
+ <location filename="../src/gui/folder.cpp" line="401"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 a un conflit de synchronisation.</numerusform><numerusform>%1 et %n autres fichiers ont des problèmes de synchronisation.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="402"/>
+ <location filename="../src/gui/folder.cpp" line="403"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 a un problème de synchronisation. Merci de vérifier le fichier conflit !</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="407"/>
+ <location filename="../src/gui/folder.cpp" line="408"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 ne peut pas être synchronisé en raison d'erreurs. Consultez les logs pour les détails.</numerusform><numerusform>%1 et %n autres fichiers n'ont pas pu être synchronisés en raison d'erreurs. Consultez les logs pour les détails.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="409"/>
+ <location filename="../src/gui/folder.cpp" line="410"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 n'a pu être synchronisé pour cause d'erreur. Consultez les logs pour les détails.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="415"/>
+ <location filename="../src/gui/folder.cpp" line="416"/>
<source>Sync Activity</source>
<translation>Activité de synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="642"/>
+ <location filename="../src/gui/folder.cpp" line="643"/>
<source>Could not read system exclude file</source>
<translation>Impossible de lire le fichier d'exclusion du système</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="850"/>
+ <location filename="../src/gui/folder.cpp" line="854"/>
<source>A new folder larger than %1 MB has been added: %2.
-Please go in the settings to select it if you wish to download it.</source>
- <translation>Un nouveau dossier de taille supérieure à %1 Mo a été ajouté : %2.
-Veuillez le sélectionner dans la fenêtre des paramètres pour le télécharger.</translation>
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="856"/>
+ <source>A folder from an external storage has been added.
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="857"/>
+ <source>Please go in the settings to select it if you wish to download it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="888"/>
+ <location filename="../src/gui/folder.cpp" line="893"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
Êtes-vous sûr de vouloir effectuer cette opération ?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="892"/>
+ <location filename="../src/gui/folder.cpp" line="897"/>
<source>Remove All Files?</source>
<translation>Supprimer tous les fichiers ?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="894"/>
+ <location filename="../src/gui/folder.cpp" line="899"/>
<source>Remove all files</source>
<translation>Supprimer tous les fichiers</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="895"/>
+ <location filename="../src/gui/folder.cpp" line="900"/>
<source>Keep files</source>
<translation>Garder les fichiers</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="911"/>
+ <location filename="../src/gui/folder.cpp" line="916"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
Continuer la synchronisation comme d'habitude fera en sorte que tous les fichiers soient remplacés par des fichiers plus vieux d'un état précédent. Voulez-vous garder les versions les plus récentes de vos fichiers en tant que fichiers conflictuels ?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="916"/>
+ <location filename="../src/gui/folder.cpp" line="921"/>
<source>Backup detected</source>
<translation>Sauvegarde détectée</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="918"/>
+ <location filename="../src/gui/folder.cpp" line="923"/>
<source>Normal Synchronisation</source>
<translation>Synchronisation normale</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="919"/>
+ <location filename="../src/gui/folder.cpp" line="924"/>
<source>Keep Local Files as Conflict</source>
<translation>Garder les fichiers locaux comme Conflits</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="140"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="148"/>
<source>You need to be connected to add a folder</source>
<translation>Vous devez être connecté pour ajouter un dossier</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="150"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="158"/>
<source>Click this button to add a folder to synchronize.</source>
<translation>Cliquez ce bouton pour ajouter un dossier à synchroniser.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
<source>%1 (%2)</source>
<extracomment>Example text: "File.txt (23KB)"</extracomment>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="180"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="188"/>
<source>Error while loading the list of folders from the server.</source>
<translation>Une erreur est survenue lors du chargement de la liste des dossiers depuis le serveur.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="218"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="226"/>
<source>Signed out</source>
<translation>Session fermée</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="145"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="153"/>
<source>Adding folder is disabled because you are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
<translation>L'ajout de dossier est désactivé car vous synchronisez déjà tous vos fichiers. Si vous voulez synchroniser plusieurs dossiers, supprimez d'abord le dossier racine configuré actuellement.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="183"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="191"/>
<source>Fetching folder list from server...</source>
<translation>Récupération de la liste des dossiers depuis le serveur...</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>Checking for changes in '%1'</source>
<translation>Recherche de modifications dans '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="868"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
<source>, '%1'</source>
<extracomment>Build a list of file names</extracomment>
<translation>, '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="871"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="900"/>
<source>'%1'</source>
<extracomment>Argument is a file name</extracomment>
<translation>'%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="896"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="925"/>
<source>Syncing %1</source>
<extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment>
<translation>Synchronisation de %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="908"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="927"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="937"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="931"/>
<source>download %1/s</source>
<extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>réception %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="933"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="911"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>upload %1/s</source>
<extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>envoi %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="913"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="942"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="918"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 de %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="922"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="951"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%5 restant, %1 sur %2, fichier %3 sur %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="948"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 de %2, fichier %3 de %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="954"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="983"/>
<source>file %1 of %2</source>
<translation>fichier %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/>
<source>Waiting...</source>
<translation>En attente ...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="998"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1027"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>En attente de %n autre(s) dossier(s)</numerusform><numerusform>En attente de %n autre(s) dossier(s)</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1033"/>
<source>Preparing to sync...</source>
<translation>Préparation à la synchronisation</translation>
</message>
<translation>Avancé</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="101"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
+ <source>Ask for confirmation before synchronizing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="105"/>
<source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>Mo</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/generalsettings.ui" line="26"/>
<source>&Launch on System Startup</source>
<translation>Utiliser les icônes &monochromes</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="59"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit &Ignored Files</source>
<translation>Éditer les fichiers &ignorés</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
- <source>Ask &confirmation before downloading folders larger than</source>
- <translation>Demander &confirmation avant de télécharger les dossiers de taille supérieure à</translation>
- </message>
- <message>
- <location filename="../src/gui/generalsettings.ui" line="129"/>
+ <location filename="../src/gui/generalsettings.ui" line="140"/>
<source>S&how crash reporter</source>
<translation>Affic&her le rapport d'incident</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="150"/>
<location filename="../src/gui/generalsettings.ui" line="156"/>
- <location filename="../src/gui/generalsettings.ui" line="162"/>
<source>About</source>
<translation>À propos de</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="172"/>
+ <location filename="../src/gui/generalsettings.ui" line="166"/>
<source>Updates</source>
<translation>Mises à jour</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="197"/>
+ <location filename="../src/gui/generalsettings.ui" line="191"/>
<source>&Restart && Update</source>
<translation>&Redémarrer && Mettre à jour</translation>
</message>
<translation>Connexion…</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="144"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="159"/>
<source>%1 folder '%2' is synced to local folder '%3'</source>
<translation>le dossier %1 '%2' est synchronisé avec le dossier local '%3'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="162"/>
<source>Sync the folder '%1'</source>
<translation>Synchroniser le dossier '%1'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="152"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="167"/>
<source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
<translation><p><small><strong>Attention :</strong> Le dossier local n'est pas vide. Que voulez-vous faire ?</small></p></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="251"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/>
<source>Local Sync Folder</source>
<translation>Dossier de synchronisation local</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="311"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="317"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
<translation>Impossible de supprimer et de sauvegarder le dossier parce que ce dossier ou un de ses fichiers est ouvert dans un autre programme. Veuillez fermer le dossier ou le fichier et ré-essayer, ou annuler l'installation.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="540"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Dossier de synchronisation local %1 créé avec succès !</b></font></translation>
</message>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="120"/>
<source>Success.</source>
<translation>Succès.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="127"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSync a échoué à charger du fichier journal. Le fichier journal est corrompu.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="130"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>Le module additionnel %1 pour csync n'a pas pu être chargé.<br/>Merci de vérifier votre installation !</p></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<source>CSync got an error while processing internal trees.</source>
<translation>Erreur CSync lors du traitement des arbres internes.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<source>CSync failed to reserve memory.</source>
<translation>Erreur lors de l'allocation mémoire par CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync fatal parameter error.</source>
<translation>Erreur fatale CSync : mauvais paramètre.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync processing step update failed.</source>
<translation>Erreur CSync lors de l'opération de mise à jour</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync processing step reconcile failed.</source>
<translation>Erreur CSync lors de l'opération de réconciliation</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync n'a pu s'authentifier auprès du proxy.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync n'a pu trouver le proxy ou serveur auquel se connecter.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync n'a pu s'authentifier auprès du serveur %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync n'a pu établir une connexion au réseau.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>A network connection timeout happened.</source>
<translation>Le délai d'attente de la connexion réseau a été dépassé.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>A HTTP transmission error happened.</source>
<translation>Une erreur de transmission HTTP s'est produite.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation>Le dossier monté est temporairement indisponible sur le serveur</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>An error occurred while opening a folder</source>
<translation>Une erreur est survenue lors de l'ouverture d'un dossier</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="197"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Error while reading folder.</source>
<translation>Erreur lors de la lecture du dossier.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="477"/>
+ <location filename="../src/libsync/syncengine.cpp" line="476"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>Le fichier/dossier est ignoré car il est caché.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="738"/>
+ <location filename="../src/libsync/syncengine.cpp" line="737"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Seulement %1 disponibles, il faut au moins %2 pour démarrer</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1206"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Non autorisé car vous n'avez pas la permission d'ajouter un dossier parent</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1213"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Non autorisé car vous n'avez pas la permission d'ajouter des fichiers dans ce dossier</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync : Aucun espace disponible sur le serveur %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>Erreur CSync inconnue.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Interrompu par l'utilisateur</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>CSync failed to access</source>
<translation>CSync n'a pas pu accéder à</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="123"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation>CSync n’a pu charger ou créer le fichier de journalisation. Veuillez vérifier que vous possédez les droits en lecture/écriture dans le dossier de synchronisation local.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation>CSync a échoué en raison d'un refus de permission non pris en charge.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync tried to create a folder that already exists.</source>
<translation>CSync a tenté de créer un dossier déjà présent.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>The service is temporarily unavailable</source>
<translation>Le service est temporairement indisponible.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>Access is forbidden</source>
<translation>L'accès est interdit</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="202"/>
+ <location filename="../src/libsync/syncengine.cpp" line="201"/>
<source>An internal error number %1 occurred.</source>
<translation>Une erreur interne numéro %1 est survenue.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="266"/>
+ <location filename="../src/libsync/syncengine.cpp" line="265"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Cet élément n'a pas été synchronisé en raison des erreurs précédentes : %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="445"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Les liens symboliques ne sont pas pris en charge par la synchronisation.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="449"/>
+ <location filename="../src/libsync/syncengine.cpp" line="448"/>
<source>File is listed on the ignore list.</source>
<translation>Le fichier est dans la liste des fichiers à ignorer.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="453"/>
+ <location filename="../src/libsync/syncengine.cpp" line="452"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="463"/>
+ <location filename="../src/libsync/syncengine.cpp" line="462"/>
<source>File names containing the character '%1' are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="466"/>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
<source>The file name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="471"/>
+ <location filename="../src/libsync/syncengine.cpp" line="470"/>
<source>Filename contains trailing spaces.</source>
<translation>Le nom du fichier se fini par des espaces.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="474"/>
+ <location filename="../src/libsync/syncengine.cpp" line="473"/>
<source>Filename is too long.</source>
<translation>Le nom de fichier est trop long.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="483"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Stat failed.</source>
<translation>Stat échoué.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="510"/>
+ <location filename="../src/libsync/syncengine.cpp" line="509"/>
<source>Filename encoding is not valid</source>
<translation>L'encodage du nom de fichier n'est pas valide</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="678"/>
+ <location filename="../src/libsync/syncengine.cpp" line="677"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Caractères non valides. Veuillez renommer "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="774"/>
+ <location filename="../src/libsync/syncengine.cpp" line="773"/>
<source>Unable to initialize a sync journal.</source>
<translation>Impossible d'initialiser un journal de synchronisation.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="793"/>
+ <location filename="../src/libsync/syncengine.cpp" line="792"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Impossible de lire la liste noire de la base de données locale</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="830"/>
+ <location filename="../src/libsync/syncengine.cpp" line="829"/>
<source>Unable to read from the sync journal.</source>
<translation>Impossible de lire le journal de synchronisation.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="875"/>
+ <location filename="../src/libsync/syncengine.cpp" line="874"/>
<source>Cannot open the sync journal</source>
<translation>Impossible d'ouvrir le journal de synchronisation</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="933"/>
+ <location filename="../src/libsync/syncengine.cpp" line="932"/>
<source>File name contains at least one invalid character</source>
<translation>Le nom de fichier contient au moins un caractère non valable</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
- <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1172"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignoré à cause de la liste noire "Choisir le contenu à synchroniser".</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1191"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Non autorisé car vous n'avez pas la permission d'ajouter des sous-dossiers dans ce dossier</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1232"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Non autorisé à envoyer ce fichier car il est en lecture seule sur le serveur. Restauration</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1249"/>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1267"/>
<source>Not allowed to remove, restoring</source>
<translation>Non autorisé à supprimer. Restauration</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1280"/>
<source>Local files and share folder removed.</source>
<translation>Fichiers locaux et répertoire de partage supprimés.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1336"/>
<source>Move not allowed, item restored</source>
<translation>Déplacement non autorisé, élément restauré</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1347"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Déplacement non autorisé car %1 est en mode lecture seule</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the destination</source>
<translation>la destination</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the source</source>
<translation>la source</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="300"/>
+ <location filename="../src/libsync/theme.cpp" line="309"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Version %1. Pour plus d'information, visitez <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="304"/>
+ <location filename="../src/libsync/theme.cpp" line="313"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation><p>Copyright ownCloud, Inc.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="305"/>
+ <location filename="../src/libsync/theme.cpp" line="314"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Distribué par %1 et sous licence GNU General Public License (GPL) Version 2.0.<br/>%2 et le logo %2 sont des marques enregistrées de %1 aux Etats-Unis, dans d'autres pays, ou les deux.</p></translation>
</message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="250"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="352"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="379"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="402"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<translation>Réinitialiser la syn&chronisation (Supprime le dossier local !)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="295"/>
+ <source>Ask for confirmation before synchroni&zing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="321"/>
+ <source>Ask for confirmation before synchronizing e&xternal storages</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="345"/>
<source>Choose what to sync</source>
<translation>Choisir le contenu à synchroniser</translation>
</message>
<translation>&Garder les données locales</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>S&ync everything from server</source>
<translation>S&ynchroniser tout le contenu depuis le serveur</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
<source>Status message</source>
<translation>Message d'état</translation>
</message>
<location filename="../src/gui/owncloudsetuppage.ui" line="129"/>
<location filename="../src/gui/owncloudsetuppage.ui" line="156"/>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="190"/>
<source>TextLabel</source>
<translation>Zone de texte</translation>
</message>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="83"/>
- <source>Server &Address</source>
- <translation>&Adresse du serveur</translation>
+ <source>Ser&ver Address</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="99"/>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="286"/>
+ <location filename="../src/libsync/theme.cpp" line="295"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Construit à partir de la révision Git <a href="%1">%2</a> du %3, %4 en utilisant Qt %5, %6.</small><p></translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="238"/>
<location filename="../src/gui/accountsettings.cpp" line="371"/>
- <location filename="../src/gui/accountsettings.cpp" line="728"/>
+ <location filename="../src/gui/accountsettings.cpp" line="733"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<translation>Acceder</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="678"/>
- <source>There are new folders that were not synchronized because they are too big: </source>
+ <location filename="../src/gui/accountsettings.cpp" line="680"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="720"/>
+ <location filename="../src/gui/accountsettings.cpp" line="681"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="725"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="721"/>
+ <location filename="../src/gui/accountsettings.cpp" line="726"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="727"/>
+ <location filename="../src/gui/accountsettings.cpp" line="732"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="600"/>
<source>Aborted by the user</source>
<translation>Interrompido polo usuario</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="139"/>
<source>Local folder %1 does not exist.</source>
<translation>O cartafol local %1 non existe.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="142"/>
<source>%1 should be a folder but is not.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="144"/>
+ <location filename="../src/gui/folder.cpp" line="145"/>
<source>%1 is not readable.</source>
<translation>%1 non é lexíbel.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="367"/>
+ <location filename="../src/gui/folder.cpp" line="368"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi retirado satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="374"/>
+ <location filename="../src/gui/folder.cpp" line="375"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi descargado satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="382"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi enviado satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="388"/>
+ <location filename="../src/gui/folder.cpp" line="389"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 foi renomeado satisfactoriamente a %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="395"/>
+ <location filename="../src/gui/folder.cpp" line="396"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido satisfactoriamente a %2</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="365"/>
+ <location filename="../src/gui/folder.cpp" line="366"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="372"/>
+ <location filename="../src/gui/folder.cpp" line="373"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="379"/>
+ <location filename="../src/gui/folder.cpp" line="380"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="386"/>
+ <location filename="../src/gui/folder.cpp" line="387"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="393"/>
+ <location filename="../src/gui/folder.cpp" line="394"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="400"/>
+ <location filename="../src/gui/folder.cpp" line="401"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="402"/>
+ <location filename="../src/gui/folder.cpp" line="403"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="407"/>
+ <location filename="../src/gui/folder.cpp" line="408"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="409"/>
+ <location filename="../src/gui/folder.cpp" line="410"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 non puido sincronizarse por mor dun erro. Vexa os detalles no rexistro.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="415"/>
+ <location filename="../src/gui/folder.cpp" line="416"/>
<source>Sync Activity</source>
<translation>Actividade de sincronización</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="642"/>
+ <location filename="../src/gui/folder.cpp" line="643"/>
<source>Could not read system exclude file</source>
<translation>Non foi posíbel ler o ficheiro de exclusión do sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="850"/>
+ <location filename="../src/gui/folder.cpp" line="854"/>
<source>A new folder larger than %1 MB has been added: %2.
-Please go in the settings to select it if you wish to download it.</source>
- <translation>Foi engadido un novo cartafol maior de %1 MB: %2.
-Vaia aos axustes e seleccióneo se quere descargalo.</translation>
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="856"/>
+ <source>A folder from an external storage has been added.
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="857"/>
+ <source>Please go in the settings to select it if you wish to download it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="888"/>
+ <location filename="../src/gui/folder.cpp" line="893"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="892"/>
+ <location filename="../src/gui/folder.cpp" line="897"/>
<source>Remove All Files?</source>
<translation>Retirar todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="894"/>
+ <location filename="../src/gui/folder.cpp" line="899"/>
<source>Remove all files</source>
<translation>Retirar todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="895"/>
+ <location filename="../src/gui/folder.cpp" line="900"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="911"/>
+ <location filename="../src/gui/folder.cpp" line="916"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="916"/>
+ <location filename="../src/gui/folder.cpp" line="921"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="918"/>
+ <location filename="../src/gui/folder.cpp" line="923"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="919"/>
+ <location filename="../src/gui/folder.cpp" line="924"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="140"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="148"/>
<source>You need to be connected to add a folder</source>
<translation>Ten que estar conectado para engadir un cartafol</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="150"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="158"/>
<source>Click this button to add a folder to synchronize.</source>
<translation>Prema nesta botón para engadir un cartafol para sincronizar</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
<source>%1 (%2)</source>
<extracomment>Example text: "File.txt (23KB)"</extracomment>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="180"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="188"/>
<source>Error while loading the list of folders from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="218"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="226"/>
<source>Signed out</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="145"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="153"/>
<source>Adding folder is disabled because you are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="183"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="191"/>
<source>Fetching folder list from server...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>Checking for changes in '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="868"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
<source>, '%1'</source>
<extracomment>Build a list of file names</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="871"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="900"/>
<source>'%1'</source>
<extracomment>Argument is a file name</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="896"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="925"/>
<source>Syncing %1</source>
<extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment>
<translation>Sincronizando %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="908"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="927"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="937"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="931"/>
<source>download %1/s</source>
<extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>descargar %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="933"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="911"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>upload %1/s</source>
<extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>enviar %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="913"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="942"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="918"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 de %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="922"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="951"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="948"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 de %2, ficheiro %3 de %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="954"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="983"/>
<source>file %1 of %2</source>
<translation>ficheiro %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/>
<source>Waiting...</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="998"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1027"/>
<source>Waiting for %n other folder(s)...</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1033"/>
<source>Preparing to sync...</source>
<translation type="unfinished"/>
</message>
<translation>Avanzado</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="101"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
+ <source>Ask for confirmation before synchronizing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="105"/>
<source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/generalsettings.ui" line="26"/>
<source>&Launch on System Startup</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="59"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit &Ignored Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
- <source>Ask &confirmation before downloading folders larger than</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/generalsettings.ui" line="129"/>
+ <location filename="../src/gui/generalsettings.ui" line="140"/>
<source>S&how crash reporter</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="150"/>
<location filename="../src/gui/generalsettings.ui" line="156"/>
- <location filename="../src/gui/generalsettings.ui" line="162"/>
<source>About</source>
<translation>Sobre</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="172"/>
+ <location filename="../src/gui/generalsettings.ui" line="166"/>
<source>Updates</source>
<translation>Actualizacións</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="197"/>
+ <location filename="../src/gui/generalsettings.ui" line="191"/>
<source>&Restart && Update</source>
<translation>&Reiniciar e actualizar</translation>
</message>
<translation>Conectar...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="144"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="159"/>
<source>%1 folder '%2' is synced to local folder '%3'</source>
<translation>O cartafol %1 «%2» está sincronizado co cartafol local «%3»</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="162"/>
<source>Sync the folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="152"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="167"/>
<source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="251"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/>
<source>Local Sync Folder</source>
<translation>Sincronización do cartafol local</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="311"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="317"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
<translation>Non é posíbel retirar e facer unha copia de seguranza do cartafol, xa que o cartafol ou un ficheiro está aberto noutro programa Peche o cartafol ou o ficheiro e ténteo de novo, ou cancele a acción.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="540"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>O cartafol local de sincronización %1 creouse correctamente!</b></font></translation>
</message>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="120"/>
<source>Success.</source>
<translation>Correcto.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="127"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>Produciuse un fallo en CSync ao cargar o ficheiro de rexistro. O ficheiro de rexistro está estragado.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="130"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>Non foi posíbel cargar o engadido %1 para CSync.<br/>Verifique a instalación!</p></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync tivo un erro ao procesar árbores internas.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<source>CSync failed to reserve memory.</source>
<translation>Produciuse un fallo ao reservar memoria para CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync fatal parameter error.</source>
<translation>Produciuse un erro fatal de parámetro CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync processing step update failed.</source>
<translation>Produciuse un fallo ao procesar o paso de actualización de CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync processing step reconcile failed.</source>
<translation>Produciuse un fallo ao procesar o paso de reconciliación de CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync non puido autenticarse no proxy.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSYNC no puido atopar o servidor proxy.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync non puido autenticarse no servidor %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to connect to the network.</source>
<translation>CSYNC no puido conectarse á rede.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>A network connection timeout happened.</source>
<translation>Excedeuse do tempo de espera para a conexión á rede.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>A HTTP transmission error happened.</source>
<translation>Produciuse un erro na transmisión HTTP.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>An error occurred while opening a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="197"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Error while reading folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="477"/>
+ <location filename="../src/libsync/syncengine.cpp" line="476"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="738"/>
+ <location filename="../src/libsync/syncengine.cpp" line="737"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1206"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1213"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: Non hai espazo dispoñíbel no servidor %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>Produciuse un erro non especificado de CSync</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Interrompido polo usuario</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>CSync failed to access</source>
<translation>Produciuse un fallo ao reservar memoria para CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="123"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>The service is temporarily unavailable</source>
<translation>O servizo está temporalmente inaccesíbel.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>Access is forbidden</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="202"/>
+ <location filename="../src/libsync/syncengine.cpp" line="201"/>
<source>An internal error number %1 occurred.</source>
<translation>Produciuse un erro interno número %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="266"/>
+ <location filename="../src/libsync/syncengine.cpp" line="265"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Este elemento non foi sincronizado por mor de erros anteriores: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="445"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>As ligazóns simbolicas non son admitidas nas sincronizacións</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="449"/>
+ <location filename="../src/libsync/syncengine.cpp" line="448"/>
<source>File is listed on the ignore list.</source>
<translation>O ficheiro está na lista de ignorados.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="453"/>
+ <location filename="../src/libsync/syncengine.cpp" line="452"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="463"/>
+ <location filename="../src/libsync/syncengine.cpp" line="462"/>
<source>File names containing the character '%1' are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="466"/>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
<source>The file name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="471"/>
+ <location filename="../src/libsync/syncengine.cpp" line="470"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="474"/>
+ <location filename="../src/libsync/syncengine.cpp" line="473"/>
<source>Filename is too long.</source>
<translation>O nome de ficheiro é longo de máis.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="483"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Stat failed.</source>
<translation>Fallou a obtención de estatísticas.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="510"/>
+ <location filename="../src/libsync/syncengine.cpp" line="509"/>
<source>Filename encoding is not valid</source>
<translation>O nome de ficheiro codificado non é correcto</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="678"/>
+ <location filename="../src/libsync/syncengine.cpp" line="677"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Caracteres incorrectos, déalle outro nome a «%1»</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="774"/>
+ <location filename="../src/libsync/syncengine.cpp" line="773"/>
<source>Unable to initialize a sync journal.</source>
<translation>Non é posíbel preparar un rexistro de sincronización.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="793"/>
+ <location filename="../src/libsync/syncengine.cpp" line="792"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="830"/>
+ <location filename="../src/libsync/syncengine.cpp" line="829"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="875"/>
+ <location filename="../src/libsync/syncengine.cpp" line="874"/>
<source>Cannot open the sync journal</source>
<translation>Non foi posíbel abrir o rexistro de sincronización</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="933"/>
+ <location filename="../src/libsync/syncengine.cpp" line="932"/>
<source>File name contains at least one invalid character</source>
<translation>O nome de ficheiro contén algún carácter incorrecto</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
- <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1172"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorado por mor da lista negra de «escolla que sincronizar»</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1191"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1232"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Non está permitido o envío xa que o ficheiro é só de lectura no servidor, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1249"/>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1267"/>
<source>Not allowed to remove, restoring</source>
<translation>Non está permitido retiralo, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1280"/>
<source>Local files and share folder removed.</source>
<translation>Retirados os ficheiros locais e o cartafol compartido.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1336"/>
<source>Move not allowed, item restored</source>
<translation>Nos está permitido movelo, elemento restaurado</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1347"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Bon está permitido movelo xa que %1 é só de lectura</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the destination</source>
<translation>o destino</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the source</source>
<translation>a orixe</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="300"/>
+ <location filename="../src/libsync/theme.cpp" line="309"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Versión %1. Para obter máis información visite <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="304"/>
+ <location filename="../src/libsync/theme.cpp" line="313"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="305"/>
+ <location filename="../src/libsync/theme.cpp" line="314"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Distribuído por %1 e licenciado baixo a Licenza Pública Xeral (GPL) GNU Versión 2.0.<br/>Os logotipos %2 e %2 son marcas rexistradas de %1 nos Estados Unidos de Norte América e/ou outros países.</p></translation>
</message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="250"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="352"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="379"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="402"/>
<source>TextLabel</source>
<translation>Etiqueta de texto</translation>
</message>
<translation>Iniciar unha sincronización &limpa (Borra o cartafol local!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="295"/>
+ <source>Ask for confirmation before synchroni&zing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="321"/>
+ <source>Ask for confirmation before synchronizing e&xternal storages</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="345"/>
<source>Choose what to sync</source>
<translation>Escolla que sincronizar</translation>
</message>
<translation>&Conservar os datos locais</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>S&ync everything from server</source>
<translation>Sincronizar &todo o contido do servidor</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
<source>Status message</source>
<translation>Mensaxe de estado</translation>
</message>
<location filename="../src/gui/owncloudsetuppage.ui" line="129"/>
<location filename="../src/gui/owncloudsetuppage.ui" line="156"/>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="190"/>
<source>TextLabel</source>
<translation>Etiqueta de texto</translation>
</message>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="83"/>
- <source>Server &Address</source>
- <translation>&Enderezo do servidor</translation>
+ <source>Ser&ver Address</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="99"/>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="286"/>
+ <location filename="../src/libsync/theme.cpp" line="295"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Construído a partir de la revisión Git <a href="%1">%2</a> en %3, %4 usando Qt %5, %6</small></p></translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="238"/>
<location filename="../src/gui/accountsettings.cpp" line="371"/>
- <location filename="../src/gui/accountsettings.cpp" line="728"/>
+ <location filename="../src/gui/accountsettings.cpp" line="733"/>
<source>Cancel</source>
<translation>Mégsem</translation>
</message>
<translation>Bejelentkezés</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="678"/>
- <source>There are new folders that were not synchronized because they are too big: </source>
- <translation>Néhány új könyvtár nem került szinkronizálása, mert azok túl nagyok:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="680"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="681"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="720"/>
+ <location filename="../src/gui/accountsettings.cpp" line="725"/>
<source>Confirm Account Removal</source>
<translation>Fiók törlésének megerősítése</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="721"/>
+ <location filename="../src/gui/accountsettings.cpp" line="726"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>Tényleg törölni szeretné a kapcsolatot <i>%1</i> fiókkal?</p><p><b>Megjegyzés:</b> Ez <b>nem</b> töröl fájlokat.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="727"/>
+ <location filename="../src/gui/accountsettings.cpp" line="732"/>
<source>Remove connection</source>
<translation>Kapcsolat törlése</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="600"/>
<source>Aborted by the user</source>
<translation>Felhasználó megszakította</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="139"/>
<source>Local folder %1 does not exist.</source>
<translation>%1 helyi mappa nem létezik.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="142"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 valószínűleg könyvtár, de nem az.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="144"/>
+ <location filename="../src/gui/folder.cpp" line="145"/>
<source>%1 is not readable.</source>
<translation>%1 nem olvasható.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="367"/>
+ <location filename="../src/gui/folder.cpp" line="368"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 sikeresen törölve.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="374"/>
+ <location filename="../src/gui/folder.cpp" line="375"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 sikeresen letöltve.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="382"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 sikeresen feltöltve.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="388"/>
+ <location filename="../src/gui/folder.cpp" line="389"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 átnevezve erre: %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="395"/>
+ <location filename="../src/gui/folder.cpp" line="396"/>
<source>%1 has been moved to %2.</source>
<translation>%1 áthelyezve ide: %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="365"/>
+ <location filename="../src/gui/folder.cpp" line="366"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 és %n további fájl törölve.</numerusform><numerusform>%1 és %n további fájl törölve.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="372"/>
+ <location filename="../src/gui/folder.cpp" line="373"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 és %n további fájl letöltve.</numerusform><numerusform>%1 és %n további fájl letöltve.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="379"/>
+ <location filename="../src/gui/folder.cpp" line="380"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 és %n további fájl feltöltve.</numerusform><numerusform>%1 és %n további fájl feltöltve.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="386"/>
+ <location filename="../src/gui/folder.cpp" line="387"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 átnevezve erre: %2 és még %n további fájl átnevezve.</numerusform><numerusform>%1 átnevezve erre: %2 és még %n további fájl átnevezve.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="393"/>
+ <location filename="../src/gui/folder.cpp" line="394"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 áthelyezve ide: %2 és még %n további fájl áthelyezve.</numerusform><numerusform>%1 áthelyezve ide: %2 és még %n további fájl áthelyezve.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="400"/>
+ <location filename="../src/gui/folder.cpp" line="401"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 és %n további fájl szinkronizálási konfliktussal rendelkezik.</numerusform><numerusform>%1 és %n további fájl szinkronizálási konfliktussal rendelkezik.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="402"/>
+ <location filename="../src/gui/folder.cpp" line="403"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 fájl szinkronizálási konfliktussal rendelkezik. Kérjük ellenőrizze a konfliktus fájlt!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="407"/>
+ <location filename="../src/gui/folder.cpp" line="408"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 és %n további fájlt nem sikerült szinkronizálni. Bővebb információ a naplófájlban.</numerusform><numerusform>%1 és %n további fájlt nem sikerült szinkronizálni. Bővebb információ a naplófájlban.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="409"/>
+ <location filename="../src/gui/folder.cpp" line="410"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 nem sikerült szinkronizálni. Bővebb információ a naplófájlban.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="415"/>
+ <location filename="../src/gui/folder.cpp" line="416"/>
<source>Sync Activity</source>
<translation>Szinkronizálási aktivitás</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="642"/>
+ <location filename="../src/gui/folder.cpp" line="643"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="850"/>
+ <location filename="../src/gui/folder.cpp" line="854"/>
<source>A new folder larger than %1 MB has been added: %2.
-Please go in the settings to select it if you wish to download it.</source>
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="856"/>
+ <source>A folder from an external storage has been added.
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="857"/>
+ <source>Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="888"/>
+ <location filename="../src/gui/folder.cpp" line="893"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="892"/>
+ <location filename="../src/gui/folder.cpp" line="897"/>
<source>Remove All Files?</source>
<translation>Törli az összes fájlt?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="894"/>
+ <location filename="../src/gui/folder.cpp" line="899"/>
<source>Remove all files</source>
<translation>Összes fájl eltávolítása</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="895"/>
+ <location filename="../src/gui/folder.cpp" line="900"/>
<source>Keep files</source>
<translation>Fájlok megtartása</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="911"/>
+ <location filename="../src/gui/folder.cpp" line="916"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="916"/>
+ <location filename="../src/gui/folder.cpp" line="921"/>
<source>Backup detected</source>
<translation>Biztonsági mentés észlelve</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="918"/>
+ <location filename="../src/gui/folder.cpp" line="923"/>
<source>Normal Synchronisation</source>
<translation>Normal szinkronizáció</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="919"/>
+ <location filename="../src/gui/folder.cpp" line="924"/>
<source>Keep Local Files as Conflict</source>
<translation>Helyi file-ok megtartása konfliktusként</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="140"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="148"/>
<source>You need to be connected to add a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="150"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="158"/>
<source>Click this button to add a folder to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
<source>%1 (%2)</source>
<extracomment>Example text: "File.txt (23KB)"</extracomment>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="180"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="188"/>
<source>Error while loading the list of folders from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="218"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="226"/>
<source>Signed out</source>
<translation>Kijelentkezve</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="145"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="153"/>
<source>Adding folder is disabled because you are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="183"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="191"/>
<source>Fetching folder list from server...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>Checking for changes in '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="868"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
<source>, '%1'</source>
<extracomment>Build a list of file names</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="871"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="900"/>
<source>'%1'</source>
<extracomment>Argument is a file name</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="896"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="925"/>
<source>Syncing %1</source>
<extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment>
<translation>%1 szinkronizálása</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="908"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="927"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="937"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="931"/>
<source>download %1/s</source>
<extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>letöltés: %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="933"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="911"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>upload %1/s</source>
<extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>feltöltés: %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="913"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="942"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="918"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 / %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="922"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="951"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%5 maradt, %1 / %2, %3 / %4 fájl</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="948"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="954"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="983"/>
<source>file %1 of %2</source>
<translation>%1 / %2 fájl</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/>
<source>Waiting...</source>
<translation>Várakozás...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="998"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1027"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>Várakozás %n további könyvtárra...</numerusform><numerusform>Várakozás %n további könyvtárra...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1033"/>
<source>Preparing to sync...</source>
<translation>Felkészülés szinkronizálásra...</translation>
</message>
<translation>Haladó</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="101"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
+ <source>Ask for confirmation before synchronizing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="105"/>
<source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/generalsettings.ui" line="26"/>
<source>&Launch on System Startup</source>
<translation>&Monokróm ikonok használata</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="59"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit &Ignored Files</source>
<translation>K&ihagyott fájlok szerkesztése</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
- <source>Ask &confirmation before downloading folders larger than</source>
- <translation>Megerősítés &kérése nagyobb könyvtárak letöltése előtt:</translation>
- </message>
- <message>
- <location filename="../src/gui/generalsettings.ui" line="129"/>
+ <location filename="../src/gui/generalsettings.ui" line="140"/>
<source>S&how crash reporter</source>
<translation>&Hibabejelentő megjelenítése</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="150"/>
<location filename="../src/gui/generalsettings.ui" line="156"/>
- <location filename="../src/gui/generalsettings.ui" line="162"/>
<source>About</source>
<translation>Rólunk</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="172"/>
+ <location filename="../src/gui/generalsettings.ui" line="166"/>
<source>Updates</source>
<translation>Frissítések</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="197"/>
+ <location filename="../src/gui/generalsettings.ui" line="191"/>
<source>&Restart && Update</source>
<translation>Új&raindítás és frissítés</translation>
</message>
<translation>Csatlakozás...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="144"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="159"/>
<source>%1 folder '%2' is synced to local folder '%3'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="162"/>
<source>Sync the folder '%1'</source>
<translation>„%1” könyvtár szinkronizálása</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="152"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="167"/>
<source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="251"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/>
<source>Local Sync Folder</source>
<translation>Helyi Sync mappa</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="311"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="317"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="540"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Helyi %1 szinkronizációs mappa sikeresen létrehozva!</b></font></translation>
</message>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="120"/>
<source>Success.</source>
<translation>Sikerült.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="127"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="130"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>Az %1 beépülőmodul a csync-hez nem tölthető be.<br/>Ellenőrizze a telepítést!</p></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<source>CSync got an error while processing internal trees.</source>
<translation>A CSync hibába ütközött a belső adatok feldolgozása közben.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<source>CSync failed to reserve memory.</source>
<translation>Hiba a CSync memórifoglalásakor.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync fatal parameter error.</source>
<translation>CSync hibás paraméterhiba.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync processing step update failed.</source>
<translation>CSync frissítés feldolgozása meghíusult.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync egyeztetési lépés meghíusult.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync could not authenticate at the proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>A CSync nem találja a proxy kiszolgálót.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>A CSync nem tuja azonosítani magát a %1 kiszolgálón.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync hálózati kapcsolódási hiba.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>A network connection timeout happened.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>A HTTP transmission error happened.</source>
<translation>HTTP átviteli hiba történt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>An error occurred while opening a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="197"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Error while reading folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="477"/>
+ <location filename="../src/libsync/syncengine.cpp" line="476"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="738"/>
+ <location filename="../src/libsync/syncengine.cpp" line="737"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1206"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1213"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: Nincs szabad tárhely az %1 kiszolgálón.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>CSync ismeretlen hiba.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Felhasználó megszakította</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>CSync failed to access</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="123"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>The service is temporarily unavailable</source>
<translation>A szolgáltatás ideiglenesen nem elérhető</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>Access is forbidden</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="202"/>
+ <location filename="../src/libsync/syncengine.cpp" line="201"/>
<source>An internal error number %1 occurred.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="266"/>
+ <location filename="../src/libsync/syncengine.cpp" line="265"/>
<source>The item is not synced because of previous errors: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="445"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="449"/>
+ <location filename="../src/libsync/syncengine.cpp" line="448"/>
<source>File is listed on the ignore list.</source>
<translation>Fájl a kizárási listán.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="453"/>
+ <location filename="../src/libsync/syncengine.cpp" line="452"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="463"/>
+ <location filename="../src/libsync/syncengine.cpp" line="462"/>
<source>File names containing the character '%1' are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="466"/>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
<source>The file name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="471"/>
+ <location filename="../src/libsync/syncengine.cpp" line="470"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="474"/>
+ <location filename="../src/libsync/syncengine.cpp" line="473"/>
<source>Filename is too long.</source>
<translation>Fájlnév túl nagy.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="483"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Stat failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="510"/>
+ <location filename="../src/libsync/syncengine.cpp" line="509"/>
<source>Filename encoding is not valid</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="678"/>
+ <location filename="../src/libsync/syncengine.cpp" line="677"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Érvénytelen karakterek, kérjük nevezd át: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="774"/>
+ <location filename="../src/libsync/syncengine.cpp" line="773"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="793"/>
+ <location filename="../src/libsync/syncengine.cpp" line="792"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="830"/>
+ <location filename="../src/libsync/syncengine.cpp" line="829"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="875"/>
+ <location filename="../src/libsync/syncengine.cpp" line="874"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="933"/>
+ <location filename="../src/libsync/syncengine.cpp" line="932"/>
<source>File name contains at least one invalid character</source>
<translation>A fájlnév legalább egy érvénytelen karaktert tartalmaz!</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
- <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1172"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1191"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1232"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1249"/>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1267"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1280"/>
<source>Local files and share folder removed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1336"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1347"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the destination</source>
<translation>a cél</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the source</source>
<translation>a forrás</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="300"/>
+ <location filename="../src/libsync/theme.cpp" line="309"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation>%1 verzió elérhető. <p>További információk: <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="304"/>
+ <location filename="../src/libsync/theme.cpp" line="313"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="305"/>
+ <location filename="../src/libsync/theme.cpp" line="314"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="250"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="352"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="379"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="402"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<translation>&Tiszta szinkronizálás elindítása (Mindent töröl a helyi könyvtárból!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="295"/>
+ <source>Ask for confirmation before synchroni&zing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="321"/>
+ <source>Ask for confirmation before synchronizing e&xternal storages</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="345"/>
<source>Choose what to sync</source>
<translation>Szinkronizálandó elemek kiválasztása</translation>
</message>
<translation>&Helyi adatok megtartása</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>S&ync everything from server</source>
<translation>M&inden szinkronizálása a szerverről</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
<source>Status message</source>
<translation>Állapotüzenet</translation>
</message>
<location filename="../src/gui/owncloudsetuppage.ui" line="129"/>
<location filename="../src/gui/owncloudsetuppage.ui" line="156"/>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="190"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="83"/>
- <source>Server &Address</source>
- <translation>Kiszolgáló &címe</translation>
+ <source>Ser&ver Address</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="99"/>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="286"/>
+ <location filename="../src/libsync/theme.cpp" line="295"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Fordítva a <a href="%1">%2</a> Git revizíóból, %3, %4 Qt %5, %6 felhasználásával</small></p></translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="238"/>
<location filename="../src/gui/accountsettings.cpp" line="371"/>
- <location filename="../src/gui/accountsettings.cpp" line="728"/>
+ <location filename="../src/gui/accountsettings.cpp" line="733"/>
<source>Cancel</source>
<translation>Annulla</translation>
</message>
<translation>Accedi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="678"/>
- <source>There are new folders that were not synchronized because they are too big: </source>
- <translation>Ci sono nuove cartelle che non sono state sincronizzate poiché sono troppo grandi:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="680"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="681"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="720"/>
+ <location filename="../src/gui/accountsettings.cpp" line="725"/>
<source>Confirm Account Removal</source>
<translation>Conferma rimozione account</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="721"/>
+ <location filename="../src/gui/accountsettings.cpp" line="726"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>Vuoi davvero eliminare la connessione all'account <i>%1</i>?</p><p><b>Nota:</b> ciò <b>non</b> eliminerà alcun file.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="727"/>
+ <location filename="../src/gui/accountsettings.cpp" line="732"/>
<source>Remove connection</source>
<translation>Rimuovi connessione</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="600"/>
<source>Aborted by the user</source>
<translation>Interrotto dall'utente</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="139"/>
<source>Local folder %1 does not exist.</source>
<translation>La cartella locale %1 non esiste.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="142"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 dovrebbe essere una cartella, ma non lo è.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="144"/>
+ <location filename="../src/gui/folder.cpp" line="145"/>
<source>%1 is not readable.</source>
<translation>%1 non è leggibile.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="367"/>
+ <location filename="../src/gui/folder.cpp" line="368"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 è stato rimosso.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="374"/>
+ <location filename="../src/gui/folder.cpp" line="375"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 è stato scaricato.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="382"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 è stato aggiornato.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="388"/>
+ <location filename="../src/gui/folder.cpp" line="389"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 è stato rinominato in %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="395"/>
+ <location filename="../src/gui/folder.cpp" line="396"/>
<source>%1 has been moved to %2.</source>
<translation>%1 è stato spostato in %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="365"/>
+ <location filename="../src/gui/folder.cpp" line="366"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 e %n altro file sono stati rimossi.</numerusform><numerusform>%1 e %n altri file sono stati rimossi.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="372"/>
+ <location filename="../src/gui/folder.cpp" line="373"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 e %n altro file sono stati scaricati.</numerusform><numerusform>%1 e %n altri file sono stati scaricati.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="379"/>
+ <location filename="../src/gui/folder.cpp" line="380"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 e %n altro file sono stati aggiornati.</numerusform><numerusform>%1 e %n altri file sono stati aggiornati.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="386"/>
+ <location filename="../src/gui/folder.cpp" line="387"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 è stato rinominato in %2 e %n altro file sono stati rinominati.</numerusform><numerusform>%1 è stato rinominato in %2 e %n altri file sono stati rinominati.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="393"/>
+ <location filename="../src/gui/folder.cpp" line="394"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 è stato spostato in %2 e %n altro file sono stati spostati.</numerusform><numerusform>%1 è stato spostato in %2 e %n altri file sono stati spostati.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="400"/>
+ <location filename="../src/gui/folder.cpp" line="401"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 e %n altro file hanno conflitti di sincronizzazione.</numerusform><numerusform>%1 e %n altri file hanno conflitti di sincronizzazione.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="402"/>
+ <location filename="../src/gui/folder.cpp" line="403"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 ha un conflitto di sincronizzazione. Controlla il file in conflitto!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="407"/>
+ <location filename="../src/gui/folder.cpp" line="408"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>1% e %n altro file non sono stati sincronizzati a causa di errori. Controlla il log per i dettagli.</numerusform><numerusform>1% e %n altri file non sono stati sincronizzati a causa di errori. Controlla il log per i dettagli.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="409"/>
+ <location filename="../src/gui/folder.cpp" line="410"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 non può essere sincronizzato a causa di un errore. Controlla il log per i dettagli.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="415"/>
+ <location filename="../src/gui/folder.cpp" line="416"/>
<source>Sync Activity</source>
<translation>Sincronizza attività</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="642"/>
+ <location filename="../src/gui/folder.cpp" line="643"/>
<source>Could not read system exclude file</source>
<translation>Impossibile leggere il file di esclusione di sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="850"/>
+ <location filename="../src/gui/folder.cpp" line="854"/>
<source>A new folder larger than %1 MB has been added: %2.
-Please go in the settings to select it if you wish to download it.</source>
- <translation>Una nuova cartella più grande di %1 MB è stata aggiunta: %2.
-Vai nelle impostazioni per selezionarla se desideri scaricarla.</translation>
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="856"/>
+ <source>A folder from an external storage has been added.
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="857"/>
+ <source>Please go in the settings to select it if you wish to download it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="888"/>
+ <location filename="../src/gui/folder.cpp" line="893"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
Sei sicuro di voler eseguire questa operazione?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="892"/>
+ <location filename="../src/gui/folder.cpp" line="897"/>
<source>Remove All Files?</source>
<translation>Vuoi rimuovere tutti i file?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="894"/>
+ <location filename="../src/gui/folder.cpp" line="899"/>
<source>Remove all files</source>
<translation>Rimuovi tutti i file</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="895"/>
+ <location filename="../src/gui/folder.cpp" line="900"/>
<source>Keep files</source>
<translation>Mantieni i file</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="911"/>
+ <location filename="../src/gui/folder.cpp" line="916"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tutti i tuoi file con file più datati in uno stato precedente. Vuoi mantenere i tuoi file locali più recenti come file di conflitto?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="916"/>
+ <location filename="../src/gui/folder.cpp" line="921"/>
<source>Backup detected</source>
<translation>Backup rilevato</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="918"/>
+ <location filename="../src/gui/folder.cpp" line="923"/>
<source>Normal Synchronisation</source>
<translation>Sincronizzazione normale</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="919"/>
+ <location filename="../src/gui/folder.cpp" line="924"/>
<source>Keep Local Files as Conflict</source>
<translation>Mantieni i file locali come conflitto</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="140"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="148"/>
<source>You need to be connected to add a folder</source>
<translation>Devi essere connesso per aggiungere una cartella</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="150"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="158"/>
<source>Click this button to add a folder to synchronize.</source>
<translation>Fai clic su questo pulsante per aggiungere una cartella da sincronizzare.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
<source>%1 (%2)</source>
<extracomment>Example text: "File.txt (23KB)"</extracomment>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="180"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="188"/>
<source>Error while loading the list of folders from the server.</source>
<translation>Errore durante il caricamento dell'elenco delle cartelle dal server.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="218"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="226"/>
<source>Signed out</source>
<translation>Disconnesso</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="145"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="153"/>
<source>Adding folder is disabled because you are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
<translation>L'aggiunta di una cartella è disabilitata perché stai già sincronizzando tutti i tuoi file. Se desideri sincronizzare più cartelle, rimuovi la cartella radice attualmente configurata.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="183"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="191"/>
<source>Fetching folder list from server...</source>
<translation>Recupero dell'elenco delle cartelle dal server...</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>Checking for changes in '%1'</source>
<translation>Controllo delle modifiche in '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="868"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
<source>, '%1'</source>
<extracomment>Build a list of file names</extracomment>
<translation>, '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="871"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="900"/>
<source>'%1'</source>
<extracomment>Argument is a file name</extracomment>
<translation>'%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="896"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="925"/>
<source>Syncing %1</source>
<extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment>
<translation>Sincronizzazione di %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="908"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="927"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="937"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="931"/>
<source>download %1/s</source>
<extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>ricezione %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="933"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="911"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>upload %1/s</source>
<extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>invio %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="913"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="942"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="918"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 di %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="922"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="951"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%5 rimanenti, %1 di %2, file %3 di %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="948"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 di %2, file %3 di %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="954"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="983"/>
<source>file %1 of %2</source>
<translation>file %1 di %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/>
<source>Waiting...</source>
<translation>Attendere...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="998"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1027"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>In attesa di %n altra cartella...</numerusform><numerusform>In attesa di %n altre cartelle...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1033"/>
<source>Preparing to sync...</source>
<translation>Preparazione della sincronizzazione...</translation>
</message>
<translation>Avanzate</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="101"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
+ <source>Ask for confirmation before synchronizing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="105"/>
<source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/generalsettings.ui" line="26"/>
<source>&Launch on System Startup</source>
<translation>Usa le icone &monocolore</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="59"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit &Ignored Files</source>
<translation>Mod&ifica file ignorati</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
- <source>Ask &confirmation before downloading folders larger than</source>
- <translation>&Chiedi conferma prima di scaricare cartelle più grandi di</translation>
- </message>
- <message>
- <location filename="../src/gui/generalsettings.ui" line="129"/>
+ <location filename="../src/gui/generalsettings.ui" line="140"/>
<source>S&how crash reporter</source>
<translation>Mostra il rapporto di c&hiusura inattesa</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="150"/>
<location filename="../src/gui/generalsettings.ui" line="156"/>
- <location filename="../src/gui/generalsettings.ui" line="162"/>
<source>About</source>
<translation>Informazioni</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="172"/>
+ <location filename="../src/gui/generalsettings.ui" line="166"/>
<source>Updates</source>
<translation>Aggiornamenti</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="197"/>
+ <location filename="../src/gui/generalsettings.ui" line="191"/>
<source>&Restart && Update</source>
<translation>&Riavvia e aggiorna</translation>
</message>
<translation>Connetti...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="144"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="159"/>
<source>%1 folder '%2' is synced to local folder '%3'</source>
<translation>La cartella '%2' di %1 è sincronizzata con la cartella locale '%3'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="162"/>
<source>Sync the folder '%1'</source>
<translation>Sincronizza la cartella '%1'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="152"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="167"/>
<source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
<translation><p><small><strong>Avviso:</strong> la cartella locale non è vuota. Scegli una soluzione.</small></p></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="251"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/>
<source>Local Sync Folder</source>
<translation>Cartella locale di sincronizzazione</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="311"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="317"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
<translation>Impossibile rimuovere o creare una copia di sicurezza della cartella poiché la cartella o un file in essa contenuto è aperta in un altro programma. Chiudi la cartella o il file e premi Riprova o annulla la configurazione.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="540"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Cartella locale %1 creata correttamente!</b></font></translation>
</message>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="120"/>
<source>Success.</source>
<translation>Successo.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="127"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSync non è riuscito a scrivere il file di registro. Il file di registro è danneggiato.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="130"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>Il plugin %1 per csync non può essere caricato.<br/>Verifica l'installazione!</p></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<source>CSync got an error while processing internal trees.</source>
<translation>Errore di CSync durante l'elaborazione degli alberi interni.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync non è riuscito a riservare la memoria.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync fatal parameter error.</source>
<translation>Errore grave di parametro di CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync processing step update failed.</source>
<translation>La fase di aggiornamento di CSync non è riuscita.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync processing step reconcile failed.</source>
<translation>La fase di riconciliazione di CSync non è riuscita.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync non è in grado di autenticarsi al proxy.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync non è riuscito a trovare un proxy o server.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync non è riuscito ad autenticarsi al server %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync non è riuscito a connettersi alla rete.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>A network connection timeout happened.</source>
<translation>Si è verificato un timeout della connessione di rete.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>A HTTP transmission error happened.</source>
<translation>Si è verificato un errore di trasmissione HTTP.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation>La cartella montata è temporaneamente indisponibile sul server</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>An error occurred while opening a folder</source>
<translation>Si è verificato un errore durante l'apertura di una cartella</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="197"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Error while reading folder.</source>
<translation>Errore durante la lettura della cartella.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="477"/>
+ <location filename="../src/libsync/syncengine.cpp" line="476"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>Il file/cartella è ignorato poiché è nascosto.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="738"/>
+ <location filename="../src/libsync/syncengine.cpp" line="737"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Sono disponibili solo %1, servono almeno %2 per iniziare</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1206"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Non consentito poiché non disponi dei permessi per aggiungere la cartella superiore</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1213"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Non consentito poiché non disponi dei permessi per aggiungere file in quella cartella</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: spazio insufficiente sul server %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>Errore non specificato di CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Interrotto dall'utente</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>CSync failed to access</source>
<translation>CSync non è riuscito ad accedere</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="123"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation>CSync non è riuscito a caricare o a creare il file journal. Assicurati di avere i permessi di lettura e scrittura nella cartella di sincronizzazione locale.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation>Problema di CSync a causa di un permesso negato non gestito.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync tried to create a folder that already exists.</source>
<translation>CSync ha cercato di creare una cartella già esistente.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>The service is temporarily unavailable</source>
<translation>Il servizio è temporaneamente non disponibile</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>Access is forbidden</source>
<translation>L'accesso è vietato</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="202"/>
+ <location filename="../src/libsync/syncengine.cpp" line="201"/>
<source>An internal error number %1 occurred.</source>
<translation>SI è verificato un errore interno numero %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="266"/>
+ <location filename="../src/libsync/syncengine.cpp" line="265"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>L'elemento non è sincronizzato a causa dell'errore precedente: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="445"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>I collegamenti simbolici non sono supportati dalla sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="449"/>
+ <location filename="../src/libsync/syncengine.cpp" line="448"/>
<source>File is listed on the ignore list.</source>
<translation>Il file è stato aggiunto alla lista ignorati.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="453"/>
+ <location filename="../src/libsync/syncengine.cpp" line="452"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="463"/>
+ <location filename="../src/libsync/syncengine.cpp" line="462"/>
<source>File names containing the character '%1' are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="466"/>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
<source>The file name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="471"/>
+ <location filename="../src/libsync/syncengine.cpp" line="470"/>
<source>Filename contains trailing spaces.</source>
<translation>Il nome del file contiene spazi alla fine.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="474"/>
+ <location filename="../src/libsync/syncengine.cpp" line="473"/>
<source>Filename is too long.</source>
<translation>Il nome del file è troppo lungo.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="483"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Stat failed.</source>
<translation>Stat non riuscita.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="510"/>
+ <location filename="../src/libsync/syncengine.cpp" line="509"/>
<source>Filename encoding is not valid</source>
<translation>La codifica del nome del file non è valida</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="678"/>
+ <location filename="../src/libsync/syncengine.cpp" line="677"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Caratteri non validi, rinomina "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="774"/>
+ <location filename="../src/libsync/syncengine.cpp" line="773"/>
<source>Unable to initialize a sync journal.</source>
<translation>Impossibile inizializzare il registro di sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="793"/>
+ <location filename="../src/libsync/syncengine.cpp" line="792"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Impossibile leggere la lista nera dal database locale</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="830"/>
+ <location filename="../src/libsync/syncengine.cpp" line="829"/>
<source>Unable to read from the sync journal.</source>
<translation>Impossibile leggere dal registro di sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="875"/>
+ <location filename="../src/libsync/syncengine.cpp" line="874"/>
<source>Cannot open the sync journal</source>
<translation>Impossibile aprire il registro di sincronizzazione</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="933"/>
+ <location filename="../src/libsync/syncengine.cpp" line="932"/>
<source>File name contains at least one invalid character</source>
<translation>Il nome del file contiene almeno un carattere non valido</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
- <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1172"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorato in base alla lista nera per la scelta di cosa sincronizzare</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1191"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Non consentito poiché non disponi dei permessi per aggiungere sottocartelle in quella cartella</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1232"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Il caricamento di questo file non è consentito poiché è in sola lettura sul server, ripristino</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1249"/>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1267"/>
<source>Not allowed to remove, restoring</source>
<translation>Rimozione non consentita, ripristino</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1280"/>
<source>Local files and share folder removed.</source>
<translation>I file locali e la cartella condivisa sono stati rimossi.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1336"/>
<source>Move not allowed, item restored</source>
<translation>Spostamento non consentito, elemento ripristinato</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1347"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Spostamento non consentito poiché %1 è in sola lettura</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the destination</source>
<translation>la destinazione</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the source</source>
<translation>l'origine</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="300"/>
+ <location filename="../src/libsync/theme.cpp" line="309"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Versione %1. Per ulteriori informazioni vedi <a href="%2">3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="304"/>
+ <location filename="../src/libsync/theme.cpp" line="313"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation><p>Copyright ownCloud GmbH</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="305"/>
+ <location filename="../src/libsync/theme.cpp" line="314"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Distribuito da %1 e sotto licenza GNU General Public License (GPL) versione 2.0.<br/>%2 e il logo di %2 sono marchi registrati di %1 negli Stati Uniti, in altri paesi o entrambi.</p></translation>
</message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="250"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="352"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="379"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="402"/>
<source>TextLabel</source>
<translation>EtichettaTesto</translation>
</message>
<translation>Avvia una nuova sin&cronizzazione (Cancella la cartella locale!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="295"/>
+ <source>Ask for confirmation before synchroni&zing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="321"/>
+ <source>Ask for confirmation before synchronizing e&xternal storages</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="345"/>
<source>Choose what to sync</source>
<translation>Scegli cosa sincronizzare</translation>
</message>
<translation>&Mantieni i dati locali</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>S&ync everything from server</source>
<translation>Sincroni&zza tutto dal server</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
<source>Status message</source>
<translation>Messaggio di stato</translation>
</message>
<location filename="../src/gui/owncloudsetuppage.ui" line="129"/>
<location filename="../src/gui/owncloudsetuppage.ui" line="156"/>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="190"/>
<source>TextLabel</source>
<translation>EtichettaTesto</translation>
</message>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="83"/>
- <source>Server &Address</source>
- <translation>In&dirizzo server</translation>
+ <source>Ser&ver Address</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="99"/>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="286"/>
+ <location filename="../src/libsync/theme.cpp" line="295"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Compilato dalla revisione Git <a href="%1">%2</a> il %3, %4 utilizzando Qt %5, %6</small><p></translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="238"/>
<location filename="../src/gui/accountsettings.cpp" line="371"/>
- <location filename="../src/gui/accountsettings.cpp" line="728"/>
+ <location filename="../src/gui/accountsettings.cpp" line="733"/>
<source>Cancel</source>
<translation>キャンセル</translation>
</message>
<translation>ログイン</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="678"/>
- <source>There are new folders that were not synchronized because they are too big: </source>
- <translation>容量が大きいため、同期されていない新規フォルダーがあります:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="680"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="681"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="720"/>
+ <location filename="../src/gui/accountsettings.cpp" line="725"/>
<source>Confirm Account Removal</source>
<translation>アカウント削除確認</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="721"/>
+ <location filename="../src/gui/accountsettings.cpp" line="726"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p> アカウント <i>%1</i> を本当に削除しますか?</p><p><b>注意:</b> これによりファイルが一切削除されることはありません。</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="727"/>
+ <location filename="../src/gui/accountsettings.cpp" line="732"/>
<source>Remove connection</source>
<translation>接続削除</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="600"/>
<source>Aborted by the user</source>
<translation>ユーザーによって中止されました</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="139"/>
<source>Local folder %1 does not exist.</source>
<translation>ローカルフォルダー %1 は存在しません。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="142"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 はフォルダーのはずですが、そうではないようです。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="144"/>
+ <location filename="../src/gui/folder.cpp" line="145"/>
<source>%1 is not readable.</source>
<translation>%1 は読み込み可能ではありません。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="367"/>
+ <location filename="../src/gui/folder.cpp" line="368"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 は削除されました。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="374"/>
+ <location filename="../src/gui/folder.cpp" line="375"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 はダウンロードされました。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="382"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 が更新されました。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="388"/>
+ <location filename="../src/gui/folder.cpp" line="389"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 の名前が %2 に変更されました。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="395"/>
+ <location filename="../src/gui/folder.cpp" line="396"/>
<source>%1 has been moved to %2.</source>
<translation>%1 は %2 に移動しました。</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="365"/>
+ <location filename="../src/gui/folder.cpp" line="366"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 とその他 %n 個のファイルが削除されました。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="372"/>
+ <location filename="../src/gui/folder.cpp" line="373"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 とその他 %n 個のファイルがダウンロードされました。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="379"/>
+ <location filename="../src/gui/folder.cpp" line="380"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 とその他 %n 個のファイルが更新されました。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="386"/>
+ <location filename="../src/gui/folder.cpp" line="387"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 を %2 にファイル名を変更し、その他 %n 個のファイル名を変更しました。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="393"/>
+ <location filename="../src/gui/folder.cpp" line="394"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 を %2 に移動し、その他 %n 個のファイルを移動しました。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="400"/>
+ <location filename="../src/gui/folder.cpp" line="401"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 と その他 %n 個のファイルが同期で衝突しました。</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="402"/>
+ <location filename="../src/gui/folder.cpp" line="403"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 が同期で衝突しています。コンフリクトファイルを確認してください。</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="407"/>
+ <location filename="../src/gui/folder.cpp" line="408"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>エラーにより、%1 と その他 %n 個のファイルが同期できませんでした。ログで詳細を確認してください。</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="409"/>
+ <location filename="../src/gui/folder.cpp" line="410"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>エラーにより %1 が未同期です。ログで詳細を確認してください。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="415"/>
+ <location filename="../src/gui/folder.cpp" line="416"/>
<source>Sync Activity</source>
<translation>同期アクティビティ</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="642"/>
+ <location filename="../src/gui/folder.cpp" line="643"/>
<source>Could not read system exclude file</source>
<translation>システム上の除外ファイルを読み込めません</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="850"/>
+ <location filename="../src/gui/folder.cpp" line="854"/>
<source>A new folder larger than %1 MB has been added: %2.
-Please go in the settings to select it if you wish to download it.</source>
- <translation>新しい %1 MB以上のフォルダーが追加されました: %2
-ダウンロードしたい場合は、設定画面で選択してください。</translation>
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="856"/>
+ <source>A folder from an external storage has been added.
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="857"/>
+ <source>Please go in the settings to select it if you wish to download it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="888"/>
+ <location filename="../src/gui/folder.cpp" line="893"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
本当にこの操作を実行しますか？</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="892"/>
+ <location filename="../src/gui/folder.cpp" line="897"/>
<source>Remove All Files?</source>
<translation>すべてのファイルを削除しますか？</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="894"/>
+ <location filename="../src/gui/folder.cpp" line="899"/>
<source>Remove all files</source>
<translation>すべてのファイルを削除</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="895"/>
+ <location filename="../src/gui/folder.cpp" line="900"/>
<source>Keep files</source>
<translation>ファイルを残す</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="911"/>
+ <location filename="../src/gui/folder.cpp" line="916"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation>この同期により同期フォルダ '%1' のファイルが以前のものに戻されます。 これは、バックアップがサーバー上に復元されたためです。 通常と同じように同期を続けると、すべてのファイルが以前の状態の古いファイルによって上書きされます。最新のローカルファイルを競合ファイルとして保存しますか？</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="916"/>
+ <location filename="../src/gui/folder.cpp" line="921"/>
<source>Backup detected</source>
<translation>バックアップが検出されました</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="918"/>
+ <location filename="../src/gui/folder.cpp" line="923"/>
<source>Normal Synchronisation</source>
<translation>正常同期</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="919"/>
+ <location filename="../src/gui/folder.cpp" line="924"/>
<source>Keep Local Files as Conflict</source>
<translation>コンフリクト時にローカルファイルを保持</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="140"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="148"/>
<source>You need to be connected to add a folder</source>
<translation>フォルダーを追加するためには、接続している必要があります。</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="150"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="158"/>
<source>Click this button to add a folder to synchronize.</source>
<translation>このボタンをクリックして同期フォルダーを追加してください。</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
<source>%1 (%2)</source>
<extracomment>Example text: "File.txt (23KB)"</extracomment>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="180"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="188"/>
<source>Error while loading the list of folders from the server.</source>
<translation>サーバーからフォルダーのリスト取得時にエラー</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="218"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="226"/>
<source>Signed out</source>
<translation>サインアウト</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="145"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="153"/>
<source>Adding folder is disabled because you are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
<translation>すでに同期対象のフォルダーのため、追加したフォルダーを無効にしました。複数のフォルダーを同期したい場合は、現在設定されているルートフォルダーの同期設定を削除してください。</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="183"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="191"/>
<source>Fetching folder list from server...</source>
<translation>サーバーからフォルダーリストを取得中...</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>Checking for changes in '%1'</source>
<translation>'%1' の更新を確認しています</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="868"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
<source>, '%1'</source>
<extracomment>Build a list of file names</extracomment>
<translation>, '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="871"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="900"/>
<source>'%1'</source>
<extracomment>Argument is a file name</extracomment>
<translation>'%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="896"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="925"/>
<source>Syncing %1</source>
<extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment>
<translation>同期中 %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="908"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="927"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="937"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="931"/>
<source>download %1/s</source>
<extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>ダウンロード %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="933"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="911"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>upload %1/s</source>
<extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>アップロード %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="913"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="942"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="918"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment>
<translation>%1 %2 (%4 中 %3 完了)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="922"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="951"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>残り %5、%2中 %1完了 、%4中 %3 ファイル完了</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="948"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 of %2, ファイル数 %3 of %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="954"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="983"/>
<source>file %1 of %2</source>
<translation>%1 / %2 ファイル</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/>
<source>Waiting...</source>
<translation>待機中...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="998"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1027"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>%n 他のフォルダーの完了待ち...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1033"/>
<source>Preparing to sync...</source>
<translation>同期の準備中...</translation>
</message>
<translation>詳細設定</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="101"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
+ <source>Ask for confirmation before synchronizing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="105"/>
<source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/generalsettings.ui" line="26"/>
<source>&Launch on System Startup</source>
<translation>モノクロアイコンを使用(&M)</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="59"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit &Ignored Files</source>
<translation>除外ファイルリストを編集(&I)</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
- <source>Ask &confirmation before downloading folders larger than</source>
- <translation>次の容量より大きい場合はダウンロード前に確認(C&)</translation>
- </message>
- <message>
- <location filename="../src/gui/generalsettings.ui" line="129"/>
+ <location filename="../src/gui/generalsettings.ui" line="140"/>
<source>S&how crash reporter</source>
<translation>クラッシュ報告を表示(&H)</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="150"/>
<location filename="../src/gui/generalsettings.ui" line="156"/>
- <location filename="../src/gui/generalsettings.ui" line="162"/>
<source>About</source>
<translation>バージョン情報</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="172"/>
+ <location filename="../src/gui/generalsettings.ui" line="166"/>
<source>Updates</source>
<translation>アップデート</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="197"/>
+ <location filename="../src/gui/generalsettings.ui" line="191"/>
<source>&Restart && Update</source>
<translation>再起動してアップデート(&R)</translation>
</message>
<translation>接続...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="144"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="159"/>
<source>%1 folder '%2' is synced to local folder '%3'</source>
<translation>%1 フォルダー '%2' はローカルフォルダー '%3' と同期しています</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="162"/>
<source>Sync the folder '%1'</source>
<translation>'%1' フォルダーを同期</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="152"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="167"/>
<source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
<translation><p><small><strong>警告:</strong> ローカルフォルダーは空ではありません。解決方法を選択してください！</small></p></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="251"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/>
<source>Local Sync Folder</source>
<translation>ローカル同期フォルダー</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="311"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="317"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
<translation>フォルダーまたはその中にあるファイルが他のプログラムで開かれているため、フォルダーの削除やバックアップができません。フォルダーまたはファイルを閉じてから再試行するか、セットアップをキャンセルしてください。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="540"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>ローカルの同期フォルダー %1 は正常に作成されました！</b></font></translation>
</message>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="120"/>
<source>Success.</source>
<translation>成功。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="127"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSyncはジャーナルファイルの読み込みに失敗しました。ジャーナルファイルが破損しています。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="130"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>csync 用の %1 プラグインをロードできませんでした。<br/>インストール状態を確認してください！</p></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSyncは内部ツリーの処理中にエラーに遭遇しました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<source>CSync failed to reserve memory.</source>
<translation>CSyncで使用するメモリの確保に失敗しました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync fatal parameter error.</source>
<translation>CSyncの致命的なパラメータエラーです。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync processing step update failed.</source>
<translation>CSyncの処理ステップの更新に失敗しました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSyncの処理ステップの調停に失敗しました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSyncはそのプロキシで認証できませんでした。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSyncはプロキシもしくはサーバーの参照に失敗しました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSyncは %1 サーバーでの認証に失敗しました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to connect to the network.</source>
<translation>CSyncはネットワークへの接続に失敗しました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>A network connection timeout happened.</source>
<translation>ネットワーク接続のタイムアウトが発生しました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>A HTTP transmission error happened.</source>
<translation>HTTPの伝送エラーが発生しました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation>サーバー上のマウント済フォルダーが一時的に利用できません。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>An error occurred while opening a folder</source>
<translation>フォルダーを開く際にエラーが発生しました</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="197"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Error while reading folder.</source>
<translation>フォルダーの読み込みエラー</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="477"/>
+ <location filename="../src/libsync/syncengine.cpp" line="476"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>隠しファイル/フォルダーのため無視されました</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="738"/>
+ <location filename="../src/libsync/syncengine.cpp" line="737"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>%1 しか空き容量がありません、開始するためには少なくとも %2 は必要です。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1206"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>親フォルダーを追加する権限がありません</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1213"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>そのフォルダーにファイルを追加する権限がありません</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: %1 サーバーには利用可能な空き領域がありません。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>CSyncの未指定のエラーです。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>ユーザーによって中止されました</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>CSync failed to access</source>
<translation>CSync は接続できませんでした</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="123"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation>CSyncはジャーナルファイルの読み込みや作成に失敗しました。ローカルの同期フォルダーに読み書きの権限があるか確認してください。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation>CSync が処理できないパーミション拒否により失敗しました</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync tried to create a folder that already exists.</source>
<translation>CSyncはすでに存在するフォルダーを作成しようとしました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>The service is temporarily unavailable</source>
<translation>サーバーは一時的に利用できません</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>Access is forbidden</source>
<translation>アクセスが禁止されています</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="202"/>
+ <location filename="../src/libsync/syncengine.cpp" line="201"/>
<source>An internal error number %1 occurred.</source>
<translation>内部エラー番号 %1 が発生しました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="266"/>
+ <location filename="../src/libsync/syncengine.cpp" line="265"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>このアイテムは以前にエラーが発生したため同期しません: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="445"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>同期機能はシンボリックリンクをサポートしていません。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="449"/>
+ <location filename="../src/libsync/syncengine.cpp" line="448"/>
<source>File is listed on the ignore list.</source>
<translation>ファイルは除外リストに登録されています。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="453"/>
+ <location filename="../src/libsync/syncengine.cpp" line="452"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="463"/>
+ <location filename="../src/libsync/syncengine.cpp" line="462"/>
<source>File names containing the character '%1' are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="466"/>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
<source>The file name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="471"/>
+ <location filename="../src/libsync/syncengine.cpp" line="470"/>
<source>Filename contains trailing spaces.</source>
<translation>ファイル名末尾にスペースが含まれます。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="474"/>
+ <location filename="../src/libsync/syncengine.cpp" line="473"/>
<source>Filename is too long.</source>
<translation>ファイル名が長すぎます</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="483"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Stat failed.</source>
<translation>情報取得エラー</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="510"/>
+ <location filename="../src/libsync/syncengine.cpp" line="509"/>
<source>Filename encoding is not valid</source>
<translation>ファイル名のエンコーディングが無効です。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="678"/>
+ <location filename="../src/libsync/syncengine.cpp" line="677"/>
<source>Invalid characters, please rename "%1"</source>
<translation>無効な文字です、"%1" を変更してください。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="774"/>
+ <location filename="../src/libsync/syncengine.cpp" line="773"/>
<source>Unable to initialize a sync journal.</source>
<translation>同期ジャーナルの初期化ができません。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="793"/>
+ <location filename="../src/libsync/syncengine.cpp" line="792"/>
<source>Unable to read the blacklist from the local database</source>
<translation>ローカルデータベースからブラックリストを読み込みできません</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="830"/>
+ <location filename="../src/libsync/syncengine.cpp" line="829"/>
<source>Unable to read from the sync journal.</source>
<translation>同期ジャーナルから読み込みできません</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="875"/>
+ <location filename="../src/libsync/syncengine.cpp" line="874"/>
<source>Cannot open the sync journal</source>
<translation>同期ジャーナルを開くことができません</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="933"/>
+ <location filename="../src/libsync/syncengine.cpp" line="932"/>
<source>File name contains at least one invalid character</source>
<translation>ファイル名に1文字以上の無効な文字が含まれています</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
- <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1172"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>"同期対象先" ブラックリストにより無視されました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1191"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>そのフォルダーにサブフォルダーを追加する権限がありません</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1232"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>サーバーでは読み取り専用となっているため、このファイルをアップロードすることはできません、復元しています</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1249"/>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1267"/>
<source>Not allowed to remove, restoring</source>
<translation>削除できないので復元しています</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1280"/>
<source>Local files and share folder removed.</source>
<translation>ローカルファイルと共有フォルダーを削除しました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1336"/>
<source>Move not allowed, item restored</source>
<translation>移動できないので項目を復元しました</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1347"/>
<source>Move not allowed because %1 is read-only</source>
<translation>%1 は読み取り専用のため移動できません</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the destination</source>
<translation>移動先</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the source</source>
<translation>移動元</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="300"/>
+ <location filename="../src/libsync/theme.cpp" line="309"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>バージョン %1. 詳細な情報は<a href='%2'>%3</a>を確認してください。</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="304"/>
+ <location filename="../src/libsync/theme.cpp" line="313"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation><p>Copyright ownCloud GmbH</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="305"/>
+ <location filename="../src/libsync/theme.cpp" line="314"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>%1 が配布し、 GNU General Public License (GPL) バージョン2.0 の下でライセンスされています。<br/>%2 及び %2 のロゴはアメリカ合衆国またはその他の国、あるいはその両方における %1 の登録商標です。</p></translation>
</message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="250"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="352"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="379"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="402"/>
<source>TextLabel</source>
<translation>テキストラベル</translation>
</message>
<translation>クリーン同期を開始(ローカルフォルダーは削除されます！)(&C)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="295"/>
+ <source>Ask for confirmation before synchroni&zing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="321"/>
+ <source>Ask for confirmation before synchronizing e&xternal storages</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="345"/>
<source>Choose what to sync</source>
<translation>同期フォルダーを選択</translation>
</message>
<translation>ローカルデータを保持(&K)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>S&ync everything from server</source>
<translation>サーバーからすべてのファイルを同期(&Y)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
<source>Status message</source>
<translation>状態メッセージ</translation>
</message>
<location filename="../src/gui/owncloudsetuppage.ui" line="129"/>
<location filename="../src/gui/owncloudsetuppage.ui" line="156"/>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="190"/>
<source>TextLabel</source>
<translation>テキストラベル</translation>
</message>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="83"/>
- <source>Server &Address</source>
- <translation>サーバーアドレス(&A)</translation>
+ <source>Ser&ver Address</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="99"/>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="286"/>
+ <location filename="../src/libsync/theme.cpp" line="295"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small><a href="%1">%2</a> %3, %4 のGitリビジョンからのビルド Qt %5, %6 を利用</small></p></translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="238"/>
<location filename="../src/gui/accountsettings.cpp" line="371"/>
- <location filename="../src/gui/accountsettings.cpp" line="728"/>
+ <location filename="../src/gui/accountsettings.cpp" line="733"/>
<source>Cancel</source>
<translation>Avbryt</translation>
</message>
<translation>Logg inn</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="678"/>
- <source>There are new folders that were not synchronized because they are too big: </source>
- <translation>Det finnes nye mapper som ikke ble synkronisert fordi de er for store: </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="680"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="681"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="720"/>
+ <location filename="../src/gui/accountsettings.cpp" line="725"/>
<source>Confirm Account Removal</source>
<translation>Bekreft fjerning av konto</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="721"/>
+ <location filename="../src/gui/accountsettings.cpp" line="726"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>Vil du virkelig fjerne tilkoblingen til kontoen <i>%1</i>?</p><p><b>Merk:</b> Dette vil <b>ikke</b> slette noen filer.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="727"/>
+ <location filename="../src/gui/accountsettings.cpp" line="732"/>
<source>Remove connection</source>
<translation>Fjern tilkobling</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="600"/>
<source>Aborted by the user</source>
<translation>Avbrutt av brukeren</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="139"/>
<source>Local folder %1 does not exist.</source>
<translation>Lokal mappe %1 eksisterer ikke.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="142"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 skal være en mappe men er ikke det.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="144"/>
+ <location filename="../src/gui/folder.cpp" line="145"/>
<source>%1 is not readable.</source>
<translation>%1 kan ikke leses.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="367"/>
+ <location filename="../src/gui/folder.cpp" line="368"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 har blitt fjernet.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="374"/>
+ <location filename="../src/gui/folder.cpp" line="375"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 har blitt lastet ned.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="382"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 har blitt oppdatert.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="388"/>
+ <location filename="../src/gui/folder.cpp" line="389"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 har blitt omdøpt til %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="395"/>
+ <location filename="../src/gui/folder.cpp" line="396"/>
<source>%1 has been moved to %2.</source>
<translation>%1 har blitt flyttet til %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="365"/>
+ <location filename="../src/gui/folder.cpp" line="366"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 og %2 annen fil har blitt fjernet.</numerusform><numerusform>%1 og %2 andre filer har blitt fjernet.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="372"/>
+ <location filename="../src/gui/folder.cpp" line="373"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 og %2 annen fil har blitt lastet ned.</numerusform><numerusform>%1 og %2 andre filer har blitt lastet ned.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="379"/>
+ <location filename="../src/gui/folder.cpp" line="380"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 og %2 annen fil har blitt oppdatert.</numerusform><numerusform>%1 og %2 andre filer har blitt oppdatert.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="386"/>
+ <location filename="../src/gui/folder.cpp" line="387"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 er blitt omdøpt til %2 og %n annen fil har blitt omdøpt.</numerusform><numerusform>%1 er blitt omdøpt til %2 og %n andre filer har blitt omdøpt.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="393"/>
+ <location filename="../src/gui/folder.cpp" line="394"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 er blitt flyttet til %2 og %n annen fil har blitt flyttet.</numerusform><numerusform>%1 er blitt flyttet til %2 og %n andre filer har blitt flyttet.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="400"/>
+ <location filename="../src/gui/folder.cpp" line="401"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 og %n andre filer har synkroniseringskonflikter.</numerusform><numerusform>%1 og %n andre filer har synkroniseringskonflikter.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="402"/>
+ <location filename="../src/gui/folder.cpp" line="403"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 har en synkroniseringskonflikt. Sjekk konflikt-filen.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="407"/>
+ <location filename="../src/gui/folder.cpp" line="408"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 og %n andre filer kunne ikke synkroniseres pga. feil. Se loggen for detaljer.</numerusform><numerusform>%1 og %n andre filer kunne ikke synkroniseres pga. feil. Se loggen for detaljer.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="409"/>
+ <location filename="../src/gui/folder.cpp" line="410"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 kunne ikke synkroniseres pga. en feil. Se loggen for detaljer.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="415"/>
+ <location filename="../src/gui/folder.cpp" line="416"/>
<source>Sync Activity</source>
<translation>Synkroniseringsaktivitet</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="642"/>
+ <location filename="../src/gui/folder.cpp" line="643"/>
<source>Could not read system exclude file</source>
<translation>Klarte ikke å lese systemets ekskluderingsfil</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="850"/>
+ <location filename="../src/gui/folder.cpp" line="854"/>
<source>A new folder larger than %1 MB has been added: %2.
-Please go in the settings to select it if you wish to download it.</source>
- <translation>En ny mappe større enn %1 MB er blitt lagt til: %2.
-Gå til Innstillinger og velg mappen hvis du ønsker å laste den ned.</translation>
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="856"/>
+ <source>A folder from an external storage has been added.
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="857"/>
+ <source>Please go in the settings to select it if you wish to download it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="888"/>
+ <location filename="../src/gui/folder.cpp" line="893"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
Er du sikker på at du vil utføre denne operasjonen?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="892"/>
+ <location filename="../src/gui/folder.cpp" line="897"/>
<source>Remove All Files?</source>
<translation>Fjerne alle filer?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="894"/>
+ <location filename="../src/gui/folder.cpp" line="899"/>
<source>Remove all files</source>
<translation>Fjern alle filer</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="895"/>
+ <location filename="../src/gui/folder.cpp" line="900"/>
<source>Keep files</source>
<translation>Behold filer</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="911"/>
+ <location filename="../src/gui/folder.cpp" line="916"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
Hvis synkroniseringen fortsetter som normalt, vil alle filene dine bli overskrevet av en eldre fil i en tidligere tilstand. Ønsker du å beholde dine ferskeste lokale filer som konflikt-filer?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="916"/>
+ <location filename="../src/gui/folder.cpp" line="921"/>
<source>Backup detected</source>
<translation>Backup oppdaget</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="918"/>
+ <location filename="../src/gui/folder.cpp" line="923"/>
<source>Normal Synchronisation</source>
<translation>Normal synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="919"/>
+ <location filename="../src/gui/folder.cpp" line="924"/>
<source>Keep Local Files as Conflict</source>
<translation>Behold lokale filer som konflikt</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="140"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="148"/>
<source>You need to be connected to add a folder</source>
<translation>Du må være tilkoblet for å legge til en mappe</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="150"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="158"/>
<source>Click this button to add a folder to synchronize.</source>
<translation>Klikk denne knappen for å legge til en mappe som skal synkroniseres.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
<source>%1 (%2)</source>
<extracomment>Example text: "File.txt (23KB)"</extracomment>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="180"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="188"/>
<source>Error while loading the list of folders from the server.</source>
<translation>Feil ved innlasting av listen av mapper fra serveren.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="218"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="226"/>
<source>Signed out</source>
<translation>Logget ut</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="145"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="153"/>
<source>Adding folder is disabled because you are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
<translation>Du kan ikke legge til en mappe fordi du allerede synkroniserer alle filene dine. Hvis du ønsker å synkronisere individuelle mapper, må du fjerne synkroniseringen av rotmappen som er konfigurert.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="183"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="191"/>
<source>Fetching folder list from server...</source>
<translation>Henter mappeliste fra server..</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>Checking for changes in '%1'</source>
<translation>Ser etter endringer i '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="868"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
<source>, '%1'</source>
<extracomment>Build a list of file names</extracomment>
<translation>, '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="871"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="900"/>
<source>'%1'</source>
<extracomment>Argument is a file name</extracomment>
<translation>'%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="896"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="925"/>
<source>Syncing %1</source>
<extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment>
<translation>Synkroniserer %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="908"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="927"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="937"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="931"/>
<source>download %1/s</source>
<extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>nedlasting %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="933"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="911"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>upload %1/s</source>
<extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>opplasting %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="913"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="942"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="918"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 av %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="922"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="951"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%5 igjen, %1 av %2, fil %3 of %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="948"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 av %2, fil %3 av %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="954"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="983"/>
<source>file %1 of %2</source>
<translation>fil %1 av %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/>
<source>Waiting...</source>
<translation>Venter..</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="998"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1027"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>Venter på %n annen mappe...</numerusform><numerusform>Venter på %n andre mappe(r)...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1033"/>
<source>Preparing to sync...</source>
<translation>Forbereder synkronisering...</translation>
</message>
<translation>Avansert</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="101"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
+ <source>Ask for confirmation before synchronizing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="105"/>
<source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/generalsettings.ui" line="26"/>
<source>&Launch on System Startup</source>
<translation>Bruk svart/&hvite ikoner</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="59"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit &Ignored Files</source>
<translation>Rediger &ignorerte filer</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
- <source>Ask &confirmation before downloading folders larger than</source>
- <translation>Be om &bekreftelse før nedlasting av mapper større enn</translation>
- </message>
- <message>
- <location filename="../src/gui/generalsettings.ui" line="129"/>
+ <location filename="../src/gui/generalsettings.ui" line="140"/>
<source>S&how crash reporter</source>
<translation>Vis &krasj-rapportering</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="150"/>
<location filename="../src/gui/generalsettings.ui" line="156"/>
- <location filename="../src/gui/generalsettings.ui" line="162"/>
<source>About</source>
<translation>Om</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="172"/>
+ <location filename="../src/gui/generalsettings.ui" line="166"/>
<source>Updates</source>
<translation>Oppdateringer</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="197"/>
+ <location filename="../src/gui/generalsettings.ui" line="191"/>
<source>&Restart && Update</source>
<translation>&Omstart && Oppdater</translation>
</message>
<translation>Koble til...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="144"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="159"/>
<source>%1 folder '%2' is synced to local folder '%3'</source>
<translation>%1 mappe '%2' er synkronisert til lokal mappe '%3'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="162"/>
<source>Sync the folder '%1'</source>
<translation>Synkroniser mappen '%1'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="152"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="167"/>
<source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
<translation><p><small><strong>Advarsel:</strong> Den lokale mappen er ikke tom. Velg en løsning!</small></p></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="251"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/>
<source>Local Sync Folder</source>
<translation>Lokal synkroniseringsmappe</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="311"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="317"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
<translation>Kan ikke fjerne og sikkerhetskopiere mappen fordi mappen eller en fil i mappen er åpen i et annet program. Lukk mappen eller filen og prøv igjen, eller avbryt oppsettet.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="540"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Oppretting av lokal synkroniseringsmappe %1 vellykket!</b></font></translation>
</message>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="120"/>
<source>Success.</source>
<translation>Suksess.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="127"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSync kunne ikke laste inn journalfilen. Journalfilen er ødelagt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="130"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>Klarte ikke å laste utvidelse %1 for csync.<br/>Verifiser installasjonen!</p></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync fikk en feil under behandling av intern trestruktur.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync klarte ikke å reservere minne.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync fatal parameter error.</source>
<translation>CSync fatal parmeterfeil.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync processing step update failed.</source>
<translation>CSync-behandlingssteg oppdatering feilet.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync-behandlingssteg overensstemming feilet.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync klarte ikke å autentisere mot proxy.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync klarte ikke å slå opp proxy eller server.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync karte ikke å autentisere på serveren %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync klarte ikke å koble seg til nettverket.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>A network connection timeout happened.</source>
<translation>Det oppstod et tidsavbrudd for en nettverksforbindelse.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>A HTTP transmission error happened.</source>
<translation>En HTTP-overføringsfeil oppstod.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation>Den oppkoblede mappen er for tiden ikke tilgjengelig på serveren</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>An error occurred while opening a folder</source>
<translation>Det oppstod en feil ved åpning av en mappe</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="197"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Error while reading folder.</source>
<translation>Feil ved lesing av mappe.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="477"/>
+ <location filename="../src/libsync/syncengine.cpp" line="476"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>Filen/mappen ignoreres fordi den er skjult.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="738"/>
+ <location filename="../src/libsync/syncengine.cpp" line="737"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Bare %1 er tilgjengelig, trenger minst %2 for å begynne</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1206"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Ikke tillatt fordi du ikke har lov til å legge til foreldremappe</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1213"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Ikke tillatt fordi du ikke har lov til å opprette filer i den mappen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: Ikke ledig plass tilgjengelig på server %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>CSync uspesifisert feil.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Avbrutt av brukeren</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>CSync failed to access</source>
<translation>CSync klarte ikke å aksessere</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="123"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation>CSync klarte ikke å laste eller opprette journalfilen. Sjekk at du har lese- og skrivetilgang i den lokale synkroniseringsmappen.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation>CSync feilet fordi nektet tilgang ikke ble håndtert.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync tried to create a folder that already exists.</source>
<translation>CSync prøvde å opprette en mappe som finnes allerede.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>The service is temporarily unavailable</source>
<translation>Tjenesten er midlertidig utilgjengelig</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>Access is forbidden</source>
<translation>Tilgang er nektet</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="202"/>
+ <location filename="../src/libsync/syncengine.cpp" line="201"/>
<source>An internal error number %1 occurred.</source>
<translation>En intern feil nummer %1 oppstod.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="266"/>
+ <location filename="../src/libsync/syncengine.cpp" line="265"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Elementet er ikke synkronisert på grunn av tidligere feil: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="445"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symbolske lenker støttes ikke i synkronisering.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="449"/>
+ <location filename="../src/libsync/syncengine.cpp" line="448"/>
<source>File is listed on the ignore list.</source>
<translation>Filen ligger på ignoreringslisten.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="453"/>
+ <location filename="../src/libsync/syncengine.cpp" line="452"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="463"/>
+ <location filename="../src/libsync/syncengine.cpp" line="462"/>
<source>File names containing the character '%1' are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="466"/>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
<source>The file name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="471"/>
+ <location filename="../src/libsync/syncengine.cpp" line="470"/>
<source>Filename contains trailing spaces.</source>
<translation>Filnavn inneholder blanke på slutten.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="474"/>
+ <location filename="../src/libsync/syncengine.cpp" line="473"/>
<source>Filename is too long.</source>
<translation>Filnavn er for langt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="483"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Stat failed.</source>
<translation>Stat feilet.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="510"/>
+ <location filename="../src/libsync/syncengine.cpp" line="509"/>
<source>Filename encoding is not valid</source>
<translation>Filnavn-koding er ikke gyldig</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="678"/>
+ <location filename="../src/libsync/syncengine.cpp" line="677"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Ugyldige tegn, gi et annet navn til "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="774"/>
+ <location filename="../src/libsync/syncengine.cpp" line="773"/>
<source>Unable to initialize a sync journal.</source>
<translation>Kan ikke initialisere en synkroniseringsjournal.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="793"/>
+ <location filename="../src/libsync/syncengine.cpp" line="792"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Kan ikke lese svartelisten fra den lokale databasen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="830"/>
+ <location filename="../src/libsync/syncengine.cpp" line="829"/>
<source>Unable to read from the sync journal.</source>
<translation>Kan ikke lese fra synkroniseringsjournalen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="875"/>
+ <location filename="../src/libsync/syncengine.cpp" line="874"/>
<source>Cannot open the sync journal</source>
<translation>Kan ikke åpne synkroniseringsjournalen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="933"/>
+ <location filename="../src/libsync/syncengine.cpp" line="932"/>
<source>File name contains at least one invalid character</source>
<translation>Filnavnet inneholder minst ett ulovlig tegn</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
- <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1172"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorert på grunn av svartelisten "velg hva som skal synkroniseres"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1191"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Ikke tillatt fordi du ikke har lov til å lage undermapper i den mappen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1232"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Ikke tillatt å laste opp denne filenfordi den er skrivebeskyttet på serveren, gjenoppretter</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1249"/>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1267"/>
<source>Not allowed to remove, restoring</source>
<translation>Ikke tillatt å fjerne, gjenoppretter</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1280"/>
<source>Local files and share folder removed.</source>
<translation>Lokale filer og delingsmappe fjernet.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1336"/>
<source>Move not allowed, item restored</source>
<translation>Flytting ikke tillatt, element gjenopprettet</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1347"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Flytting ikke tillatt fordi %1 er skrivebeskyttet</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the destination</source>
<translation>målet</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the source</source>
<translation>kilden</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="300"/>
+ <location filename="../src/libsync/theme.cpp" line="309"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Versjon %1. For mer informasjon gå til <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="304"/>
+ <location filename="../src/libsync/theme.cpp" line="313"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation><p>Copyright ownCloud GmbH</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="305"/>
+ <location filename="../src/libsync/theme.cpp" line="314"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Distribuert av %1 og lisensiert under GNU General Public License (GPL) Version 2.0.<br/>%2 og %2-logoet er registrerte varemerker for %1 i USA, i andre land eller begge deler.</p></translation>
</message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="250"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="352"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="379"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="402"/>
<source>TextLabel</source>
<translation>Tekst-etikett</translation>
</message>
<translation>Start en &ren synkronisering (sletter den lokale mappen!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="295"/>
+ <source>Ask for confirmation before synchroni&zing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="321"/>
+ <source>Ask for confirmation before synchronizing e&xternal storages</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="345"/>
<source>Choose what to sync</source>
<translation>Velg hva som synkroniseres</translation>
</message>
<translation>&Behold lokale data</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>S&ync everything from server</source>
<translation>S&ynkroniser alt fra serveren</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
<source>Status message</source>
<translation>Statusmelding</translation>
</message>
<location filename="../src/gui/owncloudsetuppage.ui" line="129"/>
<location filename="../src/gui/owncloudsetuppage.ui" line="156"/>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="190"/>
<source>TextLabel</source>
<translation>Tekst-etikett</translation>
</message>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="83"/>
- <source>Server &Address</source>
- <translation>Server-&adresse</translation>
+ <source>Ser&ver Address</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="99"/>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="286"/>
+ <location filename="../src/libsync/theme.cpp" line="295"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Bygget fra Git-revisjon <a href="%1">%2</a> %3, %4 med Qt %5, %6</small></p></translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="238"/>
<location filename="../src/gui/accountsettings.cpp" line="371"/>
- <location filename="../src/gui/accountsettings.cpp" line="728"/>
+ <location filename="../src/gui/accountsettings.cpp" line="733"/>
<source>Cancel</source>
<translation>Annuleren</translation>
</message>
<translation>Meld u aan</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="678"/>
- <source>There are new folders that were not synchronized because they are too big: </source>
- <translation>Er zijn nieuwe mappen die niet gesynchroniseerd werden, omdat ze te groot zijn:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="680"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="681"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="720"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="725"/>
<source>Confirm Account Removal</source>
<translation>Bevestig verwijderen account</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="721"/>
+ <location filename="../src/gui/accountsettings.cpp" line="726"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>Wilt u echt de verbinding met het account <i>%1</i> verbreken?</p><p><b>Let op:</b> Hierdoor verwijdert u <b>geen</b> bestanden.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="727"/>
+ <location filename="../src/gui/accountsettings.cpp" line="732"/>
<source>Remove connection</source>
<translation>Verwijderen verbinding</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="600"/>
<source>Aborted by the user</source>
<translation>Afgebroken door de gebruiker</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="139"/>
<source>Local folder %1 does not exist.</source>
<translation>Lokale map %1 bestaat niet.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="142"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 zou een map moeten zijn, maar is dat niet.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="144"/>
+ <location filename="../src/gui/folder.cpp" line="145"/>
<source>%1 is not readable.</source>
<translation>%1 is niet leesbaar.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="367"/>
+ <location filename="../src/gui/folder.cpp" line="368"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 is verwijderd.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="374"/>
+ <location filename="../src/gui/folder.cpp" line="375"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 is gedownload.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="382"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 is bijgewerkt.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="388"/>
+ <location filename="../src/gui/folder.cpp" line="389"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 is hernoemd naar %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="395"/>
+ <location filename="../src/gui/folder.cpp" line="396"/>
<source>%1 has been moved to %2.</source>
<translation>%1 is verplaatst naar %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="365"/>
+ <location filename="../src/gui/folder.cpp" line="366"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 en %n ander bestand(en) zijn verwijderd.</numerusform><numerusform>%1 en %n andere bestand(en) zijn verwijderd.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="372"/>
+ <location filename="../src/gui/folder.cpp" line="373"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 en %n ander bestand(en) zijn gedownload.</numerusform><numerusform>%1 en %n andere bestand(en) zijn gedownload.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="379"/>
+ <location filename="../src/gui/folder.cpp" line="380"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 en %n ander bestand(en) zijn bijgewerkt.</numerusform><numerusform>%1 en %n andere bestand(en) zijn bijgewerkt.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="386"/>
+ <location filename="../src/gui/folder.cpp" line="387"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 is hernoemd naar %2 en %n ander bestand(en) is hernoemd.</numerusform><numerusform>%1 is hernoemd naar %2 en %n andere bestand(en) zijn hernoemd.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="393"/>
+ <location filename="../src/gui/folder.cpp" line="394"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 is verplaatst naar %2 en %n ander bestand(en) is verplaatst.</numerusform><numerusform>%1 is verplaatst naar %2 en %n andere bestand(en) zijn verplaatst.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="400"/>
+ <location filename="../src/gui/folder.cpp" line="401"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 en %n ander bestand(en) hebben een sync conflict.</numerusform><numerusform>%1 en %n andere bestand(en) hebben sync conflicten.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="402"/>
+ <location filename="../src/gui/folder.cpp" line="403"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 heeft een sync conflict. Controleer het conflict bestand!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="407"/>
+ <location filename="../src/gui/folder.cpp" line="408"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 en %n ander bestand(en) konden niet worden gesynchroniseerd wegens fouten. Bekijk het log voor details.</numerusform><numerusform>%1 en %n andere bestand(en) konden niet worden gesynchroniseerd wegens fouten. Bekijk het log voor details.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="409"/>
+ <location filename="../src/gui/folder.cpp" line="410"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 kon niet worden gesynchroniseerd door een fout. Bekijk het log voor details.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="415"/>
+ <location filename="../src/gui/folder.cpp" line="416"/>
<source>Sync Activity</source>
<translation>Synchronisatie-activiteit</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="642"/>
+ <location filename="../src/gui/folder.cpp" line="643"/>
<source>Could not read system exclude file</source>
<translation>Kon het systeem-uitsluitingsbestand niet lezen</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="850"/>
+ <location filename="../src/gui/folder.cpp" line="854"/>
<source>A new folder larger than %1 MB has been added: %2.
-Please go in the settings to select it if you wish to download it.</source>
- <translation>Een nieuwe map groter dan %1 MB is toegevoegd: %2
-Ga naar de instellingen om het te selecteren als u deze wilt downloaden.</translation>
+</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="888"/>
+ <location filename="../src/gui/folder.cpp" line="856"/>
+ <source>A folder from an external storage has been added.
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="857"/>
+ <source>Please go in the settings to select it if you wish to download it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="893"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
Weet je zeker dat je door wilt gaan?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="892"/>
+ <location filename="../src/gui/folder.cpp" line="897"/>
<source>Remove All Files?</source>
<translation>Verwijder alle bestanden?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="894"/>
+ <location filename="../src/gui/folder.cpp" line="899"/>
<source>Remove all files</source>
<translation>Verwijder alle bestanden</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="895"/>
+ <location filename="../src/gui/folder.cpp" line="900"/>
<source>Keep files</source>
<translation>Bewaar bestanden</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="911"/>
+ <location filename="../src/gui/folder.cpp" line="916"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
Doorgaan met deze synchronisatie overschrijft al uw bestanden door een eerdere versie. Wilt u uw lokale meer recente bestanden behouden als conflict bestanden?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="916"/>
+ <location filename="../src/gui/folder.cpp" line="921"/>
<source>Backup detected</source>
<translation>Backup gedetecteerd</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="918"/>
+ <location filename="../src/gui/folder.cpp" line="923"/>
<source>Normal Synchronisation</source>
<translation>Normale synchronisatie</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="919"/>
+ <location filename="../src/gui/folder.cpp" line="924"/>
<source>Keep Local Files as Conflict</source>
<translation>Behoud lokale bestanden als conflict</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="140"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="148"/>
<source>You need to be connected to add a folder</source>
<translation>U moet verbonden zijn om een map toe te voegen</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="150"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="158"/>
<source>Click this button to add a folder to synchronize.</source>
<translation>Klik op deze knop om een te synchroniseren map toe te voegen.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
<source>%1 (%2)</source>
<extracomment>Example text: "File.txt (23KB)"</extracomment>
<translation>
%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="180"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="188"/>
<source>Error while loading the list of folders from the server.</source>
<translation>Fout bij ophalen mappenlijst van de server.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="218"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="226"/>
<source>Signed out</source>
<translation>Afgemeld</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="145"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="153"/>
<source>Adding folder is disabled because you are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
<translation>Het toevoegen van een map is uitgeschakeld, omdat u reeds al uw bestanden synchroniseert. Als u meerdere mappen wilt synchroniseren moet u de nu geconfigureerde hoofdmap verwijderen.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="183"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="191"/>
<source>Fetching folder list from server...</source>
<translation>Mappenlijst ophalen van de server...</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>Checking for changes in '%1'</source>
<translation>Controleren op wijzigingen in '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="868"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
<source>, '%1'</source>
<extracomment>Build a list of file names</extracomment>
<translation>, '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="871"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="900"/>
<source>'%1'</source>
<extracomment>Argument is a file name</extracomment>
<translation>'%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="896"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="925"/>
<source>Syncing %1</source>
<extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment>
<translation>Synchroniseren %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="908"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="927"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="937"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="931"/>
<source>download %1/s</source>
<extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>download %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="933"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="911"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>upload %1/s</source>
<extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>upload %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="913"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="942"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="918"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 van %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="922"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="951"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%5 over, %1 van %2, bestand %3 van %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="948"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 van %2, bestand %3 van %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="954"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="983"/>
<source>file %1 of %2</source>
<translation>bestand %1 van %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/>
<source>Waiting...</source>
<translation>Aan het wachten...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="998"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1027"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>Wacht op %n andere map...</numerusform><numerusform>Wacht op %n andere mappen...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1033"/>
<source>Preparing to sync...</source>
<translation>Voorbereiden op sync...</translation>
</message>
<translation>Geavanceerd</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="101"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
+ <source>Ask for confirmation before synchronizing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="105"/>
<source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/generalsettings.ui" line="26"/>
<source>&Launch on System Startup</source>
<translation>Gebruik &monochrome pictogrammen</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="59"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit &Ignored Files</source>
<translation>Bewerken &genegeerde bestanden</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
- <source>Ask &confirmation before downloading folders larger than</source>
- <translation>Vraag &bevestiging voordat mappen worden gedownload groter dan</translation>
- </message>
- <message>
- <location filename="../src/gui/generalsettings.ui" line="129"/>
+ <location filename="../src/gui/generalsettings.ui" line="140"/>
<source>S&how crash reporter</source>
<translation>T&onen crash reporter</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="150"/>
<location filename="../src/gui/generalsettings.ui" line="156"/>
- <location filename="../src/gui/generalsettings.ui" line="162"/>
<source>About</source>
<translation>Over</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="172"/>
+ <location filename="../src/gui/generalsettings.ui" line="166"/>
<source>Updates</source>
<translation>Updates</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="197"/>
+ <location filename="../src/gui/generalsettings.ui" line="191"/>
<source>&Restart && Update</source>
<translation>&Herstarten en &Bijwerken</translation>
</message>
<translation>Verbinden...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="144"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="159"/>
<source>%1 folder '%2' is synced to local folder '%3'</source>
<translation>%1 map '%2' is gesynchroniseerd naar de lokale map '%3'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="162"/>
<source>Sync the folder '%1'</source>
<translation>Sync map '%1'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="152"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="167"/>
<source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
<translation><p><small><strong>Waarschuwing:</strong> De lokale map is niet leeg. Maak een keuze!</small></p></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="251"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/>
<source>Local Sync Folder</source>
<translation>Lokale synchronisatiemap</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="311"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="317"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
<translation>Kan de map niet verwijderen en backuppen, omdat de map of een bestand daarin, geopend is in een ander programma. Sluit de map of het bestand en drup op Opnieuw of annuleer de installatie.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="540"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Lokale synch map %1 is succesvol aangemaakt!</b></font></translation>
</message>
<message>
<location filename="../src/gui/selectivesyncdialog.cpp" line="71"/>
<source>Deselect remote folders you do not wish to synchronize.</source>
- <translation type="unfinished"/>
+ <translation>Deselecteer de externe mappen die u niet wenst te synchroniseren.</translation>
</message>
<message>
<location filename="../src/gui/selectivesyncdialog.cpp" line="91"/>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="120"/>
<source>Success.</source>
<translation>Succes.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="127"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSync kon het journal bestand niet inladen. Het journal bestand is kapot.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="130"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>De %1 plugin voor csync kon niet worden geladen.<br/>Verifieer de installatie!</p></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync kreeg een fout tijdens het verwerken van de interne mappenstructuur.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync kon geen geheugen reserveren.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync fatal parameter error.</source>
<translation>CSync fatale parameter fout.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync processing step update failed.</source>
<translation>CSync verwerkingsstap bijwerken mislukt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync verwerkingsstap verzamelen mislukt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync kon niet authenticeren bij de proxy.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync kon geen proxy of server vinden.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync kon niet authenticeren bij de %1 server.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync kon niet verbinden met het netwerk.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>A network connection timeout happened.</source>
<translation>Er trad een netwerk time-out op.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>A HTTP transmission error happened.</source>
<translation>Er trad een HTTP transmissiefout plaats.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation>De gemounte map is tijdelijk niet beschikbaar op de server</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>An error occurred while opening a folder</source>
<translation>Er trad een fout op bij het openen van een map</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="197"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Error while reading folder.</source>
<translation>Fout tijdens lezen map.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="477"/>
+ <location filename="../src/libsync/syncengine.cpp" line="476"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>Bestand/Map is genegeerd omdat het verborgen is. </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="738"/>
+ <location filename="../src/libsync/syncengine.cpp" line="737"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Slechts %1 beschikbaar, maar heeft minimaal %2 nodig om te starten</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1206"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Niet toegestaan omdat u geen rechten hebt om een bovenliggende map toe te voegen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1213"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Niet toegestaan omdat u geen rechten hebt om bestanden in die map toe te voegen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: Geen ruimte op %1 server beschikbaar.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>CSync ongedefinieerde fout.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Afgebroken door de gebruiker</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>CSync failed to access</source>
<translation>CSync kreeg geen toegang</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="123"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation>CSync kon het journal bestand niet maken of lezen. Controleer of u de juiste lees- en schrijfrechten in de lokale syncmap hebt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation>CSync mislukt omdat de benodigde toegang werd geweigerd.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync tried to create a folder that already exists.</source>
<translation>CSync probeerde een al bestaande map aan te maken.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>The service is temporarily unavailable</source>
<translation>De dienst is tijdelijk niet beschikbaar</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>Access is forbidden</source>
<translation>Toegang verboden</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="202"/>
+ <location filename="../src/libsync/syncengine.cpp" line="201"/>
<source>An internal error number %1 occurred.</source>
<translation>Een interne fout met nummer %1 is opgetreden.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="266"/>
+ <location filename="../src/libsync/syncengine.cpp" line="265"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Dit onderwerp is niet gesynchroniseerd door eerdere fouten: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="445"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symbolische links worden niet ondersteund bij het synchroniseren.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="449"/>
+ <location filename="../src/libsync/syncengine.cpp" line="448"/>
<source>File is listed on the ignore list.</source>
<translation>Het bestand is opgenomen op de negeerlijst.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="453"/>
+ <location filename="../src/libsync/syncengine.cpp" line="452"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation>Bestandsnamen die eindigen met een punt worden niet ondersteund door het bestandssysteem.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="463"/>
+ <location filename="../src/libsync/syncengine.cpp" line="462"/>
<source>File names containing the character '%1' are not supported on this file system.</source>
<translation>Bestandsnamen met een '%1' symbool worden niet ondersteund door het bestandssysteem.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="466"/>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
<source>The file name is a reserved name on this file system.</source>
<translation>De bestandsnaam is een gereserveerde naam op dit bestandssysteem.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="471"/>
+ <location filename="../src/libsync/syncengine.cpp" line="470"/>
<source>Filename contains trailing spaces.</source>
<translation>De bestandsnaam bevat spaties achteraan.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="474"/>
+ <location filename="../src/libsync/syncengine.cpp" line="473"/>
<source>Filename is too long.</source>
<translation>De bestandsnaam is te lang.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="483"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Stat failed.</source>
<translation>Stat mislukt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="510"/>
+ <location filename="../src/libsync/syncengine.cpp" line="509"/>
<source>Filename encoding is not valid</source>
<translation>Bestandsnaamcodering is niet geldig</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="678"/>
+ <location filename="../src/libsync/syncengine.cpp" line="677"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Ongeldige tekens, hernoem "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="774"/>
+ <location filename="../src/libsync/syncengine.cpp" line="773"/>
<source>Unable to initialize a sync journal.</source>
<translation>Niet in staat om een synchronisatie transactielog te starten.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="793"/>
+ <location filename="../src/libsync/syncengine.cpp" line="792"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Kan de blacklist niet lezen uit de lokale database</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="830"/>
+ <location filename="../src/libsync/syncengine.cpp" line="829"/>
<source>Unable to read from the sync journal.</source>
<translation>Niet mogelijk om te lezen uit het synchronisatie verslag.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="875"/>
+ <location filename="../src/libsync/syncengine.cpp" line="874"/>
<source>Cannot open the sync journal</source>
<translation>Kan het sync transactielog niet openen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="933"/>
+ <location filename="../src/libsync/syncengine.cpp" line="932"/>
<source>File name contains at least one invalid character</source>
<translation>De bestandsnaam bevat ten minste één ongeldig teken</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
- <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1172"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Genegeerd vanwege de "wat synchroniseren" zwarte lijst</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1191"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Niet toegestaan, omdat je geen permissies hebt om submappen aan die map toe te voegen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1232"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Niet toegestaan om dit bestand te uploaden, omdat het alleen-lezen is op de server, herstellen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1249"/>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1267"/>
<source>Not allowed to remove, restoring</source>
<translation>Niet toegestaan om te verwijderen, herstellen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1280"/>
<source>Local files and share folder removed.</source>
<translation>Lokale bestanden en share-map verwijderd. </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1336"/>
<source>Move not allowed, item restored</source>
<translation>Verplaatsen niet toegestaan, object hersteld</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1347"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Verplaatsen niet toegestaan, omdat %1 alleen-lezen is</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the destination</source>
<translation>bestemming</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the source</source>
<translation>bron</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="300"/>
+ <location filename="../src/libsync/theme.cpp" line="309"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Versie %1. Voor meer informatie bezoek <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="304"/>
+ <location filename="../src/libsync/theme.cpp" line="313"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation><p>Copyright ownCloud GmbH</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="305"/>
+ <location filename="../src/libsync/theme.cpp" line="314"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Gedistribueerd door %1 en gelicenseerd onder de GNU General Public License (GPL) Versie 2.0.<br/>%2 en het %2 logo zijn geregistreerde handelsmerken van %1 in de Verenigde Staten, in andere landen of beide.</p></translation>
</message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="250"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="352"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="379"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="402"/>
<source>TextLabel</source>
<translation>TekstLabel</translation>
</message>
<translation>Starten &Schone sync (maakt lokale map leeg!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="295"/>
+ <source>Ask for confirmation before synchroni&zing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="321"/>
+ <source>Ask for confirmation before synchronizing e&xternal storages</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="345"/>
<source>Choose what to sync</source>
<translation>Selectieve synchronisatie</translation>
</message>
<translation>&Bewaar lokale gegevens</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>S&ync everything from server</source>
<translation>S&ynchroniseer alles vanaf de server</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
<source>Status message</source>
<translation>Statusbericht</translation>
</message>
<location filename="../src/gui/owncloudsetuppage.ui" line="129"/>
<location filename="../src/gui/owncloudsetuppage.ui" line="156"/>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="190"/>
<source>TextLabel</source>
<translation>Tekstlabel</translation>
</message>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="83"/>
- <source>Server &Address</source>
- <translation>Server &adres</translation>
+ <source>Ser&ver Address</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="99"/>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="286"/>
+ <location filename="../src/libsync/theme.cpp" line="295"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Gebouwd vanuit Git revisie <a href="%1">%2</a> op %3, %4 gebruik makend van Qt %5, %6</small></p></translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="238"/>
<location filename="../src/gui/accountsettings.cpp" line="371"/>
- <location filename="../src/gui/accountsettings.cpp" line="728"/>
+ <location filename="../src/gui/accountsettings.cpp" line="733"/>
<source>Cancel</source>
<translation>Anuluj</translation>
</message>
<translation>Zaloguj</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="678"/>
- <source>There are new folders that were not synchronized because they are too big: </source>
- <translation>Istnieją nowe foldery, które nie zostały zsynchronizowane, gdyż są za duże.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="680"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="681"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="720"/>
+ <location filename="../src/gui/accountsettings.cpp" line="725"/>
<source>Confirm Account Removal</source>
<translation>Potwierdź usunięcie konta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="721"/>
+ <location filename="../src/gui/accountsettings.cpp" line="726"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>Czy na pewno chcesz usunąć połączenie z kontem <i>%1</i>?</p><p><b>Uwaga:</b> ta operacja <b>nie</b> usunie plików klienta.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="727"/>
+ <location filename="../src/gui/accountsettings.cpp" line="732"/>
<source>Remove connection</source>
<translation>Usuwanie połączenia</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="600"/>
<source>Aborted by the user</source>
<translation>Anulowane przez użytkownika</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="139"/>
<source>Local folder %1 does not exist.</source>
<translation>Folder lokalny %1 nie istnieje.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="142"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 powinien być katalogiem, ale nie jest.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="144"/>
+ <location filename="../src/gui/folder.cpp" line="145"/>
<source>%1 is not readable.</source>
<translation>%1 jest nie do odczytu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="367"/>
+ <location filename="../src/gui/folder.cpp" line="368"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 został usunięty.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="374"/>
+ <location filename="../src/gui/folder.cpp" line="375"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 został ściągnięty.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="382"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 został uaktualniony.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="388"/>
+ <location filename="../src/gui/folder.cpp" line="389"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 zmienił nazwę na %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="395"/>
+ <location filename="../src/gui/folder.cpp" line="396"/>
<source>%1 has been moved to %2.</source>
<translation>%1 został przeniesiony do %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="365"/>
+ <location filename="../src/gui/folder.cpp" line="366"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 i %n inny plik został usunięty.</numerusform><numerusform>%1 i %n inne pliki zostały usunięte.</numerusform><numerusform>%1 i %n innych plików zostało usuniętych.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="372"/>
+ <location filename="../src/gui/folder.cpp" line="373"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 i %n inny plik został pobrany.</numerusform><numerusform>%1 i %n inne pliki zostały pobrane.</numerusform><numerusform>%1 i %n innych plików zostało pobranych.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="379"/>
+ <location filename="../src/gui/folder.cpp" line="380"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 i %n inny plik został zaktualizowany.</numerusform><numerusform>%1 i %n inne pliki zostały zaktualizowane.</numerusform><numerusform>%1 i %n innych plików zostało zaktualizowanych.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="386"/>
+ <location filename="../src/gui/folder.cpp" line="387"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>Zmieniono nazwę %1 na %2 oraz %n innemu plikowi została zmieniona nazwa.</numerusform><numerusform>Zmieniono nazwę %1 na %2 oraz %n innym plikom została zmieniona nazwa.</numerusform><numerusform>%1 has been renamed to %2 and %n other file(s) have been renamed.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="393"/>
+ <location filename="../src/gui/folder.cpp" line="394"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>Przeniesiono %1 do %2 oraz przeniesiono %n inny plik.</numerusform><numerusform>Przeniesiono %1 do %2 oraz przeniesiono %n inne pliki.</numerusform><numerusform>Przeniesiono %1 do %2 oraz przeniesiono %n innych plików.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="400"/>
+ <location filename="../src/gui/folder.cpp" line="401"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="402"/>
+ <location filename="../src/gui/folder.cpp" line="403"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 ma konflikt synchronizacji. Sprawdź konfliktujący plik!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="407"/>
+ <location filename="../src/gui/folder.cpp" line="408"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="409"/>
+ <location filename="../src/gui/folder.cpp" line="410"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 nie może zostać zsynchronizowany z powodu błędu. Zobacz szczegóły w logu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="415"/>
+ <location filename="../src/gui/folder.cpp" line="416"/>
<source>Sync Activity</source>
<translation>Aktywności synchronizacji</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="642"/>
+ <location filename="../src/gui/folder.cpp" line="643"/>
<source>Could not read system exclude file</source>
<translation>Nie można przeczytać pliku wyłączeń</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="850"/>
+ <location filename="../src/gui/folder.cpp" line="854"/>
<source>A new folder larger than %1 MB has been added: %2.
-Please go in the settings to select it if you wish to download it.</source>
- <translation>Nowy folder większy od %1 MB został dodany
-Przejdź do ustawień i zaznacz go, jeśli chcesz go pobrać.</translation>
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="856"/>
+ <source>A folder from an external storage has been added.
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="857"/>
+ <source>Please go in the settings to select it if you wish to download it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="888"/>
+ <location filename="../src/gui/folder.cpp" line="893"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
Czy jesteś pewien, że chcesz wykonać tę operację ? </translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="892"/>
+ <location filename="../src/gui/folder.cpp" line="897"/>
<source>Remove All Files?</source>
<translation>Usunąć wszystkie pliki?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="894"/>
+ <location filename="../src/gui/folder.cpp" line="899"/>
<source>Remove all files</source>
<translation>Usuń wszystkie pliki</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="895"/>
+ <location filename="../src/gui/folder.cpp" line="900"/>
<source>Keep files</source>
<translation>Pozostaw pliki</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="911"/>
+ <location filename="../src/gui/folder.cpp" line="916"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="916"/>
+ <location filename="../src/gui/folder.cpp" line="921"/>
<source>Backup detected</source>
<translation>Wykryto kopię zapasową.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="918"/>
+ <location filename="../src/gui/folder.cpp" line="923"/>
<source>Normal Synchronisation</source>
<translation>Normalna synchronizacja.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="919"/>
+ <location filename="../src/gui/folder.cpp" line="924"/>
<source>Keep Local Files as Conflict</source>
<translation>Zatrzymaj pliki lokalne i ustaw status konfliktu.</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="140"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="148"/>
<source>You need to be connected to add a folder</source>
<translation>Musisz być podłączony, by dodać folder.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="150"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="158"/>
<source>Click this button to add a folder to synchronize.</source>
<translation>Kliknij ten przycisk, by dodać folder do synchronizacji.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
<source>%1 (%2)</source>
<extracomment>Example text: "File.txt (23KB)"</extracomment>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="180"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="188"/>
<source>Error while loading the list of folders from the server.</source>
<translation>Wystąpił błąd podczas pobierania listy folderów z serwera.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="218"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="226"/>
<source>Signed out</source>
<translation>Odłączony</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="145"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="153"/>
<source>Adding folder is disabled because you are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
<translation>Dodawanie folderu jest zablokowane, ponieważ już synchronizujesz wszystkie swoje pliki. Jeśli chcesz zsynchronizować wiele folderów, usuń folder aktualnie skonfigurowany.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="183"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="191"/>
<source>Fetching folder list from server...</source>
<translation>Pobieranie listy folderów z serwera.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>Checking for changes in '%1'</source>
<translation>Sprawdzanie zmian na '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="868"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
<source>, '%1'</source>
<extracomment>Build a list of file names</extracomment>
<translation>, '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="871"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="900"/>
<source>'%1'</source>
<extracomment>Argument is a file name</extracomment>
<translation>'%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="896"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="925"/>
<source>Syncing %1</source>
<extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment>
<translation>Synchronizowanie %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="908"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="927"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="937"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="931"/>
<source>download %1/s</source>
<extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>pobieranie %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="933"/>
<source>u2193 %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="911"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>upload %1/s</source>
<extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>wysyłanie %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="913"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="942"/>
<source>u2191 %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="918"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 z %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="922"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="951"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>Plik %3 z %4, pozostało czasu %5 (%1 z %2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="948"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 z %2, plik %3 z %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="954"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="983"/>
<source>file %1 of %2</source>
<translation>plik %1 z %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/>
<source>Waiting...</source>
<translation>Czekaj...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="998"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1027"/>
<source>Waiting for %n other folder(s)...</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1033"/>
<source>Preparing to sync...</source>
<translation>Przygotowanie do synchronizacji ...</translation>
</message>
<translation>Zaawansowane</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="101"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
+ <source>Ask for confirmation before synchronizing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="105"/>
<source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/generalsettings.ui" line="26"/>
<source>&Launch on System Startup</source>
<translation>Używaj &monochromatycznych ikon</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="59"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit &Ignored Files</source>
<translation>Edytuj pliki &ignorowane (pomijane)</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
- <source>Ask &confirmation before downloading folders larger than</source>
- <translation>&Zapytaj o potwierdzenie przed pobraniem folderów większych niż</translation>
- </message>
- <message>
- <location filename="../src/gui/generalsettings.ui" line="129"/>
+ <location filename="../src/gui/generalsettings.ui" line="140"/>
<source>S&how crash reporter</source>
<translation>Pokaż &raport awarii</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="150"/>
<location filename="../src/gui/generalsettings.ui" line="156"/>
- <location filename="../src/gui/generalsettings.ui" line="162"/>
<source>About</source>
<translation>O aplikacji</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="172"/>
+ <location filename="../src/gui/generalsettings.ui" line="166"/>
<source>Updates</source>
<translation>Aktualizacje</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="197"/>
+ <location filename="../src/gui/generalsettings.ui" line="191"/>
<source>&Restart && Update</source>
<translation>&Zrestartuj && Aktualizuj</translation>
</message>
<translation>Połącz...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="144"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="159"/>
<source>%1 folder '%2' is synced to local folder '%3'</source>
<translation>%1 katalog '%2' jest zsynchronizowany do katalogu lokalnego '%3'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="162"/>
<source>Sync the folder '%1'</source>
<translation>Synchronizuj folder '%1'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="152"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="167"/>
<source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
<translation><p><small><strong>Uwaga:</strong> katalog lokalny nie jest pusty. Bądź ostrożny !</small></p></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="251"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/>
<source>Local Sync Folder</source>
<translation>Folder lokalnej synchronizacji</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="311"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="317"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
<translation>Nie można usunąć i zarchiwizować folderu ponieważ znajdujący się w nim plik lub folder jest otwarty przez inny program. Proszę zamknąć folder lub plik albo kliknąć ponów lub anuluj setup.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="540"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Utworzenie lokalnego folderu synchronizowanego %1 zakończone pomyślnie!</b></font></translation>
</message>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="120"/>
<source>Success.</source>
<translation>Sukces.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="127"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSync nie udało się wczytać pliku dziennika. Plik dziennika jest uszkodzony.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="130"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>Wtyczka %1 do csync nie może być załadowana.<br/>Sprawdź poprawność instalacji!</p></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync napotkał błąd podczas przetwarzania wewnętrznych drzew.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync nie mógł zarezerwować pamięci.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync fatal parameter error.</source>
<translation>Krytyczny błąd parametru CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync processing step update failed.</source>
<translation>Aktualizacja procesu przetwarzania CSync nie powiodła się.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync processing step reconcile failed.</source>
<translation>Scalenie w procesie przetwarzania CSync nie powiodło się.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync nie mógł się uwierzytelnić przez proxy.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync nie mógł odnaleźć serwera proxy.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync nie mógł uwierzytelnić się na serwerze %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync nie mógł połączyć się z siecią.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>A network connection timeout happened.</source>
<translation>Upłynął limit czasu połączenia.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>A HTTP transmission error happened.</source>
<translation>Wystąpił błąd transmisji HTTP.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation>Chwilowy brak dostępu do serwera, z którego montowany jest folder.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>An error occurred while opening a folder</source>
<translation>Wystąpił błąd podczas otwierania katalogu</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="197"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Error while reading folder.</source>
<translation>Błąd podczas odczytu katalogu.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="477"/>
+ <location filename="../src/libsync/syncengine.cpp" line="476"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>Plik / katalog zostanie zignorowany, ponieważ jest ukryty.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="738"/>
+ <location filename="../src/libsync/syncengine.cpp" line="737"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1206"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Niedozwolone, ponieważ nie masz uprawnień do dodawania katalogu nadrzędnego</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1213"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Niedozwolone, ponieważ nie masz uprawnień do dodawania plików w tym katalogu</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: Brak dostępnego miejsca na serwerze %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>Nieokreślony błąd CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Anulowane przez użytkownika</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>CSync failed to access</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="123"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>The service is temporarily unavailable</source>
<translation>Usługa jest czasowo niedostępna</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>Access is forbidden</source>
<translation>Dostęp zabroniony</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="202"/>
+ <location filename="../src/libsync/syncengine.cpp" line="201"/>
<source>An internal error number %1 occurred.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="266"/>
+ <location filename="../src/libsync/syncengine.cpp" line="265"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Ten element nie jest zsynchronizowane z powodu poprzednich błędów: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="445"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Linki symboliczne nie są wspierane przy synchronizacji. </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="449"/>
+ <location filename="../src/libsync/syncengine.cpp" line="448"/>
<source>File is listed on the ignore list.</source>
<translation>Plik jest na liście plików ignorowanych.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="453"/>
+ <location filename="../src/libsync/syncengine.cpp" line="452"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="463"/>
+ <location filename="../src/libsync/syncengine.cpp" line="462"/>
<source>File names containing the character '%1' are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="466"/>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
<source>The file name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="471"/>
+ <location filename="../src/libsync/syncengine.cpp" line="470"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="474"/>
+ <location filename="../src/libsync/syncengine.cpp" line="473"/>
<source>Filename is too long.</source>
<translation>Nazwa pliku zbyt długa</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="483"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Stat failed.</source>
<translation>Błąd statystyk.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="510"/>
+ <location filename="../src/libsync/syncengine.cpp" line="509"/>
<source>Filename encoding is not valid</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="678"/>
+ <location filename="../src/libsync/syncengine.cpp" line="677"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="774"/>
+ <location filename="../src/libsync/syncengine.cpp" line="773"/>
<source>Unable to initialize a sync journal.</source>
<translation>Nie można zainicjować synchronizacji dziennika.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="793"/>
+ <location filename="../src/libsync/syncengine.cpp" line="792"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="830"/>
+ <location filename="../src/libsync/syncengine.cpp" line="829"/>
<source>Unable to read from the sync journal.</source>
<translation>Nie można czytać z dziennika synchronizacji.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="875"/>
+ <location filename="../src/libsync/syncengine.cpp" line="874"/>
<source>Cannot open the sync journal</source>
<translation>Nie można otworzyć dziennika synchronizacji</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="933"/>
+ <location filename="../src/libsync/syncengine.cpp" line="932"/>
<source>File name contains at least one invalid character</source>
<translation>Nazwa pliku zawiera co najmniej jeden nieprawidłowy znak</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
- <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1172"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1191"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Niedozwolone, ponieważ nie masz uprawnień do dodawania podkatalogów w tym katalogu</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1232"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Wgrywanie niedozwolone, ponieważ plik jest tylko do odczytu na serwerze, przywracanie</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1249"/>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1267"/>
<source>Not allowed to remove, restoring</source>
<translation>Brak uprawnień by usunąć, przywracanie</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1280"/>
<source>Local files and share folder removed.</source>
<translation>Lokalne pliki i udostępniane foldery zostały usunięte.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1336"/>
<source>Move not allowed, item restored</source>
<translation>Przenoszenie niedozwolone, obiekt przywrócony</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1347"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Przenoszenie niedozwolone, ponieważ %1 jest tylko do odczytu</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the destination</source>
<translation>docelowy</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the source</source>
<translation>źródło</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="300"/>
+ <location filename="../src/libsync/theme.cpp" line="309"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Wersja %1. Aby uzyskać więcej informacji prosimy odwiedzić <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="304"/>
+ <location filename="../src/libsync/theme.cpp" line="313"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="305"/>
+ <location filename="../src/libsync/theme.cpp" line="314"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="250"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="352"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="379"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="402"/>
<source>TextLabel</source>
<translation>Etykieta</translation>
</message>
<translation>Zacznij od &czystej synchronizacji (usuwa lokalny katalog !)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="295"/>
+ <source>Ask for confirmation before synchroni&zing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="321"/>
+ <source>Ask for confirmation before synchronizing e&xternal storages</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="345"/>
<source>Choose what to sync</source>
<translation>Wybierz co synchronizować</translation>
</message>
<translation>&Zachowaj dane lokalne</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>S&ync everything from server</source>
<translation>S&ynchronizuj wszystko z serwera</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
<source>Status message</source>
<translation>Status wiadomości</translation>
</message>
<location filename="../src/gui/owncloudsetuppage.ui" line="129"/>
<location filename="../src/gui/owncloudsetuppage.ui" line="156"/>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="190"/>
<source>TextLabel</source>
<translation>Etykieta tekstowa</translation>
</message>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="83"/>
- <source>Server &Address</source>
- <translation>Adres &serwera</translation>
+ <source>Ser&ver Address</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="99"/>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="286"/>
+ <location filename="../src/libsync/theme.cpp" line="295"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="238"/>
<location filename="../src/gui/accountsettings.cpp" line="371"/>
- <location filename="../src/gui/accountsettings.cpp" line="728"/>
+ <location filename="../src/gui/accountsettings.cpp" line="733"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<translation>Iniciar Sessão</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="678"/>
- <source>There are new folders that were not synchronized because they are too big: </source>
- <translation>Existem novas pastas que não foram sincronizadas porque são demasiado grandes:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="680"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="681"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="720"/>
+ <location filename="../src/gui/accountsettings.cpp" line="725"/>
<source>Confirm Account Removal</source>
<translation>Confirmar Remoção da Conta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="721"/>
+ <location filename="../src/gui/accountsettings.cpp" line="726"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>Deseja mesmo remover a ligação da conta <i>%1</i>?</p><p><b>Nota:</b> isto <b>não</b> irá eliminar quaisquer ficheiros.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="727"/>
+ <location filename="../src/gui/accountsettings.cpp" line="732"/>
<source>Remove connection</source>
<translation>Remover ligação</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="600"/>
<source>Aborted by the user</source>
<translation>Abortado pelo utilizador</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="139"/>
<source>Local folder %1 does not exist.</source>
<translation>A pasta local %1 não existe.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="142"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 deveria ser uma pasta, mas não é.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="144"/>
+ <location filename="../src/gui/folder.cpp" line="145"/>
<source>%1 is not readable.</source>
<translation>%1 não é legível.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="367"/>
+ <location filename="../src/gui/folder.cpp" line="368"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi removido.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="374"/>
+ <location filename="../src/gui/folder.cpp" line="375"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi transferido.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="382"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi atualizado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="388"/>
+ <location filename="../src/gui/folder.cpp" line="389"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 foi renomeado para %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="395"/>
+ <location filename="../src/gui/folder.cpp" line="396"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido para %2</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="365"/>
+ <location filename="../src/gui/folder.cpp" line="366"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>'%1' e %n outro(s) ficheiro(s) foram removidos</numerusform><numerusform>'%1' e %n outros ficheiros foram removidos.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="372"/>
+ <location filename="../src/gui/folder.cpp" line="373"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 e %n outro ficheiro foram transferidos.</numerusform><numerusform>%1 e %n outros ficheiros foram transferidos.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="379"/>
+ <location filename="../src/gui/folder.cpp" line="380"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 e %n outro ficheiro foram actualizados.</numerusform><numerusform>%1 e %n outros ficheiros foram actualizados.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="386"/>
+ <location filename="../src/gui/folder.cpp" line="387"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 foi renomeado para %2 e %n outro ficheiro foi renomeado.</numerusform><numerusform>%1 foi renomeado para %2 e %n outros ficheiros foram renomeados.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="393"/>
+ <location filename="../src/gui/folder.cpp" line="394"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 foi movido para %2 e %n outro ficheiro foi movido.</numerusform><numerusform>%1 foi movido para %2 e %n outros ficheiros foram movidos.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="400"/>
+ <location filename="../src/gui/folder.cpp" line="401"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 tem e %n outro ficheiro têm problemas de sincronização.</numerusform><numerusform>%1 tem e %n outros ficheiros têm problemas de sincronização.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="402"/>
+ <location filename="../src/gui/folder.cpp" line="403"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 tem um problema de sincronização. Por favor, verifique o ficheiro com conflito!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="407"/>
+ <location filename="../src/gui/folder.cpp" line="408"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 e %n outro ficheiro não podem ser sincronizados devido a erros. Consulte o registo de eventos para mais detalhes.</numerusform><numerusform>%1 e %n outros ficheiros não podem ser sincronizados devido a erros. Consulte o registo de eventos para mais detalhes.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="409"/>
+ <location filename="../src/gui/folder.cpp" line="410"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>Não foi possível sincronizar %1 devido a um erro. Consulte o registo para detalhes.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="415"/>
+ <location filename="../src/gui/folder.cpp" line="416"/>
<source>Sync Activity</source>
<translation>Atividade de Sincronização</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="642"/>
+ <location filename="../src/gui/folder.cpp" line="643"/>
<source>Could not read system exclude file</source>
<translation>Não foi possível ler o ficheiro excluir do sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="850"/>
+ <location filename="../src/gui/folder.cpp" line="854"/>
<source>A new folder larger than %1 MB has been added: %2.
-Please go in the settings to select it if you wish to download it.</source>
- <translation>Foi adicionada uma nova pasta maior do que %1 MB: %2.
-Por favor, vá às configurações para a selecionar, se a desejar transferir.</translation>
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="856"/>
+ <source>A folder from an external storage has been added.
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="857"/>
+ <source>Please go in the settings to select it if you wish to download it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="888"/>
+ <location filename="../src/gui/folder.cpp" line="893"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
Tem a certeza que deseja realizar esta operação?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="892"/>
+ <location filename="../src/gui/folder.cpp" line="897"/>
<source>Remove All Files?</source>
<translation>Remover todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="894"/>
+ <location filename="../src/gui/folder.cpp" line="899"/>
<source>Remove all files</source>
<translation>Remover todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="895"/>
+ <location filename="../src/gui/folder.cpp" line="900"/>
<source>Keep files</source>
<translation>Manter ficheiros</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="911"/>
+ <location filename="../src/gui/folder.cpp" line="916"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="916"/>
+ <location filename="../src/gui/folder.cpp" line="921"/>
<source>Backup detected</source>
<translation>Detetada cópia de segurança</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="918"/>
+ <location filename="../src/gui/folder.cpp" line="923"/>
<source>Normal Synchronisation</source>
<translation>Sincronização Normal</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="919"/>
+ <location filename="../src/gui/folder.cpp" line="924"/>
<source>Keep Local Files as Conflict</source>
<translation>Manter Ficheiros Locais como Conflito</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="140"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="148"/>
<source>You need to be connected to add a folder</source>
<translation>Precisa de estar ligado para adicionar uma pasta</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="150"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="158"/>
<source>Click this button to add a folder to synchronize.</source>
<translation>Clique neste botão para adicionar uma pasta para sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
<source>%1 (%2)</source>
<extracomment>Example text: "File.txt (23KB)"</extracomment>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="180"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="188"/>
<source>Error while loading the list of folders from the server.</source>
<translation>Erro durante o carregamento da lista de pastas a partir do servidor.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="218"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="226"/>
<source>Signed out</source>
<translation>Sessão terminada</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="145"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="153"/>
<source>Adding folder is disabled because you are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
<translation>Adicionar pasta está desativada porque já está a sincronizar todos os seus ficheiros. Se deseja sincronizar múltiplas pastas, por favor, remova a pasta raiz atualmente configurada.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="183"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="191"/>
<source>Fetching folder list from server...</source>
<translation>A obter a lista de pastas do servidor...</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>Checking for changes in '%1'</source>
<translation>A procurar por alterações em '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="868"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
<source>, '%1'</source>
<extracomment>Build a list of file names</extracomment>
<translation>, '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="871"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="900"/>
<source>'%1'</source>
<extracomment>Argument is a file name</extracomment>
<translation>'%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="896"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="925"/>
<source>Syncing %1</source>
<extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment>
<translation>A sincronizar %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="908"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="927"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="937"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="931"/>
<source>download %1/s</source>
<extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>transferir %s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="933"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="911"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>upload %1/s</source>
<extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>enviar %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="913"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="942"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="918"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 de %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="922"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="951"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%5 restante, %1 de %2, ficheiro %3 de %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="948"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 de %2, ficheiro %3 de %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="954"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="983"/>
<source>file %1 of %2</source>
<translation>ficheiro %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/>
<source>Waiting...</source>
<translation>A aguardar...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="998"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1027"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>A aguardar por %n outra pasta...</numerusform><numerusform>A aguardar por %n outra(s) pasta(s)...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1033"/>
<source>Preparing to sync...</source>
<translation>A preparar para sincronizar...</translation>
</message>
<translation>Avançada</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="101"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
+ <source>Ask for confirmation before synchronizing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="105"/>
<source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/generalsettings.ui" line="26"/>
<source>&Launch on System Startup</source>
<translation>Utilizar Ícones &Monocromáticos</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="59"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit &Ignored Files</source>
<translation>Editar Ficheiros &Ignorados</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
- <source>Ask &confirmation before downloading folders larger than</source>
- <translation>Pedir &confirmação antes de transferir as pastas maiores que</translation>
- </message>
- <message>
- <location filename="../src/gui/generalsettings.ui" line="129"/>
+ <location filename="../src/gui/generalsettings.ui" line="140"/>
<source>S&how crash reporter</source>
<translation>M&ostrar relatório de crache</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="150"/>
<location filename="../src/gui/generalsettings.ui" line="156"/>
- <location filename="../src/gui/generalsettings.ui" line="162"/>
<source>About</source>
<translation>Sobre</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="172"/>
+ <location filename="../src/gui/generalsettings.ui" line="166"/>
<source>Updates</source>
<translation>Atualizações</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="197"/>
+ <location filename="../src/gui/generalsettings.ui" line="191"/>
<source>&Restart && Update</source>
<translation>&Reiniciar e Atualizar</translation>
</message>
<translation>Ligar...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="144"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="159"/>
<source>%1 folder '%2' is synced to local folder '%3'</source>
<translation>%1 pasta '%2' é sincronizada para pasta local '%3'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="162"/>
<source>Sync the folder '%1'</source>
<translation>Sincronizar a pasta '%1'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="152"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="167"/>
<source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
<translation><p><small><strong>Aviso:</strong> a pasta local não está vazia. Escolha uma resolução!</small></p></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="251"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/>
<source>Local Sync Folder</source>
<translation>Pasta de Sincronização Local</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="311"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="317"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
<translation>Não é possível remover e fazer backup à pasta porque a pasta ou um ficheiro nesta está aberto em outro programa. Por favor, feche a pasta ou o ficheiro e clique novamente ou cancele a configuração.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="540"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Pasta de sincronização local %1 criada com sucesso!</b></font></translation>
</message>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="120"/>
<source>Success.</source>
<translation>Sucesso</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="127"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSync falhou a carregar o ficheiro do jornal. O ficheiro do jornal está corrupto.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="130"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>O plugin %1 para o CSync não foi carregado.<br/>Por favor verifique a instalação!</p></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<source>CSync got an error while processing internal trees.</source>
<translation>Csync obteve um erro enquanto processava as árvores internas.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<source>CSync failed to reserve memory.</source>
<translation>O CSync falhou a reservar memória</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync fatal parameter error.</source>
<translation>Parametro errado, CSync falhou</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync processing step update failed.</source>
<translation>O passo de processamento do CSyn falhou</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync: Processo de reconciliação falhou.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync: não foi possível autenticar no servidor proxy.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync: não conseguiu contactar o proxy ou o servidor.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync: Erro a autenticar no servidor %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync: Erro na conecção à rede</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>A network connection timeout happened.</source>
<translation>Houve um erro de timeout de rede.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>A HTTP transmission error happened.</source>
<translation>Ocorreu um erro de transmissão HTTP</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation>O pasta montada está temporariamente indisponível no servidor</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>An error occurred while opening a folder</source>
<translation>Ocorreu um erro ao abrir uma pasta</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="197"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Error while reading folder.</source>
<translation>Erro ao ler o ficheiro.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="477"/>
+ <location filename="../src/libsync/syncengine.cpp" line="476"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>O ficheiro/pasta foi ignorado porque está oculto.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="738"/>
+ <location filename="../src/libsync/syncengine.cpp" line="737"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Apenas %1 estão disponíveis, é preciso um mínimo de %2 para começar</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1206"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Não permitido, porque não tem permissão para adicionar a pasta fonte</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1213"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Não permitido, porque não tem permissão para adicionar os ficheiros nessa pasta</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: Não ha espaço disponível no servidor %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>CSync: erro não especificado</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Cancelado pelo utilizador</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>CSync failed to access</source>
<translation>CSync falhou o acesso</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="123"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation>CSync falhou no carregamento ou criação do ficheiro jornal. Certifique-se de que tem permissões de gravação e leitura na pasta de sincronização local.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation>CSync falhou devido a permissão não tratada negada.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync tried to create a folder that already exists.</source>
<translation>O CSync tentou criar uma pasta que já existe.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>The service is temporarily unavailable</source>
<translation>O serviço está temporariamente indisponível</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>Access is forbidden</source>
<translation>O acesso é proibido</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="202"/>
+ <location filename="../src/libsync/syncengine.cpp" line="201"/>
<source>An internal error number %1 occurred.</source>
<translation>Ocorreu o erro interno número %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="266"/>
+ <location filename="../src/libsync/syncengine.cpp" line="265"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>O item não está sincronizado devido a erros anteriores: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="445"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Hiperligações simbólicas não são suportadas em sincronização.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="449"/>
+ <location filename="../src/libsync/syncengine.cpp" line="448"/>
<source>File is listed on the ignore list.</source>
<translation>O ficheiro está na lista de ficheiros a ignorar.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="453"/>
+ <location filename="../src/libsync/syncengine.cpp" line="452"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="463"/>
+ <location filename="../src/libsync/syncengine.cpp" line="462"/>
<source>File names containing the character '%1' are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="466"/>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
<source>The file name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="471"/>
+ <location filename="../src/libsync/syncengine.cpp" line="470"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="474"/>
+ <location filename="../src/libsync/syncengine.cpp" line="473"/>
<source>Filename is too long.</source>
<translation>O nome do ficheiro é muito grande</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="483"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Stat failed.</source>
<translation>Estado falhou.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="510"/>
+ <location filename="../src/libsync/syncengine.cpp" line="509"/>
<source>Filename encoding is not valid</source>
<translation>Codificação de nome de ficheiro não é válida</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="678"/>
+ <location filename="../src/libsync/syncengine.cpp" line="677"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Carateres inválidos, por favor, renomeie "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="774"/>
+ <location filename="../src/libsync/syncengine.cpp" line="773"/>
<source>Unable to initialize a sync journal.</source>
<translation>Impossível inicializar sincronização 'journal'.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="793"/>
+ <location filename="../src/libsync/syncengine.cpp" line="792"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Não foi possível ler a lista negra a partir da base de dados local</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="830"/>
+ <location filename="../src/libsync/syncengine.cpp" line="829"/>
<source>Unable to read from the sync journal.</source>
<translation>Não foi possível ler a partir do jornal de sincronização.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="875"/>
+ <location filename="../src/libsync/syncengine.cpp" line="874"/>
<source>Cannot open the sync journal</source>
<translation>Impossível abrir o jornal de sincronismo</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="933"/>
+ <location filename="../src/libsync/syncengine.cpp" line="932"/>
<source>File name contains at least one invalid character</source>
<translation>O nome de ficheiro contém pelo menos um caráter inválido</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
- <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1172"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorado devido à blacklist de escolha para sincronização</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1191"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Não permitido, porque não tem permissão para adicionar as subpastas nessa pasta</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1232"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Não é permitido enviar este ficheiro porque este é só de leitura no servidor, a restaurar</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1249"/>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1267"/>
<source>Not allowed to remove, restoring</source>
<translation>Não autorizado para remoção, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1280"/>
<source>Local files and share folder removed.</source>
<translation>Ficheiros locais e pasta partilhada removidos.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1336"/>
<source>Move not allowed, item restored</source>
<translation>Mover não foi permitido, item restaurado</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1347"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Mover não foi autorizado porque %1 é só de leitura</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the destination</source>
<translation>o destino</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the source</source>
<translation>a origem</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="300"/>
+ <location filename="../src/libsync/theme.cpp" line="309"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Versão %1. Para mais informações visite <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="304"/>
+ <location filename="../src/libsync/theme.cpp" line="313"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation><p>Todos os direitos reservados ownCloud GmbH</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="305"/>
+ <location filename="../src/libsync/theme.cpp" line="314"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Distribuído por %1 e licenciado sob a GNU General Public License (GPL) Versão 2.0.<br/>%2 e o logótipo %2 são marcas registadas da %1 nos Estados Unidos, outros países, ou ambos </p></translation>
</message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="250"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="352"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="379"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="402"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<translation>&Iniciar uma nova sincronização (Apaga a pasta local)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="295"/>
+ <source>Ask for confirmation before synchroni&zing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="321"/>
+ <source>Ask for confirmation before synchronizing e&xternal storages</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="345"/>
<source>Choose what to sync</source>
<translation>Escolher o que sincronizar</translation>
</message>
<translation>&Manter dados locais</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>S&ync everything from server</source>
<translation>Sincronizar tudo do servidor</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
<source>Status message</source>
<translation>Mensagem de estado</translation>
</message>
<location filename="../src/gui/owncloudsetuppage.ui" line="129"/>
<location filename="../src/gui/owncloudsetuppage.ui" line="156"/>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="190"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="83"/>
- <source>Server &Address</source>
- <translation>Endereço do servidor</translation>
+ <source>Ser&ver Address</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="99"/>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="286"/>
+ <location filename="../src/libsync/theme.cpp" line="295"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Construído a partir da revisão Git <a href="%1">%2</a> em %3, %4 usando Qt %5, %6</small></p></translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="238"/>
<location filename="../src/gui/accountsettings.cpp" line="371"/>
- <location filename="../src/gui/accountsettings.cpp" line="728"/>
+ <location filename="../src/gui/accountsettings.cpp" line="733"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<translation>Entrar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="678"/>
- <source>There are new folders that were not synchronized because they are too big: </source>
- <translation>Há novas pastas que não foram sincronizadas, porque eles são muito grandes:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="680"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="720"/>
+ <location filename="../src/gui/accountsettings.cpp" line="681"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="725"/>
<source>Confirm Account Removal</source>
<translation>Confirmar a Remoção da Conta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="721"/>
+ <location filename="../src/gui/accountsettings.cpp" line="726"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>Você realmente deseja remover a conexão desta conta<i>%1</i>?</p><p><b>Nota:</b> Isto <b>não</b> irá deletar nenhum arquivo.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="727"/>
+ <location filename="../src/gui/accountsettings.cpp" line="732"/>
<source>Remove connection</source>
<translation>Remover conexão</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="600"/>
<source>Aborted by the user</source>
<translation>Abortado pelo usuário</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="139"/>
<source>Local folder %1 does not exist.</source>
<translation>A pasta local %1 não existe.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="142"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 deve ser uma pasta, mas não é.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="144"/>
+ <location filename="../src/gui/folder.cpp" line="145"/>
<source>%1 is not readable.</source>
<translation>%1 não pode ser lido.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="367"/>
+ <location filename="../src/gui/folder.cpp" line="368"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi removido.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="374"/>
+ <location filename="../src/gui/folder.cpp" line="375"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi baixado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="382"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi atualizado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="388"/>
+ <location filename="../src/gui/folder.cpp" line="389"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 foi renomeado para %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="395"/>
+ <location filename="../src/gui/folder.cpp" line="396"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido para %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="365"/>
+ <location filename="../src/gui/folder.cpp" line="366"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 e %n outro arquivo foi removido.</numerusform><numerusform>%1 e %n outros arquivos foram removidos.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="372"/>
+ <location filename="../src/gui/folder.cpp" line="373"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 e %n outro(s) arquivo(s) foi(foram) baixados.</numerusform><numerusform>%1 e %n outro(s) arquivo(s) foi(foram) baixados.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="379"/>
+ <location filename="../src/gui/folder.cpp" line="380"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 e %n outro arquivo foi atualizado.</numerusform><numerusform>%1 e %n outros arquivos foram atualizados.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="386"/>
+ <location filename="../src/gui/folder.cpp" line="387"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 foi renomeado para %2 e %n outro arquivo foi renomeado.</numerusform><numerusform>%1 foi renomeado para %2 e %n outros arquivos foram renomeados.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="393"/>
+ <location filename="../src/gui/folder.cpp" line="394"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 foi movido para %2 e %n outro arquivo foi movido.</numerusform><numerusform>%1 foi movido para %2 e %n outros arquivos foram movidos.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="400"/>
+ <location filename="../src/gui/folder.cpp" line="401"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 tem e %n outro arquivo tem conflito na sincronização.</numerusform><numerusform>%1 tem e %n outros arquivos teem conflito na sincronização.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="402"/>
+ <location filename="../src/gui/folder.cpp" line="403"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 tem um conflito na sincronização. Por favor verifique o arquivo de conflito!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="407"/>
+ <location filename="../src/gui/folder.cpp" line="408"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 e %n outro arquivo não pode ser sincronizado devido a erros. Veja o log para detalhes.</numerusform><numerusform>%1 e %n outros arquivos não poderam ser sincronizados devido a erros. Veja o log para detalhes.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="409"/>
+ <location filename="../src/gui/folder.cpp" line="410"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 não pode ser sincronizado devido a um erro. Veja o log para obter detalhes.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="415"/>
+ <location filename="../src/gui/folder.cpp" line="416"/>
<source>Sync Activity</source>
<translation>Atividade de Sincronização</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="642"/>
+ <location filename="../src/gui/folder.cpp" line="643"/>
<source>Could not read system exclude file</source>
<translation>Não foi possível ler o sistema de arquivo de exclusão</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="850"/>
+ <location filename="../src/gui/folder.cpp" line="854"/>
<source>A new folder larger than %1 MB has been added: %2.
-Please go in the settings to select it if you wish to download it.</source>
- <translation>Uma nova pasta maior que %1 MB foi adicionada: %2.
-Por favor, vá nas configurações para selecionar o que você deseja para fazer o download.</translation>
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="856"/>
+ <source>A folder from an external storage has been added.
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="857"/>
+ <source>Please go in the settings to select it if you wish to download it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="888"/>
+ <location filename="../src/gui/folder.cpp" line="893"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
Tem certeza de que deseja executar esta operação?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="892"/>
+ <location filename="../src/gui/folder.cpp" line="897"/>
<source>Remove All Files?</source>
<translation>Deseja Remover Todos os Arquivos?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="894"/>
+ <location filename="../src/gui/folder.cpp" line="899"/>
<source>Remove all files</source>
<translation>Remover todos os arquivos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="895"/>
+ <location filename="../src/gui/folder.cpp" line="900"/>
<source>Keep files</source>
<translation>Manter arquivos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="911"/>
+ <location filename="../src/gui/folder.cpp" line="916"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
Continuar a sincronização como normal fará com que todos os seus arquivos sejam substituídos por um arquivo antigo em um estado anterior. Deseja manter seus arquivos mais recentes locais como arquivos de conflito?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="916"/>
+ <location filename="../src/gui/folder.cpp" line="921"/>
<source>Backup detected</source>
<translation>Backup detectado</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="918"/>
+ <location filename="../src/gui/folder.cpp" line="923"/>
<source>Normal Synchronisation</source>
<translation>Sincronização Normal</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="919"/>
+ <location filename="../src/gui/folder.cpp" line="924"/>
<source>Keep Local Files as Conflict</source>
<translation>Manter Arquivos Locais como Conflito</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="140"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="148"/>
<source>You need to be connected to add a folder</source>
<translation>Você precisa estar conectado para adicionar uma pasta</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="150"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="158"/>
<source>Click this button to add a folder to synchronize.</source>
<translation>Clique nesse botão para adicionar uma pasta para sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
<source>%1 (%2)</source>
<extracomment>Example text: "File.txt (23KB)"</extracomment>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="180"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="188"/>
<source>Error while loading the list of folders from the server.</source>
<translation>Erro enquanto carregava a lista de pastas do servidor.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="218"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="226"/>
<source>Signed out</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="145"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="153"/>
<source>Adding folder is disabled because you are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
<translation>Adição de pasta está desativado porque você já está sincronizando todos os seus arquivos. Se você deseja sincronizar várias pastas, por favor, remova a pasta raiz configurada atualmente.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="183"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="191"/>
<source>Fetching folder list from server...</source>
<translation>Obtendo lista de pastas do servidor...</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>Checking for changes in '%1'</source>
<translation>Verificando alterações em '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="868"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
<source>, '%1'</source>
<extracomment>Build a list of file names</extracomment>
<translation>, '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="871"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="900"/>
<source>'%1'</source>
<extracomment>Argument is a file name</extracomment>
<translation>'%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="896"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="925"/>
<source>Syncing %1</source>
<extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment>
<translation>Sincronizando %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="908"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="927"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="937"/>
<source>, </source>
<translation>,</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="931"/>
<source>download %1/s</source>
<extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>baixar %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="933"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="911"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>upload %1/s</source>
<extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>enviar %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="913"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="942"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="918"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 de %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="922"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="951"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%5 restando, %1 de %2, arquivo %3 de %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="948"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 de%2, arquivo %3 de %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="954"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="983"/>
<source>file %1 of %2</source>
<translation>arquivo %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/>
<source>Waiting...</source>
<translation>Esperando...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="998"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1027"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>Esperando por %n outra pasta...</numerusform><numerusform>Esperando por %n outras pastas...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1033"/>
<source>Preparing to sync...</source>
<translation>Preparando para sincronizar...</translation>
</message>
<translation>Avançado</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="101"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
+ <source>Ask for confirmation before synchronizing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="105"/>
<source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/generalsettings.ui" line="26"/>
<source>&Launch on System Startup</source>
<translation>Usar Icones &Monocromáticos</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="59"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit &Ignored Files</source>
<translation>Editar Arquivos &Ignorados</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
- <source>Ask &confirmation before downloading folders larger than</source>
- <translation>Solicitar &confirmação entes de baixar pastas maiores que</translation>
- </message>
- <message>
- <location filename="../src/gui/generalsettings.ui" line="129"/>
+ <location filename="../src/gui/generalsettings.ui" line="140"/>
<source>S&how crash reporter</source>
<translation>M&ostrar relatório de acidente</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="150"/>
<location filename="../src/gui/generalsettings.ui" line="156"/>
- <location filename="../src/gui/generalsettings.ui" line="162"/>
<source>About</source>
<translation>Sobre</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="172"/>
+ <location filename="../src/gui/generalsettings.ui" line="166"/>
<source>Updates</source>
<translation>Atualizações</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="197"/>
+ <location filename="../src/gui/generalsettings.ui" line="191"/>
<source>&Restart && Update</source>
<translation>&Reiniciar && Atualização
</translation>
<translation>Conectar...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="144"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="159"/>
<source>%1 folder '%2' is synced to local folder '%3'</source>
<translation>%1 Pasta '%2' está sincronizada com pasta local '%3'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="162"/>
<source>Sync the folder '%1'</source>
<translation>Sincronizar a pasta '%1'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="152"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="167"/>
<source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
<translation><p><small><strong>Aviso:</strong> A pasta local não está vazia. Escolha uma resolução!</small></p></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="251"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/>
<source>Local Sync Folder</source>
<translation>Sincronizar Pasta Local</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="311"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="317"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
<translation>Não é possível remover e fazer backup da pasta porque a pasta ou um arquivo que está nesta pasta está aberto em outro programa. Por favor, feche a pasta ou arquivo e clique tentar novamente ou cancelar a operação.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="540"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Pasta de sincronização local %1 criada com sucesso!</b></font></translation>
</message>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="120"/>
<source>Success.</source>
<translation>Sucesso.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="127"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSync não conseguiu carregar o arquivo journal. O arquivo journal está corrompido.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="130"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>O plugin %1 para csync não foi carregado.<br/>Por favor verifique a instalação!</p></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<source>CSync got an error while processing internal trees.</source>
<translation>Erro do CSync enquanto processava árvores internas.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync falhou ao reservar memória.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync fatal parameter error.</source>
<translation>Erro fatal de parametro do CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync processing step update failed.</source>
<translation>Processamento da atualização do CSync falhou.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync processing step reconcile failed.</source>
<translation>Processamento da conciliação do CSync falhou.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>Csync não conseguiu autenticação no proxy.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync falhou ao localizar o proxy ou servidor.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync falhou ao autenticar no servidor %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync falhou ao conectar à rede.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>A network connection timeout happened.</source>
<translation>Ocorreu uma desconexão de rede. </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>A HTTP transmission error happened.</source>
<translation>Houve um erro na transmissão HTTP.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation>A pasta montada não está temporariamente disponível no servidor</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>An error occurred while opening a folder</source>
<translation>Ocorreu um erro ao abrir uma pasta</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="197"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Error while reading folder.</source>
<translation>Erro ao ler pasta.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="477"/>
+ <location filename="../src/libsync/syncengine.cpp" line="476"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>Arquivo/pasta ignorado porque porque está escondido.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="738"/>
+ <location filename="../src/libsync/syncengine.cpp" line="737"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Apenas %1 estão disponíveis, precisamos de pelo menos %2 para começar</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1206"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Não permitido porque você não tem permissão para adicionar pasta mãe</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1213"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Não permitido porque você não tem permissão para adicionar arquivos na pasta</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: Sem espaço disponível no servidor %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>Erro não especificado no CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Abortado pelo usuário</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>CSync failed to access</source>
<translation>CSync não conseguiu o acesso</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="123"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation>CSync falhou ao carregar ou criar o arquivo de diário. Certifique-se de ter permissão de ler e escrever na pasta de sincronização local.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation>CSync falhou devido a permissão de não manipulação negada.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync tried to create a folder that already exists.</source>
<translation>CSync tentou criar uma pasta que já existe.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>The service is temporarily unavailable</source>
<translation>O serviço está temporariamente indisponível</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>Access is forbidden</source>
<translation>Acesso proibido</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="202"/>
+ <location filename="../src/libsync/syncengine.cpp" line="201"/>
<source>An internal error number %1 occurred.</source>
<translation>Um erro interno de número %1 ocorreu.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="266"/>
+ <location filename="../src/libsync/syncengine.cpp" line="265"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>O item não está sincronizado devido a erros anteriores: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="445"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Linques simbólicos não são suportados em sincronização.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="449"/>
+ <location filename="../src/libsync/syncengine.cpp" line="448"/>
<source>File is listed on the ignore list.</source>
<translation>O arquivo está listado na lista de ignorados.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="453"/>
+ <location filename="../src/libsync/syncengine.cpp" line="452"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation>Os nomes de arquivos que terminam com um ponto não são suportados neste sistema de arquivos.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="463"/>
+ <location filename="../src/libsync/syncengine.cpp" line="462"/>
<source>File names containing the character '%1' are not supported on this file system.</source>
<translation>Os nomes de arquivos que contêm o caractere '%1' não são suportados neste sistema de arquivos.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="466"/>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
<source>The file name is a reserved name on this file system.</source>
<translation>O nome do arquivo é um nome reservado neste sistema de arquivos.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="471"/>
+ <location filename="../src/libsync/syncengine.cpp" line="470"/>
<source>Filename contains trailing spaces.</source>
<translation>O nome do arquivo contém espaços deixados para trás.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="474"/>
+ <location filename="../src/libsync/syncengine.cpp" line="473"/>
<source>Filename is too long.</source>
<translation>O nome do arquivo é muito longo.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="483"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Stat failed.</source>
<translation>Stat falhou.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="510"/>
+ <location filename="../src/libsync/syncengine.cpp" line="509"/>
<source>Filename encoding is not valid</source>
<translation>A codificação do nome do arquivo não é válida</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="678"/>
+ <location filename="../src/libsync/syncengine.cpp" line="677"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Caracteres inválidos, por favor renomear "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="774"/>
+ <location filename="../src/libsync/syncengine.cpp" line="773"/>
<source>Unable to initialize a sync journal.</source>
<translation>Impossibilitado de iniciar a sincronização.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="793"/>
+ <location filename="../src/libsync/syncengine.cpp" line="792"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Não é possível ler a lista negra a partir do banco de dados local</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="830"/>
+ <location filename="../src/libsync/syncengine.cpp" line="829"/>
<source>Unable to read from the sync journal.</source>
<translation>Não é possível ler a partir do relatório de sincronização.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="875"/>
+ <location filename="../src/libsync/syncengine.cpp" line="874"/>
<source>Cannot open the sync journal</source>
<translation>Não é possível abrir o arquivo de sincronização</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="933"/>
+ <location filename="../src/libsync/syncengine.cpp" line="932"/>
<source>File name contains at least one invalid character</source>
<translation>O nome do arquivo contem pelo menos um caractere inválido </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
- <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1172"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorado por causa da lista negra "escolher o que sincronizar"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1191"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Não permitido porque você não tem permissão para adicionar subpastas para essa pasta</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1232"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Não é permitido fazer o upload deste arquivo porque ele é somente leitura no servidor, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1249"/>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1267"/>
<source>Not allowed to remove, restoring</source>
<translation>Não é permitido remover, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1280"/>
<source>Local files and share folder removed.</source>
<translation>Arquivos locais e pasta compartilhada removida.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1336"/>
<source>Move not allowed, item restored</source>
<translation>Não é permitido mover, item restaurado</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1347"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Não é permitido mover porque %1 é somente para leitura</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the destination</source>
<translation>o destino</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the source</source>
<translation>a fonte</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="300"/>
+ <location filename="../src/libsync/theme.cpp" line="309"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Versão %1. Para mais informações por favor visite <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="304"/>
+ <location filename="../src/libsync/theme.cpp" line="313"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation><p>Direitos autorais ownCloud GmbH</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="305"/>
+ <location filename="../src/libsync/theme.cpp" line="314"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Distribuído por %1 e licenciado sobre a GNU General Public License (GPL) Versão 2.0.<br/>%2 e o %2 logo são marcas registradas de %1 nos Estados Unidos, outros países ou ambos.</p></translation>
</message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="250"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="352"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="379"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="402"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<translation>Iniciar uma sincronização &limpa (Elimina a pasta local!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="295"/>
+ <source>Ask for confirmation before synchroni&zing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="321"/>
+ <source>Ask for confirmation before synchronizing e&xternal storages</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="345"/>
<source>Choose what to sync</source>
<translation>Escolha o que quer sincronizar</translation>
</message>
<translation>&Manter dados locais</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>S&ync everything from server</source>
<translation>S&ync tudo do servidor</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
<source>Status message</source>
<translation>Mensagem de status</translation>
</message>
<location filename="../src/gui/owncloudsetuppage.ui" line="129"/>
<location filename="../src/gui/owncloudsetuppage.ui" line="156"/>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="190"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="83"/>
- <source>Server &Address</source>
- <translation>&Endereço do Servidor</translation>
+ <source>Ser&ver Address</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="99"/>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="286"/>
+ <location filename="../src/libsync/theme.cpp" line="295"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Construído a partir de revisão Git <a href="%1">%2</a> em %3, %4 usando Qt %5, %6</small></p></translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="238"/>
<location filename="../src/gui/accountsettings.cpp" line="371"/>
- <location filename="../src/gui/accountsettings.cpp" line="728"/>
+ <location filename="../src/gui/accountsettings.cpp" line="733"/>
<source>Cancel</source>
<translation>Отмена</translation>
</message>
<translation>Войти</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="678"/>
- <source>There are new folders that were not synchronized because they are too big: </source>
- <translation>Есть новые каталоги, которые не были синхронизированы, так как они слишком большие:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="680"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="681"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="720"/>
+ <location filename="../src/gui/accountsettings.cpp" line="725"/>
<source>Confirm Account Removal</source>
<translation>Подтверждение удаления учетной записи</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="721"/>
+ <location filename="../src/gui/accountsettings.cpp" line="726"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>Вы действительно желаете удалить подключение к учетной записи <i>%1</i>?</p><p><b>Примечание:</b> Это действие <b>НЕ</b> удалит ваши файлы.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="727"/>
+ <location filename="../src/gui/accountsettings.cpp" line="732"/>
<source>Remove connection</source>
<translation>Удалить подключение</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="600"/>
<source>Aborted by the user</source>
<translation>Прервано пользов</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="139"/>
<source>Local folder %1 does not exist.</source>
<translation>Локальный каталог %1 не существует.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="142"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 должен быть папкой, но ей не является.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="144"/>
+ <location filename="../src/gui/folder.cpp" line="145"/>
<source>%1 is not readable.</source>
<translation>%1 не может быть прочитан.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="367"/>
+ <location filename="../src/gui/folder.cpp" line="368"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>'%1' был удалён.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="374"/>
+ <location filename="../src/gui/folder.cpp" line="375"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 был загружен.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="382"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 был обновлён.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="388"/>
+ <location filename="../src/gui/folder.cpp" line="389"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 был переименован в %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="395"/>
+ <location filename="../src/gui/folder.cpp" line="396"/>
<source>%1 has been moved to %2.</source>
<translation>%1 был перемещён в %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="365"/>
+ <location filename="../src/gui/folder.cpp" line="366"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 и ещё %n другой файл был удалён.</numerusform><numerusform>%1 и ещё %n других файла было удалено.</numerusform><numerusform>%1 и ещё %n других файлов были удалены.</numerusform><numerusform>%1 и ещё %n других файлов были удалены.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="372"/>
+ <location filename="../src/gui/folder.cpp" line="373"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 и ещё %n другой файл были скачаны.</numerusform><numerusform>%1 и ещё %n других файла были скачаны.</numerusform><numerusform>%1 и ещё %n других файлов были скачаны.</numerusform><numerusform>%1 и ещё %n других файлов были скачаны.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="379"/>
+ <location filename="../src/gui/folder.cpp" line="380"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 и ещё %n другой файл были обновлены.</numerusform><numerusform>%1 и ещё %n других файла были обновлены.</numerusform><numerusform>%1 и ещё %n других файлов были обновлены.</numerusform><numerusform>%1 и ещё %n других файлов были обновлены.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="386"/>
+ <location filename="../src/gui/folder.cpp" line="387"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 был переименован в %2, и ещё %n другой файл был переименован.</numerusform><numerusform>%1 был переименован в %2, и ещё %n других файла были переименованы.</numerusform><numerusform>%1 был переименован в %2, и ещё %n других файлов были переименованы.</numerusform><numerusform>%1 был переименован в %2, и ещё %n других файлов были переименованы.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="393"/>
+ <location filename="../src/gui/folder.cpp" line="394"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 был перемещён в %2, и ещё %n другой файл был перемещён.</numerusform><numerusform>%1 был перемещён в %2, и ещё %n других файла были перемещены.</numerusform><numerusform>%1 был перемещён в %2, и ещё %n других файла были перемещены.</numerusform><numerusform>%1 был перемещён в %2, и ещё %n других файла были перемещены.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="400"/>
+ <location filename="../src/gui/folder.cpp" line="401"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>У %1 и ещё у %n другого файла есть конфликты синхронизации.</numerusform><numerusform>У %1 и ещё у %n других файлов есть конфликты синхронизации.</numerusform><numerusform>У %1 и ещё у %n других файлов есть конфликты синхронизации.</numerusform><numerusform>У %1 и ещё у %n других файлов есть конфликты синхронизации.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="402"/>
+ <location filename="../src/gui/folder.cpp" line="403"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>У %1 есть конфликт синхронизации. Пожалуйста, проверьте конфликтный файл!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="407"/>
+ <location filename="../src/gui/folder.cpp" line="408"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 и ещё %n другой файл не удалось синхронизировать из-за ошибок. Подробности смотрите в журнале.</numerusform><numerusform>%1 и ещё %n других файла не удалось синхронизировать из-за ошибок. Подробности смотрите в журнале.</numerusform><numerusform>%1 и ещё %n других файлов не удалось синхронизировать из-за ошибок. Подробности смотрите в журнале.</numerusform><numerusform>%1 и ещё %n других файлов не удалось синхронизировать из-за ошибок. Подробности смотрите в журнале.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="409"/>
+ <location filename="../src/gui/folder.cpp" line="410"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 не может быть синхронизирован из-за ошибки. Подробности смотрите в журнале.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="415"/>
+ <location filename="../src/gui/folder.cpp" line="416"/>
<source>Sync Activity</source>
<translation>Журнал синхронизации</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="642"/>
+ <location filename="../src/gui/folder.cpp" line="643"/>
<source>Could not read system exclude file</source>
<translation>Невозможно прочесть системный файл исключений</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="850"/>
+ <location filename="../src/gui/folder.cpp" line="854"/>
<source>A new folder larger than %1 MB has been added: %2.
-Please go in the settings to select it if you wish to download it.</source>
- <translation>Новый каталог размером более %1 МБ был добавлен: %2.
-Пожалуйста, перейдите в настройки, если хотите скачать его.</translation>
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="856"/>
+ <source>A folder from an external storage has been added.
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="857"/>
+ <source>Please go in the settings to select it if you wish to download it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="888"/>
+ <location filename="../src/gui/folder.cpp" line="893"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
Вы действительно хотите выполнить эту операцию?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="892"/>
+ <location filename="../src/gui/folder.cpp" line="897"/>
<source>Remove All Files?</source>
<translation>Удалить все файлы?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="894"/>
+ <location filename="../src/gui/folder.cpp" line="899"/>
<source>Remove all files</source>
<translation>Удалить все файлы</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="895"/>
+ <location filename="../src/gui/folder.cpp" line="900"/>
<source>Keep files</source>
<translation>Сохранить файлы</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="911"/>
+ <location filename="../src/gui/folder.cpp" line="916"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation>Эта синхронизация собирается сбросить файлы в катлоге '%1' в более ранее состояние. Такое может случиться, если на сервере восстановлена резервная копия. Если продолжать синхронизацию как обычно, то ваши файлы будут перетёрты более старыми версиями. Хотите сохранить ваши локальные свежие файлы в качестве конфликтных?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="916"/>
+ <location filename="../src/gui/folder.cpp" line="921"/>
<source>Backup detected</source>
<translation>Обнаружена резервная копия</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="918"/>
+ <location filename="../src/gui/folder.cpp" line="923"/>
<source>Normal Synchronisation</source>
<translation>Обычная синхронизация</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="919"/>
+ <location filename="../src/gui/folder.cpp" line="924"/>
<source>Keep Local Files as Conflict</source>
<translation>Сохранить локальные файлы как конфликтующие</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="140"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="148"/>
<source>You need to be connected to add a folder</source>
<translation>Необходимо подключиться, чтобы добавить каталог</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="150"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="158"/>
<source>Click this button to add a folder to synchronize.</source>
<translation>Нажмите на эту кнопку для добавления каталога к синхронизации.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
<source>%1 (%2)</source>
<extracomment>Example text: "File.txt (23KB)"</extracomment>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="180"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="188"/>
<source>Error while loading the list of folders from the server.</source>
<translation>Ошибка загрузки списка папок с сервера.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="218"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="226"/>
<source>Signed out</source>
<translation>Вышли из аккаунта</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="145"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="153"/>
<source>Adding folder is disabled because you are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
<translation>Добавление папки отключена, потому что вы уже синхронизированы все файлы. Если вы хотите синхронизировать несколько папок, пожалуйста, удалите текущую корневую папку.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="183"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="191"/>
<source>Fetching folder list from server...</source>
<translation>Извлечение списка папок с сервера...</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>Checking for changes in '%1'</source>
<translation>Проверка изменений в '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="868"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
<source>, '%1'</source>
<extracomment>Build a list of file names</extracomment>
<translation>, '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="871"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="900"/>
<source>'%1'</source>
<extracomment>Argument is a file name</extracomment>
<translation>'%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="896"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="925"/>
<source>Syncing %1</source>
<extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment>
<translation>Синхронизация %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="908"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="927"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="937"/>
<source>, </source>
<translation>,</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="931"/>
<source>download %1/s</source>
<extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>скачивание %1/с</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="933"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/сjavascript:;</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="911"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>upload %1/s</source>
<extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>загрузка %1/с</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="913"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="942"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/с</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="918"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 из %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="922"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="951"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>Осталось %5, %1 из %2, файл %3 из %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="948"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 из %2, файл %3 из %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="954"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="983"/>
<source>file %1 of %2</source>
<translation>файл %1 из %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/>
<source>Waiting...</source>
<translation>Ожидание...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="998"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1027"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>Ожидание %n директории...</numerusform><numerusform>Ожидание %n директорий...</numerusform><numerusform>Ожидание %n директорий...</numerusform><numerusform>Ожидание %n директорий...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1033"/>
<source>Preparing to sync...</source>
<translation>Подготовка к синхронизации...</translation>
</message>
<translation>Дополнительно</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="101"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
+ <source>Ask for confirmation before synchronizing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="105"/>
<source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>МБ</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/generalsettings.ui" line="26"/>
<source>&Launch on System Startup</source>
<translation>Использовать черно-белые иконки</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="59"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit &Ignored Files</source>
<translation>Редактировать &Ignored файлы</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
- <source>Ask &confirmation before downloading folders larger than</source>
- <translation>Запрашивать &подтверждение перед загрузкой каталогов больше чем</translation>
- </message>
- <message>
- <location filename="../src/gui/generalsettings.ui" line="129"/>
+ <location filename="../src/gui/generalsettings.ui" line="140"/>
<source>S&how crash reporter</source>
<translation>Показать отчёты об ошибках</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="150"/>
<location filename="../src/gui/generalsettings.ui" line="156"/>
- <location filename="../src/gui/generalsettings.ui" line="162"/>
<source>About</source>
<translation>О программе</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="172"/>
+ <location filename="../src/gui/generalsettings.ui" line="166"/>
<source>Updates</source>
<translation>Обновления</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="197"/>
+ <location filename="../src/gui/generalsettings.ui" line="191"/>
<source>&Restart && Update</source>
<translation>&Перезапуск и обновление</translation>
</message>
<translation>Соединение...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="144"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="159"/>
<source>%1 folder '%2' is synced to local folder '%3'</source>
<translation>%1 каталог '%2' синхронизирован с локальным каталогом '%3'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="162"/>
<source>Sync the folder '%1'</source>
<translation>Синхронизация папки '%1'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="152"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="167"/>
<source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
<translation><p><small><strong>Внимание:</strong> Локальная папка не пуста. Выберите действие!</small></p></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="251"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/>
<source>Local Sync Folder</source>
<translation>Локальный каталог синхронизации</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="311"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="317"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
<translation>Невозможно удалить каталог и создать его резервную копию, каталог или файл в ней открыт в другой программе. Закройте каталог или файл и нажмите "Повторить попытку", либо прервите мастер настройки.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="540"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Локальный каталог синхронизации %1 успешно создан!</b></font></translation>
</message>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="120"/>
<source>Success.</source>
<translation>Успешно.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="127"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSync не удалось загрузить файл журнала. Файл журнала повреждён.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="130"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>Не удается загрузить плагин 1% для csync.<br/>Проверьте установку!</p></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync получил сообщение об ошибке при обработке внутренних деревьев.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync не удалось зарезервировать память.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync fatal parameter error.</source>
<translation>Критическая ошибка параметра CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync processing step update failed.</source>
<translation>Процесс обновления CSync не удался.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync processing step reconcile failed.</source>
<translation>Процесс согласования CSync не удался.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync не удалось авторизоваться на прокси сервере.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync не удалось найти прокси сервер.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync не удалось авторизоваться на сервере %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync не удалось подключиться к сети.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>A network connection timeout happened.</source>
<translation>Вышло время ожидания подключения к сети.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>A HTTP transmission error happened.</source>
<translation>Произошла ошибка передачи HTTP.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation>Смонтированная папка временно недоступна на сервере</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>An error occurred while opening a folder</source>
<translation>Произошла ошибка во время открытия папки</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="197"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Error while reading folder.</source>
<translation>Произошла ошибка во время чтения папки.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="477"/>
+ <location filename="../src/libsync/syncengine.cpp" line="476"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>Файл/папка проигнорированы, так как являются скрытыми.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="738"/>
+ <location filename="../src/libsync/syncengine.cpp" line="737"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Только %1 доступно, нужно как минимум %2 чтобы начать</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1206"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Не разрешается, так как у вас нет полномочий на добавление родительской папки</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1213"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Не разрешается, так как у вас нет полномочий на добавление файлов в эту папку</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: Нет свободного пространства на сервере %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>Неизвестная ошибка CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Прервано пользователем</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>CSync failed to access</source>
<translation>CSync отказано в доступе</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="123"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation>CSync не удалось загрузить файл журнала. Убедитесь в наличии прав на чтение и запись в локальную папку.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation>CSync не выполнен из-за отказа в доступе для необработанного разрешения.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync tried to create a folder that already exists.</source>
<translation>CSync попытался создать папку, которая уже существует.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>The service is temporarily unavailable</source>
<translation>Сервис временно недоступен</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>Access is forbidden</source>
<translation>Доступ запрещен</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="202"/>
+ <location filename="../src/libsync/syncengine.cpp" line="201"/>
<source>An internal error number %1 occurred.</source>
<translation>Произошла внутренняя ошибка номер %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="266"/>
+ <location filename="../src/libsync/syncengine.cpp" line="265"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Элемент не синхронизируется из-за произошедших ошибок: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="445"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Синхронизация символических ссылок не поддерживается.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="449"/>
+ <location filename="../src/libsync/syncengine.cpp" line="448"/>
<source>File is listed on the ignore list.</source>
<translation>Файл присутствует в списке игнорируемых.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="453"/>
+ <location filename="../src/libsync/syncengine.cpp" line="452"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation>Эта файловая система не поддерживает имена файлов, оканчивающиеся на точку.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="463"/>
+ <location filename="../src/libsync/syncengine.cpp" line="462"/>
<source>File names containing the character '%1' are not supported on this file system.</source>
<translation>Эта файловая система не поддерживает имена файлов, содержащие символ '%1'.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="466"/>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
<source>The file name is a reserved name on this file system.</source>
<translation>Данное имя файла зарезервировано в данной файловой системе.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="471"/>
+ <location filename="../src/libsync/syncengine.cpp" line="470"/>
<source>Filename contains trailing spaces.</source>
<translation>Имя файла содержит пробелы на конце.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="474"/>
+ <location filename="../src/libsync/syncengine.cpp" line="473"/>
<source>Filename is too long.</source>
<translation>Имя файла слишком длинное.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="483"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Stat failed.</source>
<translation>Не удалось загрузить статистику.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="510"/>
+ <location filename="../src/libsync/syncengine.cpp" line="509"/>
<source>Filename encoding is not valid</source>
<translation>Кодировка имени файла не верна</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="678"/>
+ <location filename="../src/libsync/syncengine.cpp" line="677"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Недопустимые символы, пожалуйста, переименуйте "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="774"/>
+ <location filename="../src/libsync/syncengine.cpp" line="773"/>
<source>Unable to initialize a sync journal.</source>
<translation>Невозможно инициализировать журнал синхронизации.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="793"/>
+ <location filename="../src/libsync/syncengine.cpp" line="792"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Не удалось прочитать файл чёрного списка из локальной базы данных.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="830"/>
+ <location filename="../src/libsync/syncengine.cpp" line="829"/>
<source>Unable to read from the sync journal.</source>
<translation>Не удалось прочитать из журнала синхронизации.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="875"/>
+ <location filename="../src/libsync/syncengine.cpp" line="874"/>
<source>Cannot open the sync journal</source>
<translation>Не удаётся открыть журнал синхронизации</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="933"/>
+ <location filename="../src/libsync/syncengine.cpp" line="932"/>
<source>File name contains at least one invalid character</source>
<translation>Имя файла содержит по крайней мере один некорректный символ</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
- <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1172"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Игнорируется из-за черного списка в "что синхронизировать"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1191"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Не разрешается, так как у вас нет полномочий на добавление подпапок в папку.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1232"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Не допускается загрузка этого файла, так как на сервере он помечен только для чтения, восстанавливаем</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1249"/>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1267"/>
<source>Not allowed to remove, restoring</source>
<translation>Не допускается удаление, восстанавливаем</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1280"/>
<source>Local files and share folder removed.</source>
<translation>Локальные файлы и общий каталог удалены.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1336"/>
<source>Move not allowed, item restored</source>
<translation>Перемещение не допускается, элемент восстановлен</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1347"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Перемещение не допускается, поскольку %1 помечен только для чтения</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the destination</source>
<translation>назначение</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the source</source>
<translation>источник</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="300"/>
+ <location filename="../src/libsync/theme.cpp" line="309"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Версия %1. Для получения дополнительной информации посетите <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="304"/>
+ <location filename="../src/libsync/theme.cpp" line="313"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation><p>Все права принадлежат ownCloud GmbH</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="305"/>
+ <location filename="../src/libsync/theme.cpp" line="314"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Распространяется %1 и лицензировано под GNU General Public License (GPL) Версии 2.0.<br/>Логотипы %2 и %2 являются зарегистрированной торговой маркой %1 в США и/или других странах.</p></translation>
</message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="250"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="352"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="379"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="402"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<translation>Начать новую синхронизацию (Стирает локальную папку!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="295"/>
+ <source>Ask for confirmation before synchroni&zing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="321"/>
+ <source>Ask for confirmation before synchronizing e&xternal storages</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="345"/>
<source>Choose what to sync</source>
<translation>Уточнить объекты</translation>
</message>
<translation>&Сохранить локальные данные</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>S&ync everything from server</source>
<translation>Синхронизировать всё с сервером</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
<source>Status message</source>
<translation>Сообщение о состоянии</translation>
</message>
<location filename="../src/gui/owncloudsetuppage.ui" line="129"/>
<location filename="../src/gui/owncloudsetuppage.ui" line="156"/>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="190"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="83"/>
- <source>Server &Address</source>
- <translation>&Адрес сервера</translation>
+ <source>Ser&ver Address</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="99"/>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="286"/>
+ <location filename="../src/libsync/theme.cpp" line="295"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Собрано исходников Git версии <a href="%1">%2</a> на %3, %4 используя Qt %5, %6</small></p></translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="238"/>
<location filename="../src/gui/accountsettings.cpp" line="371"/>
- <location filename="../src/gui/accountsettings.cpp" line="728"/>
+ <location filename="../src/gui/accountsettings.cpp" line="733"/>
<source>Cancel</source>
<translation>Zrušiť</translation>
</message>
<translation>Prihlásiť sa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="678"/>
- <source>There are new folders that were not synchronized because they are too big: </source>
- <translation>Niektoré nové priečinky neboli synchronizované, pretože sú priveľké:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="680"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="681"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="720"/>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="725"/>
<source>Confirm Account Removal</source>
<translation>Potvrďte ostránenie účtu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="721"/>
+ <location filename="../src/gui/accountsettings.cpp" line="726"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>Naozaj chcete odstrániť pripojenie k účtu <i>%1</i>?</p><p><b>Poznámka:</b> Tým sa <b>nevymažú</b> žiadne súbory.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="727"/>
+ <location filename="../src/gui/accountsettings.cpp" line="732"/>
<source>Remove connection</source>
<translation>Vymazať pripojenie</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="600"/>
<source>Aborted by the user</source>
<translation>Zrušené používateľom</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="139"/>
<source>Local folder %1 does not exist.</source>
<translation>Lokálny priečinok %1 neexistuje.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="142"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 by mal byť priečinok, avšak nie je.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="144"/>
+ <location filename="../src/gui/folder.cpp" line="145"/>
<source>%1 is not readable.</source>
<translation>%1 nie je čitateľný.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="367"/>
+ <location filename="../src/gui/folder.cpp" line="368"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 bol zmazaný.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="374"/>
+ <location filename="../src/gui/folder.cpp" line="375"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 bol stiahnutý.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="382"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 bol aktualizovaný.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="388"/>
+ <location filename="../src/gui/folder.cpp" line="389"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 bol premenovaný na %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="395"/>
+ <location filename="../src/gui/folder.cpp" line="396"/>
<source>%1 has been moved to %2.</source>
<translation>%1 bol presunutý do %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="365"/>
+ <location filename="../src/gui/folder.cpp" line="366"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="372"/>
+ <location filename="../src/gui/folder.cpp" line="373"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="379"/>
+ <location filename="../src/gui/folder.cpp" line="380"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="386"/>
+ <location filename="../src/gui/folder.cpp" line="387"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="393"/>
+ <location filename="../src/gui/folder.cpp" line="394"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="400"/>
+ <location filename="../src/gui/folder.cpp" line="401"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="402"/>
+ <location filename="../src/gui/folder.cpp" line="403"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="407"/>
+ <location filename="../src/gui/folder.cpp" line="408"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="409"/>
+ <location filename="../src/gui/folder.cpp" line="410"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 nemôže byť synchronizovaný kvôli chybe. Pozrite sa do logu pre podrobnosti.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="415"/>
+ <location filename="../src/gui/folder.cpp" line="416"/>
<source>Sync Activity</source>
<translation>Aktivita synchronizácie</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="642"/>
+ <location filename="../src/gui/folder.cpp" line="643"/>
<source>Could not read system exclude file</source>
<translation>Nemožno čítať systémový exclude file</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="850"/>
+ <location filename="../src/gui/folder.cpp" line="854"/>
<source>A new folder larger than %1 MB has been added: %2.
-Please go in the settings to select it if you wish to download it.</source>
- <translation>Bol pridaný nový priečinok, väčší ako %1 MB: %2.
-Pokiaľ si ho prajete stiahnuť, vyberte ho v nastaveniach.</translation>
+</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="888"/>
+ <location filename="../src/gui/folder.cpp" line="856"/>
+ <source>A folder from an external storage has been added.
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="857"/>
+ <source>Please go in the settings to select it if you wish to download it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="893"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
Ste si istý, že chcete pokračovať?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="892"/>
+ <location filename="../src/gui/folder.cpp" line="897"/>
<source>Remove All Files?</source>
<translation>Odstrániť všetky súbory?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="894"/>
+ <location filename="../src/gui/folder.cpp" line="899"/>
<source>Remove all files</source>
<translation>Odstrániť všetky súbory</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="895"/>
+ <location filename="../src/gui/folder.cpp" line="900"/>
<source>Keep files</source>
<translation>Ponechať súbory</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="911"/>
+ <location filename="../src/gui/folder.cpp" line="916"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="916"/>
+ <location filename="../src/gui/folder.cpp" line="921"/>
<source>Backup detected</source>
<translation>Záloha je dostupná</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="918"/>
+ <location filename="../src/gui/folder.cpp" line="923"/>
<source>Normal Synchronisation</source>
<translation>Bežná synchronizácia</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="919"/>
+ <location filename="../src/gui/folder.cpp" line="924"/>
<source>Keep Local Files as Conflict</source>
<translation>Ponechať lokálne súbory ako konfliktné</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="140"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="148"/>
<source>You need to be connected to add a folder</source>
<translation>Na pridanie priečinku je nutné byť pripojený</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="150"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="158"/>
<source>Click this button to add a folder to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
<source>%1 (%2)</source>
<extracomment>Example text: "File.txt (23KB)"</extracomment>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="180"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="188"/>
<source>Error while loading the list of folders from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="218"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="226"/>
<source>Signed out</source>
<translation>Odhlásený</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="145"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="153"/>
<source>Adding folder is disabled because you are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="183"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="191"/>
<source>Fetching folder list from server...</source>
<translation>Načítavam zoznam priečinkov zo servera...</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>Checking for changes in '%1'</source>
<translation>Kontrolujú sa zmeny v „%1“</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="868"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
<source>, '%1'</source>
<extracomment>Build a list of file names</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="871"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="900"/>
<source>'%1'</source>
<extracomment>Argument is a file name</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="896"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="925"/>
<source>Syncing %1</source>
<extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment>
<translation>Synchronizuje sa %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="908"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="927"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="937"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="931"/>
<source>download %1/s</source>
<extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>stiahnuť %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="933"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="911"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>upload %1/s</source>
<extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>nahrať %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="913"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="942"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="918"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 of %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="922"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="951"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="948"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 z %2, súbor %3 z %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="954"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="983"/>
<source>file %1 of %2</source>
<translation>súbor %1 z %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/>
<source>Waiting...</source>
<translation>Čakajte...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="998"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1027"/>
<source>Waiting for %n other folder(s)...</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1033"/>
<source>Preparing to sync...</source>
<translation>Príprava na synchronizáciu...</translation>
</message>
<translation>Rozšírené</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="101"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
+ <source>Ask for confirmation before synchronizing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="105"/>
<source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/generalsettings.ui" line="26"/>
<source>&Launch on System Startup</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="59"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit &Ignored Files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
- <source>Ask &confirmation before downloading folders larger than</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/generalsettings.ui" line="129"/>
+ <location filename="../src/gui/generalsettings.ui" line="140"/>
<source>S&how crash reporter</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="150"/>
<location filename="../src/gui/generalsettings.ui" line="156"/>
- <location filename="../src/gui/generalsettings.ui" line="162"/>
<source>About</source>
<translation>O</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="172"/>
+ <location filename="../src/gui/generalsettings.ui" line="166"/>
<source>Updates</source>
<translation>Aktualizácie</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="197"/>
+ <location filename="../src/gui/generalsettings.ui" line="191"/>
<source>&Restart && Update</source>
<translation>&Restart && aktualizácia</translation>
</message>
<translation>Pripojiť...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="144"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="159"/>
<source>%1 folder '%2' is synced to local folder '%3'</source>
<translation>%1 priečinok '%2' je zosynchronizovaný do lokálneho priečinka '%3'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="162"/>
<source>Sync the folder '%1'</source>
<translation>Sychronizovať priečinok '%1'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="152"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="167"/>
<source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="251"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/>
<source>Local Sync Folder</source>
<translation>Lokálny synchronizačný priečinok</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="311"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="317"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
<translation>Nemožno odstrániť a zazálohovať priečinok, pretože priečinok alebo súbor je otvorený v inom programe. Prosím zatvorte priečinok nebo súbor a skúste to znovu alebo zrušte akciu.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="540"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Lokálny synchronizačný priečinok %1 bol úspešne vytvorený!</b></font></translation>
</message>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="120"/>
<source>Success.</source>
<translation>Úspech.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="127"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>Nepodarilo sa načítanie žurnálovacieho súboru CSync. Súbor je poškodený.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="130"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>%1 zásuvný modul pre "CSync" nebolo možné načítať.<br/>Prosím skontrolujte inštaláciu!</p></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<source>CSync got an error while processing internal trees.</source>
<translation>Spracovanie "vnútorných stromov" vrámci "CSync" zlyhalo.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync sa nepodarilo zarezervovať pamäť.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync fatal parameter error.</source>
<translation>CSync kritická chyba parametrov.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync processing step update failed.</source>
<translation>CSync sa nepodarilo spracovať krok aktualizácie.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync sa nepodarilo spracovať krok zladenia.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync sa nemohol prihlásiť k proxy.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync sa nepodarilo nájsť proxy alebo server.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync sa nepodarilo prihlásiť na server %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync sa nepodarilo pripojiť k sieti.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>A network connection timeout happened.</source>
<translation>Skončil časový limit sieťového spojenia.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>A HTTP transmission error happened.</source>
<translation>Chyba HTTP prenosu.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>An error occurred while opening a folder</source>
<translation>Nastala chyba počas otvárania priečinka</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="197"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Error while reading folder.</source>
<translation>Chyba pri čítaní adresára</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="477"/>
+ <location filename="../src/libsync/syncengine.cpp" line="476"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="738"/>
+ <location filename="../src/libsync/syncengine.cpp" line="737"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1206"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1213"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: Na serveri %1 nie je žiadne voľné miesto.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>CSync nešpecifikovaná chyba.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Zrušené používateľom</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>CSync failed to access</source>
<translation>Prístup pre CSync zlyhal</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="123"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>The service is temporarily unavailable</source>
<translation>Služba je dočasne nedostupná</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>Access is forbidden</source>
<translation>Prístup odmietnutý</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="202"/>
+ <location filename="../src/libsync/syncengine.cpp" line="201"/>
<source>An internal error number %1 occurred.</source>
<translation>Vyskytla sa interná chyba číslo %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="266"/>
+ <location filename="../src/libsync/syncengine.cpp" line="265"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Položka nebola synchronizovaná kvôli predchádzajúcej chybe: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="445"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symbolické odkazy nie sú podporované pri synchronizácii.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="449"/>
+ <location filename="../src/libsync/syncengine.cpp" line="448"/>
<source>File is listed on the ignore list.</source>
<translation>Súbor je zapísaný na zozname ignorovaných.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="453"/>
+ <location filename="../src/libsync/syncengine.cpp" line="452"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="463"/>
+ <location filename="../src/libsync/syncengine.cpp" line="462"/>
<source>File names containing the character '%1' are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="466"/>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
<source>The file name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="471"/>
+ <location filename="../src/libsync/syncengine.cpp" line="470"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="474"/>
+ <location filename="../src/libsync/syncengine.cpp" line="473"/>
<source>Filename is too long.</source>
<translation>Meno súboru je veľmi dlhé.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="483"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Stat failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="510"/>
+ <location filename="../src/libsync/syncengine.cpp" line="509"/>
<source>Filename encoding is not valid</source>
<translation>Kódovanie znakov názvu súboru je neplatné</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="678"/>
+ <location filename="../src/libsync/syncengine.cpp" line="677"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Neplatné znaky, premenujte prosím "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="774"/>
+ <location filename="../src/libsync/syncengine.cpp" line="773"/>
<source>Unable to initialize a sync journal.</source>
<translation>Nemôžem inicializovať synchronizačný žurnál.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="793"/>
+ <location filename="../src/libsync/syncengine.cpp" line="792"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="830"/>
+ <location filename="../src/libsync/syncengine.cpp" line="829"/>
<source>Unable to read from the sync journal.</source>
<translation>Nemožno čítať zo synchronizačného žurnálu</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="875"/>
+ <location filename="../src/libsync/syncengine.cpp" line="874"/>
<source>Cannot open the sync journal</source>
<translation>Nemožno otvoriť sync žurnál</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="933"/>
+ <location filename="../src/libsync/syncengine.cpp" line="932"/>
<source>File name contains at least one invalid character</source>
<translation>Názov súboru obsahuje nevhodný znak</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
- <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1172"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorované podľa nastavenia "vybrať čo synchronizovať"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1191"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Nie je dovolené, lebo nemáte oprávnenie pridávať podpriečinky do tohto priečinka</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1232"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Nie je dovolené tento súbor nahrať, pretože je na serveri iba na čítanie. Obnovuje sa.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1249"/>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1267"/>
<source>Not allowed to remove, restoring</source>
<translation>Nie je dovolené odstrániť. Obnovuje sa.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1280"/>
<source>Local files and share folder removed.</source>
<translation>Lokálne súbory a zdieľaný priečinok boli odstránené.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1336"/>
<source>Move not allowed, item restored</source>
<translation>Presunutie nie je dovolené. Položka obnovená.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1347"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Presunutie nie je dovolené, pretože %1 je na serveri iba na čítanie</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the destination</source>
<translation>cieľ</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the source</source>
<translation>zdroj</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="300"/>
+ <location filename="../src/libsync/theme.cpp" line="309"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Verzia %1. Pre viac informácií choďte na <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="304"/>
+ <location filename="../src/libsync/theme.cpp" line="313"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="305"/>
+ <location filename="../src/libsync/theme.cpp" line="314"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Šíri %1 pod licenciou GNU General Public License (GPL) Verzia 2.0.<br/>%2 a %2 logo sú registrované známky %1 v USA, ostatných krajinách, alebo oboje.</p></translation>
</message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="250"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="352"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="379"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="402"/>
<source>TextLabel</source>
<translation>Štítok</translation>
</message>
<translation>Spustiť novú synchronizáciu (Vymaže obsah lokálneho priečinka!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="295"/>
+ <source>Ask for confirmation before synchroni&zing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="321"/>
+ <source>Ask for confirmation before synchronizing e&xternal storages</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="345"/>
<source>Choose what to sync</source>
<translation>Vybrať čo synchronizovať</translation>
</message>
<translation>&Nechať lokálne dáta</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>S&ync everything from server</source>
<translation>S&ynchronizovať zo servera všetko</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
<source>Status message</source>
<translation>Správa o stave</translation>
</message>
<location filename="../src/gui/owncloudsetuppage.ui" line="129"/>
<location filename="../src/gui/owncloudsetuppage.ui" line="156"/>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="190"/>
<source>TextLabel</source>
<translation>Štítok</translation>
</message>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="83"/>
- <source>Server &Address</source>
- <translation>Serverová &adresa</translation>
+ <source>Ser&ver Address</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="99"/>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="286"/>
+ <location filename="../src/libsync/theme.cpp" line="295"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Zostavené z Git revízie <a href="%1">%2</a> na %3, %4 s použitím Qt %5, %6</small></p></translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="238"/>
<location filename="../src/gui/accountsettings.cpp" line="371"/>
- <location filename="../src/gui/accountsettings.cpp" line="728"/>
+ <location filename="../src/gui/accountsettings.cpp" line="733"/>
<source>Cancel</source>
<translation>Prekliči</translation>
</message>
<translation>Prijava</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="678"/>
- <source>There are new folders that were not synchronized because they are too big: </source>
- <translation>Zaznane so mape, ki zaradi velikosti niso bile usklajene: </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="680"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="720"/>
+ <location filename="../src/gui/accountsettings.cpp" line="681"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="725"/>
<source>Confirm Account Removal</source>
<translation>Potrdi odstranitev računa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="721"/>
+ <location filename="../src/gui/accountsettings.cpp" line="726"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>Ali res želite odstraniti povezavo z računom <i>%1</i>?</p><p><b>Opomba:</b> S tem <b>ne bo</b> izbrisana nobena datoteka.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="727"/>
+ <location filename="../src/gui/accountsettings.cpp" line="732"/>
<source>Remove connection</source>
<translation>Odstrani povezavo</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="600"/>
<source>Aborted by the user</source>
<translation>Opravilo je bilo prekinjeno s strani uporabnika</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="139"/>
<source>Local folder %1 does not exist.</source>
<translation>Krajevna mapa %1 ne obstaja.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="142"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 bi morala biti mapa, pa ni.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="144"/>
+ <location filename="../src/gui/folder.cpp" line="145"/>
<source>%1 is not readable.</source>
<translation>%1 ni mogoče brati.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="367"/>
+ <location filename="../src/gui/folder.cpp" line="368"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>Datoteka %1 je odstranjena.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="374"/>
+ <location filename="../src/gui/folder.cpp" line="375"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>Datoteka %1 je prejeta.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="382"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>Datoteka %1 je posodobljena.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="388"/>
+ <location filename="../src/gui/folder.cpp" line="389"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>Datoteka %1 je preimenovana v %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="395"/>
+ <location filename="../src/gui/folder.cpp" line="396"/>
<source>%1 has been moved to %2.</source>
<translation>Datoteka %1 je premaknjena v %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="365"/>
+ <location filename="../src/gui/folder.cpp" line="366"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>Datoteka %1 in še %n druga datoteka je bila izbrisana.</numerusform><numerusform>Datoteka %1 in še %n drugi datoteki sta bili izbrisani.</numerusform><numerusform>Datoteka %1 in še %n druge datoteke so bile izbrisane.</numerusform><numerusform>Datoteka %1 in še %n drugih datotek je bilo izbrisanih.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="372"/>
+ <location filename="../src/gui/folder.cpp" line="373"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>Datoteka %1 in še %n druga datoteka je bila shranjena na disk.</numerusform><numerusform>Datoteka %1 in še %n drugi datoteki sta bili shranjeni na disk.</numerusform><numerusform>Datoteka %1 in še %n druge datoteke so bile shranjene na disk.</numerusform><numerusform>Datoteka %1 in še %n drugih datotek je bilo shranjenih na disk.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="379"/>
+ <location filename="../src/gui/folder.cpp" line="380"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>Datoteka %1 in še %n druga datoteka je bila posodobljena.</numerusform><numerusform>Datoteka %1 in še %n drugi datoteki sta bili posodobljeni.</numerusform><numerusform>Datoteka %1 in še %n druge datoteke so bile posodobljene.</numerusform><numerusform>Datoteka %1 in še %n drugih datotek je bilo posodobljenih.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="386"/>
+ <location filename="../src/gui/folder.cpp" line="387"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>Datoteka %1 je bila preimenovana v %2 in še %n druga datoteka je bila preimenovana.</numerusform><numerusform>Datoteka %1 je bila preimenovana v %2 in še %n drugi datoteki sta bili preimenovani.</numerusform><numerusform>Datoteka %1 je bila preimenovana v %2 in še %n druge datoteke so bile preimenovane.</numerusform><numerusform>Datoteka %1 je bila preimenovana v %2 in še %n drugih datotek je bilo preimenovanih.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="393"/>
+ <location filename="../src/gui/folder.cpp" line="394"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>Datoteka %1 je bila premaknjena v %2 in še %n druga datoteka je bila premaknjena.</numerusform><numerusform>Datoteka %1 je bila premaknjena v %2 in še %n drugi datoteki sta bili premaknjeni.</numerusform><numerusform>Datoteka %1 je bila premaknjena v %2 in še %n druge datoteke so bile premaknjene.</numerusform><numerusform>Datoteka %1 je bila premaknjena v %2 in še %n drugih datotek je bilo premaknjenih.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="400"/>
+ <location filename="../src/gui/folder.cpp" line="401"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>Pri datoteki %1 in še %n drugi datoteki je zaznan spor usklajevanja.</numerusform><numerusform>Pri datoteki %1 in še %n drugih datotekah je zaznan spor usklajevanja.</numerusform><numerusform>Pri datoteki %1 in še %n drugih datotekah je zaznan spor usklajevanja.</numerusform><numerusform>Pri datoteki %1 in še %n drugih datotekah je zaznan spor usklajevanja.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="402"/>
+ <location filename="../src/gui/folder.cpp" line="403"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>Pri datoteki %1 je zaznan spor usklajevanja. Preverite datoteko!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="407"/>
+ <location filename="../src/gui/folder.cpp" line="408"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>Datoteke %1 in še %n druge datoteke ni mogoče uskladiti zaradi napak. Podrobnosti so zapisane v dnevniški datoteki.</numerusform><numerusform>Datoteke %1 in še %n drugih datotek ni mogoče uskladiti zaradi napak. Podrobnosti so zapisane v dnevniški datoteki.</numerusform><numerusform>Datoteke %1 in še %n drugih datotek ni mogoče uskladiti zaradi napak. Podrobnosti so zapisane v dnevniški datoteki.</numerusform><numerusform>Datoteke %1 in še %n drugih datotek ni mogoče uskladiti zaradi napak. Podrobnosti so zapisane v dnevniški datoteki.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="409"/>
+ <location filename="../src/gui/folder.cpp" line="410"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>Datoteke %1 zaradi napake ni mogoče uskladiti. Več podrobnosti je zabeleženih v dnevniški datoteki.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="415"/>
+ <location filename="../src/gui/folder.cpp" line="416"/>
<source>Sync Activity</source>
<translation>Dejavnost usklajevanja</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="642"/>
+ <location filename="../src/gui/folder.cpp" line="643"/>
<source>Could not read system exclude file</source>
<translation>Ni mogoče prebrati sistemske izločitvene datoteke</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="850"/>
+ <location filename="../src/gui/folder.cpp" line="854"/>
<source>A new folder larger than %1 MB has been added: %2.
-Please go in the settings to select it if you wish to download it.</source>
- <translation>Dodana je nova mapa, ki presega %1 MB: %2.
-Med nastavitvami jo lahko izberete in označite za prejem.</translation>
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="856"/>
+ <source>A folder from an external storage has been added.
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="857"/>
+ <source>Please go in the settings to select it if you wish to download it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="888"/>
+ <location filename="../src/gui/folder.cpp" line="893"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
Ali ste prepričani, da želite izvesti to opravilo?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="892"/>
+ <location filename="../src/gui/folder.cpp" line="897"/>
<source>Remove All Files?</source>
<translation>Ali naj bodo odstranjene vse datoteke?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="894"/>
+ <location filename="../src/gui/folder.cpp" line="899"/>
<source>Remove all files</source>
<translation>Odstrani vse datoteke</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="895"/>
+ <location filename="../src/gui/folder.cpp" line="900"/>
<source>Keep files</source>
<translation>Ohrani datoteke</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="911"/>
+ <location filename="../src/gui/folder.cpp" line="916"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
Z nadaljevanjem usklajevanja bodo vse trenutne datoteke prepisane s starejšimi različicami. Ali želite ohraniti trenutne krajevne datoteke kot preimenovane datoteke v usklajevalnem sporu?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="916"/>
+ <location filename="../src/gui/folder.cpp" line="921"/>
<source>Backup detected</source>
<translation>Varnostna kopija je zaznana</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="918"/>
+ <location filename="../src/gui/folder.cpp" line="923"/>
<source>Normal Synchronisation</source>
<translation>Običajno usklajevanje</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="919"/>
+ <location filename="../src/gui/folder.cpp" line="924"/>
<source>Keep Local Files as Conflict</source>
<translation>Ohrani krajevne datoteke kot datoteke v sporu</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="140"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="148"/>
<source>You need to be connected to add a folder</source>
<translation>Za dodajanje mape mora biti vzpostavljea povezava</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="150"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="158"/>
<source>Click this button to add a folder to synchronize.</source>
<translation>Kliknite za dodajanje mape za usklajevanje.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
<source>%1 (%2)</source>
<extracomment>Example text: "File.txt (23KB)"</extracomment>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="180"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="188"/>
<source>Error while loading the list of folders from the server.</source>
<translation>Prišlo je do napake med nalaganjem datotek s strežnika.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="218"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="226"/>
<source>Signed out</source>
<translation>Odjavljeno</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="145"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="153"/>
<source>Adding folder is disabled because you are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
<translation>Dodajanje mape je onemogočeno, ker se usklajojejo vse vaše datoteke. Če želite usklajevati več map, odstranite trenutno nastavljeno korensko mapo.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="183"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="191"/>
<source>Fetching folder list from server...</source>
<translation>Poteka pridobivanje seznama map s strežnika ...</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>Checking for changes in '%1'</source>
<translation>Preverjanje za spremembe v '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="868"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
<source>, '%1'</source>
<extracomment>Build a list of file names</extracomment>
<translation>, '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="871"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="900"/>
<source>'%1'</source>
<extracomment>Argument is a file name</extracomment>
<translation>'%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="896"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="925"/>
<source>Syncing %1</source>
<extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment>
<translation>Usklajevanje %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="908"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="927"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="937"/>
<source>, </source>
<translation>,</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="931"/>
<source>download %1/s</source>
<extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>prejemanje %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="933"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="911"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>upload %1/s</source>
<extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>pošiljanje %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="913"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="942"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="918"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 od %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="922"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="951"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>Preostalo še %5, %1 od %2, datoteka %3 od %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="948"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 od %2, datoteka %3 od %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="954"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="983"/>
<source>file %1 of %2</source>
<translation>datoteka %1 od %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/>
<source>Waiting...</source>
<translation>Čakanje na povezavo ...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="998"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1027"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>V pripravi je %n druga map ...</numerusform><numerusform>V pripravi sta %n drugi mapi ...</numerusform><numerusform>V pripravi so %n druge mape ...</numerusform><numerusform>V pripravi je %n drugih map ...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1033"/>
<source>Preparing to sync...</source>
<translation>Priprava na usklajevanje ...</translation>
</message>
<translation>Napredne možnosti</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="101"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
+ <source>Ask for confirmation before synchronizing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="105"/>
<source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/generalsettings.ui" line="26"/>
<source>&Launch on System Startup</source>
<translation>Uporabi &črno-bele ikone</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="59"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit &Ignored Files</source>
<translation>Uredi &prezrte datoteke</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
- <source>Ask &confirmation before downloading folders larger than</source>
- <translation>Vprašaj za &potrditev pred prejemanjem map, večjih od</translation>
- </message>
- <message>
- <location filename="../src/gui/generalsettings.ui" line="129"/>
+ <location filename="../src/gui/generalsettings.ui" line="140"/>
<source>S&how crash reporter</source>
<translation>Pokaži &poročilo sesutja</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="150"/>
<location filename="../src/gui/generalsettings.ui" line="156"/>
- <location filename="../src/gui/generalsettings.ui" line="162"/>
<source>About</source>
<translation>O programu...</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="172"/>
+ <location filename="../src/gui/generalsettings.ui" line="166"/>
<source>Updates</source>
<translation>Posodobitve</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="197"/>
+ <location filename="../src/gui/generalsettings.ui" line="191"/>
<source>&Restart && Update</source>
<translation>&Ponovno zaženi && posodobi</translation>
</message>
<translation>Vzpostavi povezavo ...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="144"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="159"/>
<source>%1 folder '%2' is synced to local folder '%3'</source>
<translation>%1 mapa '%2' je usklajena s krajevno mapo '%3'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="162"/>
<source>Sync the folder '%1'</source>
<translation>Uskladi mapo '%1'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="152"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="167"/>
<source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
<translation><p><small><strong>Opozorilo:</strong> krajevna mapa ni prazna. Izberite možnost za razrešitev problema!</small></p></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="251"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/>
<source>Local Sync Folder</source>
<translation>Krajevna mapa usklajevanja</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="311"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="317"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
<translation>Mape ni mogoče odstraniti niti ni mogoče ustvariti varnostne kopije, saj je mapa oziroma dokument v njej odprt z drugim programom. Zaprite mapo/dokument ali prekinite namestitev.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="540"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Krajevno usklajena mapa %1 je uspešno ustvarjena!</b></font></translation>
</message>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="120"/>
<source>Success.</source>
<translation>Uspešno končano.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="127"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>Nalaganje dnevniške datoteke s CSync je spodletelo. Dnevniška datoteka je okvarjena.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="130"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>Vstavka %1 za CSync ni mogoče naložiti.<br/>Preverite namestitev!</p></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<source>CSync got an error while processing internal trees.</source>
<translation>Pri obdelavi notranje drevesne strukture s CSync je prišlo do napake.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<source>CSync failed to reserve memory.</source>
<translation>Vpisovanje prostora v pomnilniku za CSync je spodletelo.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync fatal parameter error.</source>
<translation>Usodna napaka parametra CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync processing step update failed.</source>
<translation>Korak opravila posodobitve CSync je spodletel.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync processing step reconcile failed.</source>
<translation>Korak opravila poravnave CSync je spodletel.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>Overitev CSync na posredniškem strežniku je spodletela.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>Poizvedba posredniškega strežnika s CSync je spodletela.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>Overitev CSync pri strežniku %1 je spodletela.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to connect to the network.</source>
<translation>Povezava CSync v omrežje je spodletela.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>A network connection timeout happened.</source>
<translation>Omrežna povezava je časovno potekla.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>A HTTP transmission error happened.</source>
<translation>Prišlo je do napake med prenosom HTTP.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation>Priklopljena mapa trenutno ni na voljo na strežniku</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>An error occurred while opening a folder</source>
<translation>Med odpiranjem mape je prišlo do napake.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="197"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Error while reading folder.</source>
<translation>Napaka med branjem mape</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="477"/>
+ <location filename="../src/libsync/syncengine.cpp" line="476"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>Datoteka/Mapa je prezrta, ker je skrita.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="738"/>
+ <location filename="../src/libsync/syncengine.cpp" line="737"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Le %1 je na voljo, zahtevanih pa je vaj %2 za zagon</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1206"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Dejanje ni dovoljeno, ker ni ustreznih dovoljenj za dodajanje starševske mape</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1213"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Dejanje ni dovoljeno, ker ni ustreznih dovoljenj za dodajanje datotek v to mapo</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>Odziv CSync: na strežniku %1 ni razpoložljivega prostora.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>Nedoločena napaka CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Opravilo je bilo prekinjeno s strani uporabnika</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>CSync failed to access</source>
<translation>Dostop s CSync je spodletel</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="123"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation>Nalaganje ali ustvarjanje dnevniške datoteke s CSync je spodletelo. Za to opravilo so zahtevana dovoljenja branja in zapisovanja krajevne mape za usklajevanje.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation>Delovanje CSync je zaradi nerazrešenih dovoljenj spodletelo.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync tried to create a folder that already exists.</source>
<translation>Ustvarjanje mape s CSync je spodletelo. Mapa že obstaja.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>The service is temporarily unavailable</source>
<translation>Storitev trenutno ni na voljo</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>Access is forbidden</source>
<translation>Dostop je prepovedan.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="202"/>
+ <location filename="../src/libsync/syncengine.cpp" line="201"/>
<source>An internal error number %1 occurred.</source>
<translation>Prišlo je do notranje napake %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="266"/>
+ <location filename="../src/libsync/syncengine.cpp" line="265"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Predmet ni usklajen zaradi predhodne napake: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="445"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Usklajevanje simbolnih povezav ni podprto.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="449"/>
+ <location filename="../src/libsync/syncengine.cpp" line="448"/>
<source>File is listed on the ignore list.</source>
<translation>Datoteka je na seznamu prezrtih datotek.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="453"/>
+ <location filename="../src/libsync/syncengine.cpp" line="452"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation>Imena datotek, ki vsebujejo piko, na tem sistemu niso podprta.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="463"/>
+ <location filename="../src/libsync/syncengine.cpp" line="462"/>
<source>File names containing the character '%1' are not supported on this file system.</source>
<translation>Imena datotek, ki vsebujejo znak »%1«, na tem sistemu niso podprta.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="466"/>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
<source>The file name is a reserved name on this file system.</source>
<translation>Ime datoteke je na tem sistemu zadržano za sistemsko datoteko.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="471"/>
+ <location filename="../src/libsync/syncengine.cpp" line="470"/>
<source>Filename contains trailing spaces.</source>
<translation>Datoteka vsebuje pripete presledne znake</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="474"/>
+ <location filename="../src/libsync/syncengine.cpp" line="473"/>
<source>Filename is too long.</source>
<translation>Ime datoteke je predolgo.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="483"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Stat failed.</source>
<translation>Določanje statističnih podatkov je spodletelo.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="510"/>
+ <location filename="../src/libsync/syncengine.cpp" line="509"/>
<source>Filename encoding is not valid</source>
<translation>Kodni zapis imena datoteke ni veljaven.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="678"/>
+ <location filename="../src/libsync/syncengine.cpp" line="677"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Uporabljen je neveljaven znak; preimenujte "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="774"/>
+ <location filename="../src/libsync/syncengine.cpp" line="773"/>
<source>Unable to initialize a sync journal.</source>
<translation>Dnevnika usklajevanja ni mogoče začeti.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="793"/>
+ <location filename="../src/libsync/syncengine.cpp" line="792"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Ni mogoče prebrati črnega seznama iz krajevne mape</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="830"/>
+ <location filename="../src/libsync/syncengine.cpp" line="829"/>
<source>Unable to read from the sync journal.</source>
<translation>Ni mogoče brati iz dnevnika usklajevanja</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="875"/>
+ <location filename="../src/libsync/syncengine.cpp" line="874"/>
<source>Cannot open the sync journal</source>
<translation>Ni mogoče odpreti dnevnika usklajevanja</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="933"/>
+ <location filename="../src/libsync/syncengine.cpp" line="932"/>
<source>File name contains at least one invalid character</source>
<translation>Ime datoteke vsebuje vsaj en neveljaven znak.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
- <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1172"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Prezrto, ker je predmet označen na črni listi za usklajevanje</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1191"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Dejanje ni dovoljeno! Ni ustreznih dovoljenj za dodajanje podmap v to mapo.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1232"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Ni dovoljeno pošiljati te datoteke, ker ima določena dovoljenja le za branje. Datoteka bo obnovljena na izvorno različico.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1249"/>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1267"/>
<source>Not allowed to remove, restoring</source>
<translation>Odstranitev ni dovoljena, datoteka bo obnovljena.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1280"/>
<source>Local files and share folder removed.</source>
<translation>Krajevne datoteke in mape v souporabi so odstranjene.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1336"/>
<source>Move not allowed, item restored</source>
<translation>Premikanje ni dovoljeno, datoteka bo obnovljena.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1347"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Premikanje ni dovoljeno, ker je nastavljeno določilo %1 le za branje.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the destination</source>
<translation>cilj</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the source</source>
<translation>vir</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="300"/>
+ <location filename="../src/libsync/theme.cpp" line="309"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Različica %1. Za več podrobnosti si oglejte <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="304"/>
+ <location filename="../src/libsync/theme.cpp" line="313"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation><p>Avtorske pravice ownCloud, GmbH</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="305"/>
+ <location filename="../src/libsync/theme.cpp" line="314"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Programski paket objavlja %1 pod pogoji Splošnega javnega dovoljenja GNU (GNU General Public License - GPL), različice 2.0.<br>%2 in logotip %2 sta blagovni znamki %1 v Združenih državah, drugih državah ali oboje.</p></translation>
</message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="250"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="352"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="379"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="402"/>
<source>TextLabel</source>
<translation>Besedilna oznaka</translation>
</message>
<translation>Začni s &svežim usklajevanjem (izbriše krajevno mapo!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="295"/>
+ <source>Ask for confirmation before synchroni&zing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="321"/>
+ <source>Ask for confirmation before synchronizing e&xternal storages</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="345"/>
<source>Choose what to sync</source>
<translation>Izbor datotek za usklajevanje</translation>
</message>
<translation>&Ohrani krajevno shranjene podatke</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>S&ync everything from server</source>
<translation>Uskladi &vse datoteke s strežnika</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
<source>Status message</source>
<translation>Sporočilo stanja</translation>
</message>
<location filename="../src/gui/owncloudsetuppage.ui" line="129"/>
<location filename="../src/gui/owncloudsetuppage.ui" line="156"/>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="190"/>
<source>TextLabel</source>
<translation>Besedilna oznaka</translation>
</message>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="83"/>
- <source>Server &Address</source>
- <translation>&Naslov strežnika</translation>
+ <source>Ser&ver Address</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="99"/>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="286"/>
+ <location filename="../src/libsync/theme.cpp" line="295"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Izgrajeno na osnovi predelave Git <a href="%1">%2</a> na %3, %4 z uporabo Qt %5, %6</small></p></translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="238"/>
<location filename="../src/gui/accountsettings.cpp" line="371"/>
- <location filename="../src/gui/accountsettings.cpp" line="728"/>
+ <location filename="../src/gui/accountsettings.cpp" line="733"/>
<source>Cancel</source>
<translation>Одустани</translation>
</message>
<translation>Пријава</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="678"/>
- <source>There are new folders that were not synchronized because they are too big: </source>
- <translation>Нове фасцикле нису синхронизоване јер су превелике:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="680"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="681"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="720"/>
+ <location filename="../src/gui/accountsettings.cpp" line="725"/>
<source>Confirm Account Removal</source>
<translation>Потврда уклањања налога</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="721"/>
+ <location filename="../src/gui/accountsettings.cpp" line="726"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="727"/>
+ <location filename="../src/gui/accountsettings.cpp" line="732"/>
<source>Remove connection</source>
<translation>Уклони везу</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="600"/>
<source>Aborted by the user</source>
<translation>Прекинуо корисник</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="139"/>
<source>Local folder %1 does not exist.</source>
<translation>Локална фасцикла %1 не постоји.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="142"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 би требало да је фасцикла али није.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="144"/>
+ <location filename="../src/gui/folder.cpp" line="145"/>
<source>%1 is not readable.</source>
<translation>%1 није читљив.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="367"/>
+ <location filename="../src/gui/folder.cpp" line="368"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 је уклоњен.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="374"/>
+ <location filename="../src/gui/folder.cpp" line="375"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 је преузет.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="382"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 је ажуриран.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="388"/>
+ <location filename="../src/gui/folder.cpp" line="389"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 је преименован у %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="395"/>
+ <location filename="../src/gui/folder.cpp" line="396"/>
<source>%1 has been moved to %2.</source>
<translation>%1 је премештен у %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="365"/>
+ <location filename="../src/gui/folder.cpp" line="366"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="372"/>
+ <location filename="../src/gui/folder.cpp" line="373"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="379"/>
+ <location filename="../src/gui/folder.cpp" line="380"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="386"/>
+ <location filename="../src/gui/folder.cpp" line="387"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="393"/>
+ <location filename="../src/gui/folder.cpp" line="394"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="400"/>
+ <location filename="../src/gui/folder.cpp" line="401"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="402"/>
+ <location filename="../src/gui/folder.cpp" line="403"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="407"/>
+ <location filename="../src/gui/folder.cpp" line="408"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="409"/>
+ <location filename="../src/gui/folder.cpp" line="410"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 није синхронизован због грешке. Погледајте записник за детаље.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="415"/>
+ <location filename="../src/gui/folder.cpp" line="416"/>
<source>Sync Activity</source>
<translation>Активност синхронизације</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="642"/>
+ <location filename="../src/gui/folder.cpp" line="643"/>
<source>Could not read system exclude file</source>
<translation>Не могу да прочитам системски списак за игнорисање</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="850"/>
+ <location filename="../src/gui/folder.cpp" line="854"/>
<source>A new folder larger than %1 MB has been added: %2.
-Please go in the settings to select it if you wish to download it.</source>
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="856"/>
+ <source>A folder from an external storage has been added.
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="857"/>
+ <source>Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="888"/>
+ <location filename="../src/gui/folder.cpp" line="893"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="892"/>
+ <location filename="../src/gui/folder.cpp" line="897"/>
<source>Remove All Files?</source>
<translation>Уклонити све фајлове?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="894"/>
+ <location filename="../src/gui/folder.cpp" line="899"/>
<source>Remove all files</source>
<translation>Уклони све фајлове</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="895"/>
+ <location filename="../src/gui/folder.cpp" line="900"/>
<source>Keep files</source>
<translation>Остави фајлове</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="911"/>
+ <location filename="../src/gui/folder.cpp" line="916"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="916"/>
+ <location filename="../src/gui/folder.cpp" line="921"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="918"/>
+ <location filename="../src/gui/folder.cpp" line="923"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="919"/>
+ <location filename="../src/gui/folder.cpp" line="924"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="140"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="148"/>
<source>You need to be connected to add a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="150"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="158"/>
<source>Click this button to add a folder to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
<source>%1 (%2)</source>
<extracomment>Example text: "File.txt (23KB)"</extracomment>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="180"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="188"/>
<source>Error while loading the list of folders from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="218"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="226"/>
<source>Signed out</source>
<translation>Одјављен</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="145"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="153"/>
<source>Adding folder is disabled because you are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="183"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="191"/>
<source>Fetching folder list from server...</source>
<translation>Добављам списак фасцикли са сервера...</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>Checking for changes in '%1'</source>
<translation>Проверавам измене у „%1“</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="868"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
<source>, '%1'</source>
<extracomment>Build a list of file names</extracomment>
<translation>, '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="871"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="900"/>
<source>'%1'</source>
<extracomment>Argument is a file name</extracomment>
<translation>„%1“</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="896"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="925"/>
<source>Syncing %1</source>
<extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment>
<translation>Синхронизујем %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="908"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="927"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="937"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="931"/>
<source>download %1/s</source>
<extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>преузми %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="933"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="911"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>upload %1/s</source>
<extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>отпреми %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="913"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="942"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="918"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 од %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="922"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="951"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="948"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="954"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="983"/>
<source>file %1 of %2</source>
<translation>фајл %1 од %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/>
<source>Waiting...</source>
<translation>Чекам...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="998"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1027"/>
<source>Waiting for %n other folder(s)...</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1033"/>
<source>Preparing to sync...</source>
<translation>Припремам синхронизацију...</translation>
</message>
<translation>Напредно</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="101"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
+ <source>Ask for confirmation before synchronizing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="105"/>
<source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/generalsettings.ui" line="26"/>
<source>&Launch on System Startup</source>
<translation>Користи &једнобојне иконе</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="59"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit &Ignored Files</source>
<translation>Уреди &занемарене фајлове</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
- <source>Ask &confirmation before downloading folders larger than</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/generalsettings.ui" line="129"/>
+ <location filename="../src/gui/generalsettings.ui" line="140"/>
<source>S&how crash reporter</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="150"/>
<location filename="../src/gui/generalsettings.ui" line="156"/>
- <location filename="../src/gui/generalsettings.ui" line="162"/>
<source>About</source>
<translation>О програму</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="172"/>
+ <location filename="../src/gui/generalsettings.ui" line="166"/>
<source>Updates</source>
<translation>Ажурирања</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="197"/>
+ <location filename="../src/gui/generalsettings.ui" line="191"/>
<source>&Restart && Update</source>
<translation>&Поново покрени и ажурирај</translation>
</message>
<translation>Повежи се...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="144"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="159"/>
<source>%1 folder '%2' is synced to local folder '%3'</source>
<translation>%1 фасцикла „%2“ је сингронизована са локалном „%3“</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="162"/>
<source>Sync the folder '%1'</source>
<translation>Синхронизуј фасциклу „%1“</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="152"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="167"/>
<source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="251"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/>
<source>Local Sync Folder</source>
<translation>Синхронизација локалне фасцикле</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="311"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="317"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
<translation>Не могу да уклоним и направим резервну копију фасцикле јер су фасцикла или фајл отворени у другом програму. Затворите фасциклу или фајл и покушајте поново или одустаните од подешавања.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="540"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Локална фасцикла за синхронизовање %1 је успешно направљена!</b></font></translation>
</message>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="120"/>
<source>Success.</source>
<translation>Успешно.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="127"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSync не може да учита фајл дневника. Фајл дневника је оштећен.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="130"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>Прикључак %1 за csync се не може учитати.<br/>Проверите инсталацију!</p></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync има грешку при обради интерног стабла.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync не може да резервише меморију.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync fatal parameter error.</source>
<translation>CSync фатална грешка параметара.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync processing step update failed.</source>
<translation>CSync није успео да ажурира корак процесирања.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync није успео да усклади корак процесирања.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync не може да се аутентификује на проксију.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync не налази прокси или сервер.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync не може да се аутентификује на %1 серверу.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync не може да приступи мрежи.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>A network connection timeout happened.</source>
<translation>Истекло је време за повезивање.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>A HTTP transmission error happened.</source>
<translation>Дошло је до грешке ХТТП преноса.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>An error occurred while opening a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="197"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Error while reading folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="477"/>
+ <location filename="../src/libsync/syncengine.cpp" line="476"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="738"/>
+ <location filename="../src/libsync/syncengine.cpp" line="737"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1206"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1213"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: нема простора на %1 серверу.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>CSync недефинисана грешка.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Прекинуо корисник</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>CSync failed to access</source>
<translation>CSync није приступио</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="123"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>The service is temporarily unavailable</source>
<translation>Услуга је привремено недоступна</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>Access is forbidden</source>
<translation>Приступ је забрањен</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="202"/>
+ <location filename="../src/libsync/syncengine.cpp" line="201"/>
<source>An internal error number %1 occurred.</source>
<translation>Десила се интерна грешка број %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="266"/>
+ <location filename="../src/libsync/syncengine.cpp" line="265"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Ставка није синхронизована због ранијих грешака: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="445"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Симболичке везе нису подржане у синхронизацији.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="449"/>
+ <location filename="../src/libsync/syncengine.cpp" line="448"/>
<source>File is listed on the ignore list.</source>
<translation>Фајл се налази на листи за игнорисање.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="453"/>
+ <location filename="../src/libsync/syncengine.cpp" line="452"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="463"/>
+ <location filename="../src/libsync/syncengine.cpp" line="462"/>
<source>File names containing the character '%1' are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="466"/>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
<source>The file name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="471"/>
+ <location filename="../src/libsync/syncengine.cpp" line="470"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="474"/>
+ <location filename="../src/libsync/syncengine.cpp" line="473"/>
<source>Filename is too long.</source>
<translation>Назив фајла је предугачак.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="483"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Stat failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="510"/>
+ <location filename="../src/libsync/syncengine.cpp" line="509"/>
<source>Filename encoding is not valid</source>
<translation>Кодирање назива фајла није исправно</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="678"/>
+ <location filename="../src/libsync/syncengine.cpp" line="677"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="774"/>
+ <location filename="../src/libsync/syncengine.cpp" line="773"/>
<source>Unable to initialize a sync journal.</source>
<translation>Није могуће покренути у синхронизацију дневника.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="793"/>
+ <location filename="../src/libsync/syncengine.cpp" line="792"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="830"/>
+ <location filename="../src/libsync/syncengine.cpp" line="829"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="875"/>
+ <location filename="../src/libsync/syncengine.cpp" line="874"/>
<source>Cannot open the sync journal</source>
<translation>Не могу да отворим дневник синхронизације</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="933"/>
+ <location filename="../src/libsync/syncengine.cpp" line="932"/>
<source>File name contains at least one invalid character</source>
<translation>Назив садржи бар један недозвољен карактер</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
- <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1172"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Игнорисано јер се не налази на листи за синхронизацију</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1191"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1232"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Није могуће отпремити овај фајл јер је на серверу само за читање. Враћам</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1249"/>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1267"/>
<source>Not allowed to remove, restoring</source>
<translation>Није могуће уклањање. Враћам</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1280"/>
<source>Local files and share folder removed.</source>
<translation>Локални фајлови и дељена фасцикла су уклоњени.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1336"/>
<source>Move not allowed, item restored</source>
<translation>Премештање није дозвољено. Ставка је враћена</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1347"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Премештање није дозвољено јер %1 је само за читање</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the destination</source>
<translation>одредиште</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the source</source>
<translation>извор</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="300"/>
+ <location filename="../src/libsync/theme.cpp" line="309"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Верзија %1. За више информација посетите <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="304"/>
+ <location filename="../src/libsync/theme.cpp" line="313"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="305"/>
+ <location filename="../src/libsync/theme.cpp" line="314"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Дистрибуира %1 под ГНУ општом јавном лиценцом (ОЈЛ) верзија 2.0.<br/>%2 и %2 лого су регистроване марке %1 у САД, другим земљама или обоје</p></translation>
</message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="250"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="352"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="379"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="402"/>
<source>TextLabel</source>
<translation>Текст ознака</translation>
</message>
<translation>&Почни чисту синхронизацију (брише локалну фасциклу!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="295"/>
+ <source>Ask for confirmation before synchroni&zing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="321"/>
+ <source>Ask for confirmation before synchronizing e&xternal storages</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="345"/>
<source>Choose what to sync</source>
<translation>Изаберите шта синхронизовати</translation>
</message>
<translation>&Остави локалне податке</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>S&ync everything from server</source>
<translation>Син&хронизуј све са сервера</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
<source>Status message</source>
<translation>Порука стања</translation>
</message>
<location filename="../src/gui/owncloudsetuppage.ui" line="129"/>
<location filename="../src/gui/owncloudsetuppage.ui" line="156"/>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="190"/>
<source>TextLabel</source>
<translation>Текст ознака</translation>
</message>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="83"/>
- <source>Server &Address</source>
- <translation>&Адреса сервера</translation>
+ <source>Ser&ver Address</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="99"/>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="286"/>
+ <location filename="../src/libsync/theme.cpp" line="295"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Направљено од ГИТ ревизије <a href="%1">%2</a> %3, %4 користећи КуТ %5, %6</small></p></translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="238"/>
<location filename="../src/gui/accountsettings.cpp" line="371"/>
- <location filename="../src/gui/accountsettings.cpp" line="728"/>
+ <location filename="../src/gui/accountsettings.cpp" line="733"/>
<source>Cancel</source>
<translation>Avbryt</translation>
</message>
<translation>Logga in</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="678"/>
- <source>There are new folders that were not synchronized because they are too big: </source>
- <translation>Det finns nya mappar som inte synkroniserades på grund av att det är för stora:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="680"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="681"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="720"/>
+ <location filename="../src/gui/accountsettings.cpp" line="725"/>
<source>Confirm Account Removal</source>
<translation>Bekräfta radering an kontot</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="721"/>
+ <location filename="../src/gui/accountsettings.cpp" line="726"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>Vill du verkligen avsluta anslutningen till kontot <i>%1</i>?</p><p><b>Observera:</b> Detta kommer <b>inte</b> radera några filer.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="727"/>
+ <location filename="../src/gui/accountsettings.cpp" line="732"/>
<source>Remove connection</source>
<translation>Radera anslutning</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="600"/>
<source>Aborted by the user</source>
<translation>Avbruten av användare</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="139"/>
<source>Local folder %1 does not exist.</source>
<translation>Den lokala mappen %1 finns inte.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="142"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 borde vara en mapp, men är inte det.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="144"/>
+ <location filename="../src/gui/folder.cpp" line="145"/>
<source>%1 is not readable.</source>
<translation>%1 är inte läsbar.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="367"/>
+ <location filename="../src/gui/folder.cpp" line="368"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 har tagits bort.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="374"/>
+ <location filename="../src/gui/folder.cpp" line="375"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 har laddats ner.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="382"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 har uppdaterats.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="388"/>
+ <location filename="../src/gui/folder.cpp" line="389"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 har döpts om till %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="395"/>
+ <location filename="../src/gui/folder.cpp" line="396"/>
<source>%1 has been moved to %2.</source>
<translation>%1 har flyttats till %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="365"/>
+ <location filename="../src/gui/folder.cpp" line="366"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 och %n andra filer har tagits bort.</numerusform><numerusform>%1 och %n andra filer har tagits bort.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="372"/>
+ <location filename="../src/gui/folder.cpp" line="373"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 och %n andra filer har laddats ner.</numerusform><numerusform>%1 och %n andra filer har laddats ner.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="379"/>
+ <location filename="../src/gui/folder.cpp" line="380"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 och %n andra filer har uppdaterats.</numerusform><numerusform>%1 och %n andra filer har uppdaterats.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="386"/>
+ <location filename="../src/gui/folder.cpp" line="387"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 har döpts om till %2 och %n andra filer har döpts om.</numerusform><numerusform>%1 har döpts om till %2 och %n andra filer har döpts om.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="393"/>
+ <location filename="../src/gui/folder.cpp" line="394"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 har flyttats till %2 och %n andra filer har flyttats.</numerusform><numerusform>%1 har flyttats till %2 och %n andra filer har flyttats.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="400"/>
+ <location filename="../src/gui/folder.cpp" line="401"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 och %n andra filer har synk-konflikter.</numerusform><numerusform>%1 och %n andra filer har synk-konflikter.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="402"/>
+ <location filename="../src/gui/folder.cpp" line="403"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 har en synk-konflikt. Vänligen kontrollera konfliktfilen!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="407"/>
+ <location filename="../src/gui/folder.cpp" line="408"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 och %n andra filer kunde inte synkas på grund av fel. Se loggen för detaljer.</numerusform><numerusform>%1 och %n andra filer kunde inte synkas på grund av fel. Se loggen för detaljer.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="409"/>
+ <location filename="../src/gui/folder.cpp" line="410"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 kunde inte synkroniseras på grund av ett fel. Kolla loggen för ytterligare detaljer.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="415"/>
+ <location filename="../src/gui/folder.cpp" line="416"/>
<source>Sync Activity</source>
<translation>Synk aktivitet</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="642"/>
+ <location filename="../src/gui/folder.cpp" line="643"/>
<source>Could not read system exclude file</source>
<translation>Kunde inte läsa systemets exkluderings-fil</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="850"/>
+ <location filename="../src/gui/folder.cpp" line="854"/>
<source>A new folder larger than %1 MB has been added: %2.
-Please go in the settings to select it if you wish to download it.</source>
- <translation>En ny mapp större än %1 MB har lagts till: %2.
-Var god gå in i inställningarna för att markera mappen om du vill ladda ner den.</translation>
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="856"/>
+ <source>A folder from an external storage has been added.
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="857"/>
+ <source>Please go in the settings to select it if you wish to download it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="888"/>
+ <location filename="../src/gui/folder.cpp" line="893"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
Är du säker på att du vill fortsätta?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="892"/>
+ <location filename="../src/gui/folder.cpp" line="897"/>
<source>Remove All Files?</source>
<translation>Ta bort alla filer?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="894"/>
+ <location filename="../src/gui/folder.cpp" line="899"/>
<source>Remove all files</source>
<translation>Ta bort alla filer</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="895"/>
+ <location filename="../src/gui/folder.cpp" line="900"/>
<source>Keep files</source>
<translation>Behåll filer</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="911"/>
+ <location filename="../src/gui/folder.cpp" line="916"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
Om du fortsätter synkningen kommer alla dina filer återställas med en äldre version av filen. Vill du behålla dina nyare lokala filer som konfliktfiler?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="916"/>
+ <location filename="../src/gui/folder.cpp" line="921"/>
<source>Backup detected</source>
<translation>Backup upptäckt</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="918"/>
+ <location filename="../src/gui/folder.cpp" line="923"/>
<source>Normal Synchronisation</source>
<translation>Normal synkronisation</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="919"/>
+ <location filename="../src/gui/folder.cpp" line="924"/>
<source>Keep Local Files as Conflict</source>
<translation>Behåll lokala filer som konflikt</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="140"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="148"/>
<source>You need to be connected to add a folder</source>
<translation>Du måste vara ansluten för att lägga till en mapp</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="150"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="158"/>
<source>Click this button to add a folder to synchronize.</source>
<translation>Klicka här för att lägga till en mapp att synka.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
<source>%1 (%2)</source>
<extracomment>Example text: "File.txt (23KB)"</extracomment>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="180"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="188"/>
<source>Error while loading the list of folders from the server.</source>
<translation>Ett fel uppstod när mapplistan försökte laddas från servern.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="218"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="226"/>
<source>Signed out</source>
<translation>Utloggad</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="145"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="153"/>
<source>Adding folder is disabled because you are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
<translation>Tillägg av mappar är avstängt eftersom du redan synkar alla dina filer. Om du vill synka fler mappar, var god ta bort den nuvarande rotmappen.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="183"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="191"/>
<source>Fetching folder list from server...</source>
<translation>Hämtar mapplistan från servern...</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>Checking for changes in '%1'</source>
<translation>Kollar efter ändringar i '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="868"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
<source>, '%1'</source>
<extracomment>Build a list of file names</extracomment>
<translation>, '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="871"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="900"/>
<source>'%1'</source>
<extracomment>Argument is a file name</extracomment>
<translation>'%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="896"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="925"/>
<source>Syncing %1</source>
<extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment>
<translation>Synkroniserar %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="908"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="927"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="937"/>
<source>, </source>
<translation>,</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="931"/>
<source>download %1/s</source>
<extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>ladda ner %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="933"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="911"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>upload %1/s</source>
<extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>ladda upp %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="913"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="942"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="918"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 av %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="922"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="951"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%5 kvar, %1 av %2, fil %3 av %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="948"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 av %2, fil %3 av %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="954"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="983"/>
<source>file %1 of %2</source>
<translation>fil %1 av %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/>
<source>Waiting...</source>
<translation>Väntar...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="998"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1027"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>Väntat på %n annan mapp...</numerusform><numerusform>Väntat på %n andra mappar...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1033"/>
<source>Preparing to sync...</source>
<translation>Förbereder för att synkronisera...</translation>
</message>
<translation>Avancerad</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="101"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
+ <source>Ask for confirmation before synchronizing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="105"/>
<source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/generalsettings.ui" line="26"/>
<source>&Launch on System Startup</source>
<translation>Använd &monokroma ikoner</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="59"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit &Ignored Files</source>
<translation>Ändra &ignorerade filer</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
- <source>Ask &confirmation before downloading folders larger than</source>
- <translation>Be om &bekräftelse innan nedladdning sker av mappar som är större än</translation>
- </message>
- <message>
- <location filename="../src/gui/generalsettings.ui" line="129"/>
+ <location filename="../src/gui/generalsettings.ui" line="140"/>
<source>S&how crash reporter</source>
<translation>Visa krashrapporteraren</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="150"/>
<location filename="../src/gui/generalsettings.ui" line="156"/>
- <location filename="../src/gui/generalsettings.ui" line="162"/>
<source>About</source>
<translation>Om</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="172"/>
+ <location filename="../src/gui/generalsettings.ui" line="166"/>
<source>Updates</source>
<translation>Uppdateringar</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="197"/>
+ <location filename="../src/gui/generalsettings.ui" line="191"/>
<source>&Restart && Update</source>
<translation>%Starta om && Uppdatera</translation>
</message>
<translation>Anslut...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="144"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="159"/>
<source>%1 folder '%2' is synced to local folder '%3'</source>
<translation>%1 mappen '%2' är synkroniserad mot den lokala mappen '%3'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="162"/>
<source>Sync the folder '%1'</source>
<translation>Synka mappen '%1'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="152"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="167"/>
<source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
<translation><p><small><strong>Varning:</strong> Den lokala mappen är inte tom. Välj alternativ!</small></p></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="251"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/>
<source>Local Sync Folder</source>
<translation>Lokal mapp för synkning</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="311"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="317"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
<translation>Kan inte ta bort och göra en säkerhetskopia av mappen på grund av att mappen eller en fil i den används av ett annat program. Vänligen stäng mappen eller filen och försök igen eller avbryt installationen.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="540"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Lokal synkmapp %1 skapad!</b></font></translation>
</message>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="120"/>
<source>Success.</source>
<translation>Lyckades.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="127"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSync misslyckades med att ladda journalfilen. Journalfilen är korrupt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="130"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>Plugin %1 för csync kunde inte laddas.<br/>Var god verifiera installationen!</p></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSYNC fel vid intern bearbetning.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync misslyckades att reservera minne.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync fatal parameter error.</source>
<translation>CSync fatal parameter fel.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync processing step update failed.</source>
<translation>CSync processteg update misslyckades.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync processteg reconcile misslyckades.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync kunde inte autentisera mot proxy. </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync misslyckades att hitta proxy eller server.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync misslyckades att autentisera mot %1 servern.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync misslyckades att ansluta mot nätverket.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>A network connection timeout happened.</source>
<translation>En timeout på nätverksanslutningen har inträffat.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>A HTTP transmission error happened.</source>
<translation>Ett HTTP överföringsfel inträffade.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation>Den monterade mappen är tillfälligt otillgänglig på servern</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>An error occurred while opening a folder</source>
<translation>En fel inträffande under öppnandet av en mapp</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="197"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Error while reading folder.</source>
<translation>Fel vid mappinläsning.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="477"/>
+ <location filename="../src/libsync/syncengine.cpp" line="476"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>Filen/Mappen är ignorerad för att den är dold.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="738"/>
+ <location filename="../src/libsync/syncengine.cpp" line="737"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Endast %1 tillgängligt, behöver minst %2 för att starta</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1206"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Otillåtet eftersom du inte har rättigheter att lägga till övermappar</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1213"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Otillåtet eftersom du inte har rättigheter att lägga till filer i den mappen.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: Ingen plats på %1 server tillgänglig.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>CSync ospecificerat fel.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Avbruten av användare</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>CSync failed to access</source>
<translation>CSync misslyckades med att läsa</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="123"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation>CSync misslyckades med att ladda eller skapa journalfilen. Säkerställ att du har rättigheter att läsa och skriva i den lokala synkmappen.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation>CSync misslyckades på grund av ohanterad avslagning av rättighet.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync tried to create a folder that already exists.</source>
<translation>CSync försökte skapa en mapp som redan finns.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>The service is temporarily unavailable</source>
<translation>Tjänsten är tillfälligt otillgänglig</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>Access is forbidden</source>
<translation>Tillgång förbjuden</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="202"/>
+ <location filename="../src/libsync/syncengine.cpp" line="201"/>
<source>An internal error number %1 occurred.</source>
<translation>Ett internt fel nummer %1 inträffade.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="266"/>
+ <location filename="../src/libsync/syncengine.cpp" line="265"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Objektet kunde inte synkas på grund av tidigare fel: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="445"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symboliska länkar stöds ej i synkningen.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="449"/>
+ <location filename="../src/libsync/syncengine.cpp" line="448"/>
<source>File is listed on the ignore list.</source>
<translation>Filen är listad i ignorerings listan.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="453"/>
+ <location filename="../src/libsync/syncengine.cpp" line="452"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="463"/>
+ <location filename="../src/libsync/syncengine.cpp" line="462"/>
<source>File names containing the character '%1' are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="466"/>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
<source>The file name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="471"/>
+ <location filename="../src/libsync/syncengine.cpp" line="470"/>
<source>Filename contains trailing spaces.</source>
<translation>Filnamn innehåller mellanslag i slutet.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="474"/>
+ <location filename="../src/libsync/syncengine.cpp" line="473"/>
<source>Filename is too long.</source>
<translation>Filnamnet är för långt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="483"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Stat failed.</source>
<translation>Stat misslyckades.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="510"/>
+ <location filename="../src/libsync/syncengine.cpp" line="509"/>
<source>Filename encoding is not valid</source>
<translation>Filnamnskodning är inte giltig</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="678"/>
+ <location filename="../src/libsync/syncengine.cpp" line="677"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Otillåtna tecken, var vänlig byt namn på "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="774"/>
+ <location filename="../src/libsync/syncengine.cpp" line="773"/>
<source>Unable to initialize a sync journal.</source>
<translation>Kan inte initialisera en synk journal. </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="793"/>
+ <location filename="../src/libsync/syncengine.cpp" line="792"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Kunde inte läsa svartlistan från den lokala databasen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="830"/>
+ <location filename="../src/libsync/syncengine.cpp" line="829"/>
<source>Unable to read from the sync journal.</source>
<translation>Kunde inte läsa från synk-journalen.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="875"/>
+ <location filename="../src/libsync/syncengine.cpp" line="874"/>
<source>Cannot open the sync journal</source>
<translation>Kunde inte öppna synk journalen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="933"/>
+ <location filename="../src/libsync/syncengine.cpp" line="932"/>
<source>File name contains at least one invalid character</source>
<translation>Filnamnet innehåller minst ett ogiltigt tecken</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
- <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1172"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorerad eftersom den är svartlistad i "välj vad som ska synkas" </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1191"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Otillåtet eftersom du inte har rättigheter att lägga till undermappar i den mappen.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1232"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Inte behörig att ladda upp denna fil då den är skrivskyddad på servern, återställer </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1249"/>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1267"/>
<source>Not allowed to remove, restoring</source>
<translation>Inte behörig att radera, återställer</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1280"/>
<source>Local files and share folder removed.</source>
<translation>Lokala filer och mappar som är delade är borttagna.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1336"/>
<source>Move not allowed, item restored</source>
<translation>Det gick inte att genomföra flytten, objektet återställs</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1347"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Det gick inte att genomföra flytten då %1 är skrivskyddad</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the destination</source>
<translation>destinationen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the source</source>
<translation>källan</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="300"/>
+ <location filename="../src/libsync/theme.cpp" line="309"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Version %1. För mer information vänligen besök <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="304"/>
+ <location filename="../src/libsync/theme.cpp" line="313"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation><p>Copyright ownCloud GmbH</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="305"/>
+ <location filename="../src/libsync/theme.cpp" line="314"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Distribueras av %1 och licenserad under GNU General Public License (GPL) Version 2.0.<br/>%2 och %2 logotyp är registrerade varumärken av %1 i Förenta Staterna, andra länder, eller både och.</p></translation>
</message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="250"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="352"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="379"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="402"/>
<source>TextLabel</source>
<translation>Textetikett</translation>
</message>
<translation>Starta en %ren synkning (tar bort den lokala mappen!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="295"/>
+ <source>Ask for confirmation before synchroni&zing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="321"/>
+ <source>Ask for confirmation before synchronizing e&xternal storages</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="345"/>
<source>Choose what to sync</source>
<translation>Välj vad som ska synkas</translation>
</message>
<translation>&Behåll lokal data</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>S&ync everything from server</source>
<translation>S&ynka allt från servern</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
<source>Status message</source>
<translation>Statusmeddelande</translation>
</message>
<location filename="../src/gui/owncloudsetuppage.ui" line="129"/>
<location filename="../src/gui/owncloudsetuppage.ui" line="156"/>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="190"/>
<source>TextLabel</source>
<translation>Textetikett</translation>
</message>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="83"/>
- <source>Server &Address</source>
- <translation>Server &Adress</translation>
+ <source>Ser&ver Address</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="99"/>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="286"/>
+ <location filename="../src/libsync/theme.cpp" line="295"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Byggd från Git revision <a href="%1">%2</a> den %3, %4 med Qt %5, %6</small></p></translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="238"/>
<location filename="../src/gui/accountsettings.cpp" line="371"/>
- <location filename="../src/gui/accountsettings.cpp" line="728"/>
+ <location filename="../src/gui/accountsettings.cpp" line="733"/>
<source>Cancel</source>
<translation>ยกเลิก</translation>
</message>
<translation>เข้าสู่ระบบ</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="678"/>
- <source>There are new folders that were not synchronized because they are too big: </source>
- <translation>มีโฟลเดอร์ใหม่ที่จะไม่ถูกประสานข้อมูลเพราะมันมีขนาดใหญ่เกินไป</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="680"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="720"/>
+ <location filename="../src/gui/accountsettings.cpp" line="681"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="725"/>
<source>Confirm Account Removal</source>
<translation>ยืนยันการลบบัญชี</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="721"/>
+ <location filename="../src/gui/accountsettings.cpp" line="726"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>คุณต้องการลบการเชื่อมต่อกับบัญชี<i>%1</i>?</p><p><b>หมายเหตุ:</b> นี้จะ <b>ไม่</b> ลบไฟล์ใดๆ</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="727"/>
+ <location filename="../src/gui/accountsettings.cpp" line="732"/>
<source>Remove connection</source>
<translation>ลบการเชื่อมต่อ</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="600"/>
<source>Aborted by the user</source>
<translation>ยกเลิกโดยผู้ใช้</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="139"/>
<source>Local folder %1 does not exist.</source>
<translation>โฟลเดอร์ต้นทาง %1 ไม่มีอยู่</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="142"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 ควรจะเป็นโฟลเดอร์ แต่ทำไม่ได้</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="144"/>
+ <location filename="../src/gui/folder.cpp" line="145"/>
<source>%1 is not readable.</source>
<translation>ไม่สามารถอ่านข้อมูล %1 ได้</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="367"/>
+ <location filename="../src/gui/folder.cpp" line="368"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ได้ถูกลบออก</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="374"/>
+ <location filename="../src/gui/folder.cpp" line="375"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 ได้ถูกดาวน์โหลด</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="382"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 ได้ถูกอัพเดทเรียบร้อยแล้ว</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="388"/>
+ <location filename="../src/gui/folder.cpp" line="389"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 ได้ถูกเปลี่ยนชื่อเป็น %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="395"/>
+ <location filename="../src/gui/folder.cpp" line="396"/>
<source>%1 has been moved to %2.</source>
<translation>%1 ได้ถูกย้ายไปยัง %2</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="365"/>
+ <location filename="../src/gui/folder.cpp" line="366"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 และ %n ไฟล์อื่นๆได้ถูกลบออก</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="372"/>
+ <location filename="../src/gui/folder.cpp" line="373"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 และ %n ไฟล์อื่นๆ ได้ถูกดาวน์โหลดเรียบร้อยแล้ว</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="379"/>
+ <location filename="../src/gui/folder.cpp" line="380"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 และ %n ไฟล์อื่นๆ ได้รับการอัพเดท</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="386"/>
+ <location filename="../src/gui/folder.cpp" line="387"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 และไฟล์อื่นๆอีก %n ไฟล์ได้ถูกเปลี่ยนชื่อเป็น %2</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="393"/>
+ <location filename="../src/gui/folder.cpp" line="394"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 และไฟล์อื่นๆอีก %n ไฟล์ได้ถูกย้ายไปยัง %2</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="400"/>
+ <location filename="../src/gui/folder.cpp" line="401"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 และ %n ไฟล์อื่นๆ เกิดปัญหาขณะประสานข้อมูล</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="402"/>
+ <location filename="../src/gui/folder.cpp" line="403"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 มีปัญหาขณะประสานข้อมูล กรุณาตรวจสอบไฟล์ที่มีปัญหานั้น</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="407"/>
+ <location filename="../src/gui/folder.cpp" line="408"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 และไฟล์อื่นๆอีก %n ไฟล์ไม่สามารถประสานข้อมูลเนื่องจากเกิดข้อผิดพลาด กรุณาดูไฟล์ log สำหรับรายละเอียดเพิ่มเติม</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="409"/>
+ <location filename="../src/gui/folder.cpp" line="410"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 ไม่สามารถประสานข้อมูลเนื่องจากมีข้อผิดพลาด สามารถดูไฟล์ log สำหรับรายละเอียดเพิ่มเติม</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="415"/>
+ <location filename="../src/gui/folder.cpp" line="416"/>
<source>Sync Activity</source>
<translation>ความเคลื่อนไหวของการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="642"/>
+ <location filename="../src/gui/folder.cpp" line="643"/>
<source>Could not read system exclude file</source>
<translation>ไม่สามารถอ่าน ยกเว้นไฟล์ระบบ</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="850"/>
+ <location filename="../src/gui/folder.cpp" line="854"/>
<source>A new folder larger than %1 MB has been added: %2.
-Please go in the settings to select it if you wish to download it.</source>
- <translation>โฟลเดอร์ใหม่มีขนาดใหญ่กว่า %1 เมกะไบต์ ได้ถูกเพิ่ม: %2
-กรุณาไปตั้งค่าถ้าคุณต้องการให้มันดาวน์โหลดได้</translation>
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="856"/>
+ <source>A folder from an external storage has been added.
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="857"/>
+ <source>Please go in the settings to select it if you wish to download it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="888"/>
+ <location filename="../src/gui/folder.cpp" line="893"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
คุณแน่ใจว่าคุณต้องการที่จะดำเนินการนี้?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="892"/>
+ <location filename="../src/gui/folder.cpp" line="897"/>
<source>Remove All Files?</source>
<translation>ลบไฟล์ทั้งหมด?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="894"/>
+ <location filename="../src/gui/folder.cpp" line="899"/>
<source>Remove all files</source>
<translation>ลบไฟล์ทั้งหมด</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="895"/>
+ <location filename="../src/gui/folder.cpp" line="900"/>
<source>Keep files</source>
<translation>เก็บไฟล์เอาไว้</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="911"/>
+ <location filename="../src/gui/folder.cpp" line="916"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
ไฟล์ปัจจุบันของคุณทั้งหมดจะถูกเขียนทับด้วยไฟล์เก่า คุณต้องการเก็บไฟล์ไว้หรือไม่?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="916"/>
+ <location filename="../src/gui/folder.cpp" line="921"/>
<source>Backup detected</source>
<translation>ตรวจพบการสำรองข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="918"/>
+ <location filename="../src/gui/folder.cpp" line="923"/>
<source>Normal Synchronisation</source>
<translation>ประสานข้อมูลปกติ</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="919"/>
+ <location filename="../src/gui/folder.cpp" line="924"/>
<source>Keep Local Files as Conflict</source>
<translation>เก็บไฟล์ต้นทางเป็นไฟล์ที่มีปัญหา</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="140"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="148"/>
<source>You need to be connected to add a folder</source>
<translation>คุณจะต้องเชื่อมต่อก่อนที่จะเพิ่มโฟลเดอร์</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="150"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="158"/>
<source>Click this button to add a folder to synchronize.</source>
<translation>คลิกที่ปุ่มนี้เพื่อเพิ่มโฟลเดอร์ที่ต้องการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
<source>%1 (%2)</source>
<extracomment>Example text: "File.txt (23KB)"</extracomment>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="180"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="188"/>
<source>Error while loading the list of folders from the server.</source>
<translation>ข้อผิดพลาดในขณะที่โหลดรายชื่อโฟลเดอร์จากเซิร์ฟเวอร์</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="218"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="226"/>
<source>Signed out</source>
<translation>ออกจากระบบ</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="145"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="153"/>
<source>Adding folder is disabled because you are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
<translation>การเพิ่มโฟลเดอร์ถูกยกเลิกเพราะคุณได้ประสานไฟล์ทั้งหมดของคุณอยู่แล้ว หากคุณต้องการประสานข้อมูลหลายโฟลเดอร์โปรดลบโฟลเดอร์รากกำหนดค่าในปัจจุบัน</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="183"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="191"/>
<source>Fetching folder list from server...</source>
<translation>กำลังดึงรายการโฟลเดอร์จากเซิร์ฟเวอร์ ...</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>Checking for changes in '%1'</source>
<translation>กำลังตรวจสอบการเปลี่ยนแปลงใน '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="868"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
<source>, '%1'</source>
<extracomment>Build a list of file names</extracomment>
<translation>, '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="871"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="900"/>
<source>'%1'</source>
<extracomment>Argument is a file name</extracomment>
<translation>'%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="896"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="925"/>
<source>Syncing %1</source>
<extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment>
<translation>กำลังประสานข้อมูล %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="908"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="927"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="937"/>
<source>, </source>
<translation>หรือ</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="931"/>
<source>download %1/s</source>
<extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>ดาวน์โหลด %1/วินาที</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="933"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/วินาที</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="911"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>upload %1/s</source>
<extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>อัปโหลด</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="913"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="942"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/วินาที</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="918"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 ของ %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="922"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="951"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>เหลืออีก %5 ไฟล์, %1 ไฟล์จาก %2, %3 ไฟล์จาก %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="948"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 จาก %2, %3 จาก %4 ไฟล์</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="954"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="983"/>
<source>file %1 of %2</source>
<translation>ไฟล์ %1 จาก %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/>
<source>Waiting...</source>
<translation>กรุณารอซักครู่...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="998"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1027"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>กำลังรออีก (%n) โฟลเดอร์...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1033"/>
<source>Preparing to sync...</source>
<translation>กำลังเตรียมพร้อมในการประสานข้อมูล</translation>
</message>
<translation>ขั้นสูง</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="101"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
+ <source>Ask for confirmation before synchronizing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="105"/>
<source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>เมกะไบต์</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/generalsettings.ui" line="26"/>
<source>&Launch on System Startup</source>
<translation>ใช้ไอคอนขาวดำ</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="59"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit &Ignored Files</source>
<translation>แก้ไขและละเว้นการแก้ไขไฟล์</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
- <source>Ask &confirmation before downloading folders larger than</source>
- <translation>ถามเพื่อยืนยันก่อนดาวน์โหลดโฟลเดอร์ที่มีขนาดใหญ่กว่า</translation>
- </message>
- <message>
- <location filename="../src/gui/generalsettings.ui" line="129"/>
+ <location filename="../src/gui/generalsettings.ui" line="140"/>
<source>S&how crash reporter</source>
<translation>แสดงรายงานความผิดพลาด</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="150"/>
<location filename="../src/gui/generalsettings.ui" line="156"/>
- <location filename="../src/gui/generalsettings.ui" line="162"/>
<source>About</source>
<translation>เกี่ยวกับเรา</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="172"/>
+ <location filename="../src/gui/generalsettings.ui" line="166"/>
<source>Updates</source>
<translation>อัพเดท</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="197"/>
+ <location filename="../src/gui/generalsettings.ui" line="191"/>
<source>&Restart && Update</source>
<translation>และเริ่มต้นใหม่ && อัพเดท</translation>
</message>
<translation>เชื่อมต่อ...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="144"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="159"/>
<source>%1 folder '%2' is synced to local folder '%3'</source>
<translation>%1 โฟลเดอร์ '%2' ถูกประสานข้อมูลไปยังโฟลเดอร์ต้นทาง '%3'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="162"/>
<source>Sync the folder '%1'</source>
<translation>ประสานข้อมูลโฟลเดอร์ '%1'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="152"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="167"/>
<source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
<translation><p><small><strong>คำเตือน:</strong> โฟลเดอร์ต้นทางจะต้องไม่ว่างเปล่า เลือกความละเอียด!</small></p></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="251"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/>
<source>Local Sync Folder</source>
<translation>ประสานโฟลเดอร์ต้นทาง</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="311"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="317"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
<translation>ไม่สามารถลบและสำรองข้อมูลโฟลเดอร์เพราะโฟลเดอร์หรือไฟล์ในนั้นจะเปิดในโปรแกรมอื่นอยู่ กรุณาปิดโฟลเดอร์หรือไฟล์และกดลองใหม่อีกครั้งหรือยกเลิกการติดตั้ง</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="540"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>ประสานข้อมูลโฟลเดอร์ต้นทาง %1 ได้ถูกสร้างขึ้นเรียบร้อยแล้ว!</b></font></translation>
</message>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="120"/>
<source>Success.</source>
<translation>เสร็จสิ้น</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="127"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSync ไม่สามารถโหลดไฟล์เจอร์นัล ไฟล์เจอร์นัลได้รับความเสียหาย</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="130"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>ปลั๊กอิน %1 สำหรับ csync ไม่สามารถโหลดได้.<br/>กรุณาตรวจสอบความถูกต้องในการติดตั้ง!</p></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync เกิดข้อผิดพลาดบางประการในระหว่างประมวลผล internal trees</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<source>CSync failed to reserve memory.</source>
<translation>การจัดสรรหน่วยความจำ CSync ล้มเหลว</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync fatal parameter error.</source>
<translation>พบข้อผิดพลาดเกี่ยวกับ CSync fatal parameter</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync processing step update failed.</source>
<translation>การอัพเดทขั้นตอนการประมวลผล CSync ล้มเหลว</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync processing step reconcile failed.</source>
<translation>การอัพเดทขั้นตอนการประมวลผล CSync ล้มเหลว</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync ไม่สามารถรับรองความถูกต้องที่พร็อกซี่</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync ไม่สามารถค้นหาพร็อกซี่บนเซิร์ฟเวอร์ได้</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync ล้มเหลวในการยืนยันสิทธิ์การเข้าใช้งานที่เซิร์ฟเวอร์ %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync ล้มเหลวในการเชื่อมต่อกับเครือข่าย</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>A network connection timeout happened.</source>
<translation>หมดเวลาการเชื่อมต่อเครือข่าย</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>A HTTP transmission error happened.</source>
<translation>เกิดข้อผิดพลาดเกี่ยวกับ HTTP transmission</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation>โฟลเดอร์ที่ติดตั้งชั่วคราว ไม่สามารถใช้งานบนเซิร์ฟเวอร์</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>An error occurred while opening a folder</source>
<translation>เกิดข้อผิดพลาดบางอย่างขณะกำลังเปิดโฟลเดอร์</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="197"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Error while reading folder.</source>
<translation>เกิดข้อผิดพลาดขณะกำลังอ่านโฟลเดอร์</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="477"/>
+ <location filename="../src/libsync/syncengine.cpp" line="476"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>ไฟล์/โฟลเดอร์ ที่ซ่อนอยู่จะถูกละเว้น</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="738"/>
+ <location filename="../src/libsync/syncengine.cpp" line="737"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>มีเพียง %1 ที่พร้อมใช้งาน คุณจำเป็นต้องมีไม่น้อยกว่า %2 เพื่อเริ่มใช้งาน</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1206"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>ไม่ได้รับอนุญาต เพราะคุณไม่มีสิทธิ์ที่จะเพิ่มโฟลเดอร์หลัก</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1213"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>ไม่ได้รับอนุญาต เพราะคุณไม่มีสิทธิ์ที่จะเพิ่มไฟล์ในโฟลเดอร์นั้น</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: ไม่มีพื้นที่เหลือเพียงพอบนเซิร์ฟเวอร์ %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>CSync ไม่สามารถระบุข้อผิดพลาดได้</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>ยกเลิกโดยผู้ใช้</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>CSync failed to access</source>
<translation>ล้มเหลวในการเข้าถึง CSync</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="123"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation>CSync ผิดพลาด ไม่สามารถโหลดหรือสร้างไฟล์เจอร์นัล ให้แน่ใจว่าคุณได้อ่านและเขียนสิทธิ์ในการประสานโฟลเดอร์ต้นทาง</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation>CSync ล้มเหลวเนื่องจากการอนุญาตให้จัดการได้ถูกปฏิเสธ</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync tried to create a folder that already exists.</source>
<translation>CSync พยายามสร้างโฟลเดอร์ที่มีอยู่แล้ว</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>The service is temporarily unavailable</source>
<translation>ไม่สามารถใช้บริการได้ชั่วคราว</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>Access is forbidden</source>
<translation>ถูกปฏิเสธการเข้าถึง</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="202"/>
+ <location filename="../src/libsync/syncengine.cpp" line="201"/>
<source>An internal error number %1 occurred.</source>
<translation>จำนวนข้อผิดพลาดภายในที่เกิดขึ้น %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="266"/>
+ <location filename="../src/libsync/syncengine.cpp" line="265"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>รายการจะไม่ถูกประสานข้อมูลเนื่องจากเกิดข้อผิดพลาดก่อนหน้านี้: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="445"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>ลิงค์สัญลักษณ์จะไม่ได้รับการสนับสนุนในการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="449"/>
+ <location filename="../src/libsync/syncengine.cpp" line="448"/>
<source>File is listed on the ignore list.</source>
<translation>ไฟล์อยู่ในรายการที่ละเว้น</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="453"/>
+ <location filename="../src/libsync/syncengine.cpp" line="452"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation>ชื่อไฟล์ที่ลงท้ายด้วยระยะเวลา ยังไม่ได้รับการสนับสนุนบนระบบไฟล์นี้</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="463"/>
+ <location filename="../src/libsync/syncengine.cpp" line="462"/>
<source>File names containing the character '%1' are not supported on this file system.</source>
<translation>ชื่อไฟล์ที่มีตัวอักษร '%1' ยังไม่ได้รับการสนับสนุนบนระบบไฟล์นี้</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="466"/>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
<source>The file name is a reserved name on this file system.</source>
<translation>ชื่อไฟล์นี้เป็นชื่อที่ถูกสงวนไว้</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="471"/>
+ <location filename="../src/libsync/syncengine.cpp" line="470"/>
<source>Filename contains trailing spaces.</source>
<translation>ชื่อไฟล์มีช่องว่างต่อท้าย</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="474"/>
+ <location filename="../src/libsync/syncengine.cpp" line="473"/>
<source>Filename is too long.</source>
<translation>ชื่อไฟล์ยาวเกินไป</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="483"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Stat failed.</source>
<translation>สถิติความล้มเหลว</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="510"/>
+ <location filename="../src/libsync/syncengine.cpp" line="509"/>
<source>Filename encoding is not valid</source>
<translation>การเข้ารหัสชื่อไฟล์ไม่ถูกต้อง</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="678"/>
+ <location filename="../src/libsync/syncengine.cpp" line="677"/>
<source>Invalid characters, please rename "%1"</source>
<translation>ตัวอักษรไม่ถูกต้อง โปรดเปลี่ยนชื่อ "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="774"/>
+ <location filename="../src/libsync/syncengine.cpp" line="773"/>
<source>Unable to initialize a sync journal.</source>
<translation>ไม่สามารถเตรียมการประสานข้อมูลเจอร์นัล</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="793"/>
+ <location filename="../src/libsync/syncengine.cpp" line="792"/>
<source>Unable to read the blacklist from the local database</source>
<translation>ไม่สามารถอ่านบัญชีดำจากฐานข้อมูลต้นทาง</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="830"/>
+ <location filename="../src/libsync/syncengine.cpp" line="829"/>
<source>Unable to read from the sync journal.</source>
<translation>ไม่สามารถอ่านจากบันทึกการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="875"/>
+ <location filename="../src/libsync/syncengine.cpp" line="874"/>
<source>Cannot open the sync journal</source>
<translation>ไม่สามารถเปิดการผสานข้อมูลเจอร์นัล</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="933"/>
+ <location filename="../src/libsync/syncengine.cpp" line="932"/>
<source>File name contains at least one invalid character</source>
<translation>มีชื่อแฟ้มอย่างน้อยหนึ่งตัวอักษรที่ไม่ถูกต้อง</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
- <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1172"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>ถูกละเว้นเพราะ "ข้อมูลที่เลือกประสาน" ติดบัญชีดำ</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1191"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>ไม่อนุญาติเพราะคุณไม่มีสิทธิ์ที่จะเพิ่มโฟลเดอร์ย่อยของโฟลเดอร์นั้น</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1232"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>ไม่อนุญาตให้อัพโหลดไฟล์นี้เพราะมันจะอ่านได้เพียงอย่างเดียวบนเซิร์ฟเวอร์ กำลังฟื้นฟู</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1249"/>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1267"/>
<source>Not allowed to remove, restoring</source>
<translation>ไม่อนุญาตให้ลบเพราะกำลังฟื้นฟู</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1280"/>
<source>Local files and share folder removed.</source>
<translation>ไฟล์ต้นทางและโฟลเดอร์ที่แชร์ถูกลบออก</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1336"/>
<source>Move not allowed, item restored</source>
<translation>ไม่ได้รับอนุญาตให้ย้าย เพราะกำลังกู้คืนรายการ</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1347"/>
<source>Move not allowed because %1 is read-only</source>
<translation>ไม่อนุญาตให้ย้ายเพราะ %1 จะอ่านได้เพียงอย่างเดียว</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the destination</source>
<translation>ปลายทาง</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the source</source>
<translation>แหล่งที่มา</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="300"/>
+ <location filename="../src/libsync/theme.cpp" line="309"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>รุ่น %1 สำหรับข้อมูลเพิ่มเติมกรุณาเยี่ยมชม <a href='%2'>%3</a></p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="304"/>
+ <location filename="../src/libsync/theme.cpp" line="313"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation><p>ลิขสิทธิ์ ownCloud GmbH</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="305"/>
+ <location filename="../src/libsync/theme.cpp" line="314"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>เผยแพร่โดย %1 และมีใบอนุญาตภายใต้ GNU General Public License (GPL) รุ่น 2.0 <br/>%2 และการลงทะเบียนโลโก้ %2 เครื่องหมายการค้าของ %1 ในประเทศสหรัฐอเมริกา ประเทศอื่นๆ หรือทั้งสองอย่าง</p></translation>
</message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="250"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="352"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="379"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="402"/>
<source>TextLabel</source>
<translation>ป้ายข้อความ</translation>
</message>
<translation>เริ่มต้นทำความสะอาดการประสานข้อมูล (ลบโฟลเดอร์ต้นทาง)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="295"/>
+ <source>Ask for confirmation before synchroni&zing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="321"/>
+ <source>Ask for confirmation before synchronizing e&xternal storages</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="345"/>
<source>Choose what to sync</source>
<translation>เลือกข้อมูลที่ต้องการประสาน</translation>
</message>
<translation>และเก็บข้อมูลต้นทาง</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>S&ync everything from server</source>
<translation>ผสานข้อมูลทุกอย่างจากเซิร์ฟเวอร์</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
<source>Status message</source>
<translation>ข้อความสถานะ</translation>
</message>
<location filename="../src/gui/owncloudsetuppage.ui" line="129"/>
<location filename="../src/gui/owncloudsetuppage.ui" line="156"/>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="190"/>
<source>TextLabel</source>
<translation>ป้ายข้อความ</translation>
</message>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="83"/>
- <source>Server &Address</source>
- <translation>เซิร์ฟเวอร์และที่อยู่</translation>
+ <source>Ser&ver Address</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="99"/>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="286"/>
+ <location filename="../src/libsync/theme.cpp" line="295"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>ที่สร้างขึ้นจากการแก้ไข Git <a href="%1">%2</a> บน %3, %4 กำลังใช้ Qt %5, %6</small></p></translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="189"/>
<source>Synchronize all</source>
- <translation type="unfinished"/>
+ <translation>Tümünü eşitle</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="196"/>
<source>Synchronize none</source>
- <translation type="unfinished"/>
+ <translation>Hiçbirini eşitleme</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="203"/>
<message>
<location filename="../src/gui/accountsettings.ui" line="238"/>
<location filename="../src/gui/accountsettings.cpp" line="371"/>
- <location filename="../src/gui/accountsettings.cpp" line="728"/>
+ <location filename="../src/gui/accountsettings.cpp" line="733"/>
<source>Cancel</source>
<translation>İptal</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="235"/>
<source>Force sync now</source>
- <translation type="unfinished"/>
+ <translation>Şimdi eşitlemeye zorla</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="237"/>
<source>Restart sync</source>
- <translation type="unfinished"/>
+ <translation>Eşitlemeyi yeniden başlat</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="246"/>
<translation>Giriş yap</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="678"/>
- <source>There are new folders that were not synchronized because they are too big: </source>
- <translation>Çok büyük olduklarından eşitlenmemiş yeni klasörler mevcut:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="680"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="720"/>
+ <location filename="../src/gui/accountsettings.cpp" line="681"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="725"/>
<source>Confirm Account Removal</source>
<translation>Hesap Silinmesini Onaylayın</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="721"/>
+ <location filename="../src/gui/accountsettings.cpp" line="726"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p><i>%1</i> hesabının bağlantısını kaldırmayı gerçekten istiyor musunuz?</p><p><b>Not:</b> Bu işlem herhangi bir dosyayı <b>silmeyecektir</b>.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="727"/>
+ <location filename="../src/gui/accountsettings.cpp" line="732"/>
<source>Remove connection</source>
<translation>Bağlantıyı kaldır</translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="620"/>
<source>The list of unsynced items has been copied to the clipboard.</source>
- <translation type="unfinished"/>
+ <translation>Eşitlenmemiş ögelerin listesi panoya kopyalandı.</translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="625"/>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="600"/>
<source>Aborted by the user</source>
<translation>Kullanıcı tarafından iptal edildi</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="139"/>
<source>Local folder %1 does not exist.</source>
<translation>%1 yerel klasörü mevcut değil.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="142"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 bir dizin olmalı, ancak değil.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="144"/>
+ <location filename="../src/gui/folder.cpp" line="145"/>
<source>%1 is not readable.</source>
<translation>%1 okunabilir değil.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="367"/>
+ <location filename="../src/gui/folder.cpp" line="368"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 kaldırıldı.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="374"/>
+ <location filename="../src/gui/folder.cpp" line="375"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 indirildi.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="382"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 güncellendi.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="388"/>
+ <location filename="../src/gui/folder.cpp" line="389"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1, %2 olarak adlandırıldı.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="395"/>
+ <location filename="../src/gui/folder.cpp" line="396"/>
<source>%1 has been moved to %2.</source>
<translation>%1, %2 konumuna taşındı.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="365"/>
+ <location filename="../src/gui/folder.cpp" line="366"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 ve diğer %n dosya kaldırıldı.</numerusform><numerusform>%1 ve diğer %n dosya kaldırıldı.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="372"/>
+ <location filename="../src/gui/folder.cpp" line="373"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 ve diğer %n dosya indirildi.</numerusform><numerusform>%1 ve diğer %n dosya indirildi.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="379"/>
+ <location filename="../src/gui/folder.cpp" line="380"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>'%1' ve diğer %n dosya güncellendi.</numerusform><numerusform>%1 ve diğer %n dosya güncellendi.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="386"/>
+ <location filename="../src/gui/folder.cpp" line="387"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1, %2 olarak yeniden adlandırıldı ve %n diğer dosyanın adı değiştirildi.</numerusform><numerusform>%1, %2 olarak yeniden adlandırıldı ve %n diğer dosyanın adı değiştirildi.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="393"/>
+ <location filename="../src/gui/folder.cpp" line="394"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1, %2 konumuna taşındı ve %n diğer dosya taşındı.</numerusform><numerusform>%1, %2 konumuna taşındı ve %n diğer dosya taşındı.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="400"/>
+ <location filename="../src/gui/folder.cpp" line="401"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 ve %n diğer dosya eşitleme çakışması bulunduruyor.</numerusform><numerusform>%1 ve %n diğer dosya eşitleme çakışması bulunduruyor.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="402"/>
+ <location filename="../src/gui/folder.cpp" line="403"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 bir eşitleme çakışması bulunduruyor. Lütfen çakışan dosyayı kontrol edin!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="407"/>
+ <location filename="../src/gui/folder.cpp" line="408"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 ve diğer %n dosya hatalar nedeniyle eşlenemedi. Ayrıntılar için ayıt dosyasına bakın.</numerusform><numerusform>%1 ve diğer %n dosya hatalar nedeniyle eşlenemedi. Ayrıntılar için günlük dosyasına bakın.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="409"/>
+ <location filename="../src/gui/folder.cpp" line="410"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 bir hata nedeniyle eşitlenemedi. Ayrıntılar için günlüğe bakın.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="415"/>
+ <location filename="../src/gui/folder.cpp" line="416"/>
<source>Sync Activity</source>
<translation>Eşitleme Etkinliği</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="642"/>
+ <location filename="../src/gui/folder.cpp" line="643"/>
<source>Could not read system exclude file</source>
<translation>Sistem hariç tutulma dosyası okunamadı</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="850"/>
+ <location filename="../src/gui/folder.cpp" line="854"/>
<source>A new folder larger than %1 MB has been added: %2.
-Please go in the settings to select it if you wish to download it.</source>
- <translation>%1 MB boyutundan daha büyük bir yeni klasör eklendi: %2\n
-İndirmek istiyorsanız lütfen ayarlar bölümünden seçin.</translation>
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="856"/>
+ <source>A folder from an external storage has been added.
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="857"/>
+ <source>Please go in the settings to select it if you wish to download it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="888"/>
+ <location filename="../src/gui/folder.cpp" line="893"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="892"/>
+ <location filename="../src/gui/folder.cpp" line="897"/>
<source>Remove All Files?</source>
<translation>Tüm Dosyalar Kaldırılsın mı?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="894"/>
+ <location filename="../src/gui/folder.cpp" line="899"/>
<source>Remove all files</source>
<translation>Tüm dosyaları kaldır</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="895"/>
+ <location filename="../src/gui/folder.cpp" line="900"/>
<source>Keep files</source>
<translation>Dosyaları koru</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="911"/>
+ <location filename="../src/gui/folder.cpp" line="916"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="916"/>
+ <location filename="../src/gui/folder.cpp" line="921"/>
<source>Backup detected</source>
<translation>Yedek bulundu</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="918"/>
+ <location filename="../src/gui/folder.cpp" line="923"/>
<source>Normal Synchronisation</source>
<translation>Normal Eşitleme</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="919"/>
+ <location filename="../src/gui/folder.cpp" line="924"/>
<source>Keep Local Files as Conflict</source>
<translation>Çakışma Durumunda Yerel Dosyaları Tut</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="140"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="148"/>
<source>You need to be connected to add a folder</source>
<translation>Bir klasör eklemek için bağlı olmanız gerekir</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="150"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="158"/>
<source>Click this button to add a folder to synchronize.</source>
<translation>Bir klasörü eşitlemeye dahil etmek için bu düğmeye tıklayın.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
<source>%1 (%2)</source>
<extracomment>Example text: "File.txt (23KB)"</extracomment>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="180"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="188"/>
<source>Error while loading the list of folders from the server.</source>
<translation>Sunucudan klasörlerin listesi yüklenirken hata oluştu.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="218"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="226"/>
<source>Signed out</source>
<translation>Oturum sonlandırıldı</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="145"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="153"/>
<source>Adding folder is disabled because you are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
<translation>Klasör ekleme devre dışı, çünkü şu anda bütün dosyalarınızı eşitliyorsunuz. Çoklu klasör eşitlemesi yapmak istiyorsanız, lütfen geçerli yapılandırılmış kök klasörünü silin.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="183"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="191"/>
<source>Fetching folder list from server...</source>
<translation>Sunucudan klasör listesi alınıyor...</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>Checking for changes in '%1'</source>
<translation>%1 üzerindeki değişiklikler denetleniyor</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="868"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
<source>, '%1'</source>
<extracomment>Build a list of file names</extracomment>
<translation>, '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="871"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="900"/>
<source>'%1'</source>
<extracomment>Argument is a file name</extracomment>
<translation>'%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="896"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="925"/>
<source>Syncing %1</source>
<extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment>
<translation>%1 eşitleniyor</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="908"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="927"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="937"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="931"/>
<source>download %1/s</source>
<extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>indirme %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="933"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="911"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>upload %1/s</source>
<extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>gönderme %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="913"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="942"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="918"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment>
<translation>%1 %2 (%3/%4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="922"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="951"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>Kalan %5, %1/%2, dosya %3/%4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="948"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1/%2, %3/%4 dosya</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="954"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="983"/>
<source>file %1 of %2</source>
<translation>dosya %1/%2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/>
<source>Waiting...</source>
<translation>Bekleniyor...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="998"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1027"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>Diğer %n klasör bekleniyor...</numerusform><numerusform>Diğer %n klasör bekleniyor...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1033"/>
<source>Preparing to sync...</source>
<translation>Eşitleme için hazırlanıyor...</translation>
</message>
<translation>Gelişmiş</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="101"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
+ <source>Ask for confirmation before synchronizing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="105"/>
<source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/generalsettings.ui" line="26"/>
<source>&Launch on System Startup</source>
<translation>İki &Renkli Simgeler Kullan</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="59"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit &Ignored Files</source>
<translation>Yoksayılan &Dosyaları Düzenle</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
- <source>Ask &confirmation before downloading folders larger than</source>
- <translation>Bundan &daha büyük klasörlerin eşitlenmesi için onay iste:</translation>
- </message>
- <message>
- <location filename="../src/gui/generalsettings.ui" line="129"/>
+ <location filename="../src/gui/generalsettings.ui" line="140"/>
<source>S&how crash reporter</source>
<translation>Ç&ökme bildiricisini göster</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="150"/>
<location filename="../src/gui/generalsettings.ui" line="156"/>
- <location filename="../src/gui/generalsettings.ui" line="162"/>
<source>About</source>
<translation>Hakkında</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="172"/>
+ <location filename="../src/gui/generalsettings.ui" line="166"/>
<source>Updates</source>
<translation>Güncellemeler</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="197"/>
+ <location filename="../src/gui/generalsettings.ui" line="191"/>
<source>&Restart && Update</source>
<translation>&Yeniden Başlat ve Güncelle</translation>
</message>
<translation>Bağlan...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="144"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="159"/>
<source>%1 folder '%2' is synced to local folder '%3'</source>
<translation>%1 klasörü '%2', yerel '%3' klasörü ile eşitlendi</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="162"/>
<source>Sync the folder '%1'</source>
<translation>'%1' klasörünü eşitle</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="152"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="167"/>
<source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
<translation><p><small><strong>Uyarı:</strong> Yerel klasör boş değil. Bir çözüm seçin!</small></p></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="251"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/>
<source>Local Sync Folder</source>
<translation>Yerel Eşitleme Klasörü</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="311"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="317"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="212"/>
<source>Invalid URL</source>
- <translation type="unfinished"/>
+ <translation>Geçersiz URL</translation>
</message>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="369"/>
<translation>Klasör veya içerisindeki bir dosya farklı bir program içerisinde açık olduğundan, kaldırma ve yedekleme işlemi yapılamıyor. Lütfen klasör veya dosyayı kapatıp yeniden deneyin veya kurulumu iptal edin.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="540"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Yerel eşitleme klasörü %1 başarıyla oluşturuldu!</b></font></translation>
</message>
<message>
<location filename="../src/libsync/propagateuploadng.cpp" line="461"/>
<source>Unexpected return code from server (%1)</source>
- <translation type="unfinished"/>
+ <translation>(%1) Sunucusundan bilinmeyen dönüş kodu </translation>
</message>
<message>
<location filename="../src/libsync/propagateuploadng.cpp" line="468"/>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
<source>Could not open email client</source>
- <translation type="unfinished"/>
+ <translation>E posta istemcisi açılamadı</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.cpp" line="505"/>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="120"/>
<source>Success.</source>
<translation>Başarılı.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="127"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSync günlük dosyasını yükleyemedi. Günlük dosyası bozuk.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="130"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>Csync için %1 eklentisi yüklenemedi.<br/>Lütfen kurulumu doğrulayın!</p></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync dahili ağaçları işlerken bir hata ile karşılaştı.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync bellek ayıramadı.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync fatal parameter error.</source>
<translation>CSync ciddi parametre hatası.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync processing step update failed.</source>
<translation>CSync güncelleme süreç adımı başarısız.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync uzlaştırma süreç adımı başarısız.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync vekil sunucuda kimlik doğrulayamadı.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync bir vekil veya sunucu ararken başarısız oldu.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync %1 sunucusunda kimlik doğrularken başarısız oldu.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync ağa bağlanamadı.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>A network connection timeout happened.</source>
<translation>Bir ağ zaman aşımı meydana geldi.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>A HTTP transmission error happened.</source>
<translation>Bir HTTP aktarım hatası oluştu.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation>Bağlanan dizin geçici olarak sunucuda mevcut değil</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>An error occurred while opening a folder</source>
<translation>Klasör açılırken bir hata oluştu</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="197"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Error while reading folder.</source>
<translation>Klasör okunurken hata oluştu.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="477"/>
+ <location filename="../src/libsync/syncengine.cpp" line="476"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>Dosya/Klasör gizli olduğu için yoksayıldı.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="738"/>
+ <location filename="../src/libsync/syncengine.cpp" line="737"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Sadece %1 mevcut, Çalıştırmak için en az %2 gerekmektedir</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1206"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Üst dizin ekleme yetkiniz olmadığından izin verilmedi</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1213"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Bu klasöre dosya ekleme yetkiniz olmadığından izin verilmedi</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: %1 sunucusunda kullanılabilir alan yok.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>CSync belirtilmemiş hata.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Kullanıcı tarafından iptal edildi</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>CSync failed to access</source>
<translation>CSync erişimde başarısız oldu</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="123"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation>CSync, günlük dosyası yüklenemedi veya oluşturalamadı. Lütfen yerel eşitleme dizininde okuma ve yazma izinleriniz olduğundan emin olun.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation>CSync ele alınmayan izin reddinden dolayı başarısız.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync tried to create a folder that already exists.</source>
<translation>CSync, zaten mevcut olan bir klasör oluşturmaya çalıştı.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>The service is temporarily unavailable</source>
<translation>Hizmet geçiçi olarak kullanılamıyor</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>Access is forbidden</source>
<translation>Erişim yasak</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="202"/>
+ <location filename="../src/libsync/syncengine.cpp" line="201"/>
<source>An internal error number %1 occurred.</source>
<translation>%1 numaralı dahili bir hata oluştu </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="266"/>
+ <location filename="../src/libsync/syncengine.cpp" line="265"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Bu öge, önceki hatalardan dolayı eşitlenemiyor: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="445"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Sembolik bağlantılar eşitlemede desteklenmiyor.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="449"/>
+ <location filename="../src/libsync/syncengine.cpp" line="448"/>
<source>File is listed on the ignore list.</source>
<translation>Dosya yoksayma listesinde.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="453"/>
+ <location filename="../src/libsync/syncengine.cpp" line="452"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="463"/>
+ <location filename="../src/libsync/syncengine.cpp" line="462"/>
<source>File names containing the character '%1' are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="466"/>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
<source>The file name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="471"/>
+ <location filename="../src/libsync/syncengine.cpp" line="470"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="474"/>
+ <location filename="../src/libsync/syncengine.cpp" line="473"/>
<source>Filename is too long.</source>
<translation>Dosya adı çok uzun.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="483"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Stat failed.</source>
<translation>Durum alma başarısız.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="510"/>
+ <location filename="../src/libsync/syncengine.cpp" line="509"/>
<source>Filename encoding is not valid</source>
<translation>Dosya adı kodlaması geçerli değil</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="678"/>
+ <location filename="../src/libsync/syncengine.cpp" line="677"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Geçersiz karakterler, lütfen "%1" yerine yeni bir isim girin</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="774"/>
+ <location filename="../src/libsync/syncengine.cpp" line="773"/>
<source>Unable to initialize a sync journal.</source>
<translation>Bir eşitleme günlüğü başlatılamadı.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="793"/>
+ <location filename="../src/libsync/syncengine.cpp" line="792"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Yerel veritabanından kara liste okunamadı</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="830"/>
+ <location filename="../src/libsync/syncengine.cpp" line="829"/>
<source>Unable to read from the sync journal.</source>
<translation>Eşitleme günlüğünden okunamadı.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="875"/>
+ <location filename="../src/libsync/syncengine.cpp" line="874"/>
<source>Cannot open the sync journal</source>
<translation>Eşitleme günlüğü açılamıyor</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="933"/>
+ <location filename="../src/libsync/syncengine.cpp" line="932"/>
<source>File name contains at least one invalid character</source>
<translation>Dosya adı en az bir geçersiz karakter içeriyor</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
- <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1172"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>"Eşitlenecekleri seçin" kara listesinde olduğundan yoksayıldı.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1191"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Bu dizine alt dizin ekleme yetkiniz olmadığından izin verilmedi</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1232"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Sunucuda salt okunur olduğundan, bu dosya yüklenemedi, geri alınıyor</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1249"/>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1267"/>
<source>Not allowed to remove, restoring</source>
<translation>Kaldırmaya izin verilmedi, geri alınıyor</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1280"/>
<source>Local files and share folder removed.</source>
<translation>Yerel dosyalar ve paylaşım klasörü kaldırıldı.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1336"/>
<source>Move not allowed, item restored</source>
<translation>Taşımaya izin verilmedi, öge geri alındı</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1347"/>
<source>Move not allowed because %1 is read-only</source>
<translation>%1 salt okunur olduğundan taşımaya izin verilmedi</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the destination</source>
<translation>hedef</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the source</source>
<translation>kaynak</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="300"/>
+ <location filename="../src/libsync/theme.cpp" line="309"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Sürüm %1. Daha fazla bilgi için lütfen <a href='%2'>%3</a> adresini ziyaret edin.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="304"/>
+ <location filename="../src/libsync/theme.cpp" line="313"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="305"/>
+ <location filename="../src/libsync/theme.cpp" line="314"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>%1 tarafından dağıtılmış ve GNU Genel Kamu Lisansı (GPL) Sürüm 2.0 ile lisanslanmıştır.<br/>%2 ve %2 logoları ABD ve/veya diğer ülkelerde %1 tescili markalarıdır.</p></translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="730"/>
<source>New account...</source>
- <translation type="unfinished"/>
+ <translation>Yeni hesap...</translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="748"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="250"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="352"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="379"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="402"/>
<source>TextLabel</source>
<translation>MetinEtiketi</translation>
</message>
<translation>Temiz bir &eşitleme başlat (Yerel klasörü siler!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="295"/>
+ <source>Ask for confirmation before synchroni&zing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="321"/>
+ <source>Ask for confirmation before synchronizing e&xternal storages</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="345"/>
<source>Choose what to sync</source>
<translation>Ne eşitleneceğini seçin</translation>
</message>
<translation>&Yerel veriyi sakla</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>S&ync everything from server</source>
<translation>Sunucudaki her şeyi &eşitle</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
<source>Status message</source>
<translation>Durum iletisi</translation>
</message>
<location filename="../src/gui/owncloudsetuppage.ui" line="129"/>
<location filename="../src/gui/owncloudsetuppage.ui" line="156"/>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="190"/>
<source>TextLabel</source>
<translation>MetinEtiketi</translation>
</message>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="83"/>
- <source>Server &Address</source>
- <translation>Sunucu &Adresi</translation>
+ <source>Ser&ver Address</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="99"/>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="286"/>
+ <location filename="../src/libsync/theme.cpp" line="295"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small><a href="%1">%2</a> Git gözden geçirmesi ile %3, %4 tarihinde, Qt %5, %6 kullanılarak derlendi.</small></p></translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="189"/>
<source>Synchronize all</source>
- <translation type="unfinished"/>
+ <translation>Синхронізувати все</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="196"/>
<source>Synchronize none</source>
- <translation type="unfinished"/>
+ <translation>Не синхронізувати нічого</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="203"/>
<source>Apply manual changes</source>
- <translation type="unfinished"/>
+ <translation>Застосувати ручні зміни</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="251"/>
<message>
<location filename="../src/gui/accountsettings.ui" line="238"/>
<location filename="../src/gui/accountsettings.cpp" line="371"/>
- <location filename="../src/gui/accountsettings.cpp" line="728"/>
+ <location filename="../src/gui/accountsettings.cpp" line="733"/>
<source>Cancel</source>
<translation>Скасувати</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="235"/>
<source>Force sync now</source>
- <translation type="unfinished"/>
+ <translation>Примусово синхронізувати зараз</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="237"/>
<source>Restart sync</source>
- <translation type="unfinished"/>
+ <translation>Перезапустити синхронізацію</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="246"/>
<translation>Увійти</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="678"/>
- <source>There are new folders that were not synchronized because they are too big: </source>
+ <location filename="../src/gui/accountsettings.cpp" line="680"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="681"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="720"/>
+ <location filename="../src/gui/accountsettings.cpp" line="725"/>
<source>Confirm Account Removal</source>
<translation>Підтвердіть видалення облікового запису</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="721"/>
+ <location filename="../src/gui/accountsettings.cpp" line="726"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="727"/>
+ <location filename="../src/gui/accountsettings.cpp" line="732"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="243"/>
<source>Resume sync</source>
- <translation type="unfinished"/>
+ <translation>Відновити синхронізацію</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="243"/>
<source>Pause sync</source>
- <translation type="unfinished"/>
+ <translation>Призупинити синхронізацію</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="365"/>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="600"/>
<source>Aborted by the user</source>
<translation>Скасовано користувачем</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="139"/>
<source>Local folder %1 does not exist.</source>
<translation>Локальна тека %1 не існує.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="142"/>
<source>%1 should be a folder but is not.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="144"/>
+ <location filename="../src/gui/folder.cpp" line="145"/>
<source>%1 is not readable.</source>
<translation>%1 не читається.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="367"/>
+ <location filename="../src/gui/folder.cpp" line="368"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 видалено.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="374"/>
+ <location filename="../src/gui/folder.cpp" line="375"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 завантажено.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="382"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 оновлено.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="388"/>
+ <location filename="../src/gui/folder.cpp" line="389"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 перейменовано на %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="395"/>
+ <location filename="../src/gui/folder.cpp" line="396"/>
<source>%1 has been moved to %2.</source>
<translation>%1 переміщено в %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="365"/>
+ <location filename="../src/gui/folder.cpp" line="366"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="372"/>
+ <location filename="../src/gui/folder.cpp" line="373"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="379"/>
+ <location filename="../src/gui/folder.cpp" line="380"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="386"/>
+ <location filename="../src/gui/folder.cpp" line="387"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="393"/>
+ <location filename="../src/gui/folder.cpp" line="394"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="400"/>
+ <location filename="../src/gui/folder.cpp" line="401"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="402"/>
+ <location filename="../src/gui/folder.cpp" line="403"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="407"/>
+ <location filename="../src/gui/folder.cpp" line="408"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="409"/>
+ <location filename="../src/gui/folder.cpp" line="410"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 не може синхронізуватися через помилки. Дивіться деталі в журналі.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="415"/>
+ <location filename="../src/gui/folder.cpp" line="416"/>
<source>Sync Activity</source>
<translation>Журнал синхронізації</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="642"/>
+ <location filename="../src/gui/folder.cpp" line="643"/>
<source>Could not read system exclude file</source>
<translation>Неможливо прочитати виключений системний файл</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="850"/>
+ <location filename="../src/gui/folder.cpp" line="854"/>
<source>A new folder larger than %1 MB has been added: %2.
-Please go in the settings to select it if you wish to download it.</source>
+</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="888"/>
+ <location filename="../src/gui/folder.cpp" line="856"/>
+ <source>A folder from an external storage has been added.
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="857"/>
+ <source>Please go in the settings to select it if you wish to download it.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="893"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="892"/>
+ <location filename="../src/gui/folder.cpp" line="897"/>
<source>Remove All Files?</source>
<translation>Видалити усі файли?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="894"/>
+ <location filename="../src/gui/folder.cpp" line="899"/>
<source>Remove all files</source>
<translation>Видалити усі файли</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="895"/>
+ <location filename="../src/gui/folder.cpp" line="900"/>
<source>Keep files</source>
<translation>Зберегти файли</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="911"/>
+ <location filename="../src/gui/folder.cpp" line="916"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="916"/>
+ <location filename="../src/gui/folder.cpp" line="921"/>
<source>Backup detected</source>
<translation>Резервну копію знайдено</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="918"/>
+ <location filename="../src/gui/folder.cpp" line="923"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="919"/>
+ <location filename="../src/gui/folder.cpp" line="924"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1245"/>
<source>Waiting to start syncing.</source>
- <translation type="unfinished"/>
+ <translation>Очікування початку синхронізації.</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1248"/>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="140"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="148"/>
<source>You need to be connected to add a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="150"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="158"/>
<source>Click this button to add a folder to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
<source>%1 (%2)</source>
<extracomment>Example text: "File.txt (23KB)"</extracomment>
- <translation type="unfinished"/>
+ <translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="180"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="188"/>
<source>Error while loading the list of folders from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="218"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="226"/>
<source>Signed out</source>
<translation>Вийшов</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="145"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="153"/>
<source>Adding folder is disabled because you are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="183"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="191"/>
<source>Fetching folder list from server...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>Checking for changes in '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="868"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
<source>, '%1'</source>
<extracomment>Build a list of file names</extracomment>
<translation>, '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="871"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="900"/>
<source>'%1'</source>
<extracomment>Argument is a file name</extracomment>
<translation>'%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="896"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="925"/>
<source>Syncing %1</source>
<extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="908"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="927"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="937"/>
<source>, </source>
<translation>,</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="931"/>
<source>download %1/s</source>
<extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation type="unfinished"/>
+ <translation>завантаження %1/с</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="933"/>
<source>u2193 %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="911"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>upload %1/s</source>
<extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
- <translation type="unfinished"/>
+ <translation>відвантаження %1/с</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="913"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="942"/>
<source>u2191 %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="918"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 of %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="922"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="951"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="948"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="954"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="983"/>
<source>file %1 of %2</source>
<translation>файл %1 з %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/>
<source>Waiting...</source>
<translation>Очікування...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="998"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1027"/>
<source>Waiting for %n other folder(s)...</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1033"/>
<source>Preparing to sync...</source>
<translation type="unfinished"/>
</message>
<translation>Додатково</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="101"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
+ <source>Ask for confirmation before synchronizing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="105"/>
<source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation>MB</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
<translation type="unfinished"/>
</message>
<message>
<translation>Використовувати &монохромні піктограми</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="59"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit &Ignored Files</source>
<translation>Редагувати &ігноровані файли</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
- <source>Ask &confirmation before downloading folders larger than</source>
- <translation>Запитувати &підтвердження перед завантаженням тек більших за</translation>
- </message>
- <message>
- <location filename="../src/gui/generalsettings.ui" line="129"/>
+ <location filename="../src/gui/generalsettings.ui" line="140"/>
<source>S&how crash reporter</source>
<translation type="unfinished"/>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="150"/>
<location filename="../src/gui/generalsettings.ui" line="156"/>
- <location filename="../src/gui/generalsettings.ui" line="162"/>
<source>About</source>
<translation>Про</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="172"/>
+ <location filename="../src/gui/generalsettings.ui" line="166"/>
<source>Updates</source>
<translation>Оновлення</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="197"/>
+ <location filename="../src/gui/generalsettings.ui" line="191"/>
<source>&Restart && Update</source>
<translation>&Перезавантаження && Оновлення</translation>
</message>
<translation>Підключення ...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="144"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="159"/>
<source>%1 folder '%2' is synced to local folder '%3'</source>
<translation>%1 тека '%2' синхронізована з локальним каталогом '%3'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="162"/>
<source>Sync the folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="152"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="167"/>
<source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="251"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/>
<source>Local Sync Folder</source>
<translation>Локальна Тека для Синхронізації</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="311"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="317"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="212"/>
<source>Invalid URL</source>
- <translation type="unfinished"/>
+ <translation>Невірний URL</translation>
</message>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="369"/>
<translation>Неможливо видалити теку та створити її резервну копію, оскільки тека або файли, що в ній розташовані, використовуються. Будь ласка, закрийте всі програми, що можуть використовувати цю теку та спробуйте ще раз, або скасуйте встановлення.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="540"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Локальна тека синхронізації %1 успішно створена!</b></font></translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>File was deleted from server</source>
- <translation type="unfinished"/>
+ <translation>Файл видалено з сервера</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="547"/>
<message>
<location filename="../src/gui/proxyauthdialog.ui" line="36"/>
<source>Proxy:</source>
- <translation type="unfinished"/>
+ <translation>Проксі:</translation>
</message>
<message>
<location filename="../src/gui/proxyauthdialog.ui" line="43"/>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="120"/>
<source>Success.</source>
<translation>Успішно.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="127"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSync не вдалося завантажити файл журналу. Файл журналу пошкоджений.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="130"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>Не вдалося завантажити плагін для синхронізації %1.<br/>Будь ласка, перевірте його встановлення!</p></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<source>CSync got an error while processing internal trees.</source>
<translation>У CSync виникла помилка під час сканування внутрішньої структури каталогів.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync не вдалося зарезервувати пам'ять.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync fatal parameter error.</source>
<translation>У CSync сталася фатальна помилка параметра.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync processing step update failed.</source>
<translation>CSync не вдалася зробити оновлення .</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync не вдалася зробити врегулювання.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync не вдалося аутентифікуватися на проксі-сервері.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync не вдалося знайти Проксі або Сервер.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync не вдалося аутентифікуватися на %1 сервері.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync не вдалося приєднатися до мережі.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>A network connection timeout happened.</source>
<translation>Час під'єднання до мережі вичерпався.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>A HTTP transmission error happened.</source>
<translation>Сталася помилка передачі даних по HTTP.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>An error occurred while opening a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="197"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Error while reading folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="477"/>
+ <location filename="../src/libsync/syncengine.cpp" line="476"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="738"/>
+ <location filename="../src/libsync/syncengine.cpp" line="737"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Доступно лише %1, для початку необхідно хоча б %2</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1206"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1213"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: на сервері %1 скінчилося місце.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>Невизначена помилка CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>Скасовано користувачем</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>CSync failed to access</source>
<translation>CSync не вдалося отримати доступ</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="123"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>The service is temporarily unavailable</source>
<translation>Служба тимчасово недоступна</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>Access is forbidden</source>
<translation>Доступ заборонений</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="202"/>
+ <location filename="../src/libsync/syncengine.cpp" line="201"/>
<source>An internal error number %1 occurred.</source>
<translation>Виникла внутрішня помилка за номером %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="266"/>
+ <location filename="../src/libsync/syncengine.cpp" line="265"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Шлях не синхронізується через помилки: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="445"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Синхронізація символічних посилань не підтримується. </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="449"/>
+ <location filename="../src/libsync/syncengine.cpp" line="448"/>
<source>File is listed on the ignore list.</source>
<translation>Файл присутній у списку ігнорованих.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="453"/>
+ <location filename="../src/libsync/syncengine.cpp" line="452"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="463"/>
+ <location filename="../src/libsync/syncengine.cpp" line="462"/>
<source>File names containing the character '%1' are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="466"/>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
<source>The file name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="471"/>
+ <location filename="../src/libsync/syncengine.cpp" line="470"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="474"/>
+ <location filename="../src/libsync/syncengine.cpp" line="473"/>
<source>Filename is too long.</source>
<translation>Шлях до файлу занадто довгий.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="483"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Stat failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="510"/>
+ <location filename="../src/libsync/syncengine.cpp" line="509"/>
<source>Filename encoding is not valid</source>
<translation>Кодування файлу не припустиме</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="678"/>
+ <location filename="../src/libsync/syncengine.cpp" line="677"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="774"/>
+ <location filename="../src/libsync/syncengine.cpp" line="773"/>
<source>Unable to initialize a sync journal.</source>
<translation>Не вдалося ініціалізувати протокол синхронізації.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="793"/>
+ <location filename="../src/libsync/syncengine.cpp" line="792"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="830"/>
+ <location filename="../src/libsync/syncengine.cpp" line="829"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="875"/>
+ <location filename="../src/libsync/syncengine.cpp" line="874"/>
<source>Cannot open the sync journal</source>
<translation>Не вдається відкрити протокол синхронізації</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="933"/>
+ <location filename="../src/libsync/syncengine.cpp" line="932"/>
<source>File name contains at least one invalid character</source>
<translation>Ім’я файлу містить принаймні один некоректний символ</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
- <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1172"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ігнорується через чорний список в "обрати що синхронізувати"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1191"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Заборонено через відсутність прав додавання підкаталогів в цю теку.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1232"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Не дозволено завантажувати цей файл, оскільки він має дозвіл лише на перегляд, відновлюємо</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1249"/>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1267"/>
<source>Not allowed to remove, restoring</source>
<translation>Не дозволено видаляти, відновлюємо</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1280"/>
<source>Local files and share folder removed.</source>
<translation>Локальні файли та теки в загальному доступі було видалено.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1336"/>
<source>Move not allowed, item restored</source>
<translation>Переміщення не дозволено, елемент відновлено </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1347"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Переміщення не дозволено, оскільки %1 помічений тільки для перегляду</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the destination</source>
<translation>призначення</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the source</source>
<translation>джерело</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="300"/>
+ <location filename="../src/libsync/theme.cpp" line="309"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Версія %1. Для отримання більш детальної інформації, будь ласка, відвідайте <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="304"/>
+ <location filename="../src/libsync/theme.cpp" line="313"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="305"/>
+ <location filename="../src/libsync/theme.cpp" line="314"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Поширюється через %1 і під ліцензією GNU General Public License (GPL) версії 2.0<br/>%2 логотип %2 є зареєстрованими торговими марками %1 у Сполучених Штатах та інших країнах, або обох.</p></translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="730"/>
<source>New account...</source>
- <translation type="unfinished"/>
+ <translation>Новий обліковий запис...</translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="748"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="250"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="352"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="379"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="402"/>
<source>TextLabel</source>
<translation>Мітка</translation>
</message>
<translation>Почати синхронізацію &заново (Видалить локальну теку!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="295"/>
+ <source>Ask for confirmation before synchroni&zing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="321"/>
+ <source>Ask for confirmation before synchronizing e&xternal storages</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="345"/>
<source>Choose what to sync</source>
<translation>Оберіть, що хочете синхронізувати</translation>
</message>
<translation>&Зберегти локальні дані</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>S&ync everything from server</source>
<translation>Синхронізувати все з сервером</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
<source>Status message</source>
<translation>Повідомлення про статус</translation>
</message>
<location filename="../src/gui/owncloudsetuppage.ui" line="129"/>
<location filename="../src/gui/owncloudsetuppage.ui" line="156"/>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="190"/>
<source>TextLabel</source>
<translation>Мітка</translation>
</message>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="83"/>
- <source>Server &Address</source>
- <translation>&Адреса сервера</translation>
+ <source>Ser&ver Address</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="99"/>
<message>
<location filename="../src/libsync/utility.cpp" line="502"/>
<source>in the future</source>
- <translation type="unfinished"/>
+ <translation>у майбутньому</translation>
</message>
<message numerus="yes">
<location filename="../src/libsync/utility.cpp" line="498"/>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="286"/>
+ <location filename="../src/libsync/theme.cpp" line="295"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Зібрано з Git ревізії <a href="%1">%2</a> %3, %4, використовуючи Qt %5, %6</small></p></translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="238"/>
<location filename="../src/gui/accountsettings.cpp" line="371"/>
- <location filename="../src/gui/accountsettings.cpp" line="728"/>
+ <location filename="../src/gui/accountsettings.cpp" line="733"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
<translation>登录</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="678"/>
- <source>There are new folders that were not synchronized because they are too big: </source>
- <translation>部分新文件夹没有被同步，因为文件过大：</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="680"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="681"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="720"/>
+ <location filename="../src/gui/accountsettings.cpp" line="725"/>
<source>Confirm Account Removal</source>
<translation>确认删除账号</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="721"/>
+ <location filename="../src/gui/accountsettings.cpp" line="726"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>你确定要删除账号的连接？ <i>%1</i>?</p><p><b>Note:</b> 这 <b>不会</b> 删除任何文件</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="727"/>
+ <location filename="../src/gui/accountsettings.cpp" line="732"/>
<source>Remove connection</source>
<translation>删除连接</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="600"/>
<source>Aborted by the user</source>
<translation>用户撤销</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="139"/>
<source>Local folder %1 does not exist.</source>
<translation>本地文件夹 %1 不存在。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="142"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 应该是一个文件夹，但是它现在不是文件夹</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="144"/>
+ <location filename="../src/gui/folder.cpp" line="145"/>
<source>%1 is not readable.</source>
<translation>%1 不可读。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="367"/>
+ <location filename="../src/gui/folder.cpp" line="368"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 已移除。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="374"/>
+ <location filename="../src/gui/folder.cpp" line="375"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 已下载。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="382"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 已更新。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="388"/>
+ <location filename="../src/gui/folder.cpp" line="389"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 已更名为 %2。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="395"/>
+ <location filename="../src/gui/folder.cpp" line="396"/>
<source>%1 has been moved to %2.</source>
<translation>%1 已移动至 %2。</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="365"/>
+ <location filename="../src/gui/folder.cpp" line="366"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 和 %n 其它文件已被移除。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="372"/>
+ <location filename="../src/gui/folder.cpp" line="373"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 和 %n 其它文件已下载。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="379"/>
+ <location filename="../src/gui/folder.cpp" line="380"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 和 %n 其它文件已更新。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="386"/>
+ <location filename="../src/gui/folder.cpp" line="387"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 已经更名为 %2，其它 %3 文件也已更名。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="393"/>
+ <location filename="../src/gui/folder.cpp" line="394"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 已移动到 %2，其它 %3 文件也已移动。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="400"/>
+ <location filename="../src/gui/folder.cpp" line="401"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 和 %n 其他文件有同步冲突。</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="402"/>
+ <location filename="../src/gui/folder.cpp" line="403"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 有同步冲突。请检查冲突文件！</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="407"/>
+ <location filename="../src/gui/folder.cpp" line="408"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 和 %n 其他文件由于错误不能同步。详细信息请查看日志。</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="409"/>
+ <location filename="../src/gui/folder.cpp" line="410"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 同步出错。详情请查看日志。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="415"/>
+ <location filename="../src/gui/folder.cpp" line="416"/>
<source>Sync Activity</source>
<translation>同步活动</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="642"/>
+ <location filename="../src/gui/folder.cpp" line="643"/>
<source>Could not read system exclude file</source>
<translation>无法读取系统排除的文件</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="850"/>
+ <location filename="../src/gui/folder.cpp" line="854"/>
<source>A new folder larger than %1 MB has been added: %2.
-Please go in the settings to select it if you wish to download it.</source>
- <translation>新文件夹 %2 添加成功，大于 %1 MB。
-请前往设置选择是否下载。</translation>
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="856"/>
+ <source>A folder from an external storage has been added.
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="857"/>
+ <source>Please go in the settings to select it if you wish to download it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="888"/>
+ <location filename="../src/gui/folder.cpp" line="893"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
你确定执行该操作吗？</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="892"/>
+ <location filename="../src/gui/folder.cpp" line="897"/>
<source>Remove All Files?</source>
<translation>删除所有文件？</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="894"/>
+ <location filename="../src/gui/folder.cpp" line="899"/>
<source>Remove all files</source>
<translation>删除所有文件</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="895"/>
+ <location filename="../src/gui/folder.cpp" line="900"/>
<source>Keep files</source>
<translation>保持所有文件</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="911"/>
+ <location filename="../src/gui/folder.cpp" line="916"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="916"/>
+ <location filename="../src/gui/folder.cpp" line="921"/>
<source>Backup detected</source>
<translation>备份已删除</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="918"/>
+ <location filename="../src/gui/folder.cpp" line="923"/>
<source>Normal Synchronisation</source>
<translation>正常同步</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="919"/>
+ <location filename="../src/gui/folder.cpp" line="924"/>
<source>Keep Local Files as Conflict</source>
<translation>保留本地文件为冲突文件</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="140"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="148"/>
<source>You need to be connected to add a folder</source>
<translation>请先登录后再添加文件夹</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="150"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="158"/>
<source>Click this button to add a folder to synchronize.</source>
<translation>点击选择进行同步的本地文件夹。</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
<source>%1 (%2)</source>
<extracomment>Example text: "File.txt (23KB)"</extracomment>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="180"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="188"/>
<source>Error while loading the list of folders from the server.</source>
<translation>载入文件夹列表时发生错误。</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="218"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="226"/>
<source>Signed out</source>
<translation>已登出</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="145"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="153"/>
<source>Adding folder is disabled because you are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
<translation>你已经设置同步了你的所有文件，无法同步另一文件夹。要同步多个文件夹，请取消当前设置的根文件夹同步。</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="183"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="191"/>
<source>Fetching folder list from server...</source>
<translation>获取文件夹列表...</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>Checking for changes in '%1'</source>
<translation>在 %1 检查更改</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="868"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
<source>, '%1'</source>
<extracomment>Build a list of file names</extracomment>
<translation>, '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="871"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="900"/>
<source>'%1'</source>
<extracomment>Argument is a file name</extracomment>
<translation>'%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="896"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="925"/>
<source>Syncing %1</source>
<extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment>
<translation>正在同步 %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="908"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="927"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="937"/>
<source>, </source>
<translation>，</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="931"/>
<source>download %1/s</source>
<extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>下载 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="933"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/秒</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="911"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>upload %1/s</source>
<extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>上传 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="913"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="942"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/秒</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="918"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 / %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="922"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="951"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>剩余: %5，%1 / %2, 文件数量 %3 / %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="948"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 of %2, file %3 of %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="954"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="983"/>
<source>file %1 of %2</source>
<translation>第 %1 个文件，共 %2 个</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/>
<source>Waiting...</source>
<translation>请稍等...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="998"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1027"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>等待 %n 个其他文件(文件夹)</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1033"/>
<source>Preparing to sync...</source>
<translation>准备同步...</translation>
</message>
<translation>高级</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="101"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
+ <source>Ask for confirmation before synchronizing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="105"/>
<source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/generalsettings.ui" line="26"/>
<source>&Launch on System Startup</source>
<translation>使用单色图标</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="59"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit &Ignored Files</source>
<translation>编辑忽略的文件</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
- <source>Ask &confirmation before downloading folders larger than</source>
- <translation>提醒并需要我确认，当下载文件夹大于</translation>
- </message>
- <message>
- <location filename="../src/gui/generalsettings.ui" line="129"/>
+ <location filename="../src/gui/generalsettings.ui" line="140"/>
<source>S&how crash reporter</source>
<translation>显示崩溃报告器</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="150"/>
<location filename="../src/gui/generalsettings.ui" line="156"/>
- <location filename="../src/gui/generalsettings.ui" line="162"/>
<source>About</source>
<translation>关于</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="172"/>
+ <location filename="../src/gui/generalsettings.ui" line="166"/>
<source>Updates</source>
<translation>更新</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="197"/>
+ <location filename="../src/gui/generalsettings.ui" line="191"/>
<source>&Restart && Update</source>
<translation>重启并更新 (&R)</translation>
</message>
<translation>连接...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="144"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="159"/>
<source>%1 folder '%2' is synced to local folder '%3'</source>
<translation>%1 文件夹 '%2' 将被同步到本地文件夹 '%3'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="162"/>
<source>Sync the folder '%1'</source>
<translation>同步文件夹 %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="152"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="167"/>
<source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
<translation><p><small><strong>警告：</strong> 本地目录非空。选择一个操作！</small></p></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="251"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/>
<source>Local Sync Folder</source>
<translation>本地同步文件夹</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="311"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="317"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
<translation>无法移除和备份文件夹，由于文件夹或文件正在被另一程序占用。请关闭程序后重试，或取消安装。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="540"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>本地同步目录 %1 已成功创建</b></font></translation>
</message>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="120"/>
<source>Success.</source>
<translation>成功。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="127"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSync同步无法载入日志文件。日志文件已损坏。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="130"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>csync 的 %1 插件不能加载。<br/>请校验安装！</p></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync 在处理内部文件树时出错。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync 失败，内存不足。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync fatal parameter error.</source>
<translation>CSync 致命参数错误。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync processing step update failed.</source>
<translation>CSync 处理步骤更新失败。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync 处理步骤调和失败。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync 代理认证失败。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync 无法查询代理或服务器。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync 于 %1 服务器认证失败。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync 联网失败。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>A network connection timeout happened.</source>
<translation>网络连接超时。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>A HTTP transmission error happened.</source>
<translation>HTTP 传输错误。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation>该文件夹在服务器上不可用</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>An error occurred while opening a folder</source>
<translation>打开目录失败</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="197"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Error while reading folder.</source>
<translation>读取目录时出错</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="477"/>
+ <location filename="../src/libsync/syncengine.cpp" line="476"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>已忽略隐藏的文件和文件夹。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="738"/>
+ <location filename="../src/libsync/syncengine.cpp" line="737"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>仅有 %1 有效，至少需要 %2 才能开始</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1206"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>你没有权限增加父目录</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1213"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>你没有权限增加文件</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync：%1 服务器空间已满。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>CSync 未定义错误。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>用户撤销</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>CSync failed to access</source>
<translation>访问 CSync 失败</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="123"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation>Csync同步失败，请确定是否有本地同步目录的读写权</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation>出于未处理的权限拒绝，CSync 失败。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync tried to create a folder that already exists.</source>
<translation>CSync 尝试创建了已有的文件夹。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>The service is temporarily unavailable</source>
<translation>服务暂时不可用</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>Access is forbidden</source>
<translation>访问被拒绝</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="202"/>
+ <location filename="../src/libsync/syncengine.cpp" line="201"/>
<source>An internal error number %1 occurred.</source>
<translation>发生内部错误 %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="266"/>
+ <location filename="../src/libsync/syncengine.cpp" line="265"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>文件没有被同步因为之前的错误: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="445"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>符号链接不被同步支持。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="449"/>
+ <location filename="../src/libsync/syncengine.cpp" line="448"/>
<source>File is listed on the ignore list.</source>
<translation>文件在忽略列表中。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="453"/>
+ <location filename="../src/libsync/syncengine.cpp" line="452"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="463"/>
+ <location filename="../src/libsync/syncengine.cpp" line="462"/>
<source>File names containing the character '%1' are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="466"/>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
<source>The file name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="471"/>
+ <location filename="../src/libsync/syncengine.cpp" line="470"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="474"/>
+ <location filename="../src/libsync/syncengine.cpp" line="473"/>
<source>Filename is too long.</source>
<translation>文件名过长。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="483"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Stat failed.</source>
<translation>状态失败。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="510"/>
+ <location filename="../src/libsync/syncengine.cpp" line="509"/>
<source>Filename encoding is not valid</source>
<translation>文件名编码无效</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="678"/>
+ <location filename="../src/libsync/syncengine.cpp" line="677"/>
<source>Invalid characters, please rename "%1"</source>
<translation>无效的字符，请更改为 “%1”</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="774"/>
+ <location filename="../src/libsync/syncengine.cpp" line="773"/>
<source>Unable to initialize a sync journal.</source>
<translation>无法初始化同步日志</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="793"/>
+ <location filename="../src/libsync/syncengine.cpp" line="792"/>
<source>Unable to read the blacklist from the local database</source>
<translation>无法从本地数据库读取黑名单</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="830"/>
+ <location filename="../src/libsync/syncengine.cpp" line="829"/>
<source>Unable to read from the sync journal.</source>
<translation>无法读取同步日志。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="875"/>
+ <location filename="../src/libsync/syncengine.cpp" line="874"/>
<source>Cannot open the sync journal</source>
<translation>无法打开同步日志</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="933"/>
+ <location filename="../src/libsync/syncengine.cpp" line="932"/>
<source>File name contains at least one invalid character</source>
<translation>文件名中存在至少一个非法字符</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
- <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1172"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>已忽略（“选择同步内容”黑名单）</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1191"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>你没有权限增加子目录</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1232"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>无法上传文件，因为服务器端此文件为只读，正在回退</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1249"/>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1267"/>
<source>Not allowed to remove, restoring</source>
<translation>无法删除，正在回退</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1280"/>
<source>Local files and share folder removed.</source>
<translation>本地文件和共享文件夹已被删除。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1336"/>
<source>Move not allowed, item restored</source>
<translation>无法移动，正在回退</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1347"/>
<source>Move not allowed because %1 is read-only</source>
<translation>无法移动，%1为是只读的</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the destination</source>
<translation>目标</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the source</source>
<translation>源</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="300"/>
+ <location filename="../src/libsync/theme.cpp" line="309"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>版本 %1。详情请见 <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="304"/>
+ <location filename="../src/libsync/theme.cpp" line="313"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="305"/>
+ <location filename="../src/libsync/theme.cpp" line="314"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>%1 使用GNU通用公共许可证 (GPL) 2.0。<br/>%2 以及 %2 标识已由 %1 注册使用。</p></translation>
</message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="250"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="352"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="379"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="402"/>
<source>TextLabel</source>
<translation>文本标签</translation>
</message>
<translation>开始全新同步 (将清空本地文件夹！)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="295"/>
+ <source>Ask for confirmation before synchroni&zing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="321"/>
+ <source>Ask for confirmation before synchronizing e&xternal storages</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="345"/>
<source>Choose what to sync</source>
<translation>选择同步内容</translation>
</message>
<translation>保留本地数据 (&K)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>S&ync everything from server</source>
<translation>同步服务器的所有内容 (&S)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
<source>Status message</source>
<translation>状态信息</translation>
</message>
<location filename="../src/gui/owncloudsetuppage.ui" line="129"/>
<location filename="../src/gui/owncloudsetuppage.ui" line="156"/>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="190"/>
<source>TextLabel</source>
<translation>文本标签</translation>
</message>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="83"/>
- <source>Server &Address</source>
- <translation>服务器地址 (&A)</translation>
+ <source>Ser&ver Address</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="99"/>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="286"/>
+ <location filename="../src/libsync/theme.cpp" line="295"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>从 Git 版本 <a href="%1">%2</a> 在 %3 上构建， %4 使用了 Qt %5, %6</small></p></translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="238"/>
<location filename="../src/gui/accountsettings.cpp" line="371"/>
- <location filename="../src/gui/accountsettings.cpp" line="728"/>
+ <location filename="../src/gui/accountsettings.cpp" line="733"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
<translation>登入</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="678"/>
- <source>There are new folders that were not synchronized because they are too big: </source>
- <translation>有部份的資料夾因為容量太大沒有辦法同步:</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="680"/>
+ <source>There are folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="681"/>
+ <source>There are folders that were not synchronized because they are external storages: </source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <source>There are folders that were not synchronized because they are too big or external storages: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="720"/>
+ <location filename="../src/gui/accountsettings.cpp" line="725"/>
<source>Confirm Account Removal</source>
<translation>確認移除帳號</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="721"/>
+ <location filename="../src/gui/accountsettings.cpp" line="726"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>您確定要中斷此帳號 <i>%1</i> 的連線?</p><p><b>注意:</b>此操作 <b>不會</b> 刪除任何的檔案。</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="727"/>
+ <location filename="../src/gui/accountsettings.cpp" line="732"/>
<source>Remove connection</source>
<translation>移除連線</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="600"/>
<source>Aborted by the user</source>
<translation>使用者中斷</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="138"/>
+ <location filename="../src/gui/folder.cpp" line="139"/>
<source>Local folder %1 does not exist.</source>
<translation>本地資料夾 %1 不存在</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="141"/>
+ <location filename="../src/gui/folder.cpp" line="142"/>
<source>%1 should be a folder but is not.</source>
<translation>資料夾不存在, %1 必須是資料夾</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="144"/>
+ <location filename="../src/gui/folder.cpp" line="145"/>
<source>%1 is not readable.</source>
<translation>%1 是不可讀的</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="367"/>
+ <location filename="../src/gui/folder.cpp" line="368"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 已被移除。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="374"/>
+ <location filename="../src/gui/folder.cpp" line="375"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 已被下載。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="382"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 已被更新。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="388"/>
+ <location filename="../src/gui/folder.cpp" line="389"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 已被重新命名為 %2。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="395"/>
+ <location filename="../src/gui/folder.cpp" line="396"/>
<source>%1 has been moved to %2.</source>
<translation>%1 已被搬移至 %2。</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="365"/>
+ <location filename="../src/gui/folder.cpp" line="366"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 跟 %n 其他檔案已經被刪除</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="372"/>
+ <location filename="../src/gui/folder.cpp" line="373"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 跟 %n 其他檔案已經被下載</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="379"/>
+ <location filename="../src/gui/folder.cpp" line="380"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 跟 %n 其他檔案已經被修改</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="386"/>
+ <location filename="../src/gui/folder.cpp" line="387"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="393"/>
+ <location filename="../src/gui/folder.cpp" line="394"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="400"/>
+ <location filename="../src/gui/folder.cpp" line="401"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="402"/>
+ <location filename="../src/gui/folder.cpp" line="403"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="407"/>
+ <location filename="../src/gui/folder.cpp" line="408"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="409"/>
+ <location filename="../src/gui/folder.cpp" line="410"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 因為錯誤無法被同步。請從紀錄檔觀看細節。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="415"/>
+ <location filename="../src/gui/folder.cpp" line="416"/>
<source>Sync Activity</source>
<translation>同步活動</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="642"/>
+ <location filename="../src/gui/folder.cpp" line="643"/>
<source>Could not read system exclude file</source>
<translation>無法讀取系統的排除檔案</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="850"/>
+ <location filename="../src/gui/folder.cpp" line="854"/>
<source>A new folder larger than %1 MB has been added: %2.
-Please go in the settings to select it if you wish to download it.</source>
- <translation>一個大於 %1 MB 的資料夾已經新增至: %2.
-如果您想要下載它的話，請至設定中選取。</translation>
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="856"/>
+ <source>A folder from an external storage has been added.
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folder.cpp" line="857"/>
+ <source>Please go in the settings to select it if you wish to download it.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="888"/>
+ <location filename="../src/gui/folder.cpp" line="893"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
您確定要執行這項動作?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="892"/>
+ <location filename="../src/gui/folder.cpp" line="897"/>
<source>Remove All Files?</source>
<translation>移除所有檔案?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="894"/>
+ <location filename="../src/gui/folder.cpp" line="899"/>
<source>Remove all files</source>
<translation>移除所有檔案</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="895"/>
+ <location filename="../src/gui/folder.cpp" line="900"/>
<source>Keep files</source>
<translation>保留檔案</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="911"/>
+ <location filename="../src/gui/folder.cpp" line="916"/>
<source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="916"/>
+ <location filename="../src/gui/folder.cpp" line="921"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="918"/>
+ <location filename="../src/gui/folder.cpp" line="923"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="919"/>
+ <location filename="../src/gui/folder.cpp" line="924"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="140"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="148"/>
<source>You need to be connected to add a folder</source>
<translation>您必須連上伺服器才能新增資料夾</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="150"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="158"/>
<source>Click this button to add a folder to synchronize.</source>
<translation>點擊此按鈕來新增同步資料夾</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
<source>%1 (%2)</source>
<extracomment>Example text: "File.txt (23KB)"</extracomment>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="180"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="188"/>
<source>Error while loading the list of folders from the server.</source>
<translation>從伺服器端同步資料夾清單時發生錯誤。</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="218"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="226"/>
<source>Signed out</source>
<translation>已登出</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="145"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="153"/>
<source>Adding folder is disabled because you are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
<translation>新增資料夾失敗，您已經同步您擁有的所有檔案，如果您想要同步多個資料夾，請移除當前設定的根目錄資料夾。</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="183"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="191"/>
<source>Fetching folder list from server...</source>
<translation>從伺服器抓取資料夾清單中...</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>Checking for changes in '%1'</source>
<translation>檢查 '%1' 的變動</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="868"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="897"/>
<source>, '%1'</source>
<extracomment>Build a list of file names</extracomment>
<translation>, '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="871"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="900"/>
<source>'%1'</source>
<extracomment>Argument is a file name</extracomment>
<translation>'%1'</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="896"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="925"/>
<source>Syncing %1</source>
<extracomment>Example text: "Syncing 'foo.txt', 'bar.txt'"</extracomment>
<translation>同步 %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="898"/>
- <location filename="../src/gui/folderstatusmodel.cpp" line="908"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="927"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="937"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="902"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="931"/>
<source>download %1/s</source>
<extracomment>Example text: "download 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>下載 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="904"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="933"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="911"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>upload %1/s</source>
<extracomment>Example text: "upload 24Kb/s" (%1 is replaced by 24Kb (translated))</extracomment>
<translation>上傳 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="913"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="942"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="918"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
<source>%1 %2 (%3 of %4)</source>
<extracomment>Example text: "uploading foobar.png (2MB of 2MB)"</extracomment>
<translation>%1 %2 (%3 的 %4)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="922"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="951"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="941"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="970"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="948"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="977"/>
<source>%1 of %2, file %3 of %4</source>
<extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%1 的 %2, 檔案 %3 的 %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="954"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="983"/>
<source>file %1 of %2</source>
<translation>檔案 %1 的 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="996"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1025"/>
<source>Waiting...</source>
<translation>等待中...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="998"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1027"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>正在等候 %n 的資料夾(可能不只一個)</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1033"/>
<source>Preparing to sync...</source>
<translation>正在準備同步...</translation>
</message>
<translation>進階</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="101"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
+ <source>Ask for confirmation before synchronizing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="105"/>
<source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
<translation>MB</translation>
</message>
+ <message>
+ <location filename="../src/gui/generalsettings.ui" line="127"/>
+ <source>Ask for confirmation before synchronizing external storages</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/generalsettings.ui" line="26"/>
<source>&Launch on System Startup</source>
<translation>使用&單色圖示</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="59"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit &Ignored Files</source>
<translation>編輯&被忽略的檔案</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
- <source>Ask &confirmation before downloading folders larger than</source>
- <translation>要求&確認資訊當下載的資料夾大於</translation>
- </message>
- <message>
- <location filename="../src/gui/generalsettings.ui" line="129"/>
+ <location filename="../src/gui/generalsettings.ui" line="140"/>
<source>S&how crash reporter</source>
<translation>&顯示意外回報器</translation>
</message>
<message>
+ <location filename="../src/gui/generalsettings.ui" line="150"/>
<location filename="../src/gui/generalsettings.ui" line="156"/>
- <location filename="../src/gui/generalsettings.ui" line="162"/>
<source>About</source>
<translation>關於</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="172"/>
+ <location filename="../src/gui/generalsettings.ui" line="166"/>
<source>Updates</source>
<translation>更新</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="197"/>
+ <location filename="../src/gui/generalsettings.ui" line="191"/>
<source>&Restart && Update</source>
<translation>重新啟動並更新 (&R)</translation>
</message>
<translation>連線中...</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="144"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="159"/>
<source>%1 folder '%2' is synced to local folder '%3'</source>
<translation>%1 資料夾 '%2' 與本地資料夾 '%3' 同步</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="162"/>
<source>Sync the folder '%1'</source>
<translation>同步資料夾 '%1'</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="152"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="167"/>
<source><p><small><strong>Warning:</strong> The local folder is not empty. Pick a resolution!</small></p></source>
<translation><p><small><strong>警告:</strong> 本地端的資料夾不是空的. 請選擇解決方案!</small></p></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="251"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="278"/>
<source>Local Sync Folder</source>
<translation>本地同步資料夾</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="311"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="317"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="338"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
<translation>無法移除與備份此資料夾，因為有其他的程式正在使用其中的資料夾或者檔案。請關閉使用中的資料夾或檔案並重試或者取消設定。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="540"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="542"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>本地同步資料夾 %1 建立成功!</b></font></translation>
</message>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="120"/>
<source>Success.</source>
<translation>成功。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="127"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSync 讀取歷程檔案失敗，歷程檔案已經損毀。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="130"/>
<source><p>The %1 plugin for csync could not be loaded.<br/>Please verify the installation!</p></source>
<translation><p>用於csync的套件%1</p></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync 處理內部資料樹時發生錯誤</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync 無法取得記憶體空間。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync fatal parameter error.</source>
<translation>CSync 參數錯誤。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync processing step update failed.</source>
<translation>CSync 處理步驟 "update" 失敗。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync 處理步驟 "reconcile" 失敗。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync 無法在代理伺服器認證。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync 查詢代理伺服器或伺服器失敗。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync 於伺服器 %1 認證失敗。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync 無法連接到網路。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>A network connection timeout happened.</source>
<translation>網路連線逾時。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>A HTTP transmission error happened.</source>
<translation>HTTP 傳輸錯誤。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation>掛載的資料夾暫時無法在伺服器上使用</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>An error occurred while opening a folder</source>
<translation>開啟資料夾時發生錯誤。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="197"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Error while reading folder.</source>
<translation>讀取資料夾時發生錯誤。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="477"/>
+ <location filename="../src/libsync/syncengine.cpp" line="476"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="738"/>
+ <location filename="../src/libsync/syncengine.cpp" line="737"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>目前僅有 %1 可以使用，至少需要 %2 才能開始</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1207"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1206"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>拒絕此操作，您沒有新增母資料夾的權限。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1214"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1213"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>拒絕此操作，您沒有新增檔案在此資料夾的權限。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync：伺服器 %1 沒有可用空間。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync unspecified error.</source>
<translation>CSync 未知的錯誤。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>Aborted by the user</source>
<translation>使用者中斷</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>CSync failed to access</source>
<translation>CSync 存取失敗。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="123"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation>CSync 讀取或創建歷程檔案時失敗，請確定您在此本地資料夾有讀寫的權限。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation>CSync 失敗，由於權限未處理被拒。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync tried to create a folder that already exists.</source>
<translation>CSync 試圖建立一個已經存在的資料夾。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>The service is temporarily unavailable</source>
<translation>這個服務暫時無法使用。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>Access is forbidden</source>
<translation>存取被拒</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="202"/>
+ <location filename="../src/libsync/syncengine.cpp" line="201"/>
<source>An internal error number %1 occurred.</source>
<translation>發生內部錯誤，錯誤代碼 %1。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="266"/>
+ <location filename="../src/libsync/syncengine.cpp" line="265"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>因為先前的錯誤: %1 物件沒有同步成功</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="445"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>同步不支援捷徑連結</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="449"/>
+ <location filename="../src/libsync/syncengine.cpp" line="448"/>
<source>File is listed on the ignore list.</source>
<translation>檔案被列在忽略清單。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="453"/>
+ <location filename="../src/libsync/syncengine.cpp" line="452"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="463"/>
+ <location filename="../src/libsync/syncengine.cpp" line="462"/>
<source>File names containing the character '%1' are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="466"/>
+ <location filename="../src/libsync/syncengine.cpp" line="465"/>
<source>The file name is a reserved name on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="471"/>
+ <location filename="../src/libsync/syncengine.cpp" line="470"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="474"/>
+ <location filename="../src/libsync/syncengine.cpp" line="473"/>
<source>Filename is too long.</source>
<translation>檔案名稱太長了。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="483"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Stat failed.</source>
<translation>狀態失敗。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="510"/>
+ <location filename="../src/libsync/syncengine.cpp" line="509"/>
<source>Filename encoding is not valid</source>
<translation>檔案名稱編碼是無效的</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="678"/>
+ <location filename="../src/libsync/syncengine.cpp" line="677"/>
<source>Invalid characters, please rename "%1"</source>
<translation>無效的字元，請您重新命名 "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="774"/>
+ <location filename="../src/libsync/syncengine.cpp" line="773"/>
<source>Unable to initialize a sync journal.</source>
<translation>同步處理日誌無法初始化</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="793"/>
+ <location filename="../src/libsync/syncengine.cpp" line="792"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="830"/>
+ <location filename="../src/libsync/syncengine.cpp" line="829"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="875"/>
+ <location filename="../src/libsync/syncengine.cpp" line="874"/>
<source>Cannot open the sync journal</source>
<translation>同步處理日誌無法開啟</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="933"/>
+ <location filename="../src/libsync/syncengine.cpp" line="932"/>
<source>File name contains at least one invalid character</source>
<translation>檔案名稱含有不合法的字元</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
- <location filename="../src/libsync/syncengine.cpp" line="1173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1165"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1172"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>已忽略。根據 "選擇要同步的項目"的黑名單</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1192"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1191"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>拒絕此操作，您沒有在此新增子資料夾的權限。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1233"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1232"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>拒絕上傳此檔案，此檔案在伺服器是唯讀檔，復原中</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1249"/>
- <location filename="../src/libsync/syncengine.cpp" line="1268"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1267"/>
<source>Not allowed to remove, restoring</source>
<translation>不允許刪除，復原中</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1281"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1280"/>
<source>Local files and share folder removed.</source>
<translation>本地端檔案和共享資料夾已被刪除。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1337"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1336"/>
<source>Move not allowed, item restored</source>
<translation>不允許移動，物件復原中</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1348"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1347"/>
<source>Move not allowed because %1 is read-only</source>
<translation>不允許移動，因為 %1 是唯讀的</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the destination</source>
<translation>目標</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1349"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1348"/>
<source>the source</source>
<translation>來源</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="300"/>
+ <location filename="../src/libsync/theme.cpp" line="309"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>版本 %1. 如欲得知更多資訊，請到此拜訪 <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="304"/>
+ <location filename="../src/libsync/theme.cpp" line="313"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="305"/>
+ <location filename="../src/libsync/theme.cpp" line="314"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="32"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="250"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="352"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="379"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="402"/>
<source>TextLabel</source>
<translation>文字標籤</translation>
</message>
<translation>開始清除同步(將資料從本地端刪除)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="295"/>
+ <source>Ask for confirmation before synchroni&zing folders larger than</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
+ <source>MB</source>
+ <extracomment>Trailing part of "Ask confirmation before syncing folder larger than" </extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="321"/>
+ <source>Ask for confirmation before synchronizing e&xternal storages</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="345"/>
<source>Choose what to sync</source>
<translation>選擇要同步的項目</translation>
</message>
<translation>保留本地資料 (&K)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="240"/>
<source>S&ync everything from server</source>
<translation>從伺服器同步任何東西 (&Y)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="386"/>
<source>Status message</source>
<translation>狀態訊息</translation>
</message>
<location filename="../src/gui/owncloudsetuppage.ui" line="129"/>
<location filename="../src/gui/owncloudsetuppage.ui" line="156"/>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="32"/>
- <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="187"/>
+ <location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="190"/>
<source>TextLabel</source>
<translation>文字標籤</translation>
</message>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="83"/>
- <source>Server &Address</source>
- <translation>伺服器位址 (&A)</translation>
+ <source>Ser&ver Address</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/wizard/owncloudsetupnocredspage.ui" line="99"/>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="286"/>
+ <location filename="../src/libsync/theme.cpp" line="295"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>根據Git版本號<a href="%1">%2</a>在 %3建置， %4 使用了Qt %5，%6</small></p></translation>
</message>
projects / nextcloud-desktop.git / commitdiff