</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="73"/>
+ <source>Enter your credentials to connect to the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <source>Sign in</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="89"/>
<source>Remove the account configuration from the client</source>
<translation>Elimina del client la configuració del compte </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Remove Account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="97"/>
+ <location filename="../src/gui/accountsettings.ui" line="113"/>
<source>Storage space: ...</source>
<translation>Espai d'emmagatzematze: ...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="167"/>
+ <location filename="../src/gui/accountsettings.ui" line="183"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Les carpetes desmarcades <b>s'eliminaran</b> del vostre sistema de fitxers local i ja no es sincronitzaran en aquest ordinador</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="230"/>
<source>Apply</source>
<translation>Aplica</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="198"/>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
- <location filename="../src/gui/accountsettings.cpp" line="571"/>
+ <location filename="../src/gui/accountsettings.ui" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="289"/>
+ <location filename="../src/gui/accountsettings.cpp" line="646"/>
<source>Cancel</source>
<translation>Cancel·la</translation>
</message>
<translation>Connectat amb <server> com a <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="115"/>
+ <location filename="../src/gui/accountsettings.cpp" line="121"/>
<source>No account configured.</source>
<translation>No hi ha cap compte configurat</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="161"/>
+ <source>Choose what to sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="168"/>
+ <source>Remove folder sync connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="234"/>
<source>Folder creation failed</source>
<translation>Ha fallat la creació de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="230"/>
+ <location filename="../src/gui/accountsettings.cpp" line="235"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation><p>No s'ha pogut crear la carpeta local <i>%1</i>.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="283"/>
- <source>Stop syncing</source>
- <translation>Atura la sincronització</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
+ <source>Confirm Folder Sync Connection Removal</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="309"/>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>Remove Folder Sync Connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="314"/>
<source>Confirm Folder Reset</source>
<translation>Confirmeu la reinicialització de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="310"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Voleu reiniciar la carpeta <i>%1</i> i reconstruir la base de dades del client?</p><p><b>Nota:</b> Aquesta funció existeix només per tasques de manteniment. Cap fitxer no s'eliminarà, però podria provocar-se un transit de dades significant i podria trigar diversos minuts o hores en completar-se, depenent de la mida de la carpeta. Utilitzeu aquesta opció només si us ho recomana l'administrador.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="391"/>
+ <location filename="../src/gui/accountsettings.cpp" line="396"/>
<source>Sync Running</source>
<translation>S'està sincronitzant</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="392"/>
+ <location filename="../src/gui/accountsettings.cpp" line="397"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>S'està sincronitzant.<br/>Voleu parar-la?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="472"/>
+ <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <source>%1 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="485"/>
<source>%1 as <i>%2</i></source>
<translation>%1 com a <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="476"/>
+ <location filename="../src/gui/accountsettings.cpp" line="495"/>
<source>Connected to %1.</source>
<translation>Connectat a %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="478"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>El servidor %1 no està disponible temporalment</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="480"/>
+ <location filename="../src/gui/accountsettings.cpp" line="499"/>
<source>Signed out from %1.</source>
<translation>S'ha desconnectat de %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="482"/>
+ <location filename="../src/gui/accountsettings.cpp" line="501"/>
<source>No connection to %1 at %2.</source>
<translation>No hi ha connexió amb %1 a %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
- <source>There are new folders that were not synchronized because they are too big: %1</source>
- <translation>Hi ha carpetes noves que no s'han pogut sincronitzar perquè són massa grans: %1</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="536"/>
- <source>, </source>
- <translation>, </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <source>There are new folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="563"/>
+ <location filename="../src/gui/accountsettings.cpp" line="638"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="564"/>
+ <location filename="../src/gui/accountsettings.cpp" line="639"/>
<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="570"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>Remove connection</source>
<translation>Elimina la connexió</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="158"/>
<source>Open folder</source>
<translation>Obre la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="168"/>
- <source>Choose What to Sync</source>
- <translation>Trieu què sincronitzar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Resume sync</source>
<translation>Continua la sincronització</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Pause sync</source>
<translation>Pausa la sincronització</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="176"/>
- <source>Remove sync</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="277"/>
- <source>Confirm Sync Removal</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="278"/>
+ <location filename="../src/gui/accountsettings.cpp" line="283"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>Segur que voleu aturar la sincronització de la carpeta <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="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="452"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) de %2 en ús. Algunes carpetes, incloent les carpetes muntades a través de xarxa o les compartides, poden tenir límits diferents.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="448"/>
+ <location filename="../src/gui/accountsettings.cpp" line="453"/>
<source>%1 of %2 in use</source>
<translation>%1 de %2 en ús</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="453"/>
+ <location filename="../src/gui/accountsettings.cpp" line="462"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualment no hi ha informació disponible de l'ús d'emmagatzemament.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="507"/>
<source>No %1 connection configured.</source>
<translation>La connexió %1 no està configurada.</translation>
</message>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="95"/>
+ <location filename="../src/gui/accountstate.cpp" line="99"/>
<source>Signed out</source>
<translation>S'ha desconnectat</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="97"/>
+ <location filename="../src/gui/accountstate.cpp" line="101"/>
<source>Disconnected</source>
<translation>Desconnectat</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="99"/>
+ <location filename="../src/gui/accountstate.cpp" line="103"/>
<source>Connected</source>
<translation>Connectat</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="101"/>
+ <location filename="../src/gui/accountstate.cpp" line="105"/>
<source>Service unavailable</source>
<translation>Servei no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="103"/>
+ <location filename="../src/gui/accountstate.cpp" line="107"/>
<source>Network error</source>
<translation>Error de xarxa</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="105"/>
+ <location filename="../src/gui/accountstate.cpp" line="109"/>
<source>Configuration error</source>
<translation>Error de configuració</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="107"/>
+ <location filename="../src/gui/accountstate.cpp" line="111"/>
<source>Unknown account state</source>
<translation>Estat del compte desconegut</translation>
</message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>Reauthentication required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>You need to re-login to continue using the account %1.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
<translation>Actualitzeu el servidor a l'última versió i reestabliu el client.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="143"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="135"/>
<source>Authentication error: Either username or password are wrong.</source>
<translation>Error d'autentificació: Aquest nom d'usuari o contrasenya son incorrectes.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="155"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="147"/>
<source>timeout</source>
<translation>temps excedit</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="186"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="178"/>
<source>The provided credentials are not correct</source>
<translation>Les credencials proporcionades no són correctes</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="524"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="537"/>
<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="107"/>
+ <location filename="../src/gui/folder.cpp" line="108"/>
<source>Unable to create csync-context</source>
<translation>No s'ha pogut crear el context-csync</translation>
</message>
<translation>Activitat de sincronització</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="845"/>
+ <location filename="../src/gui/folder.cpp" line="870"/>
<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="1102"/>
+ <location filename="../src/gui/folder.cpp" line="1127"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>S'ha afegit una carpeta nova de més de %1 MB: %2.
Aneu a arranjament per seleccionar-la si voleu descarregar-la.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1115"/>
+ <location filename="../src/gui/folder.cpp" line="1140"/>
<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="1119"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Remove All Files?</source>
<translation>Esborra tots els fitxers?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1121"/>
+ <location filename="../src/gui/folder.cpp" line="1146"/>
<source>Remove all files</source>
<translation>Esborra tots els fitxers</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1122"/>
+ <location filename="../src/gui/folder.cpp" line="1147"/>
<source>Keep files</source>
<translation>Mantén els fitxers</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="275"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<source>Could not reset folder state</source>
<translation>No es pot restablir l'estat de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="276"/>
+ <location filename="../src/gui/folderman.cpp" line="271"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>S'ha trobat un diari de sincronització antic '%1', però no s'ha pogut eliminar. Assegureu-vos que no hi ha cap aplicació que actualment en faci ús.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="877"/>
+ <location filename="../src/gui/folderman.cpp" line="865"/>
<source> (backup)</source>
<translation>(copia de seguretat)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="882"/>
+ <location filename="../src/gui/folderman.cpp" line="870"/>
<source> (backup %1)</source>
<translation>(copia de seguretat %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1091"/>
+ <location filename="../src/gui/folderman.cpp" line="1079"/>
<source>Undefined State.</source>
<translation>Estat indefinit.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1094"/>
- <source>Waits to start syncing.</source>
- <translation>Espera per començar la sincronització.</translation>
+ <location filename="../src/gui/folderman.cpp" line="1082"/>
+ <source>Waiting to start syncing.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1097"/>
+ <location filename="../src/gui/folderman.cpp" line="1085"/>
<source>Preparing for sync.</source>
<translation>Perparant per la sincronització.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1100"/>
+ <location filename="../src/gui/folderman.cpp" line="1088"/>
<source>Sync is running.</source>
<translation>S'està sincronitzant.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1103"/>
+ <location filename="../src/gui/folderman.cpp" line="1091"/>
<source>Last Sync was successful.</source>
<translation>La darrera sincronització va ser correcta.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1108"/>
+ <location filename="../src/gui/folderman.cpp" line="1096"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>La última sincronització ha estat un èxit, però amb avisos en fitxers individuals.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1111"/>
+ <location filename="../src/gui/folderman.cpp" line="1099"/>
<source>Setup Error.</source>
<translation>Error de configuració.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1114"/>
+ <location filename="../src/gui/folderman.cpp" line="1102"/>
<source>User Abort.</source>
<translation>Cancel·la usuari.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1117"/>
+ <location filename="../src/gui/folderman.cpp" line="1105"/>
<source>Sync is paused.</source>
<translation>La sincronització està en pausa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1123"/>
+ <location filename="../src/gui/folderman.cpp" line="1111"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sync està pausat)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1119"/>
<source>No valid folder selected!</source>
<translation>No s'ha seleccionat cap directori vàlid!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1130"/>
<source>The selected path is not a folder!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1146"/>
+ <location filename="../src/gui/folderman.cpp" line="1134"/>
<source>You have no permission to write to the selected folder!</source>
<translation>No teniu permisos per escriure en la carpeta seleccionada!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1161"/>
+ <location filename="../src/gui/folderman.cpp" line="1149"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1166"/>
+ <location filename="../src/gui/folderman.cpp" line="1154"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1173"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1168"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1186"/>
+ <location filename="../src/gui/folderman.cpp" line="1174"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="85"/>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="274"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="271"/>
<source>File</source>
<translation>Fitxer</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="228"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="224"/>
<source>Syncing selected files in your account with</source>
<translation>Sincronitzant els fitxers seleccionats del vostre compte amb</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="231"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="227"/>
<source>Remote path: %1</source>
<translation>Carpeta remota: %1</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="121"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="122"/>
<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="126"/>
- <source>Adding folder is disabled because your are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
- <translation>No es pot afegir carpetes perquè ja esteu sincronitzant tots els vostres fitxers. Si voleu sincronitzar múltiples carpetes, elimineu la carpeta arrel configurada actualment.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="131"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="132"/>
<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="141"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="142"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="156"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
<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="182"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="192"/>
<source>Signed out</source>
<translation>S'ha desconnectat</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="727"/>
- <source>Discovering '%1'</source>
- <translation>S'està descobrint '%1'</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="127"/>
+ <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="163"/>
+ <source>Fetching folder list from server...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="789"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="787"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="849"/>
<source>Syncing %1</source>
<translation>S'està sincronitzant %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="792"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="854"/>
<source>download %1/s</source>
<translation>descarrega %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="794"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="856"/>
<source>u2193 %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="800"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>upload %1/s</source>
<translation>pujada %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="802"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="864"/>
<source>u2191 %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="807"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="869"/>
<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="811"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="873"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="827"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="889"/>
<source>%1 of %2, file %3 of %4
Total time left %5</source>
<translation>%1 de %2, fitxer %3 de %4
Temps restant total %5</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
<source>file %1 of %2</source>
<translation>fitxer %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="932"/>
<source>Waiting...</source>
<translation>S'està esperant...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="934"/>
<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="878"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>Preparing to sync...</source>
<translation>S'està preparant per sincronitzar...</translation>
</message>
<name>OCC::FolderWizard</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <source>Add Folder Sync Connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderwizard.cpp" line="564"/>
- <source>Add Folder</source>
- <translation>Afegeix una carpeta</translation>
+ <source>Add Sync Connection</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Avançat</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="61"/>
+ <location filename="../src/gui/generalsettings.ui" line="109"/>
<source>Ask confirmation before downloading folders larger than</source>
<translation>Demana la confirmació per descarregar carpetes més grans de</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
+ <location filename="../src/gui/generalsettings.ui" line="129"/>
<source>MB</source>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="109"/>
+ <location filename="../src/gui/generalsettings.ui" line="159"/>
<source>Show crash reporter</source>
<translation>Mostra l'informe del error</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="118"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit Ignored Files</source>
<translation>Edita fitxers ignorats</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="142"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
<source>Add an Account</source>
<translation>Afegeix un compte</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="167"/>
- <location filename="../src/gui/generalsettings.ui" line="173"/>
+ <location filename="../src/gui/generalsettings.ui" line="171"/>
+ <location filename="../src/gui/generalsettings.ui" line="177"/>
<source>About</source>
<translation>Quant a</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <location filename="../src/gui/generalsettings.ui" line="187"/>
<source>Updates</source>
<translation>Actualitzacions</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="208"/>
+ <location filename="../src/gui/generalsettings.ui" line="212"/>
<source>&Restart && Update</source>
<translation>&Reiniciar && Actualitzar</translation>
</message>
</context>
-<context>
- <name>OCC::HttpCredentials</name>
- <message>
- <location filename="../src/libsync/creds/httpcredentials.cpp" line="290"/>
- <source>Reading from keychain failed with error: '%1'</source>
- <translation>La lectura de la cadena de claus ha fallat amb l'error: '%1'</translation>
- </message>
-</context>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="32"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
<source>Please enter %1 password:
User: %2
</translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="41"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <source>Reading from keychain failed with error: '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
<source>Enter Password</source>
<translation>Escriviu contrasenya</translation>
</message>
<translation>Elimina</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="40"/>
<source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="109"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
<source>Could not open file</source>
<translation>No s'ha pogut obrir el fitxer</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="111"/>
<source>Cannot write changes to '%1'.</source>
<translation>No es poden desar els canvis a '%1'.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="138"/>
<source>Add Ignore Pattern</source>
<translation>Afegeix una plantilla per ignorar</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>Add a new ignore pattern:</source>
<translation>Afegeix una nova plantilla d'ignorats:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="45"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="46"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Això es proporciona completament pel sistema a '%1' i no es pot modificar en aquesta vista.</translation>
</message>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="163"/>
+ <location filename="../src/libsync/logger.cpp" line="190"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="164"/>
+ <location filename="../src/libsync/logger.cpp" line="191"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>El fitxer '%1'<br/>no es pot obrir en mode escriptura.<br/><br/>La sortida del registre <b>no</b> es pot desar!</nobr></translation>
</message>
</message>
<message>
<location filename="../src/gui/networksettings.ui" line="203"/>
- <location filename="../src/gui/networksettings.ui" line="295"/>
+ <location filename="../src/gui/networksettings.ui" line="292"/>
<source>No limit</source>
<translation>Sense límit</translation>
</message>
<source>SOCKS5 proxy</source>
<translation>proxy SOCKS5</translation>
</message>
+ <message>
+ <location filename="../src/gui/networksettings.cpp" line="128"/>
+ <source>Qt >= 5.4 is required in order to use the bandwidth limit</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::OCUpdater</name>
<source>Downloading version %1. Please wait...</source>
<translation>Descarregat la versió %1. Espeu si us play...</translation>
</message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
- <source>Version %1 available. Restart application to start the update.</source>
- <translation>Versió %1 disponible. Reinicieu l'aplicació per començar l'actualització.</translation>
- </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="145"/>
<source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
<source>Could not check for new updates.</source>
<translation>No s'ha pogut comprovar si hi ha actualitzacions.</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
+ <source>%1 version %2 available. Restart application to start the update.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
- <source>New version %1 available. Please use the system's update tool to install it.</source>
- <translation>Nova versió %1 disponible. Utilitzeu l'eina d'actualització del sistema per instal·lar-la.</translation>
+ <source>New %1 version %2 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="151"/>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="114"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="110"/>
<source>Connection Timeout</source>
<translation>Temps de connexió excedit</translation>
</message>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="171"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="167"/>
<source>Invalid JSON reply from the poll URL</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>OCC::PropagateDownloadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="435"/>
- <source>Sync was aborted by user.</source>
- <translation>L'usuari ha aturat la sincronització.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="488"/>
- <source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation>No s'ha rebut cap E-Tag del servidor, comproveu el Proxy/Gateway</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="494"/>
- <source>We received a different E-Tag for resuming. Retrying next time.</source>
- <translation>Hem rebut un E-Tag diferent en la represa. Es comprovarà la pròxima vegada.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="516"/>
- <source>Server returned wrong content-range</source>
- <translation>El servidor retorna un error de contingut o rang</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="567"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation>El fitxer %1 no es pot baixar perquè hi ha un xoc amb el nom d'un fitxer local!</translation>
- </message>
-</context>
<context>
<name>OCC::PropagateDownloadFileQNAM</name>
<message>
<translation>El fitxer %1 no es pot baixar perquè hi ha un xoc amb el nom d'un fitxer local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="457"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
+ <source>The download would reduce free disk space below %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="372"/>
+ <source>Free space on disk is less than %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="482"/>
<source>File was deleted from server</source>
<translation>El fitxer s'ha esborrat del servidor</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="506"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="531"/>
<source>The file could not be downloaded completely.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="601"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="636"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="641"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="676"/>
<source>File has changed since discovery</source>
<translation>El fitxer ha canviat des de que es va descobrir</translation>
</message>
<context>
<name>OCC::PropagateItemJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="92"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
<source>; Restoration Failed: %1</source>
<translation>; Ha fallat la restauració: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="138"/>
<source>Continue blacklisting:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="230"/>
<source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove folder '%1';</source>
+ <source>Could not remove folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="243"/>
- <location filename="../src/libsync/propagator_legacy.cpp" line="302"/>
- <source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>El fitxer local ha canviat durant la sincronització, es sincronitzarà quan arribi complet</translation>
- </message>
+ <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="246"/>
- <source>Sync was aborted by user.</source>
- <translation>L'usuari ha aturat la sincronització.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="205"/>
+ <source>File name contains at least one invalid character</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="252"/>
- <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
- <translation>El fitxer s'ha editat localment però és part d'una compartició només de lectura. S'ha restaurat i la vostra edició és en el fitxer en conflicte.</translation>
- </message>
-</context>
-<context>
- <name>OCC::PropagateUploadFileQNAM</name>
- <message>
- <location filename="../src/libsync/propagateupload.cpp" line="226"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="262"/>
<source>File Removed</source>
<translation>Fitxer eliminat</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="274"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="250"/>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="286"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="665"/>
<source>Local file changed during sync.</source>
<translation>El fitxer local ha canviat durant la sincronització.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="558"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="592"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="566"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="600"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>El fitxer s'ha editat localment però és part d'una compartició només de lectura. S'ha restaurat i la vostra edició és en el fitxer en conflicte.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="597"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="631"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="620"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="654"/>
<source>The local file was removed during sync.</source>
<translation>El fitxer local s'ha eliminat durant la sincronització.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="646"/>
- <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
- <translation>El servidor no ha reconegut l'últim fragment. (No hi havia e-Tag)</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="680"/>
+ <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Les carpetes desmarcades <b>s'eliminaran</b> del vostre sistema de fitxers local i ja no es sincronitzaran en aquest ordinador</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>Trieu què sincronitzar: seleccioneu subcarpetes remotes que voleu sincronitzar.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>Trieu què sincronitzar: desseleccioneu subcarpetes remotes que no voleu sincronitzar.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
<source>Choose What to Sync</source>
<translation>Trieu què sincronitzar</translation>
</message>
<translation>Mida</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
<source>No subfolders currently on the server.</source>
<translation>Actualment no hi ha subcarpetes al servidor.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>S'ha produit un error en carregar la llista de subcarpetes.</translation>
</message>
<translation>Arranjament</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="80"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="84"/>
<source>Activity</source>
<translation>Activitat</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="86"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="90"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>Network</source>
<translation>Xarxa</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharedialog.ui" line="22"/>
- <location filename="../src/gui/sharedialog.ui" line="234"/>
+ <location filename="../src/gui/sharedialog.ui" line="258"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<translation>camí de l'OwnCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="182"/>
+ <location filename="../src/gui/sharedialog.ui" line="116"/>
<source>Set &password </source>
<translation>Estableix la &contrasenya</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="196"/>
+ <location filename="../src/gui/sharedialog.ui" line="130"/>
<source>Set &expiration date</source>
<translation>Estableix la data de &venciment</translation>
</message>
+ <message>
+ <location filename="../src/gui/sharedialog.ui" line="214"/>
+ <source>Allow editing</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/sharedialog.ui" line="77"/>
<source>Share link</source>
<translation>Comparteix l'enllaç</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="125"/>
+ <location filename="../src/gui/sharedialog.ui" line="203"/>
<source>Copy &link</source>
<translation>Copia l'en&llaç</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="142"/>
+ <location filename="../src/gui/sharedialog.ui" line="154"/>
<source>Set password</source>
<translation>Estableix la contrasenya</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="692"/>
- <source>%1 path: %2</source>
- <translation>Camí de %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="115"/>
+ <location filename="../src/gui/sharedialog.cpp" line="120"/>
<source>%1 Sharing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="103"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="112"/>
+ <location filename="../src/gui/sharedialog.cpp" line="117"/>
<source>Folder: %2</source>
<translation>Carpeta: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="121"/>
<source>P&assword protect</source>
<translation>Protegit amb contr&asenya</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="221"/>
+ <location filename="../src/gui/sharedialog.cpp" line="214"/>
<source>Password Protected</source>
<translation>Protegit amb contrasenya</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="382"/>
+ <location filename="../src/gui/sharedialog.cpp" line="338"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>El fitxer no es pot compartir perquè va ser compartit sense permisos de compartició.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="528"/>
+ <location filename="../src/gui/sharedialog.cpp" line="475"/>
<source>Please Set Password</source>
<translation>Establiu la contrasenya</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="564"/>
- <location filename="../src/gui/sharedialog.cpp" line="565"/>
+ <location filename="../src/gui/sharedialog.cpp" line="538"/>
+ <location filename="../src/gui/sharedialog.cpp" line="539"/>
<source>&Share link</source>
<translation>Com&parteix l'enllaç</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="583"/>
+ <location filename="../src/gui/sharedialog.cpp" line="552"/>
+ <location filename="../src/gui/sharedialog.cpp" line="564"/>
<source>OCS API error code: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="605"/>
- <source>There is no sync folder configured.</source>
- <translation>No hi ha cap carpeta de sincronització configurada.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="639"/>
- <source>A sync file with the same name exists. The file cannot be registered to sync.</source>
- <translation>Ja existeix un fitxer sincronitzat amb el mateix nom. El fitxer no es pot registrar per sincronitzar.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="684"/>
- <source>The file cannot be synced.</source>
- <translation>El fitxer no es pot sincronitzar.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="624"/>
- <source>Sharing of external directories is not yet working.</source>
- <translation>La compartició de carpetes externes encara no funciona.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="473"/>
- <location filename="../src/gui/sharedialog.cpp" line="506"/>
+ <location filename="../src/gui/sharedialog.cpp" line="418"/>
+ <location filename="../src/gui/sharedialog.cpp" line="460"/>
<source>Public sh&aring requires a password</source>
<translation>La comp&artició pública requereix una contrasenya</translation>
</message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="617"/>
- <source>Cannot find a folder to upload to.</source>
- <translation>No es pot trobar una carpeta a la què pujar-ho.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
- <source>Waiting to upload...</source>
- <translation>S'està esperant per pujar-ho...</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="653"/>
- <source>Unable to register in sync space.</source>
- <translation>No es pot registrar a l'espai de sincronització.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="694"/>
- <source>Sync of registered file was not successful yet.</source>
- <translation>La sincronització del fitxer registrat encara no s'ha fet amb èxit.</translation>
- </message>
</context>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>Login Error</source>
<translation>Error d'accés</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>You must sign in as user %1</source>
<translation>Cal identificar-se com a usuari %1</translation>
</message>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="452"/>
+ <location filename="../src/gui/socketapi.cpp" line="447"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Comparteix amb %1</translation>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="97"/>
+ <location filename="../src/libsync/syncengine.cpp" line="94"/>
<source>Success.</source>
<translation>Èxit.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="104"/>
+ <location filename="../src/libsync/syncengine.cpp" line="101"/>
<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="107"/>
+ <location filename="../src/libsync/syncengine.cpp" line="104"/>
<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="110"/>
+ <location filename="../src/libsync/syncengine.cpp" line="107"/>
<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="113"/>
+ <location filename="../src/libsync/syncengine.cpp" line="110"/>
<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="116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>Error fatal de paràmetre en CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="119"/>
+ <location filename="../src/libsync/syncengine.cpp" line="116"/>
<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="122"/>
+ <location filename="../src/libsync/syncengine.cpp" line="119"/>
<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="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="122"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="125"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="128"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="131"/>
<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="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="134"/>
<source>A network connection timeout happened.</source>
<translation>Temps excedit en la connexió.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="137"/>
<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="143"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation>CSync ha fallat en no implementar el permís denegat.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
<source>An error occurred while opening a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
<source>Error while reading folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="996"/>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
<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="1003"/>
+ <location filename="../src/libsync/syncengine.cpp" line="991"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="152"/>
<source>CSync unspecified error.</source>
<translation>Error inespecífic de CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="155"/>
<source>Aborted by the user</source>
<translation>Aturat per l'usuari</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="392"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>El nom del fitxer conté caràcters no vàlids que no es poden sincronitzar entre plataformes.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="143"/>
<source>CSync failed to access</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <location filename="../src/libsync/syncengine.cpp" line="97"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <source>CSync failed due to unhandled permission denied.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="146"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="158"/>
<source>The service is temporarily unavailable</source>
<translation>El servei no està disponible temporalment</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="175"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<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="230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="227"/>
<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="389"/>
+ <location filename="../src/libsync/syncengine.cpp" line="386"/>
<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="392"/>
+ <location filename="../src/libsync/syncengine.cpp" line="389"/>
<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="398"/>
+ <location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename is too long.</source>
<translation>El nom de fitxer és massa llarg.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="401"/>
+ <location filename="../src/libsync/syncengine.cpp" line="398"/>
<source>File is ignored because it's hidden.</source>
<translation>El fitxer s'ignora perquè és ocult.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="407"/>
+ <location filename="../src/libsync/syncengine.cpp" line="404"/>
<source>Stat failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="429"/>
+ <location filename="../src/libsync/syncengine.cpp" line="426"/>
<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="561"/>
+ <location filename="../src/libsync/syncengine.cpp" line="558"/>
<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="631"/>
+ <location filename="../src/libsync/syncengine.cpp" line="612"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="645"/>
<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="718"/>
+ <location filename="../src/libsync/syncengine.cpp" line="723"/>
<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="965"/>
- <location filename="../src/libsync/syncengine.cpp" line="972"/>
+ <location filename="../src/libsync/syncengine.cpp" line="953"/>
+ <location filename="../src/libsync/syncengine.cpp" line="960"/>
<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="990"/>
+ <location filename="../src/libsync/syncengine.cpp" line="978"/>
<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="1023"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1011"/>
<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="1040"/>
- <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1028"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1048"/>
<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="1073"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1061"/>
<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="1128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1116"/>
<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="1137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1125"/>
<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="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the destination</source>
<translation>el destí</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the source</source>
<translation>l'origen</translation>
</message>
</message>
</context>
<context>
- <name>OCC::TransmissionChecksumValidator</name>
+ <name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="128"/>
<source>The checksum header is malformed.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+ <source>The checksum header contained an unknown checksum type '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="148"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
- <translation>El fitxer descarregat no concorda amb la suma de verificació. Es reintentarà.</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<source>Recent Changes</source>
<translation>Canvis recents</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="561"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="331"/>
<source>Managed Folders:</source>
<source>Open %1 in browser</source>
<translation>Obre %1 en el navegador</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="449"/>
- <source>Log out everywhere</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="457"/>
- <source>Log in everywhere...</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="513"/>
<source>Unknown status</source>
<source>Account %1: %2</source>
<translation>Compte %1: %2</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="449"/>
+ <source>Log out of all accounts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="457"/>
+ <source>Log in to all accounts...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="532"/>
<source>Crash now</source>
<source>No items synced recently</source>
<translation>No hi ha elements sincronitzats recentment</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="561"/>
- <source>Discovering '%1'</source>
- <translation>Descobrint '%1'</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="566"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>%L1 B</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="306"/>
+ <location filename="../src/libsync/utility.cpp" line="303"/>
<source>%Ln year(s)</source>
<translation>%Ln any/s</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="307"/>
+ <location filename="../src/libsync/utility.cpp" line="304"/>
<source>%Ln month(s)</source>
<translation>%Ln mes/os</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="308"/>
+ <location filename="../src/libsync/utility.cpp" line="305"/>
<source>%Ln day(s)</source>
<translation>%Ln dia/es</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="309"/>
+ <location filename="../src/libsync/utility.cpp" line="306"/>
<source>%Ln hour(s)</source>
<translation>%Ln hora/es</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="310"/>
+ <location filename="../src/libsync/utility.cpp" line="307"/>
<source>%Ln minute(s)</source>
<translation>%Ln minut/s</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="311"/>
+ <location filename="../src/libsync/utility.cpp" line="308"/>
<source>%Ln second(s)</source>
<translation>%Ln segon/s</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="318"/>
<source>0 seconds</source>
<translation>0 segons</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="336"/>
+ <location filename="../src/libsync/utility.cpp" line="333"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="73"/>
+ <source>Enter your credentials to connect to the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <source>Sign in</source>
+ <translation>Přihlásit</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="89"/>
<source>Remove the account configuration from the client</source>
<translation>Odebrat nastavení účtu z tohoto klienta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Remove Account</source>
<translation>Odebrat účet</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="97"/>
+ <location filename="../src/gui/accountsettings.ui" line="113"/>
<source>Storage space: ...</source>
<translation>Prostor úložiště: ...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="167"/>
+ <location filename="../src/gui/accountsettings.ui" line="183"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Neoznačené složky budou <b>odstraněny</b> z místního souborového systému a nebudou již synchronizovány na tento počítač</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="230"/>
<source>Apply</source>
<translation>Použít</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="198"/>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
- <location filename="../src/gui/accountsettings.cpp" line="571"/>
+ <location filename="../src/gui/accountsettings.ui" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="289"/>
+ <location filename="../src/gui/accountsettings.cpp" line="646"/>
<source>Cancel</source>
<translation>Zrušit</translation>
</message>
<translation>Připojen k <server> jako <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="115"/>
+ <location filename="../src/gui/accountsettings.cpp" line="121"/>
<source>No account configured.</source>
<translation>Žádný účet nenastaven.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="161"/>
+ <source>Choose what to sync</source>
+ <translation>Vybrat co sesynchronizovat</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="168"/>
+ <source>Remove folder sync connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="234"/>
<source>Folder creation failed</source>
<translation>Vytvoření adresáře selhalo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="230"/>
+ <location filename="../src/gui/accountsettings.cpp" line="235"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation><p>Nelze vytvořit místní adresář <i>%1</i>.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="283"/>
- <source>Stop syncing</source>
- <translation>Ukončit synchronizaci</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
+ <source>Confirm Folder Sync Connection Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>Remove Folder Sync Connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="309"/>
+ <location filename="../src/gui/accountsettings.cpp" line="314"/>
<source>Confirm Folder Reset</source>
<translation>Potvrdit restartování složky</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="310"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Skutečně chcete resetovat složku <i>%1</i> a znovu sestavit klientskou databázi?</p><p><b>Poznámka:</b> Tato funkce je určena pouze pro účely údržby. Žádné soubory nebudou smazány, ale může to způsobit velké datové přenosy a dokončení může trvat mnoho minut či hodin v závislosti na množství dat ve složce. Použijte tuto volbu pouze na pokyn správce.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="391"/>
+ <location filename="../src/gui/accountsettings.cpp" line="396"/>
<source>Sync Running</source>
<translation>Synchronizace probíhá</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="392"/>
+ <location filename="../src/gui/accountsettings.cpp" line="397"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Operace synchronizace právě probíhá.<br/>Přejete si ji ukončit?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="472"/>
+ <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <source>%1 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="485"/>
<source>%1 as <i>%2</i></source>
<translation>%1 jako <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="476"/>
+ <location filename="../src/gui/accountsettings.cpp" line="495"/>
<source>Connected to %1.</source>
<translation>Připojeno k %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="478"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Server %1 je dočasně nedostupný.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="480"/>
+ <location filename="../src/gui/accountsettings.cpp" line="499"/>
<source>Signed out from %1.</source>
<translation>Odhlášeno z %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="482"/>
+ <location filename="../src/gui/accountsettings.cpp" line="501"/>
<source>No connection to %1 at %2.</source>
<translation>Bez připojení k %1 na %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
- <source>There are new folders that were not synchronized because they are too big: %1</source>
- <translation>Jsou dostupné nové adresáře, které nebyly synchronizovány z důvodu jejich nadměrné velikosti: %1</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="536"/>
- <source>, </source>
- <translation>, </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <source>There are new folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="563"/>
+ <location filename="../src/gui/accountsettings.cpp" line="638"/>
<source>Confirm Account Removal</source>
<translation>Potvrdit odstranění účtu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="564"/>
+ <location filename="../src/gui/accountsettings.cpp" line="639"/>
<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="570"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>Remove connection</source>
<translation>Odstranit připojení</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="158"/>
<source>Open folder</source>
<translation>Otevřít adresář</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="168"/>
- <source>Choose What to Sync</source>
- <translation>Vybrat co synchronizovat</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Resume sync</source>
<translation>Pokračovat v synchronizaci</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Pause sync</source>
<translation>Pozastavit synchronizaci</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="176"/>
- <source>Remove sync</source>
- <translation>Odstranit synchronizaci</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="277"/>
- <source>Confirm Sync Removal</source>
- <translation>Potvrdit odstranění synchronizace</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="278"/>
+ <location filename="../src/gui/accountsettings.cpp" line="283"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>Opravdu chcete zastavit synchronizaci adresáře <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="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="452"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>Používaných %1 (%3%) z %2. Některé adresáře včetně připojených síťových nebo sdílených adresářů mohou mít odlišné limity.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="448"/>
+ <location filename="../src/gui/accountsettings.cpp" line="453"/>
<source>%1 of %2 in use</source>
<translation>Používaných %1 z %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="453"/>
+ <location filename="../src/gui/accountsettings.cpp" line="462"/>
<source>Currently there is no storage usage information available.</source>
<translation>Momentálně nejsou k dispozici žádné informace o využití úložiště.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="507"/>
<source>No %1 connection configured.</source>
<translation>Žádné spojení s %1 nenastaveno.</translation>
</message>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="95"/>
+ <location filename="../src/gui/accountstate.cpp" line="99"/>
<source>Signed out</source>
<translation>Odhlášeno</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="97"/>
+ <location filename="../src/gui/accountstate.cpp" line="101"/>
<source>Disconnected</source>
<translation>Odpojeno</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="99"/>
+ <location filename="../src/gui/accountstate.cpp" line="103"/>
<source>Connected</source>
<translation>Připojeno</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="101"/>
+ <location filename="../src/gui/accountstate.cpp" line="105"/>
<source>Service unavailable</source>
<translation>Služba nedostupná</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="103"/>
+ <location filename="../src/gui/accountstate.cpp" line="107"/>
<source>Network error</source>
<translation>Chyba sítě</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="105"/>
+ <location filename="../src/gui/accountstate.cpp" line="109"/>
<source>Configuration error</source>
<translation>Chyba konfigurace</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="107"/>
+ <location filename="../src/gui/accountstate.cpp" line="111"/>
<source>Unknown account state</source>
<translation>Neznámý stav účtu</translation>
</message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>Reauthentication required</source>
+ <translation>Vyžadováno opětovné ověření</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>You need to re-login to continue using the account %1.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
<translation>Prosím, aktualizujte na poslední verzi serveru a restartujte klienta.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="143"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="135"/>
<source>Authentication error: Either username or password are wrong.</source>
<translation>Chyba ověření: Uživatelské jméno nebo heslo není správné.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="155"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="147"/>
<source>timeout</source>
<translation>vypršel časový interval</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="186"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="178"/>
<source>The provided credentials are not correct</source>
<translation>Poskytnuté přihlašovací údaje nejsou správné</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="524"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="537"/>
<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="107"/>
+ <location filename="../src/gui/folder.cpp" line="108"/>
<source>Unable to create csync-context</source>
<translation>Nepodařilo se vytvořit csync-context</translation>
</message>
<translation>Průběh synchronizace</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="845"/>
+ <location filename="../src/gui/folder.cpp" line="870"/>
<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="1102"/>
+ <location filename="../src/gui/folder.cpp" line="1127"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Byl přidán nový adresář %2 větší než %1 MB.
Pokud ho chcete stáhnout, přejděte prosím do nastavení a označte ho.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1115"/>
+ <location filename="../src/gui/folder.cpp" line="1140"/>
<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="1119"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Remove All Files?</source>
<translation>Odstranit všechny soubory?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1121"/>
+ <location filename="../src/gui/folder.cpp" line="1146"/>
<source>Remove all files</source>
<translation>Odstranit všechny soubory</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1122"/>
+ <location filename="../src/gui/folder.cpp" line="1147"/>
<source>Keep files</source>
<translation>Ponechat soubory</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="275"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<source>Could not reset folder state</source>
<translation>Nelze obnovit stav složky</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="276"/>
+ <location filename="../src/gui/folderman.cpp" line="271"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Byl nalezen starý záznam synchronizace '%1', ale nebylo možné jej odebrat. Ujistěte se, že není aktuálně používán jinou aplikací.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="877"/>
+ <location filename="../src/gui/folderman.cpp" line="865"/>
<source> (backup)</source>
<translation> (záloha)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="882"/>
+ <location filename="../src/gui/folderman.cpp" line="870"/>
<source> (backup %1)</source>
<translation> (záloha %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1091"/>
+ <location filename="../src/gui/folderman.cpp" line="1079"/>
<source>Undefined State.</source>
<translation>Nedefinovaný stav.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1094"/>
- <source>Waits to start syncing.</source>
- <translation>Vyčkává na spuštění synchronizace.</translation>
+ <location filename="../src/gui/folderman.cpp" line="1082"/>
+ <source>Waiting to start syncing.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1097"/>
+ <location filename="../src/gui/folderman.cpp" line="1085"/>
<source>Preparing for sync.</source>
<translation>Příprava na synchronizaci.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1100"/>
+ <location filename="../src/gui/folderman.cpp" line="1088"/>
<source>Sync is running.</source>
<translation>Synchronizace probíhá.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1103"/>
+ <location filename="../src/gui/folderman.cpp" line="1091"/>
<source>Last Sync was successful.</source>
<translation>Poslední synchronizace byla úspěšná.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1108"/>
+ <location filename="../src/gui/folderman.cpp" line="1096"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Poslední synchronizace byla úspěšná, ale s varováním u některých souborů</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1111"/>
+ <location filename="../src/gui/folderman.cpp" line="1099"/>
<source>Setup Error.</source>
<translation>Chyba nastavení.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1114"/>
+ <location filename="../src/gui/folderman.cpp" line="1102"/>
<source>User Abort.</source>
<translation>Zrušení uživatelem.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1117"/>
+ <location filename="../src/gui/folderman.cpp" line="1105"/>
<source>Sync is paused.</source>
<translation>Synchronizace pozastavena.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1123"/>
+ <location filename="../src/gui/folderman.cpp" line="1111"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronizace je pozastavena)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1119"/>
<source>No valid folder selected!</source>
<translation>Nebyl vybrán platný adresář!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1130"/>
<source>The selected path is not a folder!</source>
<translation>Vybraná cesta nevede do adresáře!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1146"/>
+ <location filename="../src/gui/folderman.cpp" line="1134"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Nemáte oprávnění pro zápis do zvolené složky!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1161"/>
+ <location filename="../src/gui/folderman.cpp" line="1149"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>Místní adresář %1 je již použit pro synchronizaci odesílání. Zvolte prosím jiný!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1166"/>
+ <location filename="../src/gui/folderman.cpp" line="1154"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Místní adresář %1 již obsahuje podadresář použitý pro synchronizaci odesílání. Zvolte prosím jiný!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1173"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Místní adresář %1 je symbolickým obsahem. Cíl odkazu již obsahuje adresář použitý pro synchronizaci adresáře. Vyberte, prosím, jiný!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1168"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Místní adresář %1 je již obsažen ve složce použité pro synchronizaci. Vyberte, prosím, jiný!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1186"/>
+ <location filename="../src/gui/folderman.cpp" line="1174"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Místní adresář %1 je symbolickým obsahem. Cíl odkazu je již obsažen v adresáři použitém pro synchronizaci. Vyberte, prosím, jiný!</translation>
</message>
<translation>Přidat synchronizaci adresáře</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="85"/>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="274"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="271"/>
<source>File</source>
<translation>Soubor</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="228"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="224"/>
<source>Syncing selected files in your account with</source>
<translation>Synchronizovat vybrané soubory z vašeho účtu s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="231"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="227"/>
<source>Remote path: %1</source>
<translation>Vzdálená cesta: %1</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="121"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="122"/>
<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="126"/>
- <source>Adding folder is disabled because your 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="131"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="132"/>
<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="141"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="142"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="156"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
<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="182"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="192"/>
<source>Signed out</source>
<translation>Odhlášeno</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="727"/>
- <source>Discovering '%1'</source>
- <translation>Prohledávám '%1'</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="127"/>
+ <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="163"/>
+ <source>Fetching folder list from server...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="789"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="787"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="849"/>
<source>Syncing %1</source>
<translation>Synchronizuji %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="792"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="854"/>
<source>download %1/s</source>
<translation>stahování %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="794"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="856"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="800"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>upload %1/s</source>
<translation>nahrávání %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="802"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="864"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="807"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="869"/>
<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="811"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="873"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="827"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="889"/>
<source>%1 of %2, file %3 of %4
Total time left %5</source>
<translation>%1 z %2, soubor %3 ze %4
Celkový zbývající čas %5</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
<source>file %1 of %2</source>
<translation>soubor %1 z %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="932"/>
<source>Waiting...</source>
<translation>Chvíli strpení...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="934"/>
<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="878"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>Preparing to sync...</source>
<translation>Synchronizace se připravuje...</translation>
</message>
<name>OCC::FolderWizard</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <source>Add Folder Sync Connection</source>
+ <translation>Přidat synchronizaci adresáře</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderwizard.cpp" line="564"/>
- <source>Add Folder</source>
- <translation>Přidat složku</translation>
+ <source>Add Sync Connection</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Pokročilé</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="61"/>
+ <location filename="../src/gui/generalsettings.ui" line="109"/>
<source>Ask confirmation before downloading folders larger than</source>
<translation>Nechat potvrzovat stahování adresářů větších než</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
+ <location filename="../src/gui/generalsettings.ui" line="129"/>
<source>MB</source>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="109"/>
+ <location filename="../src/gui/generalsettings.ui" line="159"/>
<source>Show crash reporter</source>
<translation>Zobrazit hlášení o pádech</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="118"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit Ignored Files</source>
<translation>Editovat ignorované soubory</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="142"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
<source>Add an Account</source>
<translation>Přidat účet</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="167"/>
- <location filename="../src/gui/generalsettings.ui" line="173"/>
+ <location filename="../src/gui/generalsettings.ui" line="171"/>
+ <location filename="../src/gui/generalsettings.ui" line="177"/>
<source>About</source>
<translation>O aplikaci</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <location filename="../src/gui/generalsettings.ui" line="187"/>
<source>Updates</source>
<translation>Aktualizace</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="208"/>
+ <location filename="../src/gui/generalsettings.ui" line="212"/>
<source>&Restart && Update</source>
<translation>&Restart && aktualizace</translation>
</message>
</context>
-<context>
- <name>OCC::HttpCredentials</name>
- <message>
- <location filename="../src/libsync/creds/httpcredentials.cpp" line="290"/>
- <source>Reading from keychain failed with error: '%1'</source>
- <translation>Čtení z klíčenky selhalo z chybou: '%1'</translation>
- </message>
-</context>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="32"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
<source>Please enter %1 password:
User: %2
</translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="41"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <source>Reading from keychain failed with error: '%1'</source>
+ <translation>Čtení z klíčenky selhalo z chybou: '%1'</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
<source>Enter Password</source>
<translation>Zadejte heslo</translation>
</message>
<translation>Odebrat</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="40"/>
<source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
Položky u kterých je povoleno smazání budou vymazány, pokud by bránily odstranění adresáře. Toto je užitečné pro metadata.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="109"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
<source>Could not open file</source>
<translation>Nepodařilo se otevřít soubor</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="111"/>
<source>Cannot write changes to '%1'.</source>
<translation>Nelze zapsat změny do '%1'.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="138"/>
<source>Add Ignore Pattern</source>
<translation>Přidat masku ignorovaných</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>Add a new ignore pattern:</source>
<translation>Přidat novou masku ignorovaných souborů:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="45"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="46"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Tato položka je poskytnuta systémem na '%1' a nemůže být v tomto pohledu změněna.</translation>
</message>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="163"/>
+ <location filename="../src/libsync/logger.cpp" line="190"/>
<source>Error</source>
<translation>Chyba</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="164"/>
+ <location filename="../src/libsync/logger.cpp" line="191"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Soubor '%1'<br/>nelze otevřít pro zápis.<br/><br/>Výstup záznamu <b>nelze</b> uložit.</nobr></translation>
</message>
</message>
<message>
<location filename="../src/gui/networksettings.ui" line="203"/>
- <location filename="../src/gui/networksettings.ui" line="295"/>
+ <location filename="../src/gui/networksettings.ui" line="292"/>
<source>No limit</source>
<translation>Bez limitu</translation>
</message>
<source>SOCKS5 proxy</source>
<translation>SOCKS5 proxy</translation>
</message>
+ <message>
+ <location filename="../src/gui/networksettings.cpp" line="128"/>
+ <source>Qt >= 5.4 is required in order to use the bandwidth limit</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::OCUpdater</name>
<source>Downloading version %1. Please wait...</source>
<translation>Stahuji verzi %1. Počkejte prosím ...</translation>
</message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
- <source>Version %1 available. Restart application to start the update.</source>
- <translation>Verze %1 je dostupná. Aktualizaci zahájíte restartováním aplikace.</translation>
- </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="145"/>
<source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
<source>Could not check for new updates.</source>
<translation>Nemohu zkontrolovat aktualizace.</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
+ <source>%1 version %2 available. Restart application to start the update.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
- <source>New version %1 available. Please use the system's update tool to install it.</source>
- <translation>Je dostupná nová verze %1. Pro instalaci použijte aktualizační nástroj systému. </translation>
+ <source>New %1 version %2 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="151"/>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="114"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="110"/>
<source>Connection Timeout</source>
<translation>Čas spojení vypršel</translation>
</message>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="171"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="167"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Neplatná JSON odpověď z adresy URL</translation>
</message>
</context>
-<context>
- <name>OCC::PropagateDownloadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="435"/>
- <source>Sync was aborted by user.</source>
- <translation>Synchronizace zrušena uživatelem.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="488"/>
- <source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation>Ze serveru nebyl obdržen E-Tag, zkontrolujte proxy/bránu</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="494"/>
- <source>We received a different E-Tag for resuming. Retrying next time.</source>
- <translation>Obdrželi jsme jiný E-Tag pro pokračování. Zkusím znovu příště.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="516"/>
- <source>Server returned wrong content-range</source>
- <translation>Server odpověděl chybným rozsahem obsahu</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="567"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation>Soubor %1 nemohl být stažen z důvodu kolize názvu se souborem v místním systému!</translation>
- </message>
-</context>
<context>
<name>OCC::PropagateDownloadFileQNAM</name>
<message>
<translation>Soubor %1 nemohl být stažen z důvodu kolize názvu se souborem v místním systému!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="457"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
+ <source>The download would reduce free disk space below %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="372"/>
+ <source>Free space on disk is less than %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="482"/>
<source>File was deleted from server</source>
<translation>Soubor byl smazán ze serveru</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="506"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="531"/>
<source>The file could not be downloaded completely.</source>
<translation>Soubor nemohl být kompletně stažen.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="601"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="636"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Soubor %1 nemohl být uložen z důvodu kolize názvu se souborem v místním systému!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="641"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="676"/>
<source>File has changed since discovery</source>
<translation>Soubor se mezitím změnil</translation>
</message>
<context>
<name>OCC::PropagateItemJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="92"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
<source>; Restoration Failed: %1</source>
<translation>; Obnovení selhalo: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="138"/>
<source>Continue blacklisting:</source>
<translation>Pokračovat v blacklistingu:</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="230"/>
<source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation>Soubor nebo adresář by odebrán ze sdílení pouze pro čtení, ale jeho obnovení selhalo: %1</translation>
</message>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove folder '%1';</source>
- <translation>Nezdařilo se odstranění adresáře '%1';</translation>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="243"/>
- <location filename="../src/libsync/propagator_legacy.cpp" line="302"/>
- <source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>Místní soubor byl změněn během synchronizace, bude sesynchronizován, jakmile bude kompletní</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="246"/>
- <source>Sync was aborted by user.</source>
- <translation>Synchronizace zrušena uživatelem.</translation>
- </message>
+ <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="252"/>
- <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
- <translation>Soubor zde byl editován, ale je součástí sdílení pouze pro čtení. Původní soubor byl obnoven a editovaná verze je uložena v konfliktním souboru.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="205"/>
+ <source>File name contains at least one invalid character</source>
+ <translation>Jméno souboru obsahuje aelspoň jeden neplatný znak</translation>
</message>
-</context>
-<context>
- <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="226"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="262"/>
<source>File Removed</source>
<translation>Soubor odebrán</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="274"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Místní soubor se během synchronizace změnil. </translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="250"/>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="286"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="665"/>
<source>Local file changed during sync.</source>
<translation>Místní soubor byl změněn během synchronizace.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="558"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="592"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>Vynucené ukončení procesu při resetu HTTP připojení s Qt < 5.4.2.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="566"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="600"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Soubor zde byl editován, ale je součástí sdílení pouze pro čtení. Původní soubor byl obnoven a editovaná verze je uložena v konfliktním souboru.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="597"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="631"/>
<source>Poll URL missing</source>
<translation>Chybí adresa URL</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="620"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="654"/>
<source>The local file was removed during sync.</source>
<translation>Místní soubor byl odstraněn během synchronizace.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="646"/>
- <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
- <translation>Server nepotvrdil poslední část dat. (Nebyl nalezen e-tag)</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="680"/>
+ <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Neoznačené složky budou <b>odstraněny</b> z místního souborového systému a nebudou již synchronizovány na tento počítač</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>Výběr synchronizace: Označte vzdálené podsložky, které si přejete synchronizovat.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>Výběr synchronizace: Odznačte vzdálené podsložky, které si nepřejete synchronizovat.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
<source>Choose What to Sync</source>
<translation>Vybrat co synchronizovat</translation>
</message>
<translation>Velikost</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
<source>No subfolders currently on the server.</source>
<translation>Na serveru nejsou momentálně žádné podadresáře.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>Došlo k chybě v průběhu načítání seznamu podadresářů.</translation>
</message>
<translation>Nastavení</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="80"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="84"/>
<source>Activity</source>
<translation>Aktivita</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="86"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="90"/>
<source>General</source>
<translation>Hlavní</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>Network</source>
<translation>Síť</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharedialog.ui" line="22"/>
- <location filename="../src/gui/sharedialog.ui" line="234"/>
+ <location filename="../src/gui/sharedialog.ui" line="258"/>
<source>TextLabel</source>
<translation>Textový popisek</translation>
</message>
<translation>ownCloud cesta:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="182"/>
+ <location filename="../src/gui/sharedialog.ui" line="116"/>
<source>Set &password </source>
<translation>Nastavit &heslo</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="196"/>
+ <location filename="../src/gui/sharedialog.ui" line="130"/>
<source>Set &expiration date</source>
<translation>Nastavit datum &vypršení</translation>
</message>
+ <message>
+ <location filename="../src/gui/sharedialog.ui" line="214"/>
+ <source>Allow editing</source>
+ <translation>Povolit úpravy</translation>
+ </message>
<message>
<location filename="../src/gui/sharedialog.ui" line="77"/>
<source>Share link</source>
<translation>Sdílet odkaz</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="125"/>
+ <location filename="../src/gui/sharedialog.ui" line="203"/>
<source>Copy &link</source>
<translation>Zkopírovat &odkaz</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="142"/>
+ <location filename="../src/gui/sharedialog.ui" line="154"/>
<source>Set password</source>
<translation>Nastavit heslo</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="692"/>
- <source>%1 path: %2</source>
- <translation>%1 v umístění: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="115"/>
+ <location filename="../src/gui/sharedialog.cpp" line="120"/>
<source>%1 Sharing</source>
<translation>%1 sdílení</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="103"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="112"/>
+ <location filename="../src/gui/sharedialog.cpp" line="117"/>
<source>Folder: %2</source>
<translation>Adresář: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="121"/>
<source>P&assword protect</source>
<translation>Ch&ránit heslem</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="221"/>
+ <location filename="../src/gui/sharedialog.cpp" line="214"/>
<source>Password Protected</source>
<translation>Chráněno heslem</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="382"/>
+ <location filename="../src/gui/sharedialog.cpp" line="338"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Tento soubor nelze sdílet, protože byl nasdílen bez možnosti dalšího sdílení.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="528"/>
+ <location filename="../src/gui/sharedialog.cpp" line="475"/>
<source>Please Set Password</source>
<translation>Nastavte prosím heslo</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="564"/>
- <location filename="../src/gui/sharedialog.cpp" line="565"/>
+ <location filename="../src/gui/sharedialog.cpp" line="538"/>
+ <location filename="../src/gui/sharedialog.cpp" line="539"/>
<source>&Share link</source>
<translation>&Sdílet odkaz</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="583"/>
+ <location filename="../src/gui/sharedialog.cpp" line="552"/>
+ <location filename="../src/gui/sharedialog.cpp" line="564"/>
<source>OCS API error code: %1</source>
<translation>OCS API chybový kód: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="605"/>
- <source>There is no sync folder configured.</source>
- <translation>Není nakonfigurována žádná synchronizační složka.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="639"/>
- <source>A sync file with the same name exists. The file cannot be registered to sync.</source>
- <translation>Existuje synchronizovaný soubor stejného jména. Tento soubor nelze registrovat pro synchronizaci.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="684"/>
- <source>The file cannot be synced.</source>
- <translation>Soubor nelze synchronizovat.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="624"/>
- <source>Sharing of external directories is not yet working.</source>
- <translation>Sdílení externích adresářů ještě nefunguje.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="473"/>
- <location filename="../src/gui/sharedialog.cpp" line="506"/>
+ <location filename="../src/gui/sharedialog.cpp" line="418"/>
+ <location filename="../src/gui/sharedialog.cpp" line="460"/>
<source>Public sh&aring requires a password</source>
<translation>Veřejné s&dílení vyžaduje heslo</translation>
</message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="617"/>
- <source>Cannot find a folder to upload to.</source>
- <translation>Nelze nalézt adresář pro nahrávání.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
- <source>Waiting to upload...</source>
- <translation>Čekání na nahrávání...</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="653"/>
- <source>Unable to register in sync space.</source>
- <translation>Nelze registrovat v synchronizačním umístění.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="694"/>
- <source>Sync of registered file was not successful yet.</source>
- <translation>Synchronizace registrovaného souboru ještě nebyla úspěšná.</translation>
- </message>
</context>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>Login Error</source>
<translation>Chyba přihlášení</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>You must sign in as user %1</source>
<translation>Musíte se přihlásit jako uživatel %1</translation>
</message>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="452"/>
+ <location filename="../src/gui/socketapi.cpp" line="447"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Sdílet s %1</translation>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="97"/>
+ <location filename="../src/libsync/syncengine.cpp" line="94"/>
<source>Success.</source>
<translation>Úspěch.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="104"/>
+ <location filename="../src/libsync/syncengine.cpp" line="101"/>
<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="107"/>
+ <location filename="../src/libsync/syncengine.cpp" line="104"/>
<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="110"/>
+ <location filename="../src/libsync/syncengine.cpp" line="107"/>
<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="113"/>
+ <location filename="../src/libsync/syncengine.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync se nezdařilo rezervovat paměť.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>CSync: kritická chyba parametrů.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="119"/>
+ <location filename="../src/libsync/syncengine.cpp" line="116"/>
<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="122"/>
+ <location filename="../src/libsync/syncengine.cpp" line="119"/>
<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="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="122"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="125"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="128"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="131"/>
<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="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="134"/>
<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="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="137"/>
<source>A HTTP transmission error happened.</source>
<translation>Nastala chyba HTTP přenosu.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation>CSync selhalo z důvodu nezpracovaného odmítnutí práv.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
<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="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
<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="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
<source>Error while reading folder.</source>
<translation>Chyba při čtení adresáře.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="996"/>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
<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="1003"/>
+ <location filename="../src/libsync/syncengine.cpp" line="991"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="152"/>
<source>CSync unspecified error.</source>
<translation>Nespecifikovaná chyba CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="155"/>
<source>Aborted by the user</source>
<translation>Zrušeno uživatelem</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="392"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>Jméno souboru obsahuje neplatné znaky, které neumožňují synchronizaci mezi různými platformami.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="143"/>
<source>CSync failed to access</source>
<translation>Selhal přístup pro CSync</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <location filename="../src/libsync/syncengine.cpp" line="97"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <source>CSync failed due to unhandled permission denied.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="146"/>
<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="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="158"/>
<source>The service is temporarily unavailable</source>
<translation>Služba je dočasně nedostupná</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="175"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<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="230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="227"/>
<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="389"/>
+ <location filename="../src/libsync/syncengine.cpp" line="386"/>
<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="392"/>
+ <location filename="../src/libsync/syncengine.cpp" line="389"/>
<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="398"/>
+ <location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename is too long.</source>
<translation>Jméno souboru je moc dlouhé.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="401"/>
+ <location filename="../src/libsync/syncengine.cpp" line="398"/>
<source>File is ignored because it's hidden.</source>
<translation>Soubor je ignorován, protože je skrytý.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="407"/>
+ <location filename="../src/libsync/syncengine.cpp" line="404"/>
<source>Stat failed.</source>
<translation>Stat selhal.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="429"/>
+ <location filename="../src/libsync/syncengine.cpp" line="426"/>
<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="561"/>
+ <location filename="../src/libsync/syncengine.cpp" line="558"/>
<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="631"/>
+ <location filename="../src/libsync/syncengine.cpp" line="612"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="645"/>
<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="718"/>
+ <location filename="../src/libsync/syncengine.cpp" line="723"/>
<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="965"/>
- <location filename="../src/libsync/syncengine.cpp" line="972"/>
+ <location filename="../src/libsync/syncengine.cpp" line="953"/>
+ <location filename="../src/libsync/syncengine.cpp" line="960"/>
<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="990"/>
+ <location filename="../src/libsync/syncengine.cpp" line="978"/>
<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="1023"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1011"/>
<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="1040"/>
- <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1028"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1048"/>
<source>Not allowed to remove, restoring</source>
<translation>Odstranění není povoleno, obnovuji</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1073"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1061"/>
<source>Local files and share folder removed.</source>
<translation>Místní soubory a sdílená složka byly odstraněny.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1116"/>
<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="1137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1125"/>
<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="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the destination</source>
<translation>cílové umístění</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the source</source>
<translation>zdroj</translation>
</message>
</message>
</context>
<context>
- <name>OCC::TransmissionChecksumValidator</name>
+ <name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="128"/>
<source>The checksum header is malformed.</source>
<translation>Hlavička kontrolního součtu je poškozena.</translation>
</message>
<message>
<location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+ <source>The checksum header contained an unknown checksum type '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="148"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>Stažený soubor neodpovídá kontrolnímu součtu, bude znovu stažen.</translation>
</message>
<source>Recent Changes</source>
<translation>Poslední změny</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="561"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="331"/>
<source>Managed Folders:</source>
<source>Open %1 in browser</source>
<translation>Otevřít %1 v prohlížeči</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="449"/>
- <source>Log out everywhere</source>
- <translation>Vše odhlásit</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="457"/>
- <source>Log in everywhere...</source>
- <translation>Vše přihlásit...</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="513"/>
<source>Unknown status</source>
<source>Account %1: %2</source>
<translation>Účet %1: %2</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="449"/>
+ <source>Log out of all accounts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="457"/>
+ <source>Log in to all accounts...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="532"/>
<source>Crash now</source>
<source>No items synced recently</source>
<translation>Žádné položky nebyly nedávno synchronizovány</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="561"/>
- <source>Discovering '%1'</source>
- <translation>Prohledávám '%1'</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="566"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>%L1 B</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="306"/>
+ <location filename="../src/libsync/utility.cpp" line="303"/>
<source>%Ln year(s)</source>
<translation>%Ln rok(ů)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="307"/>
+ <location filename="../src/libsync/utility.cpp" line="304"/>
<source>%Ln month(s)</source>
<translation>%Ln měsíc(ů)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="308"/>
+ <location filename="../src/libsync/utility.cpp" line="305"/>
<source>%Ln day(s)</source>
<translation>%Ln dny(ů)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="309"/>
+ <location filename="../src/libsync/utility.cpp" line="306"/>
<source>%Ln hour(s)</source>
<translation>%Ln hodina(y)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="310"/>
+ <location filename="../src/libsync/utility.cpp" line="307"/>
<source>%Ln minute(s)</source>
<translation>%Ln minuta(y)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="311"/>
+ <location filename="../src/libsync/utility.cpp" line="308"/>
<source>%Ln second(s)</source>
<translation>%Ln sekunda(y)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="318"/>
<source>0 seconds</source>
<translation>0 sekund</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="336"/>
+ <location filename="../src/libsync/utility.cpp" line="333"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="73"/>
+ <source>Enter your credentials to connect to the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <source>Sign in</source>
+ <translation>Einloggen</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="89"/>
<source>Remove the account configuration from the client</source>
<translation>Konto von diesem Computer entfernen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Remove Account</source>
<translation>Nutzerkonto entfernen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="97"/>
+ <location filename="../src/gui/accountsettings.ui" line="113"/>
<source>Storage space: ...</source>
<translation>Speicherplatz: ...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="167"/>
+ <location filename="../src/gui/accountsettings.ui" line="183"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Nicht markierte Ordner werden von Ihrem lokalen Dateisystem <b>entfernt</b> und werden auch nicht mehr auf diesem Rechner synchronisiert</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="230"/>
<source>Apply</source>
<translation>Anwenden</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="198"/>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
- <location filename="../src/gui/accountsettings.cpp" line="571"/>
+ <location filename="../src/gui/accountsettings.ui" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="289"/>
+ <location filename="../src/gui/accountsettings.cpp" line="646"/>
<source>Cancel</source>
<translation>Abbrechen</translation>
</message>
<translation>Verbunden mit <server> als <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="115"/>
+ <location filename="../src/gui/accountsettings.cpp" line="121"/>
<source>No account configured.</source>
<translation>Kein Konto konfiguriert.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="161"/>
+ <source>Choose what to sync</source>
+ <translation>Zu synchronisierende Elemente auswählen</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="168"/>
+ <source>Remove folder sync connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="234"/>
<source>Folder creation failed</source>
<translation>Ordner anlegen fehlgeschlagen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="230"/>
+ <location filename="../src/gui/accountsettings.cpp" line="235"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation><p>Konnte lokalen Ordner <i>%1</i> nicht anlegen.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="283"/>
- <source>Stop syncing</source>
- <translation>Synchronisation stoppen</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
+ <source>Confirm Folder Sync Connection Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>Remove Folder Sync Connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="309"/>
+ <location filename="../src/gui/accountsettings.cpp" line="314"/>
<source>Confirm Folder Reset</source>
<translation>Zurücksetzen des Ordners bestätigen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="310"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Soll Ordner <i>%1</i> wirklich zurückgesetzt und die Datenbank auf dem Client neu aufgebaut werden?</p><p><b>Hinweis:</b>
Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entfernt, jedoch kann diese Aktion erheblichen Datenverkehr verursachen und je nach Größe des Ordnerinhalts mehrere Minuten oder Stunden in Anspruch nehmen. Verwenden Sie diese Funktion nur dann, wenn Ihr Administrator Sie ausdrücklich dazu auffordert.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="391"/>
+ <location filename="../src/gui/accountsettings.cpp" line="396"/>
<source>Sync Running</source>
<translation>Synchronisation läuft</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="392"/>
+ <location filename="../src/gui/accountsettings.cpp" line="397"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Die Synchronisation läuft gerade.<br/>Wollen Sie sie beenden?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="472"/>
+ <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <source>%1 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="485"/>
<source>%1 as <i>%2</i></source>
<translation>%1 als <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="476"/>
+ <location filename="../src/gui/accountsettings.cpp" line="495"/>
<source>Connected to %1.</source>
<translation>Verbunden mit %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="478"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Server %1 ist derzeit nicht verfügbar.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="480"/>
+ <location filename="../src/gui/accountsettings.cpp" line="499"/>
<source>Signed out from %1.</source>
<translation>Abgemeldet von %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="482"/>
+ <location filename="../src/gui/accountsettings.cpp" line="501"/>
<source>No connection to %1 at %2.</source>
<translation>Keine Verbindung zu %1 auf %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
- <source>There are new folders that were not synchronized because they are too big: %1</source>
- <translation>Einige neue Ordner wurden nicht synchronisiert, weil sie zu groß sind: %1</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="536"/>
- <source>, </source>
- <translation>, </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <source>There are new folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="563"/>
+ <location filename="../src/gui/accountsettings.cpp" line="638"/>
<source>Confirm Account Removal</source>
<translation>Konto wirklich entfernen?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="564"/>
+ <location filename="../src/gui/accountsettings.cpp" line="639"/>
<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="570"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>Remove connection</source>
<translation>Verbindung entfernen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="158"/>
<source>Open folder</source>
<translation>Ordner öffnen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="168"/>
- <source>Choose What to Sync</source>
- <translation>Zu synchronisierende Elemente auswählen</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Resume sync</source>
<translation>Synchronisation fortsetzen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Pause sync</source>
<translation>Synchronisation pausieren</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="176"/>
- <source>Remove sync</source>
- <translation>Synchronisation löschen</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="277"/>
- <source>Confirm Sync Removal</source>
- <translation>Synchronisation Löschen Bestätigen</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="278"/>
+ <location filename="../src/gui/accountsettings.cpp" line="283"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>Möchten Sie wirklich die Synchronisation des Ordners <i>%1</i> stoppen?</p><p><b>Anmerkung:</b> Dies wird <b>keine</b> Dateien löschen.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="452"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) von %2 Serverkapazität verwendet. Einige Ordner, einschließlich über das Netzwerk verbundene oder freigegebene Ordner oder geteilte ordner können unterschiedliche Beschränkungen aufweisen. </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="448"/>
+ <location filename="../src/gui/accountsettings.cpp" line="453"/>
<source>%1 of %2 in use</source>
<translation>%1 von %2 Serverkapazität verwendet</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="453"/>
+ <location filename="../src/gui/accountsettings.cpp" line="462"/>
<source>Currently there is no storage usage information available.</source>
<translation>Derzeit sind keine Speichernutzungsinformationen verfügbar.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="507"/>
<source>No %1 connection configured.</source>
<translation>Keine %1-Verbindung konfiguriert.</translation>
</message>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="95"/>
+ <location filename="../src/gui/accountstate.cpp" line="99"/>
<source>Signed out</source>
<translation>Abgemeldet</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="97"/>
+ <location filename="../src/gui/accountstate.cpp" line="101"/>
<source>Disconnected</source>
<translation>Getrennt</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="99"/>
+ <location filename="../src/gui/accountstate.cpp" line="103"/>
<source>Connected</source>
<translation>Verbunden</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="101"/>
+ <location filename="../src/gui/accountstate.cpp" line="105"/>
<source>Service unavailable</source>
<translation>Dienst nicht verfügbar</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="103"/>
+ <location filename="../src/gui/accountstate.cpp" line="107"/>
<source>Network error</source>
<translation>Netzwerkfehler</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="105"/>
+ <location filename="../src/gui/accountstate.cpp" line="109"/>
<source>Configuration error</source>
<translation>Konfigurationsfehler</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="107"/>
+ <location filename="../src/gui/accountstate.cpp" line="111"/>
<source>Unknown account state</source>
<translation>Unbekannten Konto-Zustand</translation>
</message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>Reauthentication required</source>
+ <translation>Erneute Authentifizierung erforderlich</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>You need to re-login to continue using the account %1.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
<translation>Aktualisieren Sie auf die letzte Server-Version und starten Sie den Client neu.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="143"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="135"/>
<source>Authentication error: Either username or password are wrong.</source>
<translation>Authentifizierungsfehler: Entweder der Benutzername oder das Passwort sind falsch.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="155"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="147"/>
<source>timeout</source>
<translation>Zeitüberschreitung</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="186"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="178"/>
<source>The provided credentials are not correct</source>
<translation>Die zur Verfügung gestellten Anmeldeinformationen sind nicht korrekt</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="524"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="537"/>
<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="107"/>
+ <location filename="../src/gui/folder.cpp" line="108"/>
<source>Unable to create csync-context</source>
<translation>Kann keinen CSync-Kontext erstellen</translation>
</message>
<translation>Synchronisierungsaktivität</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="845"/>
+ <location filename="../src/gui/folder.cpp" line="870"/>
<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="1102"/>
+ <location filename="../src/gui/folder.cpp" line="1127"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Ein neue Order größer als %1 MB wurde hinzugefügt: %2. Bitte besuchen Sie die Einstellungen, falls sie ihn herunterladen wollen.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1115"/>
+ <location filename="../src/gui/folder.cpp" line="1140"/>
<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="1119"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Remove All Files?</source>
<translation>Alle Dateien löschen?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1121"/>
+ <location filename="../src/gui/folder.cpp" line="1146"/>
<source>Remove all files</source>
<translation>Lösche alle Dateien</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1122"/>
+ <location filename="../src/gui/folder.cpp" line="1147"/>
<source>Keep files</source>
<translation>Dateien behalten</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="275"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<source>Could not reset folder state</source>
<translation>Konnte Ordner-Zustand nicht zurücksetzen</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="276"/>
+ <location filename="../src/gui/folderman.cpp" line="271"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Ein altes Synchronisations-Journal '%1' wurde gefunden, konnte jedoch nicht entfernt werden. Bitte stellen Sie sicher, dass keine Anwendung es verwendet.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="877"/>
+ <location filename="../src/gui/folderman.cpp" line="865"/>
<source> (backup)</source>
<translation>(Sicherung)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="882"/>
+ <location filename="../src/gui/folderman.cpp" line="870"/>
<source> (backup %1)</source>
<translation>(Sicherung %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1091"/>
+ <location filename="../src/gui/folderman.cpp" line="1079"/>
<source>Undefined State.</source>
<translation>Undefinierter Zustand.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1094"/>
- <source>Waits to start syncing.</source>
- <translation>Wartet auf Beginn der Synchronistation</translation>
+ <location filename="../src/gui/folderman.cpp" line="1082"/>
+ <source>Waiting to start syncing.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1097"/>
+ <location filename="../src/gui/folderman.cpp" line="1085"/>
<source>Preparing for sync.</source>
<translation>Synchronisation wird vorbereitet.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1100"/>
+ <location filename="../src/gui/folderman.cpp" line="1088"/>
<source>Sync is running.</source>
<translation>Synchronisation läuft.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1103"/>
+ <location filename="../src/gui/folderman.cpp" line="1091"/>
<source>Last Sync was successful.</source>
<translation>Die letzte Synchronisation war erfolgreich.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1108"/>
+ <location filename="../src/gui/folderman.cpp" line="1096"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Letzte Synchronisation war erfolgreich, aber mit Warnungen für einzelne Dateien.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1111"/>
+ <location filename="../src/gui/folderman.cpp" line="1099"/>
<source>Setup Error.</source>
<translation>Installationsfehler.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1114"/>
+ <location filename="../src/gui/folderman.cpp" line="1102"/>
<source>User Abort.</source>
<translation>Benutzer-Abbruch</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1117"/>
+ <location filename="../src/gui/folderman.cpp" line="1105"/>
<source>Sync is paused.</source>
<translation>Synchronisation wurde angehalten.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1123"/>
+ <location filename="../src/gui/folderman.cpp" line="1111"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisation ist pausiert)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1119"/>
<source>No valid folder selected!</source>
<translation>Kein gültige Ordner gewählt!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1130"/>
<source>The selected path is not a folder!</source>
<translation>Der gewählte Pfad ist kein Ordner!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1146"/>
+ <location filename="../src/gui/folderman.cpp" line="1134"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Sie haben keine Schreibberechtigung für den ausgewählten Ordner!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1161"/>
+ <location filename="../src/gui/folderman.cpp" line="1149"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>Der lokale Ordner %1 wird bereits als Synchronisationsordner benutzt. Bitte wählen Sie einen anderen!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1166"/>
+ <location filename="../src/gui/folderman.cpp" line="1154"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Der lokale Ordner %1 liegt innerhalb eines synchronisierten Ordners. Bitte wählen Sie einen anderen aus!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1173"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Der lokale Ordner %1 ist ein symbolischer Link. Das Ziel des Links beinhaltet schon einen Ordner, der in einer anderen Synchronisation liegt. Bitte wählen Sie einen anderen lokalen Ordner aus!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1168"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Der lokale Ordner %1 liegt in einem Ordner, der bereits synchronisiert wird. Bitte wählen Sie einen anderen aus!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1186"/>
+ <location filename="../src/gui/folderman.cpp" line="1174"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Der lokale Ordner %1 ist ein symbolischer Link. Das Ziel des Links liegt in einem Ordner, der schon synchronisiert wird. Bitte wählen Sie einen anderen aus!</translation>
</message>
<translation>Ordner Synchronisation hinzufügen</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="85"/>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="274"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="271"/>
<source>File</source>
<translation>Datei</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="228"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="224"/>
<source>Syncing selected files in your account with</source>
<translation>Synchronisiere gewählte Dateien in Ihrem Konto mit</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="231"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="227"/>
<source>Remote path: %1</source>
<translation>Remote-Pfad: %1</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="121"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="122"/>
<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="126"/>
- <source>Adding folder is disabled because your 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="131"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="132"/>
<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="141"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="142"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="156"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
<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="182"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="192"/>
<source>Signed out</source>
<translation>Abgemeldet</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="727"/>
- <source>Discovering '%1'</source>
- <translation>„%1“ wird untersucht</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="127"/>
+ <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="163"/>
+ <source>Fetching folder list from server...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="789"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="787"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="849"/>
<source>Syncing %1</source>
<translation>Synchronisiere %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="792"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="854"/>
<source>download %1/s</source>
<translation>Download %s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="794"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="856"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="800"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>upload %1/s</source>
<translation>Upload %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="802"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="864"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="807"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="869"/>
<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="811"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="873"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="827"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="889"/>
<source>%1 of %2, file %3 of %4
Total time left %5</source>
<translation>%1 von %2, Datei %3 von %4
Gesamtzeit übrig %5</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
<source>file %1 of %2</source>
<translation>Datei %1 von %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="932"/>
<source>Waiting...</source>
<translation>Warte...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="934"/>
<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="878"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>Preparing to sync...</source>
<translation>Bereite Synchronisation vor...</translation>
</message>
<name>OCC::FolderWizard</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <source>Add Folder Sync Connection</source>
+ <translation>Ordner Synchronisation hinzufügen</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderwizard.cpp" line="564"/>
- <source>Add Folder</source>
- <translation>Ordner hinzufügen</translation>
+ <source>Add Sync Connection</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Erweitert</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="61"/>
+ <location filename="../src/gui/generalsettings.ui" line="109"/>
<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="81"/>
+ <location filename="../src/gui/generalsettings.ui" line="129"/>
<source>MB</source>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="109"/>
+ <location filename="../src/gui/generalsettings.ui" line="159"/>
<source>Show crash reporter</source>
<translation>Crash-Reporter anzeigen</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="118"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit Ignored Files</source>
<translation>Ignorierte Dateien bearbeiten</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="142"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
<source>Add an Account</source>
<translation>Ein Konto hinzufügen</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="167"/>
- <location filename="../src/gui/generalsettings.ui" line="173"/>
+ <location filename="../src/gui/generalsettings.ui" line="171"/>
+ <location filename="../src/gui/generalsettings.ui" line="177"/>
<source>About</source>
<translation>Über</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <location filename="../src/gui/generalsettings.ui" line="187"/>
<source>Updates</source>
<translation>Updates</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="208"/>
+ <location filename="../src/gui/generalsettings.ui" line="212"/>
<source>&Restart && Update</source>
<translation>&Neustarten && aktualisieren</translation>
</message>
</context>
-<context>
- <name>OCC::HttpCredentials</name>
- <message>
- <location filename="../src/libsync/creds/httpcredentials.cpp" line="290"/>
- <source>Reading from keychain failed with error: '%1'</source>
- <translation>Schlüsselbund fehlgeschlagen mit Fehler: '%1'</translation>
- </message>
-</context>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="32"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
<source>Please enter %1 password:
User: %2
</translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="41"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <source>Reading from keychain failed with error: '%1'</source>
+ <translation>Schlüsselbund fehlgeschlagen mit Fehler: '%1'</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
<source>Enter Password</source>
<translation>Passwort eingeben</translation>
</message>
<translation>Entfernen</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="40"/>
<source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
Objekte, bei denen Löschen erlaubt ist, werden gelöscht, wenn sie die Löschung eines Ordners verhindern würden. Das ist für Metadaten nützlich.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="109"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
<source>Could not open file</source>
<translation>Datei konnte nicht geöffnet werden</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="111"/>
<source>Cannot write changes to '%1'.</source>
<translation>Konnte Änderungen nicht in '%1' schreiben.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="138"/>
<source>Add Ignore Pattern</source>
<translation>Ignoriermuster hinzufügen</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>Add a new ignore pattern:</source>
<translation>Neues Ignoriermuster hinzufügen:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="45"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="46"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Dieser Eintrag wird vom System auf '%1' bereitgestellt und kann in dieser Ansicht nicht geändert werden.</translation>
</message>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="163"/>
+ <location filename="../src/libsync/logger.cpp" line="190"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="164"/>
+ <location filename="../src/libsync/logger.cpp" line="191"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Datei »%1«<br/>kann nicht zum Schreiben geöffnet werden.<br/><br/>Die Protokolldatei kann <b>nicht</b> gespeichert werden!</nobr></translation>
</message>
</message>
<message>
<location filename="../src/gui/networksettings.ui" line="203"/>
- <location filename="../src/gui/networksettings.ui" line="295"/>
+ <location filename="../src/gui/networksettings.ui" line="292"/>
<source>No limit</source>
<translation>Keine Begrenzung</translation>
</message>
<source>SOCKS5 proxy</source>
<translation>SOCKS5-Proxy</translation>
</message>
+ <message>
+ <location filename="../src/gui/networksettings.cpp" line="128"/>
+ <source>Qt >= 5.4 is required in order to use the bandwidth limit</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::OCUpdater</name>
<source>Downloading version %1. Please wait...</source>
<translation>Version %1 wird heruntergeladen. Bitte warten …</translation>
</message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
- <source>Version %1 available. Restart application to start the update.</source>
- <translation>Version %1 verfügbar. Anwendung zum Start der Aktualisierung neustarten.</translation>
- </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="145"/>
<source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
<source>Could not check for new updates.</source>
<translation>Auf neue Aktualisierungen kann nicht geprüft werden.</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
+ <source>%1 version %2 available. Restart application to start the update.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
- <source>New version %1 available. Please use the system's update tool to install it.</source>
- <translation>Neue Version %1 verfügbar. Bitte nutzen Sie das System-Updatetool zur Installation.</translation>
+ <source>New %1 version %2 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="151"/>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="114"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="110"/>
<source>Connection Timeout</source>
<translation>Zeitüberschreitung der Verbindung</translation>
</message>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="171"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="167"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Ungültige JSON-Antwort von der Poll-URL</translation>
</message>
</context>
-<context>
- <name>OCC::PropagateDownloadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="435"/>
- <source>Sync was aborted by user.</source>
- <translation>Synchronisation wurde durch den Benutzer abgebrochen.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="488"/>
- <source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation>Kein E-Tag vom Server empfangen, bitte Proxy / Gateway überprüfen</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="494"/>
- <source>We received a different E-Tag for resuming. Retrying next time.</source>
- <translation>Es wurde ein unterschiedlicher E-Tag zum Fortfahren empfangen. Bitte beim nächsten mal nochmal versuchen.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="516"/>
- <source>Server returned wrong content-range</source>
- <translation>Server hat falschen Bereich für den Inhalt zurück gegeben</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="567"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation>Die Datei %1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht herunter geladen werden!</translation>
- </message>
-</context>
<context>
<name>OCC::PropagateDownloadFileQNAM</name>
<message>
<translation>Die Datei %1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht herunter geladen werden!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="457"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
+ <source>The download would reduce free disk space below %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="372"/>
+ <source>Free space on disk is less than %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="482"/>
<source>File was deleted from server</source>
<translation>Die Datei wurde vom Server gelöscht</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="506"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="531"/>
<source>The file could not be downloaded completely.</source>
<translation>Die Datei konnte nicht vollständig herunter geladen werden.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="601"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="636"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Die Datei %1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht gespeichert geladen werden!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="641"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="676"/>
<source>File has changed since discovery</source>
<translation>Datei ist seit der Entdeckung geändert worden</translation>
</message>
<context>
<name>OCC::PropagateItemJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="92"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
<source>; Restoration Failed: %1</source>
<translation>; Wiederherstellung fehlgeschlagen: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="138"/>
<source>Continue blacklisting:</source>
<translation>Blacklisting fortsetzen:</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="230"/>
<source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation>Eine Datei oder ein Ordner wurde von einer Nur-Lese-Freigabe wiederhergestellt, aber die Wiederherstellung ist mit folgendem Fehler fehlgeschlagen: %1</translation>
</message>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove folder '%1';</source>
- <translation>Ordner '%1' konnte nicht entfernt werden</translation>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="243"/>
- <location filename="../src/libsync/propagator_legacy.cpp" line="302"/>
- <source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>Eine lokale Datei wurde während der Synchronisation geändert, synchronisieren Sie nochmals sobald die aktuelle Datei vollständig angekommen ist</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="246"/>
- <source>Sync was aborted by user.</source>
- <translation>Synchronisation wurde durch den Benutzer abgebrochen.</translation>
- </message>
+ <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="252"/>
- <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
- <translation>Die Datei wurde von einer Nur-Lese-Freigabe lokal bearbeitet. Die Datei wurde wiederhergestellt und Ihre Bearbeitung ist in der Konflikte-Datei.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="205"/>
+ <source>File name contains at least one invalid character</source>
+ <translation>Der Dateiname enthält mindestens ein ungültiges Zeichen</translation>
</message>
-</context>
-<context>
- <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="226"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="262"/>
<source>File Removed</source>
<translation>Datei gelöscht</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="274"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Lokale Datei hat sich während der Synchronisation geändert. Die Synchronisation wird wiederaufgenommen.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="250"/>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="286"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="665"/>
<source>Local file changed during sync.</source>
<translation>Eine lokale Datei wurde während der Synchronisation geändert.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="558"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="592"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>Auftragsabbruch beim Rücksetzen der HTTP-Verbindung mit QT < 5.4.2 wird erzwungen.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="566"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="600"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Die Datei wurde von einer Nur-Lese-Freigabe lokal bearbeitet. Die Datei wurde wiederhergestellt und Ihre Bearbeitung ist in der Konflikte-Datei.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="597"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="631"/>
<source>Poll URL missing</source>
<translation>Poll-URL fehlt</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="620"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="654"/>
<source>The local file was removed during sync.</source>
<translation>Die lokale Datei wurde während der Synchronisation gelöscht.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="646"/>
- <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
- <translation>Der Server hat den letzten Block nicht bestätigt. (Der E-Tag war nicht vorhanden)</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="680"/>
+ <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Nicht markierte Ordner werden von Ihrem lokalen Dateisystem <b>entfernt</b> und werden auch nicht mehr auf diesem Rechner synchronisiert</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>Zu synchronisierende Elemente auswählen: Sie können Unterordner des Servers auswählen, die synchronisiert werden sollen.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>Zu synchronisierende Elemente auswählen: Sie können Unterordner des Servers abwählen, die nicht synchronisiert werden sollen.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
<source>Choose What to Sync</source>
<translation>Zu synchronisierende Elemente auswählen</translation>
</message>
<translation>Größe</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
<source>No subfolders currently on the server.</source>
<translation>Aktuell befinden sich keine Unterordner auf dem Server.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>Ein Fehler ist aufgetreten, während die Liste der Unterordner geladen wurde.</translation>
</message>
<translation>Einstellungen</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="80"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="84"/>
<source>Activity</source>
<translation>Aktivität</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="86"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="90"/>
<source>General</source>
<translation>Allgemein</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>Network</source>
<translation>Netzwerk</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharedialog.ui" line="22"/>
- <location filename="../src/gui/sharedialog.ui" line="234"/>
+ <location filename="../src/gui/sharedialog.ui" line="258"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<translation>ownCloud-Pfad:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="182"/>
+ <location filename="../src/gui/sharedialog.ui" line="116"/>
<source>Set &password </source>
<translation>&password festlegen</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="196"/>
+ <location filename="../src/gui/sharedialog.ui" line="130"/>
<source>Set &expiration date</source>
<translation>Ablaufdatum setzen</translation>
</message>
+ <message>
+ <location filename="../src/gui/sharedialog.ui" line="214"/>
+ <source>Allow editing</source>
+ <translation>Bearbeitung erlauben</translation>
+ </message>
<message>
<location filename="../src/gui/sharedialog.ui" line="77"/>
<source>Share link</source>
<translation>Link teilen</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="125"/>
+ <location filename="../src/gui/sharedialog.ui" line="203"/>
<source>Copy &link</source>
<translation>&Link kopieren</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="142"/>
+ <location filename="../src/gui/sharedialog.ui" line="154"/>
<source>Set password</source>
<translation>Passwort setzen</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="692"/>
- <source>%1 path: %2</source>
- <translation>%1-Pfad: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="115"/>
+ <location filename="../src/gui/sharedialog.cpp" line="120"/>
<source>%1 Sharing</source>
<translation>%1-Freigabe</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="103"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="112"/>
+ <location filename="../src/gui/sharedialog.cpp" line="117"/>
<source>Folder: %2</source>
<translation>Ordner: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="121"/>
<source>P&assword protect</source>
<translation>Passwort geschützt</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="221"/>
+ <location filename="../src/gui/sharedialog.cpp" line="214"/>
<source>Password Protected</source>
<translation>passwortgeschützt</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="382"/>
+ <location filename="../src/gui/sharedialog.cpp" line="338"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Die Datei kann nicht geteilt werden, weil sie ohne erneute Teilungs-Berechtigung für Sie geteilt wurde.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="528"/>
+ <location filename="../src/gui/sharedialog.cpp" line="475"/>
<source>Please Set Password</source>
<translation>Bitte wählen Sie ein Passwort:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="564"/>
- <location filename="../src/gui/sharedialog.cpp" line="565"/>
+ <location filename="../src/gui/sharedialog.cpp" line="538"/>
+ <location filename="../src/gui/sharedialog.cpp" line="539"/>
<source>&Share link</source>
<translation>&Link teilen</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="583"/>
+ <location filename="../src/gui/sharedialog.cpp" line="552"/>
+ <location filename="../src/gui/sharedialog.cpp" line="564"/>
<source>OCS API error code: %1</source>
<translation>OCS-API-Fehlercode: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="605"/>
- <source>There is no sync folder configured.</source>
- <translation>Es ist kein Synchronisationsordner konfiguriert.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="639"/>
- <source>A sync file with the same name exists. The file cannot be registered to sync.</source>
- <translation>Eine Syncdatei selben Namens existiert. Die Datei kann nicht zur Synchronisation registriert werden.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="684"/>
- <source>The file cannot be synced.</source>
- <translation>Die Datei kann nicht synchronisiert werden.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="624"/>
- <source>Sharing of external directories is not yet working.</source>
- <translation>Das Teilen von externen Verzeichnissen funktioniert noch nicht.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="473"/>
- <location filename="../src/gui/sharedialog.cpp" line="506"/>
+ <location filename="../src/gui/sharedialog.cpp" line="418"/>
+ <location filename="../src/gui/sharedialog.cpp" line="460"/>
<source>Public sh&aring requires a password</source>
<translation>Öffentliches Teilen erfordert ein P&asswort</translation>
</message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="617"/>
- <source>Cannot find a folder to upload to.</source>
- <translation>Kein keinen Ordner zum Hochladen auffindbar.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
- <source>Waiting to upload...</source>
- <translation>Warten auf das Hochladen…</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="653"/>
- <source>Unable to register in sync space.</source>
- <translation>Registrierung im Synchronisationsraum nicht möglich.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="694"/>
- <source>Sync of registered file was not successful yet.</source>
- <translation>Die Synchronisation der registrierten Datei war noch nicht erfolgreich.</translation>
- </message>
</context>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>Login Error</source>
<translation>Log-In Fehler</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>You must sign in as user %1</source>
<translation>Sie müssen sich als %1 einloggen</translation>
</message>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="452"/>
+ <location filename="../src/gui/socketapi.cpp" line="447"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Via %1 teilen</translation>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="97"/>
+ <location filename="../src/libsync/syncengine.cpp" line="94"/>
<source>Success.</source>
<translation>Erfolgreich</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="104"/>
+ <location filename="../src/libsync/syncengine.cpp" line="101"/>
<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="107"/>
+ <location filename="../src/libsync/syncengine.cpp" line="104"/>
<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="110"/>
+ <location filename="../src/libsync/syncengine.cpp" line="107"/>
<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="113"/>
+ <location filename="../src/libsync/syncengine.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync konnte keinen Speicher reservieren.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>CSync hat einen schwerwiegender Parameterfehler festgestellt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="119"/>
+ <location filename="../src/libsync/syncengine.cpp" line="116"/>
<source>CSync processing step update failed.</source>
<translation>CSync Verarbeitungsschritt "Aktualisierung" fehlgeschlagen.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="122"/>
+ <location filename="../src/libsync/syncengine.cpp" line="119"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync Verarbeitungsschritt "Abgleich" fehlgeschlagen.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="122"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="125"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="128"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="131"/>
<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="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="134"/>
<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="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="137"/>
<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="143"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation>CSync wegen fehlender Berechtigung fehlgeschlagen.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
<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="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
<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="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
<source>Error while reading folder.</source>
<translation>Fehler beim Lesen eines Ordners.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="996"/>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
<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="1003"/>
+ <location filename="../src/libsync/syncengine.cpp" line="991"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="152"/>
<source>CSync unspecified error.</source>
<translation>CSync unbekannter Fehler.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="155"/>
<source>Aborted by the user</source>
<translation>Abbruch durch den Benutzer</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="392"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>Dateiname enthält Zeichen die nicht auf allen Betriebssystemen dargestellt werden können.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="143"/>
<source>CSync failed to access</source>
<translation>CSync-Zugriff fehlgeschlagen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <location filename="../src/libsync/syncengine.cpp" line="97"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <source>CSync failed due to unhandled permission denied.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="146"/>
<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="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="158"/>
<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="175"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<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="230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="227"/>
<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="389"/>
+ <location filename="../src/libsync/syncengine.cpp" line="386"/>
<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="392"/>
+ <location filename="../src/libsync/syncengine.cpp" line="389"/>
<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="398"/>
+ <location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename is too long.</source>
<translation>Der Dateiname ist zu lang.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="401"/>
+ <location filename="../src/libsync/syncengine.cpp" line="398"/>
<source>File 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="407"/>
+ <location filename="../src/libsync/syncengine.cpp" line="404"/>
<source>Stat failed.</source>
<translation>Stat fehlgeschlagen.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="429"/>
+ <location filename="../src/libsync/syncengine.cpp" line="426"/>
<source>Filename encoding is not valid</source>
<translation>Dateikodierung ist ungültig</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="561"/>
+ <location filename="../src/libsync/syncengine.cpp" line="558"/>
<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="631"/>
+ <location filename="../src/libsync/syncengine.cpp" line="612"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="645"/>
<source>Unable to initialize a sync journal.</source>
<translation>Synchronisationsbericht konnte nicht initialisiert werden.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="718"/>
+ <location filename="../src/libsync/syncengine.cpp" line="723"/>
<source>Cannot open the sync journal</source>
<translation>Synchronisationsbericht kann nicht geöffnet werden</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="965"/>
- <location filename="../src/libsync/syncengine.cpp" line="972"/>
+ <location filename="../src/libsync/syncengine.cpp" line="953"/>
+ <location filename="../src/libsync/syncengine.cpp" line="960"/>
<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="990"/>
+ <location filename="../src/libsync/syncengine.cpp" line="978"/>
<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="1023"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1011"/>
<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="1040"/>
- <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1028"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1048"/>
<source>Not allowed to remove, restoring</source>
<translation>Löschen nicht erlaubt, Wiederherstellung</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1073"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1061"/>
<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="1128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1116"/>
<source>Move not allowed, item restored</source>
<translation>Verschieben nicht erlaubt, Element wiederhergestellt</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1125"/>
<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="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the destination</source>
<translation>Das Ziel</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the source</source>
<translation>Die Quelle</translation>
</message>
</message>
</context>
<context>
- <name>OCC::TransmissionChecksumValidator</name>
+ <name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="128"/>
<source>The checksum header is malformed.</source>
<translation>Der Prüfsummen-Header hat ein fehlerhaftes Format.</translation>
</message>
<message>
<location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+ <source>The checksum header contained an unknown checksum type '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="148"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>Die heruntergeladene Datei entspricht nicht der Prüfsumme, das Herunterladen wird wiederaufgenommen.</translation>
</message>
<source>Recent Changes</source>
<translation>Letzte Änderungen</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="561"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="331"/>
<source>Managed Folders:</source>
<source>Open %1 in browser</source>
<translation>%1 im Browser öffnen</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="449"/>
- <source>Log out everywhere</source>
- <translation>Überall abmelden</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="457"/>
- <source>Log in everywhere...</source>
- <translation>Überall anmelden...</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="513"/>
<source>Unknown status</source>
<source>Account %1: %2</source>
<translation>Konto %1: %2</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="449"/>
+ <source>Log out of all accounts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="457"/>
+ <source>Log in to all accounts...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="532"/>
<source>Crash now</source>
<source>No items synced recently</source>
<translation>Keine kürzlich synchronisierten Elemente</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="561"/>
- <source>Discovering '%1'</source>
- <translation>»%1« wird untersucht</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="566"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>%L1 B</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="306"/>
+ <location filename="../src/libsync/utility.cpp" line="303"/>
<source>%Ln year(s)</source>
<translation>%Ln Jahr(e)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="307"/>
+ <location filename="../src/libsync/utility.cpp" line="304"/>
<source>%Ln month(s)</source>
<translation>%Ln Monat(e)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="308"/>
+ <location filename="../src/libsync/utility.cpp" line="305"/>
<source>%Ln day(s)</source>
<translation>%Ln Tag(e)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="309"/>
+ <location filename="../src/libsync/utility.cpp" line="306"/>
<source>%Ln hour(s)</source>
<translation>%Ln Stunde(n)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="310"/>
+ <location filename="../src/libsync/utility.cpp" line="307"/>
<source>%Ln minute(s)</source>
<translation>%Ln Minute(n)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="311"/>
+ <location filename="../src/libsync/utility.cpp" line="308"/>
<source>%Ln second(s)</source>
<translation>%Ln Sekunde(n)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="318"/>
<source>0 seconds</source>
<translation>0 Sekunden</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="336"/>
+ <location filename="../src/libsync/utility.cpp" line="333"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="73"/>
+ <source>Enter your credentials to connect to the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <source>Sign in</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="89"/>
<source>Remove the account configuration from the client</source>
<translation>Αφαίρεση της διαμόρφωσης του λογαριασμού</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Remove Account</source>
<translation>Αφαίρεση Λογαριασμού</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="97"/>
+ <location filename="../src/gui/accountsettings.ui" line="113"/>
<source>Storage space: ...</source>
<translation>Χώρος αποθήκευσης: ...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="167"/>
+ <location filename="../src/gui/accountsettings.ui" line="183"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Οι μη επιλεγμένοι φάκελοι θα <b>αφαιρεθούν</ b> από το τοπικό σύστημα αρχείων σας και δεν θα συγχρονιστούν πια με αυτόν τον υπολογιστή</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="230"/>
<source>Apply</source>
<translation>Εφαρμογή</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="198"/>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
- <location filename="../src/gui/accountsettings.cpp" line="571"/>
+ <location filename="../src/gui/accountsettings.ui" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="289"/>
+ <location filename="../src/gui/accountsettings.cpp" line="646"/>
<source>Cancel</source>
<translation>Άκυρο</translation>
</message>
<translation>Συνδεδεμένοι με το <server> ως <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="115"/>
+ <location filename="../src/gui/accountsettings.cpp" line="121"/>
<source>No account configured.</source>
<translation>Δεν ρυθμίστηκε λογαριασμός.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="161"/>
+ <source>Choose what to sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="168"/>
+ <source>Remove folder sync connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="234"/>
<source>Folder creation failed</source>
<translation>Αποτυχία αφαίρεσης φακέλου</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="230"/>
+ <location filename="../src/gui/accountsettings.cpp" line="235"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation><p>Αδυναμία δημιουργίας τοπικού φακέλου <i>%1</i>.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="283"/>
- <source>Stop syncing</source>
- <translation>Διακοπή συγχρονισμού</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
+ <source>Confirm Folder Sync Connection Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>Remove Folder Sync Connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="309"/>
+ <location filename="../src/gui/accountsettings.cpp" line="314"/>
<source>Confirm Folder Reset</source>
<translation>Επιβεβαίωση Επαναφοράς Φακέλου</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="310"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Θέλετε στ' αλήθεια να επαναφέρετε το φάκελο <i>%1</i> και να επαναδημιουργήσετε τη βάση δεδομένων του δέκτη;</p><p><b>Σημείωση:</b> Αυτή η λειτουργία έχει σχεδιαστεί αποκλειστικά για λόγους συντήρησης. Κανένα αρχείο δεν θα αφαιρεθεί, αλλά αυτό μπορεί να προκαλέσει σημαντική κίνηση δεδομένων και να πάρει αρκετά λεπτά ή ώρες μέχρι να ολοκληρωθεί, ανάλογα με το μέγεθος του φακέλου. Χρησιμοποιείστε αυτή την επιλογή μόνο εάν έχετε συμβουλευτεί αναλόγως από το διαχειριστή σας.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="391"/>
+ <location filename="../src/gui/accountsettings.cpp" line="396"/>
<source>Sync Running</source>
<translation>Εκτελείται Συγχρονισμός </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="392"/>
+ <location filename="../src/gui/accountsettings.cpp" line="397"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Η λειτουργία συγχρονισμού εκτελείται.<br/> Θέλετε να την τερματίσετε;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="472"/>
+ <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <source>%1 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="485"/>
<source>%1 as <i>%2</i></source>
<translation>%1 ως <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="476"/>
+ <location filename="../src/gui/accountsettings.cpp" line="495"/>
<source>Connected to %1.</source>
<translation>Συνδεδεμένο με %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="478"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Ο διακομιστής %1 δεν είναι διαθέσιμος προσωρινά.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="480"/>
+ <location filename="../src/gui/accountsettings.cpp" line="499"/>
<source>Signed out from %1.</source>
<translation>Αποσυνδέθηκε από %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="482"/>
+ <location filename="../src/gui/accountsettings.cpp" line="501"/>
<source>No connection to %1 at %2.</source>
<translation>Δεν υπάρχει σύνδεση με το %1 στο %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
- <source>There are new folders that were not synchronized because they are too big: %1</source>
- <translation>Υπάρχουν νέοι φάκελοι που δεν συγχρονίσθηκαν επειδή είναι πολυ μεγάλοι: %1</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="536"/>
- <source>, </source>
- <translation>, </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <source>There are new folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="563"/>
+ <location filename="../src/gui/accountsettings.cpp" line="638"/>
<source>Confirm Account Removal</source>
<translation>Επιβεβαίωση Αφαίρεσης Λογαριασμού</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="564"/>
+ <location filename="../src/gui/accountsettings.cpp" line="639"/>
<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="570"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>Remove connection</source>
<translation>Αφαίρεση σύνδεσης</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="158"/>
<source>Open folder</source>
<translation>Άνοιγμα φακέλου</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="168"/>
- <source>Choose What to Sync</source>
- <translation>Επιλέξτε Τι θα Συγχρονιστεί</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Resume sync</source>
<translation>Συνέχιση συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Pause sync</source>
<translation>Παύση συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="176"/>
- <source>Remove sync</source>
- <translation>Αφαίρεση συγχρονισμού</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="277"/>
- <source>Confirm Sync Removal</source>
- <translation>Επιβεβαίωση Αφαίρεσης Συγχρονισμού</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="278"/>
+ <location filename="../src/gui/accountsettings.cpp" line="283"/>
<source><p>Do you really want to stop syncing the folder <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="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="452"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) από %2 σε χρήση. Μερικοί φάκελοι, συμπεριλαμβανομένων των δικτυακών ή των κοινόχρηστων μπορεί να έχουν διαφορετικά όρια.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="448"/>
+ <location filename="../src/gui/accountsettings.cpp" line="453"/>
<source>%1 of %2 in use</source>
<translation>%1 από %2 σε χρήση</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="453"/>
+ <location filename="../src/gui/accountsettings.cpp" line="462"/>
<source>Currently there is no storage usage information available.</source>
<translation>Προς το παρόν δεν υπάρχουν πληροφορίες χρήσης χώρου αποθήκευσης διαθέσιμες.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="507"/>
<source>No %1 connection configured.</source>
<translation>Δεν έχει ρυθμιστεί σύνδεση με το %1.</translation>
</message>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="95"/>
+ <location filename="../src/gui/accountstate.cpp" line="99"/>
<source>Signed out</source>
<translation>Αποσύνδεση</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="97"/>
+ <location filename="../src/gui/accountstate.cpp" line="101"/>
<source>Disconnected</source>
<translation>Αποσυνδεδεμένο</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="99"/>
+ <location filename="../src/gui/accountstate.cpp" line="103"/>
<source>Connected</source>
<translation>Συνδεδεμένο</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="101"/>
+ <location filename="../src/gui/accountstate.cpp" line="105"/>
<source>Service unavailable</source>
<translation>Η υπηρεσία δεν είναι διαθέσιμη</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="103"/>
+ <location filename="../src/gui/accountstate.cpp" line="107"/>
<source>Network error</source>
<translation>Σφάλμα δικτύου</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="105"/>
+ <location filename="../src/gui/accountstate.cpp" line="109"/>
<source>Configuration error</source>
<translation>Σφάλμα ρυθμίσεων</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="107"/>
+ <location filename="../src/gui/accountstate.cpp" line="111"/>
<source>Unknown account state</source>
<translation>Άγνωστη κατάσταση λογαριασμού</translation>
</message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>Reauthentication required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>You need to re-login to continue using the account %1.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
<translation>Παρακαλώ ενημερώστε το διακομιστή στη νεώτερη έκδοση και επανεκκινήστε το δέκτη.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="143"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="135"/>
<source>Authentication error: Either username or password are wrong.</source>
<translation>Σφάλμα Πιστοποίησης: Το όνομα χρήστη ή ο κωδικός πρόσβασης είναι λανθασμένα.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="155"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="147"/>
<source>timeout</source>
<translation>παρέλευση χρονικού ορίου</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="186"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="178"/>
<source>The provided credentials are not correct</source>
<translation>Τα παρεχόμενα διαπιστευτήρια δεν είναι σωστά</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="524"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="537"/>
<source>Aborted by the user</source>
<translation>Ματαιώθηκε από το χρήστη</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="107"/>
+ <location filename="../src/gui/folder.cpp" line="108"/>
<source>Unable to create csync-context</source>
<translation>Αδυναμία δημιουργίας csync-context</translation>
</message>
<translation>Δραστηριότητα Συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="845"/>
+ <location filename="../src/gui/folder.cpp" line="870"/>
<source>Could not read system exclude file</source>
<translation>Αδυναμία ανάγνωσης αρχείου αποκλεισμού συστήματος</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1102"/>
+ <location filename="../src/gui/folder.cpp" line="1127"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Ένας νέος φάκελος μεγαλύτερος από %1 MB έχει προστεθεί: %2.
Παρακαλούμε πηγαίνετε στις ρυθμίσεις για να επιλέξετε αν επιθυμείτε να τον κατεβάσετε.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1115"/>
+ <location filename="../src/gui/folder.cpp" line="1140"/>
<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="1119"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Remove All Files?</source>
<translation>Αφαίρεση Όλων των Αρχείων;</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1121"/>
+ <location filename="../src/gui/folder.cpp" line="1146"/>
<source>Remove all files</source>
<translation>Αφαίρεση όλων των αρχείων</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1122"/>
+ <location filename="../src/gui/folder.cpp" line="1147"/>
<source>Keep files</source>
<translation>Διατήρηση αρχείων</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="275"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<source>Could not reset folder state</source>
<translation>Δεν ήταν δυνατό να επαναφερθεί η κατάσταση του φακέλου</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="276"/>
+ <location filename="../src/gui/folderman.cpp" line="271"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Βρέθηκε ένα παλαιότερο αρχείο συγχρονισμού '%1', αλλά δεν μπόρεσε να αφαιρεθεί. Παρακαλώ βεβαιωθείτε ότι καμμία εφαρμογή δεν το χρησιμοποιεί αυτή τη στιγμή.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="877"/>
+ <location filename="../src/gui/folderman.cpp" line="865"/>
<source> (backup)</source>
<translation>(αντίγραφο ασφαλείας)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="882"/>
+ <location filename="../src/gui/folderman.cpp" line="870"/>
<source> (backup %1)</source>
<translation>(αντίγραοφ ασφαλέιας %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1091"/>
+ <location filename="../src/gui/folderman.cpp" line="1079"/>
<source>Undefined State.</source>
<translation>Απροσδιόριστη Κατάσταση.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1094"/>
- <source>Waits to start syncing.</source>
- <translation>Αναμονή έναρξης συγχρονισμού.</translation>
+ <location filename="../src/gui/folderman.cpp" line="1082"/>
+ <source>Waiting to start syncing.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1097"/>
+ <location filename="../src/gui/folderman.cpp" line="1085"/>
<source>Preparing for sync.</source>
<translation>Προετοιμασία για συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1100"/>
+ <location filename="../src/gui/folderman.cpp" line="1088"/>
<source>Sync is running.</source>
<translation>Ο συγχρονισμός εκτελείται.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1103"/>
+ <location filename="../src/gui/folderman.cpp" line="1091"/>
<source>Last Sync was successful.</source>
<translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1108"/>
+ <location filename="../src/gui/folderman.cpp" line="1096"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής, αλλά υπήρχαν προειδοποιήσεις σε συγκεκριμένα αρχεία.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1111"/>
+ <location filename="../src/gui/folderman.cpp" line="1099"/>
<source>Setup Error.</source>
<translation>Σφάλμα Ρύθμισης.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1114"/>
+ <location filename="../src/gui/folderman.cpp" line="1102"/>
<source>User Abort.</source>
<translation>Ματαίωση από Χρήστη.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1117"/>
+ <location filename="../src/gui/folderman.cpp" line="1105"/>
<source>Sync is paused.</source>
<translation>Παύση συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1123"/>
+ <location filename="../src/gui/folderman.cpp" line="1111"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Παύση συγχρονισμού)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1119"/>
<source>No valid folder selected!</source>
<translation>Δεν επιλέχθηκε έγκυρος φάκελος!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1130"/>
<source>The selected path is not a folder!</source>
<translation>Η επιλεγμένη διαδρομή δεν είναι φάκελος!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1146"/>
+ <location filename="../src/gui/folderman.cpp" line="1134"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Δεν έχετε δικαιώματα εγγραφής στον επιλεγμένο φάκελο!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1161"/>
+ <location filename="../src/gui/folderman.cpp" line="1149"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>Ο τοπικός φάκελος %1 χρησιμοποιείται ήδη σε μια σύνδεση συγχρονισμού φακέλου. Παρακαλώ επιλέξτε άλλον!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1166"/>
+ <location filename="../src/gui/folderman.cpp" line="1154"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Ο τοπικός φάκελος %1 περιέχει ήδη ένα φάκελο που χρησιμοποιείται σε μια σύνδεση συγχρονισμού φακέλου. Παρακαλώ επιλέξτε άλλον!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1173"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Ο τοπικός φάκελος %1 είναι συμβολικός σύνδεσμος. Ο σύνδεσμος που παραπέμπει περιέχει ήδη ένα φάκελο που βρίσκεται σε συγχρονισμό. Παρακαλώ επιλέξτε άλλον!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1168"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Ο τοπικός φάκελος %1 περιέχεται ήδη σε φάκελο που χρησιμοποιείται σε μια σύνδεση συγχρονισμού. Παρακαλώ επιλέξτε άλλον!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1186"/>
+ <location filename="../src/gui/folderman.cpp" line="1174"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Ο τοπικός φάκελος %1 είναι συμβολικός σύνδεσμος. Ο σύνδεσμος που παραπέμπει περιέχεται ήδη σε φάκελο που βρίσκεται σε συγχρονισμό. Παρακαλώ επιλέξτε άλλον!</translation>
</message>
<translation>Προσθήκη Σύνδεσης Συγχρονισμού Φακέλου</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="85"/>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="274"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="271"/>
<source>File</source>
<translation>Αρχείο</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="228"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="224"/>
<source>Syncing selected files in your account with</source>
<translation>Συγχρονισμός επιλεγμένων αρχείων στο λογαριασμό σας με</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="231"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="227"/>
<source>Remote path: %1</source>
<translation>Απομακρυσμένη διαδρομή: %1</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="121"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="122"/>
<source>You need to be connected to add a folder</source>
<translation>Πρέπει να έχετε συνδεθεί για να προσθέσετε φάκελο</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="126"/>
- <source>Adding folder is disabled because your 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="131"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="132"/>
<source>Click this button to add a folder to synchronize.</source>
<translation>Κάντε κλικ σε αυτό το κουμπί για να προσθέσετε ένα φάκελο προς συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="141"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="142"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="156"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
<source>Error while loading the list of folders from the server.</source>
<translation>Σφάλμα κατά τη φόρτωση της λίστας φακέλων από το διακομιστή.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="182"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="192"/>
<source>Signed out</source>
<translation>Αποσύνδεση</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="727"/>
- <source>Discovering '%1'</source>
- <translation>Εντοπισμός '%1'</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="127"/>
+ <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="163"/>
+ <source>Fetching folder list from server...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="787"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="789"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="849"/>
<source>Syncing %1</source>
<translation>Συγχρονισμός %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="792"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="854"/>
<source>download %1/s</source>
<translation>λήψη %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="794"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="856"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="800"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>upload %1/s</source>
<translation>μεταφόρτωση %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="802"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="864"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="807"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="869"/>
<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="811"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="873"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="827"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="889"/>
<source>%1 of %2, file %3 of %4
Total time left %5</source>
<translation>%1 από %2, αρχείο %3 από%4
Συνολικός χρόνος που απομένει %5</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
<source>file %1 of %2</source>
<translation>αρχείο %1 από %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="932"/>
<source>Waiting...</source>
<translation>Αναμονή...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="934"/>
<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="878"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>Preparing to sync...</source>
<translation>Προετοιμασία για συγχρονισμό...</translation>
</message>
<name>OCC::FolderWizard</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <source>Add Folder Sync Connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderwizard.cpp" line="564"/>
- <source>Add Folder</source>
- <translation>Προσθήκη Φακέλου</translation>
+ <source>Add Sync Connection</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Για προχωρημένους</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="61"/>
+ <location filename="../src/gui/generalsettings.ui" line="109"/>
<source>Ask confirmation before downloading folders larger than</source>
<translation>Επιβεβαίωση πριν το κατέβασμα φακέλων μεγαλύτερων από</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
+ <location filename="../src/gui/generalsettings.ui" line="129"/>
<source>MB</source>
<translation>ΜΒ</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="109"/>
+ <location filename="../src/gui/generalsettings.ui" line="159"/>
<source>Show crash reporter</source>
<translation>Εμφάνιση αναφοράς κατάρρευσης</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="118"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit Ignored Files</source>
<translation>Επεξεργασία Αρχείων προς Αγνόηση</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="142"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
<source>Add an Account</source>
<translation>Προσθήκη λογαριασμού</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="167"/>
- <location filename="../src/gui/generalsettings.ui" line="173"/>
+ <location filename="../src/gui/generalsettings.ui" line="171"/>
+ <location filename="../src/gui/generalsettings.ui" line="177"/>
<source>About</source>
<translation>Σχετικά</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <location filename="../src/gui/generalsettings.ui" line="187"/>
<source>Updates</source>
<translation>Ενημερώσεις</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="208"/>
+ <location filename="../src/gui/generalsettings.ui" line="212"/>
<source>&Restart && Update</source>
<translation>&Επανεκκίνηση && Ενημέρωση</translation>
</message>
</context>
-<context>
- <name>OCC::HttpCredentials</name>
- <message>
- <location filename="../src/libsync/creds/httpcredentials.cpp" line="290"/>
- <source>Reading from keychain failed with error: '%1'</source>
- <translation>Η ανάγνωση από την κλειδοθήκη απέτυχε με σφάλμα: '%1'</translation>
- </message>
-</context>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="32"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
<source>Please enter %1 password:
User: %2
</translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="41"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <source>Reading from keychain failed with error: '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
<source>Enter Password</source>
<translation>Εισάγετε Κωδικό Πρόσβασης</translation>
</message>
<translation>Αφαίρεση</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="40"/>
<source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
Τα στοιχεία όπου επιτρέπεται η διαγραφή θα διαγράφονται εάν εμποδίζουν την αφαίρεση ενός φακέλου αρχείων. Αυτό είναι χρήσιμο για μετα-δεδομένα.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="109"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
<source>Could not open file</source>
<translation>Αδυναμία ανοίγματος αρχείου</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="111"/>
<source>Cannot write changes to '%1'.</source>
<translation>Αδυναμία εγγραφής αλλαγών στο '%1'.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="138"/>
<source>Add Ignore Pattern</source>
<translation>Προσθήκη Προτύπου Αγνόησης</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>Add a new ignore pattern:</source>
<translation>Προσθήκη νέου προτύπου αγνόησης:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="45"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="46"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Αυτή η είσοδος παρέχεται από το σύστημα στο '%1' και δεν μπορεί να τροποποιηθεί σε αυτή την προβολή.</translation>
</message>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="163"/>
+ <location filename="../src/libsync/logger.cpp" line="190"/>
<source>Error</source>
<translation>Σφάλμα</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="164"/>
+ <location filename="../src/libsync/logger.cpp" line="191"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Το αρχείο '%1'<br/>δεν μπορεί να ανοιχθεί για εγγραφή.<br/><br/>Το αρχείο καταγραφής <b>δεν</b> μπορεί να αποθηκευτεί!</nobr> </translation>
</message>
</message>
<message>
<location filename="../src/gui/networksettings.ui" line="203"/>
- <location filename="../src/gui/networksettings.ui" line="295"/>
+ <location filename="../src/gui/networksettings.ui" line="292"/>
<source>No limit</source>
<translation>Χωρίς όριο</translation>
</message>
<source>SOCKS5 proxy</source>
<translation>Ενδιάμεσος SOCKS5</translation>
</message>
+ <message>
+ <location filename="../src/gui/networksettings.cpp" line="128"/>
+ <source>Qt >= 5.4 is required in order to use the bandwidth limit</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::OCUpdater</name>
<source>Downloading version %1. Please wait...</source>
<translation>Λήψη έκδοσης %1. Παρακαλώ περιμένετε...</translation>
</message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
- <source>Version %1 available. Restart application to start the update.</source>
- <translation>Η έκδοση %1 είναι διαθέσιμη. Επανεκκινήστε την εφαρμογή για να ξεκινήσει η ενημέρωση.</translation>
- </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="145"/>
<source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
<source>Could not check for new updates.</source>
<translation>Αδυναμία ελέγχου για νέες ενημερώσεις.</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
+ <source>%1 version %2 available. Restart application to start the update.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
- <source>New version %1 available. Please use the system's update tool to install it.</source>
- <translation>Νέα έκδοση του %1 είναι διαθέσιμη. Παρακαλώ χρησιμοποιήστε το εργαλείο ενημερώσεων του συστήματος για να την εγκαταστήσετε.</translation>
+ <source>New %1 version %2 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="151"/>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="114"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="110"/>
<source>Connection Timeout</source>
<translation>Λήξη Χρόνου Αναμονής Σύνδεσης</translation>
</message>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="171"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="167"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Λανθασμένη απάντηση JSON από την ιστοσελίδα poll</translation>
</message>
</context>
-<context>
- <name>OCC::PropagateDownloadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="435"/>
- <source>Sync was aborted by user.</source>
- <translation>Ο συγχρονισμός ματαιώθηκε από τον χρήστη.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="488"/>
- <source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation>Δεν ελήφθη E-Tag από το διακομιστή, ελέγξτε το διακομιστή μεσολάβησης/πύλη</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="494"/>
- <source>We received a different E-Tag for resuming. Retrying next time.</source>
- <translation>Ελήφθη διαφορετικό E-Tag για συνέχιση. Επανάληψη την επόμενη φορά.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="516"/>
- <source>Server returned wrong content-range</source>
- <translation>Ο διακομιστής επέστρεψε εσφαλμένο πεδίο τιμών</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="567"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation>Το αρχείο %1 δεν είναι δυνατό να ληφθεί λόγω διένεξης με το όνομα ενός τοπικού αρχείου!</translation>
- </message>
-</context>
<context>
<name>OCC::PropagateDownloadFileQNAM</name>
<message>
<translation>Το αρχείο %1 δεν είναι δυνατό να ληφθεί λόγω διένεξης με το όνομα ενός τοπικού αρχείου!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="457"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
+ <source>The download would reduce free disk space below %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="372"/>
+ <source>Free space on disk is less than %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="482"/>
<source>File was deleted from server</source>
<translation>Το αρχείο διαγράφηκε από τον διακομιστή</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="506"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="531"/>
<source>The file could not be downloaded completely.</source>
<translation>Η λήψη του αρχείου δεν ολοκληρώθηκε.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="601"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="636"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Το αρχείο %1 δεν είναι δυνατό να αποθηκευτεί λόγω διένεξης με το όνομα ενός τοπικού ονόματος αρχείου!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="641"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="676"/>
<source>File has changed since discovery</source>
<translation>Το αρχείο έχει αλλάξει από όταν ανακαλύφθηκε</translation>
</message>
<context>
<name>OCC::PropagateItemJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="92"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
<source>; Restoration Failed: %1</source>
<translation>; Η Αποκατάσταση Απέτυχε: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="138"/>
<source>Continue blacklisting:</source>
<translation>Συνέχιση αποκλεισμού:</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="230"/>
<source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation>Ένα αρχείο ή ένας κατάλογος αφαιρέθηκε από ένα διαμοιρασμένο κατάλογο μόνο για ανάγνωση, αλλά η επαναφορά απέτυχε: %1</translation>
</message>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove folder '%1';</source>
- <translation>Αδυναμία αφαίρεσης φακέλου '%1';</translation>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="243"/>
- <location filename="../src/libsync/propagator_legacy.cpp" line="302"/>
- <source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>Το τοπικό αρχείο τροποποιήθηκε κατά τη διάρκεια του συγχρονισμού, θα συγχρονιστεί και πάλι όταν φτάσει πλήρως</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="246"/>
- <source>Sync was aborted by user.</source>
- <translation>Ο συγχρονισμός ματαιώθηκε από τον χρήστη.</translation>
- </message>
+ <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="252"/>
- <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
- <translation>Το αρχείο υπέστη επεξεργασία τοπικά αλλά είναι τμήμα ενός διαμοιρασμένου καταλόγου μόνο για ανάγνωση. Επαναφέρθηκε και το επεξεργασμένο βρίσκεται στο αρχείο συγκρούσεων.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="205"/>
+ <source>File name contains at least one invalid character</source>
+ <translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="226"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="262"/>
<source>File Removed</source>
<translation>Το αρχείο αφαιρέθηκε</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="274"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Το τοπικό αρχείο τροποποιήθηκε κατά τη διάρκεια του συγχρονισμού. Θα συγχρονιστεί πάλι.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="250"/>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="286"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="665"/>
<source>Local file changed during sync.</source>
<translation>Το τοπικό αρχείο τροποποιήθηκε κατά τον συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="558"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="592"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>Εξαναγκασμός ακύρωσης εργασίας στην επαναφορά σύνδεσης HTTP με Qt < 5.4.2</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="566"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="600"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Το αρχείο υπέστη επεξεργασία τοπικά αλλά είναι τμήμα ενός διαμοιρασμένου καταλόγου μόνο για ανάγνωση. Επαναφέρθηκε και το επεξεργασμένο βρίσκεται στο αρχείο συγκρούσεων.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="597"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="631"/>
<source>Poll URL missing</source>
<translation>Η διεύθυνση poll URL λείπει</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="620"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="654"/>
<source>The local file was removed during sync.</source>
<translation>Το τοπικό αρχείο αφαιρέθηκε κατά το συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="646"/>
- <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
- <translation>Ο διακομιστής δεν αναγνώρισε το τελευταίο τμήμα. (Δεν υπήρχε e-tag)</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="680"/>
+ <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Οι μη επιλεγμένοι φάκελοι θα <b>αφαιρεθούν</ b> από το τοπικό σύστημα αρχείων σας και δεν θα συγχρονιστούν πια με αυτόν τον υπολογιστή</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>Επιλέξτε Τι θα Συγχρονιστεί: Επιλέξτε τους απομακρυσμένους υποφακέλους που επιθυμείτε να συγχρονίσετε.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>Επιλέξτε Τι θα Συγχρονιστεί: Επιλέξτε τους απομακρυσμένους υποφακέλους που δεν επιθυμείτε να συγχρονίσετε.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
<source>Choose What to Sync</source>
<translation>Επιλέξτε Τι θα Συγχρονιστεί</translation>
</message>
<translation>Μέγεθος</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
<source>No subfolders currently on the server.</source>
<translation>Δεν υπάρχουν υποφάκελοι αυτή τη στιγμή στον διακομιστή.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>Προέκυψε σφάλμα κατά τη φόρτωση της λίστας υποφακέλων.</translation>
</message>
<translation>Ρυθμίσεις</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="80"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="84"/>
<source>Activity</source>
<translation>Δραστηριότητα</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="86"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="90"/>
<source>General</source>
<translation>Γενικά</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>Network</source>
<translation>Δίκτυο</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharedialog.ui" line="22"/>
- <location filename="../src/gui/sharedialog.ui" line="234"/>
+ <location filename="../src/gui/sharedialog.ui" line="258"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<translation>Διαδρομή ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="182"/>
+ <location filename="../src/gui/sharedialog.ui" line="116"/>
<source>Set &password </source>
<translation>Ορισμός &κωδικού πρόσβασης</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="196"/>
+ <location filename="../src/gui/sharedialog.ui" line="130"/>
<source>Set &expiration date</source>
<translation>Ορισμός &ημερομηνίας λήξης</translation>
</message>
+ <message>
+ <location filename="../src/gui/sharedialog.ui" line="214"/>
+ <source>Allow editing</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/sharedialog.ui" line="77"/>
<source>Share link</source>
<translation>Διαμοιρασμός συνδέσμου</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="125"/>
+ <location filename="../src/gui/sharedialog.ui" line="203"/>
<source>Copy &link</source>
<translation>Αντιγραφή &συνδέσμου</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="142"/>
+ <location filename="../src/gui/sharedialog.ui" line="154"/>
<source>Set password</source>
<translation>Ορισμός κωδικού πρόσβασης</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="692"/>
- <source>%1 path: %2</source>
- <translation>%1 διαδρομή: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="115"/>
+ <location filename="../src/gui/sharedialog.cpp" line="120"/>
<source>%1 Sharing</source>
<translation>%1 Διαμοιράστηκε</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="103"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="112"/>
+ <location filename="../src/gui/sharedialog.cpp" line="117"/>
<source>Folder: %2</source>
<translation>Φάκελος: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="121"/>
<source>P&assword protect</source>
<translation>Π&ροστασία με κωδικό</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="221"/>
+ <location filename="../src/gui/sharedialog.cpp" line="214"/>
<source>Password Protected</source>
<translation>Προστατευμένο με κωδικό πρόσβασης</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="382"/>
+ <location filename="../src/gui/sharedialog.cpp" line="338"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Το αρχείο δεν μπορεί να διαμοιραστεί γιατί διαμοιράστηκε χωρίς δικαιώματα διαμοιρασμού.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="528"/>
+ <location filename="../src/gui/sharedialog.cpp" line="475"/>
<source>Please Set Password</source>
<translation>Παρακαλούμε ορίστε Κωδικό</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="564"/>
- <location filename="../src/gui/sharedialog.cpp" line="565"/>
+ <location filename="../src/gui/sharedialog.cpp" line="538"/>
+ <location filename="../src/gui/sharedialog.cpp" line="539"/>
<source>&Share link</source>
<translation>Δ&ιαμοιρασμός συνδέσμου</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="583"/>
+ <location filename="../src/gui/sharedialog.cpp" line="552"/>
+ <location filename="../src/gui/sharedialog.cpp" line="564"/>
<source>OCS API error code: %1</source>
<translation>OCS API κωδικός λάθους: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="605"/>
- <source>There is no sync folder configured.</source>
- <translation>Δεν έχει οριστεί φάκελος συνχρονισμού.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="639"/>
- <source>A sync file with the same name exists. The file cannot be registered to sync.</source>
- <translation>Ήδη υπάρχει αρχείο συγχρονισμού με το ίδιο όνομα. Το αρχείο δεν μπορεί να καταχωρηθεί προς συγχρονισμό.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="684"/>
- <source>The file cannot be synced.</source>
- <translation>Το αρχείο δεν μπορεί να συγχρονιστεί.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="624"/>
- <source>Sharing of external directories is not yet working.</source>
- <translation>Ο διαμοιρασμός εξωτερικών καταλόγων δεν λειτουργεί ακόμα.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="473"/>
- <location filename="../src/gui/sharedialog.cpp" line="506"/>
+ <location filename="../src/gui/sharedialog.cpp" line="418"/>
+ <location filename="../src/gui/sharedialog.cpp" line="460"/>
<source>Public sh&aring requires a password</source>
<translation>Ο δημόσιος &διαμοιρασμός απαιτεί κωδικό πρόσβασης</translation>
</message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="617"/>
- <source>Cannot find a folder to upload to.</source>
- <translation>Αδυναμία εύρεσης φακέλου μεταφόρτωσης.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
- <source>Waiting to upload...</source>
- <translation>Αναμονή για μεταφόρτωση</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="653"/>
- <source>Unable to register in sync space.</source>
- <translation>Αδυναμία καταχώρησης στο χώρο συγχρονισμού.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="694"/>
- <source>Sync of registered file was not successful yet.</source>
- <translation>Ο συγχρονισμός του καταχωρημένου αρχείου δεν πέτυχε ακόμη.</translation>
- </message>
</context>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>Login Error</source>
<translation>Σφάλμα Σύνδεσης</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>You must sign in as user %1</source>
<translation>Πρέπει να εισέλθετε σαν χρήστης %1</translation>
</message>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="452"/>
+ <location filename="../src/gui/socketapi.cpp" line="447"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Διαμοιρασμός με %1</translation>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="97"/>
+ <location filename="../src/libsync/syncengine.cpp" line="94"/>
<source>Success.</source>
<translation>Επιτυχία.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="104"/>
+ <location filename="../src/libsync/syncengine.cpp" line="101"/>
<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="107"/>
+ <location filename="../src/libsync/syncengine.cpp" line="104"/>
<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="110"/>
+ <location filename="../src/libsync/syncengine.cpp" line="107"/>
<source>CSync got an error while processing internal trees.</source>
<translation>Το CSync έλαβε κάποιο μήνυμα λάθους κατά την επεξεργασία της εσωτερικής διεργασίας.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="113"/>
+ <location filename="../src/libsync/syncengine.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>Το CSync απέτυχε να δεσμεύσει μνήμη.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>Μοιραίο σφάλμα παράμετρου CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="119"/>
+ <location filename="../src/libsync/syncengine.cpp" line="116"/>
<source>CSync processing step update failed.</source>
<translation>Η ενημέρωση του βήματος επεξεργασίας του CSync απέτυχε.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="122"/>
+ <location filename="../src/libsync/syncengine.cpp" line="119"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync στάδιο επεξεργασίας συμφιλίωση απέτυχε. </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="122"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>Το CSync δεν μπόρεσε να πιστοποιηθεί στο διακομιστή μεσολάβησης.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="125"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>Το CSync απέτυχε να διερευνήσει το διαμεσολαβητή ή το διακομιστή.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="128"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>Το CSync απέτυχε να πιστοποιηθεί στο διακομιστή 1%. </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="131"/>
<source>CSync failed to connect to the network.</source>
<translation>Το CSync απέτυχε να συνδεθεί με το δίκτυο.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="134"/>
<source>A network connection timeout happened.</source>
<translation>Διακοπή σύνδεσης δικτύου λόγω παρέλευσης χρονικού ορίου.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="137"/>
<source>A HTTP transmission error happened.</source>
<translation>Ένα σφάλμα μετάδοσης HTTP συνέβη.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation>Το CSync απέτυχε λόγω απόρριψης μη-διαχειρίσιμων δικαιωμάτων.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation>Ο προσαρτημένος φάκελος δεν είναι διαθέσιμος στον δικομιστή προσωρινά</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
<source>An error occurred while opening a folder</source>
<translation>Παρουσιάστηκε σφάλμα κατά το άνοιγμα του φακέλου</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
<source>Error while reading folder.</source>
<translation>Σφάλμα κατά την ανάγνωση του φακέλου.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="996"/>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
<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="1003"/>
+ <location filename="../src/libsync/syncengine.cpp" line="991"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: Δεν υπάρχει διαθέσιμος χώρος στο διακομιστή 1%.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="152"/>
<source>CSync unspecified error.</source>
<translation>Άγνωστο σφάλμα CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="155"/>
<source>Aborted by the user</source>
<translation>Ματαιώθηκε από το χρήστη</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="392"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>Το όνομα αρχείου περιέχει χαρακτήρες που δεν μπορούν να συγχρονιστούν σε όλα τα συστήματα.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="143"/>
<source>CSync failed to access</source>
<translation>Το CSync απέτυχε να αποκτήσει πρόσβαση</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <location filename="../src/libsync/syncengine.cpp" line="97"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <source>CSync failed due to unhandled permission denied.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="146"/>
<source>CSync tried to create a folder that already exists.</source>
<translation>Το CSync προσπάθησε να δημιουργήσει φάκελο που υπάρχει ήδη.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="158"/>
<source>The service is temporarily unavailable</source>
<translation>Η υπηρεσία δεν είναι διαθέσιμη προσωρινά</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="175"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>An internal error number %1 occurred.</source>
<translation>Προέκυψε ένα εσωτερικό σφάλμα με αριθμό %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="227"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Το αντικείμενο δεν είναι συγχρονισμένο λόγω προηγούμενων σφαλμάτων: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="389"/>
+ <location filename="../src/libsync/syncengine.cpp" line="386"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Οι συμβολικού σύνδεσμοι δεν υποστηρίζονται για το συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="392"/>
+ <location filename="../src/libsync/syncengine.cpp" line="389"/>
<source>File is listed on the ignore list.</source>
<translation>Το αρχείο περιέχεται στη λίστα αρχείων προς αγνόηση.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="398"/>
+ <location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename is too long.</source>
<translation>Το όνομα αρχείου είνια πολύ μεγάλο.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="401"/>
+ <location filename="../src/libsync/syncengine.cpp" line="398"/>
<source>File is ignored because it's hidden.</source>
<translation>Το αρχείο αγνοήθηκε επειδή είναι κρυφό.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="407"/>
+ <location filename="../src/libsync/syncengine.cpp" line="404"/>
<source>Stat failed.</source>
<translation>Απέτυχε.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="429"/>
+ <location filename="../src/libsync/syncengine.cpp" line="426"/>
<source>Filename encoding is not valid</source>
<translation>Η κωδικοποίηση του ονόματος αρχείου δεν είναι έγκυρη</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="561"/>
+ <location filename="../src/libsync/syncengine.cpp" line="558"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Μη έγκυροι χαρακτήρες, παρακαλώ μετονομάστε το "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="631"/>
+ <location filename="../src/libsync/syncengine.cpp" line="612"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="645"/>
<source>Unable to initialize a sync journal.</source>
<translation>Αδυναμία προετοιμασίας αρχείου συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="718"/>
+ <location filename="../src/libsync/syncengine.cpp" line="723"/>
<source>Cannot open the sync journal</source>
<translation>Αδυναμία ανοίγματος του αρχείου συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="965"/>
- <location filename="../src/libsync/syncengine.cpp" line="972"/>
+ <location filename="../src/libsync/syncengine.cpp" line="953"/>
+ <location filename="../src/libsync/syncengine.cpp" line="960"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Αγνοήθηκε εξαιτίας της μαύρης λίστας "διάλεξε τι να συγχρονιστεί"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <location filename="../src/libsync/syncengine.cpp" line="978"/>
<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="1023"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1011"/>
<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="1040"/>
- <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1028"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1048"/>
<source>Not allowed to remove, restoring</source>
<translation>Δεν επιτρέπεται η αφαίρεση, αποκατάσταση σε εξέλιξη</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1073"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1061"/>
<source>Local files and share folder removed.</source>
<translation>Οι τοπικοί φάκελοι και ο φάκελος κοινής χρήσης αφαιρέθηκαν.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1116"/>
<source>Move not allowed, item restored</source>
<translation>Η μετακίνηση δεν επιτρέπεται, το αντικείμενο αποκαταστάθηκε</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1125"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Η μετακίνηση δεν επιτρέπεται επειδή το %1 είναι μόνο για ανάγνωση</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the destination</source>
<translation>ο προορισμός</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the source</source>
<translation>η προέλευση</translation>
</message>
</message>
</context>
<context>
- <name>OCC::TransmissionChecksumValidator</name>
+ <name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="128"/>
<source>The checksum header is malformed.</source>
- <translation>Η κεφαλίδα του αθροίσματος ελέγχου δεν είναι σωστά διαμορφωμένη.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+ <source>The checksum header contained an unknown checksum type '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="148"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
- <translation>Το αρχείο που μεταφορτώθηκε δεν επαληθεύει το άθροισμα ελέγχου, θα συγχρονιστεί πάλι.</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<source>Recent Changes</source>
<translation>Πρόσφατες Αλλαγές</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="561"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="331"/>
<source>Managed Folders:</source>
<source>Open %1 in browser</source>
<translation>Άνοιγμα %1 στον περιηγητή</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="449"/>
- <source>Log out everywhere</source>
- <translation>Αποσύνδεση από παντού</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="457"/>
- <source>Log in everywhere...</source>
- <translation>Συνδεση παντού...</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="513"/>
<source>Unknown status</source>
<source>Account %1: %2</source>
<translation>Λογαριασμός %1: %2</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="449"/>
+ <source>Log out of all accounts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="457"/>
+ <source>Log in to all accounts...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="532"/>
<source>Crash now</source>
<source>No items synced recently</source>
<translation>Κανένα στοιχείο δεν συγχρονίστηκε πρόσφατα</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="561"/>
- <source>Discovering '%1'</source>
- <translation>Εντοπισμός '%1'</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="566"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>%L1 B</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="306"/>
+ <location filename="../src/libsync/utility.cpp" line="303"/>
<source>%Ln year(s)</source>
<translation>%Ln έτος(η)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="307"/>
+ <location filename="../src/libsync/utility.cpp" line="304"/>
<source>%Ln month(s)</source>
<translation>%Ln μήνας(ες)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="308"/>
+ <location filename="../src/libsync/utility.cpp" line="305"/>
<source>%Ln day(s)</source>
<translation>%Ln ημέρα(ες)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="309"/>
+ <location filename="../src/libsync/utility.cpp" line="306"/>
<source>%Ln hour(s)</source>
<translation>%Ln ώρα(ες)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="310"/>
+ <location filename="../src/libsync/utility.cpp" line="307"/>
<source>%Ln minute(s)</source>
<translation>%Ln λεπτό(ά)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="311"/>
+ <location filename="../src/libsync/utility.cpp" line="308"/>
<source>%Ln second(s)</source>
<translation>%Ln δευτερόλεπτο(α)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="318"/>
<source>0 seconds</source>
<translation>0 δευτερόλεπτα</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="336"/>
+ <location filename="../src/libsync/utility.cpp" line="333"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="73"/>
- <source>Remove the account configuration from the client</source>
+ <source>Enter your credentials to connect to the server</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="76"/>
+ <source>Sign in</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="89"/>
+ <source>Remove the account configuration from the client</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Remove Account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="97"/>
+ <location filename="../src/gui/accountsettings.ui" line="113"/>
<source>Storage space: ...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="167"/>
+ <location filename="../src/gui/accountsettings.ui" line="183"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="230"/>
<source>Apply</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="198"/>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
- <location filename="../src/gui/accountsettings.cpp" line="571"/>
+ <location filename="../src/gui/accountsettings.ui" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="289"/>
+ <location filename="../src/gui/accountsettings.cpp" line="646"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="115"/>
+ <location filename="../src/gui/accountsettings.cpp" line="121"/>
<source>No account configured.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="161"/>
+ <source>Choose what to sync</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="168"/>
+ <source>Remove folder sync connection</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="234"/>
<source>Folder creation failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="230"/>
+ <location filename="../src/gui/accountsettings.cpp" line="235"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="283"/>
- <source>Stop syncing</source>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
+ <source>Confirm Folder Sync Connection Removal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="309"/>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>Remove Folder Sync Connection</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="314"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="310"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="391"/>
+ <location filename="../src/gui/accountsettings.cpp" line="396"/>
<source>Sync Running</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="392"/>
+ <location filename="../src/gui/accountsettings.cpp" line="397"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="472"/>
+ <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <source>%1 in use</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="485"/>
<source>%1 as <i>%2</i></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="476"/>
+ <location filename="../src/gui/accountsettings.cpp" line="495"/>
<source>Connected to %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="478"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
<source>Server %1 is temporarily unavailable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="480"/>
+ <location filename="../src/gui/accountsettings.cpp" line="499"/>
<source>Signed out from %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="482"/>
+ <location filename="../src/gui/accountsettings.cpp" line="501"/>
<source>No connection to %1 at %2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
- <source>There are new folders that were not synchronized because they are too big: %1</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="536"/>
- <source>, </source>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <source>There are new folders that were not synchronized because they are too big: </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="563"/>
+ <location filename="../src/gui/accountsettings.cpp" line="638"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="564"/>
+ <location filename="../src/gui/accountsettings.cpp" line="639"/>
<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="570"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>Remove connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="158"/>
<source>Open folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="168"/>
- <source>Choose What to Sync</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Resume sync</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Pause sync</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="176"/>
- <source>Remove sync</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="277"/>
- <source>Confirm Sync Removal</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="278"/>
+ <location filename="../src/gui/accountsettings.cpp" line="283"/>
<source><p>Do you really want to stop syncing the folder <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="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="452"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="448"/>
+ <location filename="../src/gui/accountsettings.cpp" line="453"/>
<source>%1 of %2 in use</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="453"/>
+ <location filename="../src/gui/accountsettings.cpp" line="462"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="507"/>
<source>No %1 connection configured.</source>
<translation type="unfinished"></translation>
</message>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="95"/>
+ <location filename="../src/gui/accountstate.cpp" line="99"/>
<source>Signed out</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="97"/>
+ <location filename="../src/gui/accountstate.cpp" line="101"/>
<source>Disconnected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="99"/>
+ <location filename="../src/gui/accountstate.cpp" line="103"/>
<source>Connected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="101"/>
+ <location filename="../src/gui/accountstate.cpp" line="105"/>
<source>Service unavailable</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="103"/>
+ <location filename="../src/gui/accountstate.cpp" line="107"/>
<source>Network error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="105"/>
+ <location filename="../src/gui/accountstate.cpp" line="109"/>
<source>Configuration error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="107"/>
+ <location filename="../src/gui/accountstate.cpp" line="111"/>
<source>Unknown account state</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>Reauthentication required</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>You need to re-login to continue using the account %1.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="143"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="135"/>
<source>Authentication error: Either username or password are wrong.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="155"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="147"/>
<source>timeout</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="186"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="178"/>
<source>The provided credentials are not correct</source>
<translation type="unfinished"></translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="524"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="537"/>
<source>Aborted by the user</source>
<translation type="unfinished"></translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="107"/>
+ <location filename="../src/gui/folder.cpp" line="108"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"></translation>
</message>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="845"/>
+ <location filename="../src/gui/folder.cpp" line="870"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1102"/>
+ <location filename="../src/gui/folder.cpp" line="1127"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1115"/>
+ <location filename="../src/gui/folder.cpp" line="1140"/>
<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="1119"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Remove All Files?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1121"/>
+ <location filename="../src/gui/folder.cpp" line="1146"/>
<source>Remove all files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1122"/>
+ <location filename="../src/gui/folder.cpp" line="1147"/>
<source>Keep files</source>
<translation type="unfinished"></translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="275"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<source>Could not reset folder state</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="276"/>
+ <location filename="../src/gui/folderman.cpp" line="271"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="877"/>
+ <location filename="../src/gui/folderman.cpp" line="865"/>
<source> (backup)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="882"/>
+ <location filename="../src/gui/folderman.cpp" line="870"/>
<source> (backup %1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1091"/>
+ <location filename="../src/gui/folderman.cpp" line="1079"/>
<source>Undefined State.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1094"/>
- <source>Waits to start syncing.</source>
+ <location filename="../src/gui/folderman.cpp" line="1082"/>
+ <source>Waiting to start syncing.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1097"/>
+ <location filename="../src/gui/folderman.cpp" line="1085"/>
<source>Preparing for sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1100"/>
+ <location filename="../src/gui/folderman.cpp" line="1088"/>
<source>Sync is running.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1103"/>
+ <location filename="../src/gui/folderman.cpp" line="1091"/>
<source>Last Sync was successful.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1108"/>
+ <location filename="../src/gui/folderman.cpp" line="1096"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1111"/>
+ <location filename="../src/gui/folderman.cpp" line="1099"/>
<source>Setup Error.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1114"/>
+ <location filename="../src/gui/folderman.cpp" line="1102"/>
<source>User Abort.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1117"/>
+ <location filename="../src/gui/folderman.cpp" line="1105"/>
<source>Sync is paused.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1123"/>
+ <location filename="../src/gui/folderman.cpp" line="1111"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1119"/>
<source>No valid folder selected!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1130"/>
<source>The selected path is not a folder!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1146"/>
+ <location filename="../src/gui/folderman.cpp" line="1134"/>
<source>You have no permission to write to the selected folder!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1161"/>
+ <location filename="../src/gui/folderman.cpp" line="1149"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1166"/>
+ <location filename="../src/gui/folderman.cpp" line="1154"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1173"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1168"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1186"/>
+ <location filename="../src/gui/folderman.cpp" line="1174"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"></translation>
</message>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="85"/>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="274"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="271"/>
<source>File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="228"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="224"/>
<source>Syncing selected files in your account with</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="231"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="227"/>
<source>Remote path: %1</source>
<translation type="unfinished"></translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="121"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="122"/>
<source>You need to be connected to add a folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="126"/>
- <source>Adding folder is disabled because your 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="131"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="132"/>
<source>Click this button to add a folder to synchronize.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="141"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="142"/>
<source>%1 (%2)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="156"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
<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="182"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="192"/>
<source>Signed out</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="727"/>
- <source>Discovering '%1'</source>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="127"/>
+ <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="787"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="163"/>
+ <source>Fetching folder list from server...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="789"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="849"/>
<source>Syncing %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="792"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="854"/>
<source>download %1/s</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="794"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="856"/>
<source>u2193 %1/s</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="800"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>upload %1/s</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="802"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="864"/>
<source>u2191 %1/s</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="807"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="869"/>
<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="811"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="873"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="827"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="889"/>
<source>%1 of %2, file %3 of %4
Total time left %5</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
<source>file %1 of %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="932"/>
<source>Waiting...</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="934"/>
<source>Waiting for %n other folder(s)...</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="878"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>Preparing to sync...</source>
<translation type="unfinished"></translation>
</message>
<name>OCC::FolderWizard</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <source>Add Folder Sync Connection</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../src/gui/folderwizard.cpp" line="564"/>
- <source>Add Folder</source>
+ <source>Add Sync Connection</source>
<translation type="unfinished"></translation>
</message>
</context>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="61"/>
+ <location filename="../src/gui/generalsettings.ui" line="109"/>
<source>Ask confirmation before downloading folders larger than</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
+ <location filename="../src/gui/generalsettings.ui" line="129"/>
<source>MB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="109"/>
+ <location filename="../src/gui/generalsettings.ui" line="159"/>
<source>Show crash reporter</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="118"/>
+ <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="142"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
<source>Add an Account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="167"/>
- <location filename="../src/gui/generalsettings.ui" line="173"/>
+ <location filename="../src/gui/generalsettings.ui" line="171"/>
+ <location filename="../src/gui/generalsettings.ui" line="177"/>
<source>About</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <location filename="../src/gui/generalsettings.ui" line="187"/>
<source>Updates</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="208"/>
+ <location filename="../src/gui/generalsettings.ui" line="212"/>
<source>&Restart && Update</source>
<translation type="unfinished"></translation>
</message>
</context>
-<context>
- <name>OCC::HttpCredentials</name>
- <message>
- <location filename="../src/libsync/creds/httpcredentials.cpp" line="290"/>
- <source>Reading from keychain failed with error: '%1'</source>
- <translation type="unfinished"></translation>
- </message>
-</context>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="32"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
<source>Please enter %1 password:
User: %2
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="41"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <source>Reading from keychain failed with error: '%1'</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
<source>Enter Password</source>
<translation type="unfinished"></translation>
</message>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="40"/>
<source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="109"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
<source>Could not open file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="111"/>
<source>Cannot write changes to '%1'.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="138"/>
<source>Add Ignore Pattern</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>Add a new ignore pattern:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="45"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="46"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation type="unfinished"></translation>
</message>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="163"/>
+ <location filename="../src/libsync/logger.cpp" line="190"/>
<source>Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="164"/>
+ <location filename="../src/libsync/logger.cpp" line="191"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation type="unfinished"></translation>
</message>
</message>
<message>
<location filename="../src/gui/networksettings.ui" line="203"/>
- <location filename="../src/gui/networksettings.ui" line="295"/>
+ <location filename="../src/gui/networksettings.ui" line="292"/>
<source>No limit</source>
<translation type="unfinished"></translation>
</message>
<source>SOCKS5 proxy</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/gui/networksettings.cpp" line="128"/>
+ <source>Qt >= 5.4 is required in order to use the bandwidth limit</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>OCC::OCUpdater</name>
<source>Downloading version %1. Please wait...</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
- <source>Version %1 available. Restart application to start the update.</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="145"/>
<source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
<source>Could not check for new updates.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
+ <source>%1 version %2 available. Restart application to start the update.</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
- <source>New version %1 available. Please use the system's update tool to install it.</source>
+ <source>New %1 version %2 available. Please use the system's update tool to install it.</source>
<translation type="unfinished"></translation>
</message>
<message>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="114"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="110"/>
<source>Connection Timeout</source>
<translation type="unfinished"></translation>
</message>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="171"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="167"/>
<source>Invalid JSON reply from the poll URL</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="435"/>
- <source>Sync was aborted by user.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="488"/>
- <source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="494"/>
- <source>We received a different E-Tag for resuming. Retrying next time.</source>
- <translation type="unfinished"></translation>
- </message>
+ <name>OCC::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="516"/>
- <source>Server returned wrong content-range</source>
+ <location filename="../src/libsync/propagatedownload.cpp" line="315"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="567"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
+ <source>The download would reduce free disk space below %1</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="315"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <location filename="../src/libsync/propagatedownload.cpp" line="372"/>
+ <source>Free space on disk is less than %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="457"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="482"/>
<source>File was deleted from server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="506"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="531"/>
<source>The file could not be downloaded completely.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="601"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="636"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="641"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="676"/>
<source>File has changed since discovery</source>
<translation type="unfinished"></translation>
</message>
<context>
<name>OCC::PropagateItemJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="92"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
<source>; Restoration Failed: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="138"/>
<source>Continue blacklisting:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="230"/>
<source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"></translation>
</message>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove folder '%1';</source>
+ <source>Could not remove folder '%1'</source>
<translation type="unfinished"></translation>
</message>
<message>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="243"/>
- <location filename="../src/libsync/propagator_legacy.cpp" line="302"/>
- <source>Local file changed during sync, syncing once it arrived completely</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="246"/>
- <source>Sync was aborted by user.</source>
- <translation type="unfinished"></translation>
- </message>
+ <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="252"/>
- <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="205"/>
+ <source>File name contains at least one invalid character</source>
<translation type="unfinished"></translation>
</message>
-</context>
-<context>
- <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="226"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="262"/>
<source>File Removed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="274"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="250"/>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="286"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="665"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="558"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="592"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="566"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="600"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="597"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="631"/>
<source>Poll URL missing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="620"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="654"/>
<source>The local file was removed during sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="646"/>
- <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="680"/>
+ <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
<source>Choose What to Sync</source>
<translation type="unfinished"></translation>
</message>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
<source>No subfolders currently on the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
<source>An error occured while loading the list of sub folders.</source>
<translation type="unfinished"></translation>
</message>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="80"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="84"/>
<source>Activity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="86"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="90"/>
<source>General</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>Network</source>
<translation type="unfinished"></translation>
</message>
</message>
<message>
<location filename="../src/gui/sharedialog.ui" line="22"/>
- <location filename="../src/gui/sharedialog.ui" line="234"/>
+ <location filename="../src/gui/sharedialog.ui" line="258"/>
<source>TextLabel</source>
<translation type="unfinished"></translation>
</message>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="182"/>
+ <location filename="../src/gui/sharedialog.ui" line="116"/>
<source>Set &password </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="196"/>
+ <location filename="../src/gui/sharedialog.ui" line="130"/>
<source>Set &expiration date</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/gui/sharedialog.ui" line="214"/>
+ <source>Allow editing</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/gui/sharedialog.ui" line="77"/>
<source>Share link</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="125"/>
+ <location filename="../src/gui/sharedialog.ui" line="203"/>
<source>Copy &link</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="142"/>
+ <location filename="../src/gui/sharedialog.ui" line="154"/>
<source>Set password</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="692"/>
- <source>%1 path: %2</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="115"/>
+ <location filename="../src/gui/sharedialog.cpp" line="120"/>
<source>%1 Sharing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="103"/>
<source>%1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="112"/>
+ <location filename="../src/gui/sharedialog.cpp" line="117"/>
<source>Folder: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="121"/>
<source>P&assword protect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="221"/>
+ <location filename="../src/gui/sharedialog.cpp" line="214"/>
<source>Password Protected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="382"/>
+ <location filename="../src/gui/sharedialog.cpp" line="338"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="528"/>
+ <location filename="../src/gui/sharedialog.cpp" line="475"/>
<source>Please Set Password</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="564"/>
- <location filename="../src/gui/sharedialog.cpp" line="565"/>
+ <location filename="../src/gui/sharedialog.cpp" line="538"/>
+ <location filename="../src/gui/sharedialog.cpp" line="539"/>
<source>&Share link</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="583"/>
+ <location filename="../src/gui/sharedialog.cpp" line="552"/>
+ <location filename="../src/gui/sharedialog.cpp" line="564"/>
<source>OCS API error code: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="605"/>
- <source>There is no sync folder configured.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="639"/>
- <source>A sync file with the same name exists. The file cannot be registered to sync.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="684"/>
- <source>The file cannot be synced.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="624"/>
- <source>Sharing of external directories is not yet working.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="473"/>
- <location filename="../src/gui/sharedialog.cpp" line="506"/>
+ <location filename="../src/gui/sharedialog.cpp" line="418"/>
+ <location filename="../src/gui/sharedialog.cpp" line="460"/>
<source>Public sh&aring requires a password</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="617"/>
- <source>Cannot find a folder to upload to.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
- <source>Waiting to upload...</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="653"/>
- <source>Unable to register in sync space.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="694"/>
- <source>Sync of registered file was not successful yet.</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>Login Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>You must sign in as user %1</source>
<translation type="unfinished"></translation>
</message>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="452"/>
+ <location filename="../src/gui/socketapi.cpp" line="447"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation type="unfinished"></translation>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="97"/>
+ <location filename="../src/libsync/syncengine.cpp" line="94"/>
<source>Success.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="104"/>
+ <location filename="../src/libsync/syncengine.cpp" line="101"/>
<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="107"/>
+ <location filename="../src/libsync/syncengine.cpp" line="104"/>
<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="110"/>
+ <location filename="../src/libsync/syncengine.cpp" line="107"/>
<source>CSync got an error while processing internal trees.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="113"/>
+ <location filename="../src/libsync/syncengine.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="119"/>
+ <location filename="../src/libsync/syncengine.cpp" line="116"/>
<source>CSync processing step update failed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="122"/>
+ <location filename="../src/libsync/syncengine.cpp" line="119"/>
<source>CSync processing step reconcile failed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="122"/>
<source>CSync could not authenticate at the proxy.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="125"/>
<source>CSync failed to lookup proxy or server.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="128"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="131"/>
<source>CSync failed to connect to the network.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="134"/>
<source>A network connection timeout happened.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="137"/>
<source>A HTTP transmission error happened.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
<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="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
<source>An error occurred while opening a folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
<source>Error while reading folder.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="996"/>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
<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="1003"/>
+ <location filename="../src/libsync/syncengine.cpp" line="991"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
<source>CSync: No space on %1 server available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="152"/>
<source>CSync unspecified error.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="155"/>
<source>Aborted by the user</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="392"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="143"/>
<source>CSync failed to access</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <location filename="../src/libsync/syncengine.cpp" line="97"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <source>CSync failed due to unhandled permission denied.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="146"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="158"/>
<source>The service is temporarily unavailable</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="175"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>An internal error number %1 occurred.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="227"/>
<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="389"/>
+ <location filename="../src/libsync/syncengine.cpp" line="386"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="392"/>
+ <location filename="../src/libsync/syncengine.cpp" line="389"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="398"/>
+ <location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename is too long.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="401"/>
+ <location filename="../src/libsync/syncengine.cpp" line="398"/>
<source>File is ignored because it's hidden.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="407"/>
+ <location filename="../src/libsync/syncengine.cpp" line="404"/>
<source>Stat failed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="429"/>
+ <location filename="../src/libsync/syncengine.cpp" line="426"/>
<source>Filename encoding is not valid</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="561"/>
+ <location filename="../src/libsync/syncengine.cpp" line="558"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="631"/>
+ <location filename="../src/libsync/syncengine.cpp" line="612"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="645"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="718"/>
+ <location filename="../src/libsync/syncengine.cpp" line="723"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="965"/>
- <location filename="../src/libsync/syncengine.cpp" line="972"/>
+ <location filename="../src/libsync/syncengine.cpp" line="953"/>
+ <location filename="../src/libsync/syncengine.cpp" line="960"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <location filename="../src/libsync/syncengine.cpp" line="978"/>
<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="1023"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1011"/>
<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="1040"/>
- <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1028"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1048"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1073"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1061"/>
<source>Local files and share folder removed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1116"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1125"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the destination</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the source</source>
<translation type="unfinished"></translation>
</message>
</message>
</context>
<context>
- <name>OCC::TransmissionChecksumValidator</name>
+ <name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="128"/>
<source>The checksum header is malformed.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+ <source>The checksum header contained an unknown checksum type '%1'</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="148"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation type="unfinished"></translation>
</message>
<source>Recent Changes</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="561"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="331"/>
<source>Managed Folders:</source>
<source>Open %1 in browser</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="449"/>
- <source>Log out everywhere</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="457"/>
- <source>Log in everywhere...</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="513"/>
<source>Unknown status</source>
<source>Account %1: %2</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="449"/>
+ <source>Log out of all accounts</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="457"/>
+ <source>Log in to all accounts...</source>
+ <translation type="unfinished"></translation>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="532"/>
<source>Crash now</source>
<source>No items synced recently</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="561"/>
- <source>Discovering '%1'</source>
- <translation type="unfinished"></translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="566"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="306"/>
+ <location filename="../src/libsync/utility.cpp" line="303"/>
<source>%Ln year(s)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="307"/>
+ <location filename="../src/libsync/utility.cpp" line="304"/>
<source>%Ln month(s)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="308"/>
+ <location filename="../src/libsync/utility.cpp" line="305"/>
<source>%Ln day(s)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="309"/>
+ <location filename="../src/libsync/utility.cpp" line="306"/>
<source>%Ln hour(s)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="310"/>
+ <location filename="../src/libsync/utility.cpp" line="307"/>
<source>%Ln minute(s)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="311"/>
+ <location filename="../src/libsync/utility.cpp" line="308"/>
<source>%Ln second(s)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="318"/>
<source>0 seconds</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="336"/>
+ <location filename="../src/libsync/utility.cpp" line="333"/>
<source>%1 %2</source>
<translation type="unfinished"></translation>
</message>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="73"/>
+ <source>Enter your credentials to connect to the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <source>Sign in</source>
+ <translation>Registrarse</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="89"/>
<source>Remove the account configuration from the client</source>
<translation>Quitar la configuración de cuenta desde el cliente</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Remove Account</source>
<translation>Eliminar cuenta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="97"/>
+ <location filename="../src/gui/accountsettings.ui" line="113"/>
<source>Storage space: ...</source>
<translation>Espacio de almacenamiento: ...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="167"/>
+ <location filename="../src/gui/accountsettings.ui" line="183"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Las carpetas no seleccionadas serán <b>eliminadas</b> de su sistema de archivos local y ya no serán sincronizadas con este ordenador</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="230"/>
<source>Apply</source>
<translation>Aplicar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="198"/>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
- <location filename="../src/gui/accountsettings.cpp" line="571"/>
+ <location filename="../src/gui/accountsettings.ui" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="289"/>
+ <location filename="../src/gui/accountsettings.cpp" line="646"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<translation>Conectado a <server> como <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="115"/>
+ <location filename="../src/gui/accountsettings.cpp" line="121"/>
<source>No account configured.</source>
<translation>No se ha configurado ninguna cuenta.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="161"/>
+ <source>Choose what to sync</source>
+ <translation>Elija qué sincronizar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="168"/>
+ <source>Remove folder sync connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="234"/>
<source>Folder creation failed</source>
<translation>Hubo un fallo al crear la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="230"/>
+ <location filename="../src/gui/accountsettings.cpp" line="235"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation><p>No se pudo crear la carpeta local <i>%1</i>.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="283"/>
- <source>Stop syncing</source>
- <translation>Parando la sincronización</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
+ <source>Confirm Folder Sync Connection Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>Remove Folder Sync Connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="309"/>
+ <location filename="../src/gui/accountsettings.cpp" line="314"/>
<source>Confirm Folder Reset</source>
<translation>Confirme que desea restablecer la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="310"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>¿Realmente desea restablecer la carpeta <i>%1</i> y reconstruir la base de datos de cliente?</p><p><b>Nota:</b> Esta función es para mantenimiento únicamente. No se eliminarán archivos, pero se puede causar alto tráfico en la red y puede tomar varios minutos u horas para terminar, dependiendo del tamaño de la carpeta. Únicamente utilice esta opción si así lo indica su administrador.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="391"/>
+ <location filename="../src/gui/accountsettings.cpp" line="396"/>
<source>Sync Running</source>
<translation>Sincronización en curso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="392"/>
+ <location filename="../src/gui/accountsettings.cpp" line="397"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>La sincronización está en curso.<br/>¿Desea interrumpirla?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="472"/>
+ <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <source>%1 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="485"/>
<source>%1 as <i>%2</i></source>
<translation>%1 como <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="476"/>
+ <location filename="../src/gui/accountsettings.cpp" line="495"/>
<source>Connected to %1.</source>
<translation>Conectado a %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="478"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Servidor %1 no está disponible temporalmente.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="480"/>
+ <location filename="../src/gui/accountsettings.cpp" line="499"/>
<source>Signed out from %1.</source>
<translation>Cerró sesión desde %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="482"/>
+ <location filename="../src/gui/accountsettings.cpp" line="501"/>
<source>No connection to %1 at %2.</source>
<translation>Sin conexión a %1 en %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
- <source>There are new folders that were not synchronized because they are too big: %1</source>
- <translation>Hay carpetas que no fueron sincronizadas debido a que son demasiado grandes: %1</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="536"/>
- <source>, </source>
- <translation>, </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <source>There are new folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="563"/>
+ <location filename="../src/gui/accountsettings.cpp" line="638"/>
<source>Confirm Account Removal</source>
<translation>Confirmar eliminación de cuenta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="564"/>
+ <location filename="../src/gui/accountsettings.cpp" line="639"/>
<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="570"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>Remove connection</source>
<translation>Eliminar conexión</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="158"/>
<source>Open folder</source>
<translation>Abrir carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="168"/>
- <source>Choose What to Sync</source>
- <translation>Escoja qué sincronizar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Resume sync</source>
<translation>Continuar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Pause sync</source>
<translation>Pausar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="176"/>
- <source>Remove sync</source>
- <translation>Eliminar sincronización</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="277"/>
- <source>Confirm Sync Removal</source>
- <translation>Confirmar eliminación de la sincronización</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="278"/>
+ <location filename="../src/gui/accountsettings.cpp" line="283"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>¿De verdad quiere dejar de sincronizar la carpeta <i>%1</i>?</p><p><b>Nota:</b> Esto <b>no</b> elminará los archivo.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="452"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) de %2 en uso. Algunas carpetas, como carpetas de red o compartidas, podrían tener límites diferentes.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="448"/>
+ <location filename="../src/gui/accountsettings.cpp" line="453"/>
<source>%1 of %2 in use</source>
<translation>%1 de %2 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="453"/>
+ <location filename="../src/gui/accountsettings.cpp" line="462"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente no hay información disponible sobre el uso de almacenamiento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="507"/>
<source>No %1 connection configured.</source>
<translation>No hay ninguna conexión de %1 configurada.</translation>
</message>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="95"/>
+ <location filename="../src/gui/accountstate.cpp" line="99"/>
<source>Signed out</source>
<translation>Cerrar sesión</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="97"/>
+ <location filename="../src/gui/accountstate.cpp" line="101"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="99"/>
+ <location filename="../src/gui/accountstate.cpp" line="103"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="101"/>
+ <location filename="../src/gui/accountstate.cpp" line="105"/>
<source>Service unavailable</source>
<translation>Servicio no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="103"/>
+ <location filename="../src/gui/accountstate.cpp" line="107"/>
<source>Network error</source>
<translation>Error en la red</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="105"/>
+ <location filename="../src/gui/accountstate.cpp" line="109"/>
<source>Configuration error</source>
<translation>Error en la configuración</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="107"/>
+ <location filename="../src/gui/accountstate.cpp" line="111"/>
<source>Unknown account state</source>
<translation>Estado de cuenta desconocido</translation>
</message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>Reauthentication required</source>
+ <translation>Debe volver a autenticarse</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>You need to re-login to continue using the account %1.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
<translation>Por favor, actualice a la última versión del servidor y reinicie el cliente</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="143"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="135"/>
<source>Authentication error: Either username or password are wrong.</source>
<translation>Error de autenticación: El usuario o la contraseña son incorrectos</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="155"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="147"/>
<source>timeout</source>
<translation>tiempo de espera</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="186"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="178"/>
<source>The provided credentials are not correct</source>
<translation>Las credenciales proporcionadas no son correctas</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="524"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="537"/>
<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="107"/>
+ <location filename="../src/gui/folder.cpp" line="108"/>
<source>Unable to create csync-context</source>
<translation>Imposible crear csync-context</translation>
</message>
<translation>Actividad de la sincronización</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="845"/>
+ <location filename="../src/gui/folder.cpp" line="870"/>
<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="1102"/>
+ <location filename="../src/gui/folder.cpp" line="1127"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Se ha añadido una nueva carpeta más grande de %1 MB: %2.
Por favor diríjase a los ajustes para seleccionarlo si desea descargarlo.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1115"/>
+ <location filename="../src/gui/folder.cpp" line="1140"/>
<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="1119"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Remove All Files?</source>
<translation>¿Eliminar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1121"/>
+ <location filename="../src/gui/folder.cpp" line="1146"/>
<source>Remove all files</source>
<translation>Eliminar todos los archivos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1122"/>
+ <location filename="../src/gui/folder.cpp" line="1147"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="275"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<source>Could not reset folder state</source>
<translation>No se ha podido restablecer el estado de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="276"/>
+ <location filename="../src/gui/folderman.cpp" line="271"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Se ha encontrado un antiguo registro de sincronización '%1'; pero no se ha podido eliminar. Por favor, asegúrese de que ninguna aplicación la esté utilizando.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="877"/>
+ <location filename="../src/gui/folderman.cpp" line="865"/>
<source> (backup)</source>
<translation>(copia de seguridad)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="882"/>
+ <location filename="../src/gui/folderman.cpp" line="870"/>
<source> (backup %1)</source>
<translation>(copia de seguridad %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1091"/>
+ <location filename="../src/gui/folderman.cpp" line="1079"/>
<source>Undefined State.</source>
<translation>Estado no definido.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1094"/>
- <source>Waits to start syncing.</source>
- <translation>Esperando el inicio de la sincronización.</translation>
+ <location filename="../src/gui/folderman.cpp" line="1082"/>
+ <source>Waiting to start syncing.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1097"/>
+ <location filename="../src/gui/folderman.cpp" line="1085"/>
<source>Preparing for sync.</source>
<translation>Preparándose para sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1100"/>
+ <location filename="../src/gui/folderman.cpp" line="1088"/>
<source>Sync is running.</source>
<translation>Sincronización en funcionamiento.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1103"/>
+ <location filename="../src/gui/folderman.cpp" line="1091"/>
<source>Last Sync was successful.</source>
<translation>La última sincronización se ha realizado con éxito.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1108"/>
+ <location filename="../src/gui/folderman.cpp" line="1096"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>La última sincronización salió bien; pero hay advertencias para archivos individuales.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1111"/>
+ <location filename="../src/gui/folderman.cpp" line="1099"/>
<source>Setup Error.</source>
<translation>Error de configuración.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1114"/>
+ <location filename="../src/gui/folderman.cpp" line="1102"/>
<source>User Abort.</source>
<translation>Interrumpido por el usuario.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1117"/>
+ <location filename="../src/gui/folderman.cpp" line="1105"/>
<source>Sync is paused.</source>
<translation>La sincronización está en pausa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1123"/>
+ <location filename="../src/gui/folderman.cpp" line="1111"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sincronización en pausa)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1119"/>
<source>No valid folder selected!</source>
<translation>¡La carpeta seleccionada no es válida!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1130"/>
<source>The selected path is not a folder!</source>
<translation>¡La ruta seleccionada no es un directorio!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1146"/>
+ <location filename="../src/gui/folderman.cpp" line="1134"/>
<source>You have no permission to write to the selected folder!</source>
<translation>¡Usted no tiene permiso para escribir en la carpeta seleccionada!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1161"/>
+ <location filename="../src/gui/folderman.cpp" line="1149"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>El directorio local %1 ya se usa en una conexión de sincronización de directorios. Por favor, elija otro.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1166"/>
+ <location filename="../src/gui/folderman.cpp" line="1154"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>El directorio local %1 ya contiene un directorio usado en una conexión de sincronización de directorios. Por favor, elija otro.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1173"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>El directorio local %1 es un enlace simbólico. El objetivo del enlace ya contiene un directorio usado en una conexión de sincronización de directorios. Por favor, elija otro.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1168"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>El directorio local %1 está dentro de un directorio usado en una conexión de sincronización de directorios. Por favor, elija otro.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1186"/>
+ <location filename="../src/gui/folderman.cpp" line="1174"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>El directorio local %1 es un enlace simbólico. El objetivo está incluido en un directorio usado en una conexión de sincronización de directorios. Por favor, elija otro.</translation>
</message>
<translation>Añadir Conexión para el Directorio de Sincronización</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="85"/>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="274"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="271"/>
<source>File</source>
<translation>Archivo</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="228"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="224"/>
<source>Syncing selected files in your account with</source>
<translation>Sincronización de archivos seleccionados en su cuenta</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="231"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="227"/>
<source>Remote path: %1</source>
<translation>Ruta remota: %1</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="121"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="122"/>
<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="126"/>
- <source>Adding folder is disabled because your are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
- <translation>Añadir carpeta está deshabilitada debido a que está sincronizando todos sus archivos. Si desea sincronizar múltiples carpetas, por favor quite la actual carpeta raíz configurada.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="131"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="132"/>
<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="141"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="142"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="156"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
<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="182"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="192"/>
<source>Signed out</source>
<translation>Cerrar sesión</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="727"/>
- <source>Discovering '%1'</source>
- <translation>Descubriendo '%1'</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="127"/>
+ <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="787"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="163"/>
+ <source>Fetching folder list from server...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="789"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="849"/>
<source>Syncing %1</source>
<translation>Sincronizando %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="792"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="854"/>
<source>download %1/s</source>
<translation>descargando: %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="794"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="856"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="800"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>upload %1/s</source>
<translation>cargar %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="802"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="864"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="807"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="869"/>
<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="811"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="873"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="827"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="889"/>
<source>%1 of %2, file %3 of %4
Total time left %5</source>
<translation>%1 de %2, archivo %3 de %4
Tiempo restante %5</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
<source>file %1 of %2</source>
<translation>archivo %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="932"/>
<source>Waiting...</source>
<translation>Esperando...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="934"/>
<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="878"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>Preparing to sync...</source>
<translation>Preparando para sincronizar...</translation>
</message>
<name>OCC::FolderWizard</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <source>Add Folder Sync Connection</source>
+ <translation>Añadir Conexión para el Directorio de Sincronización</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderwizard.cpp" line="564"/>
- <source>Add Folder</source>
- <translation>Añadir carpeta</translation>
+ <source>Add Sync Connection</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Avanzado</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="61"/>
+ <location filename="../src/gui/generalsettings.ui" line="109"/>
<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="81"/>
+ <location filename="../src/gui/generalsettings.ui" line="129"/>
<source>MB</source>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="109"/>
+ <location filename="../src/gui/generalsettings.ui" line="159"/>
<source>Show crash reporter</source>
<translation>Mostrar el informe de fallos</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="118"/>
+ <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="142"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
<source>Add an Account</source>
<translation>Añadir una cuenta</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="167"/>
- <location filename="../src/gui/generalsettings.ui" line="173"/>
+ <location filename="../src/gui/generalsettings.ui" line="171"/>
+ <location filename="../src/gui/generalsettings.ui" line="177"/>
<source>About</source>
<translation>Acerca de</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <location filename="../src/gui/generalsettings.ui" line="187"/>
<source>Updates</source>
<translation>Actualizaciones</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="208"/>
+ <location filename="../src/gui/generalsettings.ui" line="212"/>
<source>&Restart && Update</source>
<translation>&Reiniciar && Actualizar</translation>
</message>
</context>
-<context>
- <name>OCC::HttpCredentials</name>
- <message>
- <location filename="../src/libsync/creds/httpcredentials.cpp" line="290"/>
- <source>Reading from keychain failed with error: '%1'</source>
- <translation>La lectura del llavero ha fallado y ha generado este error: '%1'</translation>
- </message>
-</context>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="32"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
<source>Please enter %1 password:
User: %2
</translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="41"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <source>Reading from keychain failed with error: '%1'</source>
+ <translation>La lectura del llavero ha fallado y ha generado este error: '%1'</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
<source>Enter Password</source>
<translation>Introduzca la contraseña</translation>
</message>
<translation>Eliminar</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="40"/>
<source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
Los elementos cuya eliminación está permitida serán eliminados si impiden que un directorio sea eliminado. Esto es útil para sus metadatos.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="109"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
<source>Could not open file</source>
<translation>No se ha podido abrir el archivo</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="111"/>
<source>Cannot write changes to '%1'.</source>
<translation>No se pueden guardar cambios en '%1'.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="138"/>
<source>Add Ignore Pattern</source>
<translation>Añadir patrón para ignorar</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>Add a new ignore pattern:</source>
<translation>Añadir nuevo patrón para ignorar:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="45"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="46"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Esta entrada la proporciona el sistema en '%1' y no se puede modificar en esta vista.</translation>
</message>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="163"/>
+ <location filename="../src/libsync/logger.cpp" line="190"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="164"/>
+ <location filename="../src/libsync/logger.cpp" line="191"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>El archivo '%1'<br/>no se puede abrir para escritura.<br/><br/>¡El archivo de registro <b>no</b> se puede guardar!</nobr></translation>
</message>
</message>
<message>
<location filename="../src/gui/networksettings.ui" line="203"/>
- <location filename="../src/gui/networksettings.ui" line="295"/>
+ <location filename="../src/gui/networksettings.ui" line="292"/>
<source>No limit</source>
<translation>Ilimitado</translation>
</message>
<source>SOCKS5 proxy</source>
<translation>Proxy SOCKS5</translation>
</message>
+ <message>
+ <location filename="../src/gui/networksettings.cpp" line="128"/>
+ <source>Qt >= 5.4 is required in order to use the bandwidth limit</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::OCUpdater</name>
<source>Downloading version %1. Please wait...</source>
<translation>Descargando la versión %1. Espere...</translation>
</message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
- <source>Version %1 available. Restart application to start the update.</source>
- <translation>Versión %1 disponible. Reinicie la aplicación para comenzar con la actualización.</translation>
- </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="145"/>
<source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
<source>Could not check for new updates.</source>
<translation>No se puede comprobar si hay actualizaciones.</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
+ <source>%1 version %2 available. Restart application to start the update.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
- <source>New version %1 available. Please use the system's update tool to install it.</source>
- <translation>La nueva versión %1 está disponible. Use la herramienta de actualización de su sistema para instalarla.</translation>
+ <source>New %1 version %2 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="151"/>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="114"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="110"/>
<source>Connection Timeout</source>
<translation>Tiempo de espera de conexión agotado</translation>
</message>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="171"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="167"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Respuesta JSON invalida desde URL</translation>
</message>
</context>
-<context>
- <name>OCC::PropagateDownloadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="435"/>
- <source>Sync was aborted by user.</source>
- <translation>El usuario ha interrumpido la sincronización.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="488"/>
- <source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation>No se ha recibido ninguna e-tag del servidor, revise el proxy/puerta de enlace</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="494"/>
- <source>We received a different E-Tag for resuming. Retrying next time.</source>
- <translation>Se ha recibido una e-tag distinta para reanudar. Se volverá a intentar.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="516"/>
- <source>Server returned wrong content-range</source>
- <translation>El servidor devolvió un content-range erróneo</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="567"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation>¡El archivo %1 no se puede descargar a causa de un conflicto con el nombre de un archivo local!</translation>
- </message>
-</context>
<context>
<name>OCC::PropagateDownloadFileQNAM</name>
<message>
<translation>¡El archivo %1 no se puede descargar a causa de un conflicto con el nombre de un archivo local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="457"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
+ <source>The download would reduce free disk space below %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="372"/>
+ <source>Free space on disk is less than %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="482"/>
<source>File was deleted from server</source>
<translation>Se ha eliminado el archivo del servidor</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="506"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="531"/>
<source>The file could not be downloaded completely.</source>
<translation>No se ha podido descargar el archivo completamente.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="601"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="636"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>¡El fichero %1 no puede guardarse debido a un conflicto con el nombre de otro fichero local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="641"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="676"/>
<source>File has changed since discovery</source>
<translation>El archivo ha cambiado desde que fue descubierto</translation>
</message>
<context>
<name>OCC::PropagateItemJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="92"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
<source>; Restoration Failed: %1</source>
<translation>; Falló la restauración: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="138"/>
<source>Continue blacklisting:</source>
<translation>Continuar añadiendo a su lista negra:</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="230"/>
<source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation>Un archivo o directorio fue eliminado de una carpeta de compartida de solo lectura pero la recuperación falló: %1</translation>
</message>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove folder '%1';</source>
- <translation>No se puedo eliminar el directorio '%1';</translation>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="243"/>
- <location filename="../src/libsync/propagator_legacy.cpp" line="302"/>
- <source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>Fichero local modificado mientras se sincronizaba, sincronice otra vez cuando termine de editar</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="246"/>
- <source>Sync was aborted by user.</source>
- <translation>El usuario ha interrumpiado la sincronización.</translation>
- </message>
+ <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="252"/>
- <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
- <translation>El archivo fue modificado localmente; pero es parte de una carpeta compartida en modo de sólo lectura. Ha sido recuperado y su modificación está en el archivo de conflicto.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="205"/>
+ <source>File name contains at least one invalid character</source>
+ <translation>Nombre de archivo contiene al menos un caracter no válido</translation>
</message>
-</context>
-<context>
- <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="226"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="262"/>
<source>File Removed</source>
<translation>Archivo eliminado</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="274"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Archivo local cambió durante la sincronización. Será actualizado.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="250"/>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="286"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="665"/>
<source>Local file changed during sync.</source>
<translation>Un archivo local fue modificado durante la sincronización.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="558"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="592"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>Forzar el trabajo en una conexión HTTP, causará un Reset si Qt< 5.4.2.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="566"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="600"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>El archivo fue modificado localmente; pero es parte de una carpeta compartida en modo de sólo lectura. Ha sido recuperado y su modificación está en el archivo de conflicto.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="597"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="631"/>
<source>Poll URL missing</source>
<translation>Falta la URL de la encuesta</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="620"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="654"/>
<source>The local file was removed during sync.</source>
<translation>El archivo local ha sido eliminado durante la sincronización.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="646"/>
- <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
- <translation>El servidor no reconoció la última parte. (No había una e-tag presente.)</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="680"/>
+ <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Las carpetas no seleccionadas serán <b>eliminadas</b> de su sistema de archivos local y ya no serán sincronizadas con este ordenador</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>Elija qué sincronizar: seleccione las subcarpetas remotas que desea sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>Elija qué sincronizar: desmarque las subcarpetas remotas que no desea sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
<source>Choose What to Sync</source>
<translation>Escoja qué sincronizar</translation>
</message>
<translation>Tamaño</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
<source>No subfolders currently on the server.</source>
<translation>No hay subcarpetas actualmente en el servidor.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>Ocurrió un error cuando se cargaba la lista de subcarpetas.</translation>
</message>
<translation>Ajustes</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="80"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="84"/>
<source>Activity</source>
<translation>Actividad</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="86"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="90"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>Network</source>
<translation>Red</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharedialog.ui" line="22"/>
- <location filename="../src/gui/sharedialog.ui" line="234"/>
+ <location filename="../src/gui/sharedialog.ui" line="258"/>
<source>TextLabel</source>
<translation>Etiqueta de texto</translation>
</message>
<translation>Ruta de OwnCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="182"/>
+ <location filename="../src/gui/sharedialog.ui" line="116"/>
<source>Set &password </source>
<translation>Establecer &contraseña</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="196"/>
+ <location filename="../src/gui/sharedialog.ui" line="130"/>
<source>Set &expiration date</source>
<translation>Establecer fecha de v&encimiento</translation>
</message>
+ <message>
+ <location filename="../src/gui/sharedialog.ui" line="214"/>
+ <source>Allow editing</source>
+ <translation>Permitir edición</translation>
+ </message>
<message>
<location filename="../src/gui/sharedialog.ui" line="77"/>
<source>Share link</source>
<translation>Compartir link</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="125"/>
+ <location filename="../src/gui/sharedialog.ui" line="203"/>
<source>Copy &link</source>
<translation>Copiar &enlace</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="142"/>
+ <location filename="../src/gui/sharedialog.ui" line="154"/>
<source>Set password</source>
<translation>Establecer contraseña</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="692"/>
- <source>%1 path: %2</source>
- <translation>%1 ruta: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="115"/>
+ <location filename="../src/gui/sharedialog.cpp" line="120"/>
<source>%1 Sharing</source>
<translation>%1 Compartiendo</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="103"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="112"/>
+ <location filename="../src/gui/sharedialog.cpp" line="117"/>
<source>Folder: %2</source>
<translation>Carpeta: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="121"/>
<source>P&assword protect</source>
<translation>Protegido por contr&aseña </translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="221"/>
+ <location filename="../src/gui/sharedialog.cpp" line="214"/>
<source>Password Protected</source>
<translation>Protegido con contraseña</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="382"/>
+ <location filename="../src/gui/sharedialog.cpp" line="338"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>El archivo no puede compartirse; ya que fue compartido sin permisos correspondientes.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="528"/>
+ <location filename="../src/gui/sharedialog.cpp" line="475"/>
<source>Please Set Password</source>
<translation>Por favor establece una contraseña</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="564"/>
- <location filename="../src/gui/sharedialog.cpp" line="565"/>
+ <location filename="../src/gui/sharedialog.cpp" line="538"/>
+ <location filename="../src/gui/sharedialog.cpp" line="539"/>
<source>&Share link</source>
<translation>&Compartir enlace</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="583"/>
+ <location filename="../src/gui/sharedialog.cpp" line="552"/>
+ <location filename="../src/gui/sharedialog.cpp" line="564"/>
<source>OCS API error code: %1</source>
<translation>OCS API codigo error: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="605"/>
- <source>There is no sync folder configured.</source>
- <translation>No hay ninguna carpeta de sincronización configurada.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="639"/>
- <source>A sync file with the same name exists. The file cannot be registered to sync.</source>
- <translation>Existe un archivo sincronizado con el mismo nombre. Éste no se puede registrar para sincronizar.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="684"/>
- <source>The file cannot be synced.</source>
- <translation>El archivo no puede sincronizarse.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="624"/>
- <source>Sharing of external directories is not yet working.</source>
- <translation>La compartición de directorios externos no está funcionando aún.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="473"/>
- <location filename="../src/gui/sharedialog.cpp" line="506"/>
+ <location filename="../src/gui/sharedialog.cpp" line="418"/>
+ <location filename="../src/gui/sharedialog.cpp" line="460"/>
<source>Public sh&aring requires a password</source>
<translation>Compartir public&amente requiere contraseña</translation>
</message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="617"/>
- <source>Cannot find a folder to upload to.</source>
- <translation>No se encuentra tal carpeta para ser cargada.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
- <source>Waiting to upload...</source>
- <translation>Esperando para subir...</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="653"/>
- <source>Unable to register in sync space.</source>
- <translation>No se ha podido registrar en el espacio de sincronización.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="694"/>
- <source>Sync of registered file was not successful yet.</source>
- <translation>La sincronización del archivo registrado aún no se ha realizado con éxito.</translation>
- </message>
</context>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>Login Error</source>
<translation>Error al iniciar sesión</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>You must sign in as user %1</source>
<translation>Debe iniciar sesión como el usuario %1</translation>
</message>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="452"/>
+ <location filename="../src/gui/socketapi.cpp" line="447"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Compartir con %1</translation>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="97"/>
+ <location filename="../src/libsync/syncengine.cpp" line="94"/>
<source>Success.</source>
<translation>Completado con éxito.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="104"/>
+ <location filename="../src/libsync/syncengine.cpp" line="101"/>
<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="107"/>
+ <location filename="../src/libsync/syncengine.cpp" line="104"/>
<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="110"/>
+ <location filename="../src/libsync/syncengine.cpp" line="107"/>
<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="113"/>
+ <location filename="../src/libsync/syncengine.cpp" line="110"/>
<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="116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>Error fatal de parámetro en CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="119"/>
+ <location filename="../src/libsync/syncengine.cpp" line="116"/>
<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="122"/>
+ <location filename="../src/libsync/syncengine.cpp" line="119"/>
<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="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="122"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="125"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="128"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="131"/>
<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="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="134"/>
<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="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="137"/>
<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="143"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation>CSync: Falló debido a un permiso denegado.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
<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="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
<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="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
<source>Error while reading folder.</source>
<translation>Error al leer el directorio.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="996"/>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
<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="1003"/>
+ <location filename="../src/libsync/syncengine.cpp" line="991"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="152"/>
<source>CSync unspecified error.</source>
<translation>Error no especificado de CSync</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="155"/>
<source>Aborted by the user</source>
<translation>Interrumpido por el usuario</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="392"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>El nombre del archivo contiene caracteres inválidos que no pueden ser sincronizados entre las plataformas.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="143"/>
<source>CSync failed to access</source>
<translation>CSync ha fallado al acceder</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <location filename="../src/libsync/syncengine.cpp" line="97"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <source>CSync failed due to unhandled permission denied.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="146"/>
<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="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="158"/>
<source>The service is temporarily unavailable</source>
<translation>El servicio no está disponible temporalmente </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="175"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<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="230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="227"/>
<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="389"/>
+ <location filename="../src/libsync/syncengine.cpp" line="386"/>
<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="392"/>
+ <location filename="../src/libsync/syncengine.cpp" line="389"/>
<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="398"/>
+ <location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename is too long.</source>
<translation>El nombre del archivo es demasiado largo.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="401"/>
+ <location filename="../src/libsync/syncengine.cpp" line="398"/>
<source>File is ignored because it's hidden.</source>
<translation>Archivo es ignorado porque está oculto.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="407"/>
+ <location filename="../src/libsync/syncengine.cpp" line="404"/>
<source>Stat failed.</source>
<translation>Stat ha fallado.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="429"/>
+ <location filename="../src/libsync/syncengine.cpp" line="426"/>
<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="561"/>
+ <location filename="../src/libsync/syncengine.cpp" line="558"/>
<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="631"/>
+ <location filename="../src/libsync/syncengine.cpp" line="612"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="645"/>
<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="718"/>
+ <location filename="../src/libsync/syncengine.cpp" line="723"/>
<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="965"/>
- <location filename="../src/libsync/syncengine.cpp" line="972"/>
+ <location filename="../src/libsync/syncengine.cpp" line="953"/>
+ <location filename="../src/libsync/syncengine.cpp" line="960"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorado por que se encuentra en la lista negra de "elija qué va a sincronizar"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <location filename="../src/libsync/syncengine.cpp" line="978"/>
<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="1023"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1011"/>
<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="1040"/>
- <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1028"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1048"/>
<source>Not allowed to remove, restoring</source>
<translation>No está permitido borrar, restaurando.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1073"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1061"/>
<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="1128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1116"/>
<source>Move not allowed, item restored</source>
<translation>No está permitido mover, elemento restaurado.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1125"/>
<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="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the destination</source>
<translation>destino</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the source</source>
<translation>origen</translation>
</message>
</message>
</context>
<context>
- <name>OCC::TransmissionChecksumValidator</name>
+ <name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="128"/>
<source>The checksum header is malformed.</source>
<translation>La cabecera del archivo de comprobación es incorrecto.</translation>
</message>
<message>
<location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+ <source>The checksum header contained an unknown checksum type '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="148"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>El archivo descargado no coincide con el archivo de comprobación, será reanudado.</translation>
</message>
<source>Recent Changes</source>
<translation>Cambios recientes</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="561"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="331"/>
<source>Managed Folders:</source>
<source>Open %1 in browser</source>
<translation>Abrir %1 en el navegador</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="449"/>
- <source>Log out everywhere</source>
- <translation>Cerrar sesión en todas partes</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="457"/>
- <source>Log in everywhere...</source>
- <translation>Iniciar sesión en todas partes...</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="513"/>
<source>Unknown status</source>
<source>Account %1: %2</source>
<translation>Cuenta %1: %2</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="449"/>
+ <source>Log out of all accounts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="457"/>
+ <source>Log in to all accounts...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="532"/>
<source>Crash now</source>
<source>No items synced recently</source>
<translation>No se han sincronizado elementos recientemente</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="561"/>
- <source>Discovering '%1'</source>
- <translation>Descubriendo '%1'</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="566"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>%L1 B</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="306"/>
+ <location filename="../src/libsync/utility.cpp" line="303"/>
<source>%Ln year(s)</source>
<translation>%Ln año(s)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="307"/>
+ <location filename="../src/libsync/utility.cpp" line="304"/>
<source>%Ln month(s)</source>
<translation>%Ln meses(s)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="308"/>
+ <location filename="../src/libsync/utility.cpp" line="305"/>
<source>%Ln day(s)</source>
<translation>%Ln dia(s)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="309"/>
+ <location filename="../src/libsync/utility.cpp" line="306"/>
<source>%Ln hour(s)</source>
<translation>%Ln hora(s)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="310"/>
+ <location filename="../src/libsync/utility.cpp" line="307"/>
<source>%Ln minute(s)</source>
<translation>%Ln minuto(s)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="311"/>
+ <location filename="../src/libsync/utility.cpp" line="308"/>
<source>%Ln second(s)</source>
<translation>%Ln segundos(s)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="318"/>
<source>0 seconds</source>
<translation>0 segundos</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="336"/>
+ <location filename="../src/libsync/utility.cpp" line="333"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="73"/>
+ <source>Enter your credentials to connect to the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <source>Sign in</source>
+ <translation>Entrar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="89"/>
<source>Remove the account configuration from the client</source>
<translation>Eliminar la configuración de la cuenta del cliente</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Remove Account</source>
<translation>Eliminar Cuenta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="97"/>
+ <location filename="../src/gui/accountsettings.ui" line="113"/>
<source>Storage space: ...</source>
<translation>Espacio de almacenamiento: ...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="167"/>
+ <location filename="../src/gui/accountsettings.ui" line="183"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Deseleccionar Carpetas que serán <b>eliminadas</b> de su sistema de archivos local y no será sincronizado más en este equipo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="230"/>
<source>Apply</source>
<translation>Aplicar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="198"/>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
- <location filename="../src/gui/accountsettings.cpp" line="571"/>
+ <location filename="../src/gui/accountsettings.ui" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="289"/>
+ <location filename="../src/gui/accountsettings.cpp" line="646"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<translation>Conectado con <server> como <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="115"/>
+ <location filename="../src/gui/accountsettings.cpp" line="121"/>
<source>No account configured.</source>
<translation>No hay cuenta configurada.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="161"/>
+ <source>Choose what to sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="168"/>
+ <source>Remove folder sync connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="234"/>
<source>Folder creation failed</source>
<translation>Falló la creacion de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="230"/>
+ <location filename="../src/gui/accountsettings.cpp" line="235"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation><p>No pudó ser creada la carpeta local <i>%1</i>.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="283"/>
- <source>Stop syncing</source>
- <translation>Detener la sincronización</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
+ <source>Confirm Folder Sync Connection Removal</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="309"/>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>Remove Folder Sync Connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="314"/>
<source>Confirm Folder Reset</source>
<translation>Confirme el reseteo de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="310"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>¿Realmente deseas resetear el directorio <i>%1</i> y reconstruir la base de datos del cliente?</p><p><b>Nota:</b> Esta función está designada para propósitos de mantenimiento solamente. Ningún archivo será eliminado, pero puede causar un tráfico de datos significante y tomar varios minutos o horas para completarse, dependiendo del tamaño del directorio. Sólo use esta opción si es aconsejado por su administrador.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="391"/>
+ <location filename="../src/gui/accountsettings.cpp" line="396"/>
<source>Sync Running</source>
<translation>Sincronización en curso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="392"/>
+ <location filename="../src/gui/accountsettings.cpp" line="397"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>La sincronización está en curso.<br/>¿Querés interrumpirla?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="472"/>
+ <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <source>%1 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="485"/>
<source>%1 as <i>%2</i></source>
<translation>%1 de <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="476"/>
+ <location filename="../src/gui/accountsettings.cpp" line="495"/>
<source>Connected to %1.</source>
<translation>Conectado a %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="478"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>El servidor %1 esta temporalmente sin conexión</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="480"/>
+ <location filename="../src/gui/accountsettings.cpp" line="499"/>
<source>Signed out from %1.</source>
<translation>Registrado desde %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="482"/>
+ <location filename="../src/gui/accountsettings.cpp" line="501"/>
<source>No connection to %1 at %2.</source>
<translation>Sin conexión a %1 desde %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
- <source>There are new folders that were not synchronized because they are too big: %1</source>
- <translation>Hay nuevas carpetas que no han sido sincronizadas porque son demasiado grandes: %1</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="536"/>
- <source>, </source>
- <translation>, </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <source>There are new folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="563"/>
+ <location filename="../src/gui/accountsettings.cpp" line="638"/>
<source>Confirm Account Removal</source>
<translation>Confirmar la eliminación de la cuenta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="564"/>
+ <location filename="../src/gui/accountsettings.cpp" line="639"/>
<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="570"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>Remove connection</source>
<translation>Eliminar conexión</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="158"/>
<source>Open folder</source>
<translation>Abrir carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="168"/>
- <source>Choose What to Sync</source>
- <translation>Elige que quieres sincronizar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Resume sync</source>
<translation>Reanudar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Pause sync</source>
<translation>Pausar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="176"/>
- <source>Remove sync</source>
- <translation>Eliminar la sincronización</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="277"/>
- <source>Confirm Sync Removal</source>
- <translation>Confirma la eliminacion de la sincronización</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="278"/>
+ <location filename="../src/gui/accountsettings.cpp" line="283"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>Realmente quieres detener la sincronización de la carpeta <i>%1</i>?</p><p><b>Nota:</b> Esto <b>no</b> eliminara ningun archivo.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="452"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="448"/>
+ <location filename="../src/gui/accountsettings.cpp" line="453"/>
<source>%1 of %2 in use</source>
<translation>%1 de %2 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="453"/>
+ <location filename="../src/gui/accountsettings.cpp" line="462"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente no hay información disponible acerca del uso del almacenamiento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="507"/>
<source>No %1 connection configured.</source>
<translation>No hay ninguna conexión de %1 configurada.</translation>
</message>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="95"/>
+ <location filename="../src/gui/accountstate.cpp" line="99"/>
<source>Signed out</source>
<translation>Desautentificado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="97"/>
+ <location filename="../src/gui/accountstate.cpp" line="101"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="99"/>
+ <location filename="../src/gui/accountstate.cpp" line="103"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="101"/>
+ <location filename="../src/gui/accountstate.cpp" line="105"/>
<source>Service unavailable</source>
<translation>Servicio no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="103"/>
+ <location filename="../src/gui/accountstate.cpp" line="107"/>
<source>Network error</source>
<translation>Error de red</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="105"/>
+ <location filename="../src/gui/accountstate.cpp" line="109"/>
<source>Configuration error</source>
<translation>Error de configuración</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="107"/>
+ <location filename="../src/gui/accountstate.cpp" line="111"/>
<source>Unknown account state</source>
<translation>Estado de la cuenta desconocido</translation>
</message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>Reauthentication required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>You need to re-login to continue using the account %1.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
<translation>Por favor actualice a la última versión del servidor y reinicie el cliente.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="143"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="135"/>
<source>Authentication error: Either username or password are wrong.</source>
<translation>Error de autentificación: el usuario o contraseña es incorrecta.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="155"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="147"/>
<source>timeout</source>
<translation>agotado</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="186"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="178"/>
<source>The provided credentials are not correct</source>
<translation>Las credenciales otorgadas no son correctas</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="524"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="537"/>
<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="107"/>
+ <location filename="../src/gui/folder.cpp" line="108"/>
<source>Unable to create csync-context</source>
<translation>Imposible crear csync-context</translation>
</message>
<translation>Actividad de Sync</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="845"/>
+ <location filename="../src/gui/folder.cpp" line="870"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1102"/>
+ <location filename="../src/gui/folder.cpp" line="1127"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1115"/>
+ <location filename="../src/gui/folder.cpp" line="1140"/>
<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="1119"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Remove All Files?</source>
<translation>¿Borrar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1121"/>
+ <location filename="../src/gui/folder.cpp" line="1146"/>
<source>Remove all files</source>
<translation>Borrar todos los archivos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1122"/>
+ <location filename="../src/gui/folder.cpp" line="1147"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="275"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<source>Could not reset folder state</source>
<translation>No se pudo </translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="276"/>
+ <location filename="../src/gui/folderman.cpp" line="271"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Una antigua sincronización con journaling '%1' fue encontrada, pero no se pudo eliminar. Por favor, asegurate que ninguna aplicación la está utilizando.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="877"/>
+ <location filename="../src/gui/folderman.cpp" line="865"/>
<source> (backup)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="882"/>
+ <location filename="../src/gui/folderman.cpp" line="870"/>
<source> (backup %1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1091"/>
+ <location filename="../src/gui/folderman.cpp" line="1079"/>
<source>Undefined State.</source>
<translation>Estado no definido.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1094"/>
- <source>Waits to start syncing.</source>
- <translation>Esperando el comienzo de la sincronización.</translation>
+ <location filename="../src/gui/folderman.cpp" line="1082"/>
+ <source>Waiting to start syncing.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1097"/>
+ <location filename="../src/gui/folderman.cpp" line="1085"/>
<source>Preparing for sync.</source>
<translation>Preparando la sincronización.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1100"/>
+ <location filename="../src/gui/folderman.cpp" line="1088"/>
<source>Sync is running.</source>
<translation>Sincronización en funcionamiento.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1103"/>
+ <location filename="../src/gui/folderman.cpp" line="1091"/>
<source>Last Sync was successful.</source>
<translation>La última sincronización fue exitosa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1108"/>
+ <location filename="../src/gui/folderman.cpp" line="1096"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>El último Sync fue exitoso, pero hubo advertencias en archivos individuales.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1111"/>
+ <location filename="../src/gui/folderman.cpp" line="1099"/>
<source>Setup Error.</source>
<translation>Error de configuración.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1114"/>
+ <location filename="../src/gui/folderman.cpp" line="1102"/>
<source>User Abort.</source>
<translation>Interrumpir.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1117"/>
+ <location filename="../src/gui/folderman.cpp" line="1105"/>
<source>Sync is paused.</source>
<translation>La sincronización está en pausa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1123"/>
+ <location filename="../src/gui/folderman.cpp" line="1111"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sincronización en pausa)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1119"/>
<source>No valid folder selected!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1130"/>
<source>The selected path is not a folder!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1146"/>
+ <location filename="../src/gui/folderman.cpp" line="1134"/>
<source>You have no permission to write to the selected folder!</source>
<translation>¡No tenés permisos para escribir el directorio seleccionado!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1161"/>
+ <location filename="../src/gui/folderman.cpp" line="1149"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1166"/>
+ <location filename="../src/gui/folderman.cpp" line="1154"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1173"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1168"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1186"/>
+ <location filename="../src/gui/folderman.cpp" line="1174"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="85"/>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="274"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="271"/>
<source>File</source>
<translation>Archivo</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="228"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="224"/>
<source>Syncing selected files in your account with</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="231"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="227"/>
<source>Remote path: %1</source>
<translation>Ruta Remota: %1</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="121"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="122"/>
<source>You need to be connected to add a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="126"/>
- <source>Adding folder is disabled because your 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="131"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="132"/>
<source>Click this button to add a folder to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="141"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="142"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="156"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
<source>Error while loading the list of folders from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="182"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="192"/>
<source>Signed out</source>
<translation>Desautentificado</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="727"/>
- <source>Discovering '%1'</source>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="127"/>
+ <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="787"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="163"/>
+ <source>Fetching folder list from server...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="789"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="849"/>
<source>Syncing %1</source>
<translation>Sincronizando %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="792"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="854"/>
<source>download %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="794"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="856"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="800"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>upload %1/s</source>
<translation>Cargado %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="802"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="864"/>
<source>u2191 %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="807"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="869"/>
<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="811"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="873"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="827"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="889"/>
<source>%1 of %2, file %3 of %4
Total time left %5</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
<source>file %1 of %2</source>
<translation>Archivo %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="932"/>
<source>Waiting...</source>
<translation>Esperando...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="934"/>
<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="878"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>Preparing to sync...</source>
<translation>Preparando para sincronizar...</translation>
</message>
<name>OCC::FolderWizard</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <source>Add Folder Sync Connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderwizard.cpp" line="564"/>
- <source>Add Folder</source>
- <translation>gregar directorio</translation>
+ <source>Add Sync Connection</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Avanzado</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="61"/>
+ <location filename="../src/gui/generalsettings.ui" line="109"/>
<source>Ask confirmation before downloading folders larger than</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
+ <location filename="../src/gui/generalsettings.ui" line="129"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="109"/>
+ <location filename="../src/gui/generalsettings.ui" line="159"/>
<source>Show crash reporter</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="118"/>
+ <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="142"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
<source>Add an Account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="167"/>
- <location filename="../src/gui/generalsettings.ui" line="173"/>
+ <location filename="../src/gui/generalsettings.ui" line="171"/>
+ <location filename="../src/gui/generalsettings.ui" line="177"/>
<source>About</source>
<translation>Acerca de</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <location filename="../src/gui/generalsettings.ui" line="187"/>
<source>Updates</source>
<translation>Actualizaciones</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="208"/>
+ <location filename="../src/gui/generalsettings.ui" line="212"/>
<source>&Restart && Update</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>OCC::HttpCredentials</name>
- <message>
- <location filename="../src/libsync/creds/httpcredentials.cpp" line="290"/>
- <source>Reading from keychain failed with error: '%1'</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="32"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
<source>Please enter %1 password:
User: %2
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="41"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <source>Reading from keychain failed with error: '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
<source>Enter Password</source>
<translation>Ingresar contraseña</translation>
</message>
<translation>Borrar</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="40"/>
<source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="109"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
<source>Could not open file</source>
<translation>No se pudo abrir el archivo</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="111"/>
<source>Cannot write changes to '%1'.</source>
<translation>No se pueden guardar cambios en '%1'.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="138"/>
<source>Add Ignore Pattern</source>
<translation>Agregar patrón a ignorar</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>Add a new ignore pattern:</source>
<translation>Añadir nuevo patrón a ignorar:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="45"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="46"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Esta entrada es provista por el sistema en '%1' y no puede ser modificada en esta vista.</translation>
</message>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="163"/>
+ <location filename="../src/libsync/logger.cpp" line="190"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="164"/>
+ <location filename="../src/libsync/logger.cpp" line="191"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>El archivo '%1'<br/>no puede ser abierto para escritura.<br/><br/>¡El archivo de log <b>no</b> puede ser guardado!</nobr></translation>
</message>
</message>
<message>
<location filename="../src/gui/networksettings.ui" line="203"/>
- <location filename="../src/gui/networksettings.ui" line="295"/>
+ <location filename="../src/gui/networksettings.ui" line="292"/>
<source>No limit</source>
<translation>Ilimitado</translation>
</message>
<source>SOCKS5 proxy</source>
<translation>Proxy SOCKS5</translation>
</message>
+ <message>
+ <location filename="../src/gui/networksettings.cpp" line="128"/>
+ <source>Qt >= 5.4 is required in order to use the bandwidth limit</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::OCUpdater</name>
<source>Downloading version %1. Please wait...</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
- <source>Version %1 available. Restart application to start the update.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="145"/>
<source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
<source>Could not check for new updates.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
+ <source>%1 version %2 available. Restart application to start the update.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
- <source>New version %1 available. Please use the system's update tool to install it.</source>
+ <source>New %1 version %2 available. Please use the system's update tool to install it.</source>
<translation type="unfinished"/>
</message>
<message>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="114"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="110"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="171"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="167"/>
<source>Invalid JSON reply from the poll URL</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="435"/>
- <source>Sync was aborted by user.</source>
- <translation>Sincronizaciójn abortada por el usuario.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="488"/>
- <source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="494"/>
- <source>We received a different E-Tag for resuming. Retrying next time.</source>
- <translation type="unfinished"/>
- </message>
+ <name>OCC::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="516"/>
- <source>Server returned wrong content-range</source>
+ <location filename="../src/libsync/propagatedownload.cpp" line="315"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="567"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
+ <source>The download would reduce free disk space below %1</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="315"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <location filename="../src/libsync/propagatedownload.cpp" line="372"/>
+ <source>Free space on disk is less than %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="457"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="482"/>
<source>File was deleted from server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="506"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="531"/>
<source>The file could not be downloaded completely.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="601"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="636"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="641"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="676"/>
<source>File has changed since discovery</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateItemJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="92"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
<source>; Restoration Failed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="138"/>
<source>Continue blacklisting:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="230"/>
<source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove folder '%1';</source>
+ <source>Could not remove folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="243"/>
- <location filename="../src/libsync/propagator_legacy.cpp" line="302"/>
- <source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>Los archivos locales han cambiado durante la sincronización, la primera vez ha funcionado completamente</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="246"/>
- <source>Sync was aborted by user.</source>
- <translation>Sincronizaciójn abortada por el usuario.</translation>
- </message>
+ <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="252"/>
- <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="205"/>
+ <source>File name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="226"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="262"/>
<source>File Removed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="274"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="250"/>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="286"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="665"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="558"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="592"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="566"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="600"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="597"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="631"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="620"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="654"/>
<source>The local file was removed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="646"/>
- <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="680"/>
+ <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Deseleccionar Carpetas que serán <b>eliminadas</b> de su sistema de archivos local y no será sincronizado más en este equipo</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
<source>Choose What to Sync</source>
<translation>Elige </translation>
</message>
<translation>Tamaño</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
<source>No subfolders currently on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
<source>An error occured while loading the list of sub folders.</source>
<translation type="unfinished"/>
</message>
<translation>Configuración</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="80"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="84"/>
<source>Activity</source>
<translation>Actividad</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="86"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="90"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>Network</source>
<translation>Red</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharedialog.ui" line="22"/>
- <location filename="../src/gui/sharedialog.ui" line="234"/>
+ <location filename="../src/gui/sharedialog.ui" line="258"/>
<source>TextLabel</source>
<translation>EtiquetaDeTexto</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="182"/>
+ <location filename="../src/gui/sharedialog.ui" line="116"/>
<source>Set &password </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="196"/>
+ <location filename="../src/gui/sharedialog.ui" line="130"/>
<source>Set &expiration date</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/sharedialog.ui" line="214"/>
+ <source>Allow editing</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/sharedialog.ui" line="77"/>
<source>Share link</source>
<translation>Compartir vínculo</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="125"/>
+ <location filename="../src/gui/sharedialog.ui" line="203"/>
<source>Copy &link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="142"/>
+ <location filename="../src/gui/sharedialog.ui" line="154"/>
<source>Set password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="692"/>
- <source>%1 path: %2</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="115"/>
+ <location filename="../src/gui/sharedialog.cpp" line="120"/>
<source>%1 Sharing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="103"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="112"/>
+ <location filename="../src/gui/sharedialog.cpp" line="117"/>
<source>Folder: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="121"/>
<source>P&assword protect</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="221"/>
+ <location filename="../src/gui/sharedialog.cpp" line="214"/>
<source>Password Protected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="382"/>
+ <location filename="../src/gui/sharedialog.cpp" line="338"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="528"/>
+ <location filename="../src/gui/sharedialog.cpp" line="475"/>
<source>Please Set Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="564"/>
- <location filename="../src/gui/sharedialog.cpp" line="565"/>
+ <location filename="../src/gui/sharedialog.cpp" line="538"/>
+ <location filename="../src/gui/sharedialog.cpp" line="539"/>
<source>&Share link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="583"/>
+ <location filename="../src/gui/sharedialog.cpp" line="552"/>
+ <location filename="../src/gui/sharedialog.cpp" line="564"/>
<source>OCS API error code: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="605"/>
- <source>There is no sync folder configured.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="639"/>
- <source>A sync file with the same name exists. The file cannot be registered to sync.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="684"/>
- <source>The file cannot be synced.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="624"/>
- <source>Sharing of external directories is not yet working.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="473"/>
- <location filename="../src/gui/sharedialog.cpp" line="506"/>
+ <location filename="../src/gui/sharedialog.cpp" line="418"/>
+ <location filename="../src/gui/sharedialog.cpp" line="460"/>
<source>Public sh&aring requires a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="617"/>
- <source>Cannot find a folder to upload to.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
- <source>Waiting to upload...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="653"/>
- <source>Unable to register in sync space.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="694"/>
- <source>Sync of registered file was not successful yet.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>Login Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>You must sign in as user %1</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="452"/>
+ <location filename="../src/gui/socketapi.cpp" line="447"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation type="unfinished"/>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="97"/>
+ <location filename="../src/libsync/syncengine.cpp" line="94"/>
<source>Success.</source>
<translation>Éxito.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="104"/>
+ <location filename="../src/libsync/syncengine.cpp" line="101"/>
<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="107"/>
+ <location filename="../src/libsync/syncengine.cpp" line="104"/>
<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="110"/>
+ <location filename="../src/libsync/syncengine.cpp" line="107"/>
<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="113"/>
+ <location filename="../src/libsync/syncengine.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync falló al reservar memoria.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>Error fatal de parámetro en CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="119"/>
+ <location filename="../src/libsync/syncengine.cpp" line="116"/>
<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="122"/>
+ <location filename="../src/libsync/syncengine.cpp" line="119"/>
<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="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="122"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="125"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="128"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="131"/>
<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="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="134"/>
<source>A network connection timeout happened.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="137"/>
<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="143"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation>CSync: Falló debido a un permiso denegado.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
<source>An error occurred while opening a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
<source>Error while reading folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="996"/>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
<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="1003"/>
+ <location filename="../src/libsync/syncengine.cpp" line="991"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="152"/>
<source>CSync unspecified error.</source>
<translation>Error no especificado de CSync</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="155"/>
<source>Aborted by the user</source>
<translation>Interrumpido por el usuario</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="392"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="143"/>
<source>CSync failed to access</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <location filename="../src/libsync/syncengine.cpp" line="97"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <source>CSync failed due to unhandled permission denied.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="146"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="158"/>
<source>The service is temporarily unavailable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="175"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>An internal error number %1 occurred.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="227"/>
<source>The item is not synced because of previous errors: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="389"/>
+ <location filename="../src/libsync/syncengine.cpp" line="386"/>
<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="392"/>
+ <location filename="../src/libsync/syncengine.cpp" line="389"/>
<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="398"/>
+ <location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename is too long.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="401"/>
+ <location filename="../src/libsync/syncengine.cpp" line="398"/>
<source>File is ignored because it's hidden.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="407"/>
+ <location filename="../src/libsync/syncengine.cpp" line="404"/>
<source>Stat failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="429"/>
+ <location filename="../src/libsync/syncengine.cpp" line="426"/>
<source>Filename encoding is not valid</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="561"/>
+ <location filename="../src/libsync/syncengine.cpp" line="558"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="631"/>
+ <location filename="../src/libsync/syncengine.cpp" line="612"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="645"/>
<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="718"/>
+ <location filename="../src/libsync/syncengine.cpp" line="723"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="965"/>
- <location filename="../src/libsync/syncengine.cpp" line="972"/>
+ <location filename="../src/libsync/syncengine.cpp" line="953"/>
+ <location filename="../src/libsync/syncengine.cpp" line="960"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <location filename="../src/libsync/syncengine.cpp" line="978"/>
<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="1023"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1011"/>
<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="1040"/>
- <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1028"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1048"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1073"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1061"/>
<source>Local files and share folder removed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1116"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1125"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the destination</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the source</source>
<translation type="unfinished"/>
</message>
</message>
</context>
<context>
- <name>OCC::TransmissionChecksumValidator</name>
+ <name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="128"/>
<source>The checksum header is malformed.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+ <source>The checksum header contained an unknown checksum type '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="148"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation type="unfinished"/>
</message>
<source>Recent Changes</source>
<translation>Cambios recientes</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="561"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="331"/>
<source>Managed Folders:</source>
<source>Open %1 in browser</source>
<translation>Abrir %1 en el navegador...</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="449"/>
- <source>Log out everywhere</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="457"/>
- <source>Log in everywhere...</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="513"/>
<source>Unknown status</source>
<source>Account %1: %2</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="449"/>
+ <source>Log out of all accounts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="457"/>
+ <source>Log in to all accounts...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="532"/>
<source>Crash now</source>
<source>No items synced recently</source>
<translation>No se sincronizaron elementos recientemente</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="561"/>
- <source>Discovering '%1'</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="566"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>%L1 B</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="306"/>
+ <location filename="../src/libsync/utility.cpp" line="303"/>
<source>%Ln year(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="307"/>
+ <location filename="../src/libsync/utility.cpp" line="304"/>
<source>%Ln month(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="308"/>
+ <location filename="../src/libsync/utility.cpp" line="305"/>
<source>%Ln day(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="309"/>
+ <location filename="../src/libsync/utility.cpp" line="306"/>
<source>%Ln hour(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="310"/>
+ <location filename="../src/libsync/utility.cpp" line="307"/>
<source>%Ln minute(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="311"/>
+ <location filename="../src/libsync/utility.cpp" line="308"/>
<source>%Ln second(s)</source>
<translation>%Ln segundo(s)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="318"/>
<source>0 seconds</source>
<translation>0 segundos</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="336"/>
+ <location filename="../src/libsync/utility.cpp" line="333"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="73"/>
- <source>Remove the account configuration from the client</source>
+ <source>Enter your credentials to connect to the server</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="76"/>
+ <source>Sign in</source>
+ <translation>Logi sisse</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="89"/>
+ <source>Remove the account configuration from the client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Remove Account</source>
<translation>Kustuta konto</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="97"/>
+ <location filename="../src/gui/accountsettings.ui" line="113"/>
<source>Storage space: ...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="167"/>
+ <location filename="../src/gui/accountsettings.ui" line="183"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Märkimata kataloogid <b>eemaldatakse</b> kohalikust failisüsteemist ning neid ei sünkroniseerita enam sellesse arvutisse</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="230"/>
<source>Apply</source>
<translation>Rakenda</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="198"/>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
- <location filename="../src/gui/accountsettings.cpp" line="571"/>
+ <location filename="../src/gui/accountsettings.ui" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="289"/>
+ <location filename="../src/gui/accountsettings.cpp" line="646"/>
<source>Cancel</source>
<translation>Loobu</translation>
</message>
<translation>Ühendatud <server> kasutajana <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="115"/>
+ <location filename="../src/gui/accountsettings.cpp" line="121"/>
<source>No account configured.</source>
<translation>Ühtegi kontot pole seadistatud</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="161"/>
+ <source>Choose what to sync</source>
+ <translation>Vali, mida sünkroniseerida</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="168"/>
+ <source>Remove folder sync connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="234"/>
<source>Folder creation failed</source>
<translation>Kausta loomine ebaõnnestus</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="230"/>
+ <location filename="../src/gui/accountsettings.cpp" line="235"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="283"/>
- <source>Stop syncing</source>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
+ <source>Confirm Folder Sync Connection Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>Remove Folder Sync Connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="309"/>
+ <location filename="../src/gui/accountsettings.cpp" line="314"/>
<source>Confirm Folder Reset</source>
<translation>Kinnita kataloogi algseadistus</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="310"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Kas tõesti soovid kataloogi <i>%1</i> algseadistada ning uuesti luua oma kliendi andmebaasi?</p><p><b>See funktsioon on mõeldud peamiselt ainult hooldustöödeks. Märkus:</b>Kuigi ühtegi faili ei eemaldata, siis see võib põhjustada märkimisväärset andmeliiklust ja võtta mitu minutit või tundi, sõltuvalt kataloogi suurusest. Kasuta seda võimalust ainult siis kui seda soovitab süsteemihaldur.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="391"/>
+ <location filename="../src/gui/accountsettings.cpp" line="396"/>
<source>Sync Running</source>
<translation>Sünkroniseerimine on käimas</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="392"/>
+ <location filename="../src/gui/accountsettings.cpp" line="397"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Sünkroniseerimine on käimas.<br/>Kas sa soovid seda lõpetada?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="472"/>
+ <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <source>%1 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="485"/>
<source>%1 as <i>%2</i></source>
<translation>%1 as <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="476"/>
+ <location filename="../src/gui/accountsettings.cpp" line="495"/>
<source>Connected to %1.</source>
<translation>Ühendatud %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="478"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Server %1 pole ajutiselt saadaval.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="480"/>
+ <location filename="../src/gui/accountsettings.cpp" line="499"/>
<source>Signed out from %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="482"/>
+ <location filename="../src/gui/accountsettings.cpp" line="501"/>
<source>No connection to %1 at %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
- <source>There are new folders that were not synchronized because they are too big: %1</source>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <source>There are new folders that were not synchronized because they are too big: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="536"/>
- <source>, </source>
- <translation>, </translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="563"/>
+ <location filename="../src/gui/accountsettings.cpp" line="638"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="564"/>
+ <location filename="../src/gui/accountsettings.cpp" line="639"/>
<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="570"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>Remove connection</source>
<translation>Eemalda ühendus</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="158"/>
<source>Open folder</source>
<translation>Ava kaust</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="168"/>
- <source>Choose What to Sync</source>
- <translation>Vali, mida sünkroniseerida</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Resume sync</source>
<translation>Taasta sünroonimist</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Pause sync</source>
<translation>Peata sünkroonimine</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="176"/>
- <source>Remove sync</source>
- <translation>Eemalda sünkroonimine</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="277"/>
- <source>Confirm Sync Removal</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="278"/>
+ <location filename="../src/gui/accountsettings.cpp" line="283"/>
<source><p>Do you really want to stop syncing the folder <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="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="452"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="448"/>
+ <location filename="../src/gui/accountsettings.cpp" line="453"/>
<source>%1 of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="453"/>
+ <location filename="../src/gui/accountsettings.cpp" line="462"/>
<source>Currently there is no storage usage information available.</source>
<translation>Hetkel pole mahu kasutuse info saadaval.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="507"/>
<source>No %1 connection configured.</source>
<translation>Ühtegi %1 ühendust pole seadistatud.</translation>
</message>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="95"/>
+ <location filename="../src/gui/accountstate.cpp" line="99"/>
<source>Signed out</source>
<translation>Välja logitud</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="97"/>
+ <location filename="../src/gui/accountstate.cpp" line="101"/>
<source>Disconnected</source>
<translation>Lahti ühendatud</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="99"/>
+ <location filename="../src/gui/accountstate.cpp" line="103"/>
<source>Connected</source>
<translation>Ühendatud</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="101"/>
+ <location filename="../src/gui/accountstate.cpp" line="105"/>
<source>Service unavailable</source>
<translation>Teenus pole saadaval</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="103"/>
+ <location filename="../src/gui/accountstate.cpp" line="107"/>
<source>Network error</source>
<translation>Võrgu viga</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="105"/>
+ <location filename="../src/gui/accountstate.cpp" line="109"/>
<source>Configuration error</source>
<translation>Seadistamise tõrge</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="107"/>
+ <location filename="../src/gui/accountstate.cpp" line="111"/>
<source>Unknown account state</source>
<translation>Tundmatu konto olek</translation>
</message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>Reauthentication required</source>
+ <translation>Vajalik on uuesti autentimine</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>You need to re-login to continue using the account %1.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
<translation>Palun uuenda server viimasele versioonile ning taaskäivita klient.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="143"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="135"/>
<source>Authentication error: Either username or password are wrong.</source>
<translation>Autentimise tõrge: Kasutajanimi või parool on vale</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="155"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="147"/>
<source>timeout</source>
<translation>aegumine</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="186"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="178"/>
<source>The provided credentials are not correct</source>
<translation>Sisestatud kasutajatunnused pole õiged</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="524"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="537"/>
<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="107"/>
+ <location filename="../src/gui/folder.cpp" line="108"/>
<source>Unable to create csync-context</source>
<translation>Ei suuda luua csync-konteksti</translation>
</message>
<translation>Sünkroniseerimise tegevus</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="845"/>
+ <location filename="../src/gui/folder.cpp" line="870"/>
<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="1102"/>
+ <location filename="../src/gui/folder.cpp" line="1127"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1115"/>
+ <location filename="../src/gui/folder.cpp" line="1140"/>
<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="1119"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Remove All Files?</source>
<translation>Kustutada kõik failid?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1121"/>
+ <location filename="../src/gui/folder.cpp" line="1146"/>
<source>Remove all files</source>
<translation>Kustutada kõik failid</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1122"/>
+ <location filename="../src/gui/folder.cpp" line="1147"/>
<source>Keep files</source>
<translation>Säilita failid</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="275"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<source>Could not reset folder state</source>
<translation>Ei suutnud tühistada kataloogi staatust</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="276"/>
+ <location filename="../src/gui/folderman.cpp" line="271"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Leiti vana sünkroniseeringu zurnaal '%1', kuid selle eemaldamine ebaõnnenstus. Palun veendu, et seda kasutaks ükski programm.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="877"/>
+ <location filename="../src/gui/folderman.cpp" line="865"/>
<source> (backup)</source>
<translation>(varukoopia)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="882"/>
+ <location filename="../src/gui/folderman.cpp" line="870"/>
<source> (backup %1)</source>
<translation> (varukoopia %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1091"/>
+ <location filename="../src/gui/folderman.cpp" line="1079"/>
<source>Undefined State.</source>
<translation>Määramata staatus.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1094"/>
- <source>Waits to start syncing.</source>
- <translation>Ootab sünkroniseerimise alustamist.</translation>
+ <location filename="../src/gui/folderman.cpp" line="1082"/>
+ <source>Waiting to start syncing.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1097"/>
+ <location filename="../src/gui/folderman.cpp" line="1085"/>
<source>Preparing for sync.</source>
<translation>Valmistun sünkroniseerima.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1100"/>
+ <location filename="../src/gui/folderman.cpp" line="1088"/>
<source>Sync is running.</source>
<translation>Sünkroniseerimine on käimas.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1103"/>
+ <location filename="../src/gui/folderman.cpp" line="1091"/>
<source>Last Sync was successful.</source>
<translation>Viimane sünkroniseerimine oli edukas.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1108"/>
+ <location filename="../src/gui/folderman.cpp" line="1096"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Viimane sünkroniseering oli edukas, kuid mõned failid põhjustasid tõrkeid.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1111"/>
+ <location filename="../src/gui/folderman.cpp" line="1099"/>
<source>Setup Error.</source>
<translation>Seadistamise viga.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1114"/>
+ <location filename="../src/gui/folderman.cpp" line="1102"/>
<source>User Abort.</source>
<translation>Kasutaja tühistamine.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1117"/>
+ <location filename="../src/gui/folderman.cpp" line="1105"/>
<source>Sync is paused.</source>
<translation>Sünkroniseerimine on peatatud.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1123"/>
+ <location filename="../src/gui/folderman.cpp" line="1111"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sünkroniseerimine on peatatud)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1119"/>
<source>No valid folder selected!</source>
<translation>Sobilikku kausta pole valitud!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1130"/>
<source>The selected path is not a folder!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1146"/>
+ <location filename="../src/gui/folderman.cpp" line="1134"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Sul puuduvad õigused valitud kataloogi kirjutamiseks!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1161"/>
+ <location filename="../src/gui/folderman.cpp" line="1149"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1166"/>
+ <location filename="../src/gui/folderman.cpp" line="1154"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1173"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1168"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1186"/>
+ <location filename="../src/gui/folderman.cpp" line="1174"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="85"/>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="274"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="271"/>
<source>File</source>
<translation>Fail</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="228"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="224"/>
<source>Syncing selected files in your account with</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="231"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="227"/>
<source>Remote path: %1</source>
<translation>Eemalda asukoht: %1</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="121"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="122"/>
<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="126"/>
- <source>Adding folder is disabled because your 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="131"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="132"/>
<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="141"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="142"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="156"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
<source>Error while loading the list of folders from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="182"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="192"/>
<source>Signed out</source>
<translation>Välja logitud</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="727"/>
- <source>Discovering '%1'</source>
- <translation>'%1' avastamine</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="127"/>
+ <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="787"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="163"/>
+ <source>Fetching folder list from server...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="789"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="849"/>
<source>Syncing %1</source>
<translation>Sünkroniseerimine %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="792"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="854"/>
<source>download %1/s</source>
<translation>allalaadimine %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="794"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="856"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="800"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>upload %1/s</source>
<translation>üleslaadimine %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="802"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="864"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="807"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="869"/>
<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="811"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="873"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="827"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="889"/>
<source>%1 of %2, file %3 of %4
Total time left %5</source>
<translation>%1 of %2, fail %3 of %4
Aega kokku jäänud %5</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
<source>file %1 of %2</source>
<translation>fail %1 / %2-st</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="932"/>
<source>Waiting...</source>
<translation>Ootamine...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="934"/>
<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="878"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>Preparing to sync...</source>
<translation type="unfinished"/>
</message>
<name>OCC::FolderWizard</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <source>Add Folder Sync Connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderwizard.cpp" line="564"/>
- <source>Add Folder</source>
- <translation>Lisa kaust</translation>
+ <source>Add Sync Connection</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Täpsem</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="61"/>
+ <location filename="../src/gui/generalsettings.ui" line="109"/>
<source>Ask confirmation before downloading folders larger than</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
+ <location filename="../src/gui/generalsettings.ui" line="129"/>
<source>MB</source>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="109"/>
+ <location filename="../src/gui/generalsettings.ui" line="159"/>
<source>Show crash reporter</source>
<translation>Näita kokkujooksmise teavitajat</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="118"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit Ignored Files</source>
<translation>Redigeeri ignoreeritud faile</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="142"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
<source>Add an Account</source>
<translation>Lisa konto</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="167"/>
- <location filename="../src/gui/generalsettings.ui" line="173"/>
+ <location filename="../src/gui/generalsettings.ui" line="171"/>
+ <location filename="../src/gui/generalsettings.ui" line="177"/>
<source>About</source>
<translation>Info</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <location filename="../src/gui/generalsettings.ui" line="187"/>
<source>Updates</source>
<translation>Uuendused</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="208"/>
+ <location filename="../src/gui/generalsettings.ui" line="212"/>
<source>&Restart && Update</source>
<translation>&Taaskäivita && Uuenda</translation>
</message>
</context>
-<context>
- <name>OCC::HttpCredentials</name>
- <message>
- <location filename="../src/libsync/creds/httpcredentials.cpp" line="290"/>
- <source>Reading from keychain failed with error: '%1'</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="32"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
<source>Please enter %1 password:
User: %2
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="41"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <source>Reading from keychain failed with error: '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
<source>Enter Password</source>
<translation>Sisesta parool</translation>
</message>
<translation>Eemalda</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="40"/>
<source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="109"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
<source>Could not open file</source>
<translation>Ei suutunud avada faili</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="111"/>
<source>Cannot write changes to '%1'.</source>
<translation>Ei saa kirjutada muudatusi '%1'.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="138"/>
<source>Add Ignore Pattern</source>
<translation>Lisa ignoreerimise muster</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>Add a new ignore pattern:</source>
<translation>Lisa uus ignoreerimise muster:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="45"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="46"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Selle kirje on pakkunud süsteem '%1' ning seda ei saa antud vaates muuta.</translation>
</message>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="163"/>
+ <location filename="../src/libsync/logger.cpp" line="190"/>
<source>Error</source>
<translation>Viga</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="164"/>
+ <location filename="../src/libsync/logger.cpp" line="191"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Faili '%1'<br/>ei saa kirjutamiseks avada.<br/><br/>Logi väljundit <b>ei saa</b> salvestada!</nobr></translation>
</message>
</message>
<message>
<location filename="../src/gui/networksettings.ui" line="203"/>
- <location filename="../src/gui/networksettings.ui" line="295"/>
+ <location filename="../src/gui/networksettings.ui" line="292"/>
<source>No limit</source>
<translation>Piiramatu</translation>
</message>
<source>SOCKS5 proxy</source>
<translation>SOCKS5 proksi</translation>
</message>
+ <message>
+ <location filename="../src/gui/networksettings.cpp" line="128"/>
+ <source>Qt >= 5.4 is required in order to use the bandwidth limit</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::OCUpdater</name>
<source>Downloading version %1. Please wait...</source>
<translation>Laadin alla versiooni %1. Palun oota...</translation>
</message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
- <source>Version %1 available. Restart application to start the update.</source>
- <translation>Versioon %1 on saadaval. Taaskäivita rakendus alustamaks uuendust.</translation>
- </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="145"/>
<source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
<source>Could not check for new updates.</source>
<translation>Uuenduste kontrollimine ebaõnnestus.</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
+ <source>%1 version %2 available. Restart application to start the update.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
- <source>New version %1 available. Please use the system's update tool to install it.</source>
- <translation>Uus versioon %1 on saadaval. Palun kasuta süsteemi uuendushaldurit selle paigaldamiseks.</translation>
+ <source>New %1 version %2 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="151"/>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="114"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="110"/>
<source>Connection Timeout</source>
<translation>Ühenduse aegumine</translation>
</message>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="171"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="167"/>
<source>Invalid JSON reply from the poll URL</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>OCC::PropagateDownloadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="435"/>
- <source>Sync was aborted by user.</source>
- <translation>Sünkroniseering katkestati kasutaja poolt.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="488"/>
- <source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation>Ühtegi E-Silti ei saabunud serverist, kontrolli puhverserverit/lüüsi.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="494"/>
- <source>We received a different E-Tag for resuming. Retrying next time.</source>
- <translation>Saime jätkamiseks erineva E-Sildi. Proovin järgmine kord uuesti.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="516"/>
- <source>Server returned wrong content-range</source>
- <translation>Server tagastas vale vahemiku</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="567"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation>Faili %1 ei saa alla laadida kuna on konflikt kohaliku faili nimega.</translation>
- </message>
-</context>
<context>
<name>OCC::PropagateDownloadFileQNAM</name>
<message>
<translation>Faili %1 ei saa alla laadida kuna on konflikt kohaliku faili nimega.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="457"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
+ <source>The download would reduce free disk space below %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="372"/>
+ <source>Free space on disk is less than %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="482"/>
<source>File was deleted from server</source>
<translation>Fail on serverist kustutatud</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="506"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="531"/>
<source>The file could not be downloaded completely.</source>
<translation>Faili täielik allalaadimine ebaõnnestus.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="601"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="636"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Faili %1 ei saa salvestada kuna on nime konflikt kohaliku failiga!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="641"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="676"/>
<source>File has changed since discovery</source>
<translation>Faili on pärast avastamist muudetud</translation>
</message>
<context>
<name>OCC::PropagateItemJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="92"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
<source>; Restoration Failed: %1</source>
<translation>; Taastamine ebaõnnestus: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="138"/>
<source>Continue blacklisting:</source>
<translation>Jätka mustas nimekirjas hoidmist:</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="230"/>
<source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove folder '%1';</source>
+ <source>Could not remove folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="243"/>
- <location filename="../src/libsync/propagator_legacy.cpp" line="302"/>
- <source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>Kohalik fail muutus sünkroniseerimise ajal, sünkroniseerin kuni ülekanne on täielik</translation>
- </message>
+ <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="246"/>
- <source>Sync was aborted by user.</source>
- <translation>Sünkroniseering katkestati kasutaja poolt.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="205"/>
+ <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/propagator_legacy.cpp" line="252"/>
- <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
- <translation>Faili on lokaalselt muudetud, kuid see on osa kirjutamisõiguseta jagamisest. See on taastatud ning sinu muudatus on konfliktses failis.</translation>
- </message>
-</context>
-<context>
- <name>OCC::PropagateUploadFileQNAM</name>
- <message>
- <location filename="../src/libsync/propagateupload.cpp" line="226"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="262"/>
<source>File Removed</source>
<translation>Fail eemaldatud</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="274"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Kohalik fail muutus sünkroniseeringu käigus. See taastakse.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="250"/>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="286"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="665"/>
<source>Local file changed during sync.</source>
<translation>Kohalik fail muutus sünkroniseeringu käigus.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="558"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="592"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="566"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="600"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Faili on lokaalselt muudetud, kuid see on osa kirjutamisõiguseta jagamisest. See on taastatud ning sinu muudatus on konfliktses failis.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="597"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="631"/>
<source>Poll URL missing</source>
<translation>Küsitluse URL puudub</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="620"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="654"/>
<source>The local file was removed during sync.</source>
<translation>Kohalik fail on eemaldatud sünkroniseeringu käigus.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="646"/>
- <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
- <translation>Server ei tunnistanud viimast tükki. (E-silt puudus).</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="680"/>
+ <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Märkimata kataloogid <b>eemaldatakse</b> kohalikust failisüsteemist ning neid ei sünkroniseerita enam sellesse arvutisse</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
<source>Choose What to Sync</source>
<translation>Vali, mida sünkroniseerida</translation>
</message>
<translation>Suurus</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
<source>No subfolders currently on the server.</source>
<translation>Serveris pole praegu alamkaustasid.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
<source>An error occured while loading the list of sub folders.</source>
<translation type="unfinished"/>
</message>
<translation>Seaded</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="80"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="84"/>
<source>Activity</source>
<translation>Toimingud</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="86"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="90"/>
<source>General</source>
<translation>Üldine</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>Network</source>
<translation>Võrk</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharedialog.ui" line="22"/>
- <location filename="../src/gui/sharedialog.ui" line="234"/>
+ <location filename="../src/gui/sharedialog.ui" line="258"/>
<source>TextLabel</source>
<translation>Tekstisilt</translation>
</message>
<translation>ownCloudi kaust:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="182"/>
+ <location filename="../src/gui/sharedialog.ui" line="116"/>
<source>Set &password </source>
<translation>Määra &parool</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="196"/>
+ <location filename="../src/gui/sharedialog.ui" line="130"/>
<source>Set &expiration date</source>
<translation>Määra &aegumise kuupäev</translation>
</message>
+ <message>
+ <location filename="../src/gui/sharedialog.ui" line="214"/>
+ <source>Allow editing</source>
+ <translation>Luba muutmine</translation>
+ </message>
<message>
<location filename="../src/gui/sharedialog.ui" line="77"/>
<source>Share link</source>
<translation>Jaga linki</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="125"/>
+ <location filename="../src/gui/sharedialog.ui" line="203"/>
<source>Copy &link</source>
<translation>Kopeeri &link</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="142"/>
+ <location filename="../src/gui/sharedialog.ui" line="154"/>
<source>Set password</source>
<translation>Määra parool</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="692"/>
- <source>%1 path: %2</source>
- <translation>%1 asukoht: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="115"/>
+ <location filename="../src/gui/sharedialog.cpp" line="120"/>
<source>%1 Sharing</source>
<translation>%1 jagamine</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="103"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="112"/>
+ <location filename="../src/gui/sharedialog.cpp" line="117"/>
<source>Folder: %2</source>
<translation>Kaust: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="121"/>
<source>P&assword protect</source>
<translation>P&arooliga kaitstud</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="221"/>
+ <location filename="../src/gui/sharedialog.cpp" line="214"/>
<source>Password Protected</source>
<translation>Parooliga kaitstud</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="382"/>
+ <location filename="../src/gui/sharedialog.cpp" line="338"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="528"/>
+ <location filename="../src/gui/sharedialog.cpp" line="475"/>
<source>Please Set Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="564"/>
- <location filename="../src/gui/sharedialog.cpp" line="565"/>
+ <location filename="../src/gui/sharedialog.cpp" line="538"/>
+ <location filename="../src/gui/sharedialog.cpp" line="539"/>
<source>&Share link</source>
<translation>&Jaga linki</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="583"/>
+ <location filename="../src/gui/sharedialog.cpp" line="552"/>
+ <location filename="../src/gui/sharedialog.cpp" line="564"/>
<source>OCS API error code: %1</source>
<translation>OCS API veakood: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="605"/>
- <source>There is no sync folder configured.</source>
- <translation>Sünkroniseeritavat kausta pole määratud.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="639"/>
- <source>A sync file with the same name exists. The file cannot be registered to sync.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="684"/>
- <source>The file cannot be synced.</source>
- <translation>Faili ei saa sünkroonida.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="624"/>
- <source>Sharing of external directories is not yet working.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="473"/>
- <location filename="../src/gui/sharedialog.cpp" line="506"/>
+ <location filename="../src/gui/sharedialog.cpp" line="418"/>
+ <location filename="../src/gui/sharedialog.cpp" line="460"/>
<source>Public sh&aring requires a password</source>
<translation>Avalik j&agamine nõuab parooli</translation>
</message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="617"/>
- <source>Cannot find a folder to upload to.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
- <source>Waiting to upload...</source>
- <translation>Üleslaadimise ootamine...</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="653"/>
- <source>Unable to register in sync space.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="694"/>
- <source>Sync of registered file was not successful yet.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>Login Error</source>
<translation>Sisselogimise viga</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>You must sign in as user %1</source>
<translation>Pead sisse logima kui kasutaja %1</translation>
</message>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="452"/>
+ <location filename="../src/gui/socketapi.cpp" line="447"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Jagatud kasutajaga %1</translation>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="97"/>
+ <location filename="../src/libsync/syncengine.cpp" line="94"/>
<source>Success.</source>
<translation>Korras.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="104"/>
+ <location filename="../src/libsync/syncengine.cpp" line="101"/>
<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="107"/>
+ <location filename="../src/libsync/syncengine.cpp" line="104"/>
<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="110"/>
+ <location filename="../src/libsync/syncengine.cpp" line="107"/>
<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="113"/>
+ <location filename="../src/libsync/syncengine.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync ei suutnud mälu reserveerida.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>CSync parameetri saatuslik viga.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="119"/>
+ <location filename="../src/libsync/syncengine.cpp" line="116"/>
<source>CSync processing step update failed.</source>
<translation>CSync uuendusprotsess ebaõnnestus.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="122"/>
+ <location filename="../src/libsync/syncengine.cpp" line="119"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync tasakaalustuse protsess ebaõnnestus.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="122"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="125"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="128"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="131"/>
<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="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="134"/>
<source>A network connection timeout happened.</source>
<translation>Toimus võrgukatkestus.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="137"/>
<source>A HTTP transmission error happened.</source>
<translation>HTTP ülekande viga.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation>CSync ebaõnnestus ligipääsu puudumisel.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
<source>An error occurred while opening a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
<source>Error while reading folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="996"/>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
<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="1003"/>
+ <location filename="../src/libsync/syncengine.cpp" line="991"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="152"/>
<source>CSync unspecified error.</source>
<translation>CSync tuvastamatu viga.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="155"/>
<source>Aborted by the user</source>
<translation>Kasutaja poolt tühistatud</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="392"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="143"/>
<source>CSync failed to access</source>
<translation>CSyncile ligipääs ebaõnnestus</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <location filename="../src/libsync/syncengine.cpp" line="97"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <source>CSync failed due to unhandled permission denied.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="146"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="158"/>
<source>The service is temporarily unavailable</source>
<translation>Teenus pole ajutiselt saadaval</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="175"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>An internal error number %1 occurred.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="227"/>
<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="389"/>
+ <location filename="../src/libsync/syncengine.cpp" line="386"/>
<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="392"/>
+ <location filename="../src/libsync/syncengine.cpp" line="389"/>
<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="398"/>
+ <location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename is too long.</source>
<translation>Faili nimi on liiga pikk.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="401"/>
+ <location filename="../src/libsync/syncengine.cpp" line="398"/>
<source>File is ignored because it's hidden.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="407"/>
+ <location filename="../src/libsync/syncengine.cpp" line="404"/>
<source>Stat failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="429"/>
+ <location filename="../src/libsync/syncengine.cpp" line="426"/>
<source>Filename encoding is not valid</source>
<translation>Failinime kodeering pole kehtiv</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="561"/>
+ <location filename="../src/libsync/syncengine.cpp" line="558"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="631"/>
+ <location filename="../src/libsync/syncengine.cpp" line="612"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="645"/>
<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="718"/>
+ <location filename="../src/libsync/syncengine.cpp" line="723"/>
<source>Cannot open the sync journal</source>
<translation>Ei suuda avada sünkroniseeringu zurnaali</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="965"/>
- <location filename="../src/libsync/syncengine.cpp" line="972"/>
+ <location filename="../src/libsync/syncengine.cpp" line="953"/>
+ <location filename="../src/libsync/syncengine.cpp" line="960"/>
<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="990"/>
+ <location filename="../src/libsync/syncengine.cpp" line="978"/>
<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="1023"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1011"/>
<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="1040"/>
- <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1028"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1048"/>
<source>Not allowed to remove, restoring</source>
<translation>Eemaldamine pole lubatud, taastan</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1073"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1061"/>
<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="1128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1116"/>
<source>Move not allowed, item restored</source>
<translation>Liigutamine pole lubatud, üksus taastatud</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1125"/>
<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="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the destination</source>
<translation>sihtkoht</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the source</source>
<translation>allikas</translation>
</message>
</message>
</context>
<context>
- <name>OCC::TransmissionChecksumValidator</name>
+ <name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="128"/>
<source>The checksum header is malformed.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+ <source>The checksum header contained an unknown checksum type '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="148"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation type="unfinished"/>
</message>
<source>Recent Changes</source>
<translation>Hiljutised muudatused</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="561"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="331"/>
<source>Managed Folders:</source>
<source>Open %1 in browser</source>
<translation>Ava %1 veebilehitsejas</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="449"/>
- <source>Log out everywhere</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="457"/>
- <source>Log in everywhere...</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="513"/>
<source>Unknown status</source>
<source>Account %1: %2</source>
<translation>Konto %1: %2</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="449"/>
+ <source>Log out of all accounts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="457"/>
+ <source>Log in to all accounts...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="532"/>
<source>Crash now</source>
<source>No items synced recently</source>
<translation>Ühtegi üksust pole hiljuti sünkroniseeritud</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="561"/>
- <source>Discovering '%1'</source>
- <translation>'%1' avastamine</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="566"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>%L1 B</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="306"/>
+ <location filename="../src/libsync/utility.cpp" line="303"/>
<source>%Ln year(s)</source>
<translation>%Ln aasta(t)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="307"/>
+ <location filename="../src/libsync/utility.cpp" line="304"/>
<source>%Ln month(s)</source>
<translation>%Ln kuu(d)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="308"/>
+ <location filename="../src/libsync/utility.cpp" line="305"/>
<source>%Ln day(s)</source>
<translation>%Ln päeva(a)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="309"/>
+ <location filename="../src/libsync/utility.cpp" line="306"/>
<source>%Ln hour(s)</source>
<translation>%Ln tund(i)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="310"/>
+ <location filename="../src/libsync/utility.cpp" line="307"/>
<source>%Ln minute(s)</source>
<translation>%Ln minut(it)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="311"/>
+ <location filename="../src/libsync/utility.cpp" line="308"/>
<source>%Ln second(s)</source>
<translation>%Ln sekund(it)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="318"/>
<source>0 seconds</source>
<translation>0 sekundit</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="336"/>
+ <location filename="../src/libsync/utility.cpp" line="333"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="73"/>
- <source>Remove the account configuration from the client</source>
+ <source>Enter your credentials to connect to the server</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="76"/>
+ <source>Sign in</source>
+ <translation>Izena eman</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="89"/>
+ <source>Remove the account configuration from the client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Remove Account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="97"/>
+ <location filename="../src/gui/accountsettings.ui" line="113"/>
<source>Storage space: ...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="167"/>
+ <location filename="../src/gui/accountsettings.ui" line="183"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="230"/>
<source>Apply</source>
<translation>Aplikatu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="198"/>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
- <location filename="../src/gui/accountsettings.cpp" line="571"/>
+ <location filename="../src/gui/accountsettings.ui" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="289"/>
+ <location filename="../src/gui/accountsettings.cpp" line="646"/>
<source>Cancel</source>
<translation>Ezeztatu</translation>
</message>
<translation><user> bezala <server>-n konektatuta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="115"/>
+ <location filename="../src/gui/accountsettings.cpp" line="121"/>
<source>No account configured.</source>
<translation>Ez da konturik konfiguratu.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="161"/>
+ <source>Choose what to sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="168"/>
+ <source>Remove folder sync connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="234"/>
<source>Folder creation failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="230"/>
+ <location filename="../src/gui/accountsettings.cpp" line="235"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="283"/>
- <source>Stop syncing</source>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
+ <source>Confirm Folder Sync Connection Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>Remove Folder Sync Connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="309"/>
+ <location filename="../src/gui/accountsettings.cpp" line="314"/>
<source>Confirm Folder Reset</source>
<translation>Baieztatu Karpetaren Leheneratzea</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="310"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Benetan nahi duzu <i>%1</i> karpeta leheneratu eta zure bezeroaren datu basea berreraiki?</p><p><b>Oharra:</p> Funtzio hau mantenurako bakarrik diseinauta izan da. Ez da fitxategirik ezabatuko, baina honek datu trafiko handia sor dezake eta minutu edo ordu batzuk behar izango ditu burutzeko, karpetaren tamainaren arabera. Erabili aukera hau bakarrik zure kudeatzaileak esanez gero.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="391"/>
+ <location filename="../src/gui/accountsettings.cpp" line="396"/>
<source>Sync Running</source>
<translation>Sinkronizazioa martxan da</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="392"/>
+ <location filename="../src/gui/accountsettings.cpp" line="397"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Sinkronizazio martxan da.<br/>Bukatu nahi al duzu?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="472"/>
+ <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <source>%1 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="485"/>
<source>%1 as <i>%2</i></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="476"/>
+ <location filename="../src/gui/accountsettings.cpp" line="495"/>
<source>Connected to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="478"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
<source>Server %1 is temporarily unavailable.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="480"/>
+ <location filename="../src/gui/accountsettings.cpp" line="499"/>
<source>Signed out from %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="482"/>
+ <location filename="../src/gui/accountsettings.cpp" line="501"/>
<source>No connection to %1 at %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
- <source>There are new folders that were not synchronized because they are too big: %1</source>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <source>There are new folders that were not synchronized because they are too big: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="536"/>
- <source>, </source>
- <translation>, </translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="563"/>
+ <location filename="../src/gui/accountsettings.cpp" line="638"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="564"/>
+ <location filename="../src/gui/accountsettings.cpp" line="639"/>
<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="570"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="158"/>
<source>Open folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="168"/>
- <source>Choose What to Sync</source>
- <translation>Hautatu zer sinkronizatu</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="176"/>
- <source>Remove sync</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="277"/>
- <source>Confirm Sync Removal</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="278"/>
+ <location filename="../src/gui/accountsettings.cpp" line="283"/>
<source><p>Do you really want to stop syncing the folder <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="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="452"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="448"/>
+ <location filename="../src/gui/accountsettings.cpp" line="453"/>
<source>%1 of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="453"/>
+ <location filename="../src/gui/accountsettings.cpp" line="462"/>
<source>Currently there is no storage usage information available.</source>
<translation>Orain ez dago eskuragarri biltegiratze erabileraren informazioa.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="507"/>
<source>No %1 connection configured.</source>
<translation>Ez dago %1 konexiorik konfiguratuta.</translation>
</message>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="95"/>
+ <location filename="../src/gui/accountstate.cpp" line="99"/>
<source>Signed out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="97"/>
+ <location filename="../src/gui/accountstate.cpp" line="101"/>
<source>Disconnected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="99"/>
+ <location filename="../src/gui/accountstate.cpp" line="103"/>
<source>Connected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="101"/>
+ <location filename="../src/gui/accountstate.cpp" line="105"/>
<source>Service unavailable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="103"/>
+ <location filename="../src/gui/accountstate.cpp" line="107"/>
<source>Network error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="105"/>
+ <location filename="../src/gui/accountstate.cpp" line="109"/>
<source>Configuration error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="107"/>
+ <location filename="../src/gui/accountstate.cpp" line="111"/>
<source>Unknown account state</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>Reauthentication required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>You need to re-login to continue using the account %1.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
<translation>Mesedez eguneratu zerbitzarira eta berrabiarazi bezeroa.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="143"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="135"/>
<source>Authentication error: Either username or password are wrong.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="155"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="147"/>
<source>timeout</source>
<translation>denbora iraungi da</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="186"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="178"/>
<source>The provided credentials are not correct</source>
<translation>Emandako kredentzialak ez dira zuzenak</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="524"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="537"/>
<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="107"/>
+ <location filename="../src/gui/folder.cpp" line="108"/>
<source>Unable to create csync-context</source>
<translation>Ezin da csync-context sortu</translation>
</message>
<translation>Sinkronizazio Jarduerak</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="845"/>
+ <location filename="../src/gui/folder.cpp" line="870"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1102"/>
+ <location filename="../src/gui/folder.cpp" line="1127"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1115"/>
+ <location filename="../src/gui/folder.cpp" line="1140"/>
<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="1119"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Remove All Files?</source>
<translation>Ezabatu Fitxategi Guztiak?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1121"/>
+ <location filename="../src/gui/folder.cpp" line="1146"/>
<source>Remove all files</source>
<translation>Ezabatu fitxategi guztiak</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1122"/>
+ <location filename="../src/gui/folder.cpp" line="1147"/>
<source>Keep files</source>
<translation>Mantendu fitxategiak</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="275"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<source>Could not reset folder state</source>
<translation>Ezin izan da karpetaren egoera berrezarri</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="276"/>
+ <location filename="../src/gui/folderman.cpp" line="271"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Aurkitu da '%1' sinkronizazio erregistro zaharra, baina ezin da ezabatu. Ziurtatu aplikaziorik ez dela erabiltzen ari.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="877"/>
+ <location filename="../src/gui/folderman.cpp" line="865"/>
<source> (backup)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="882"/>
+ <location filename="../src/gui/folderman.cpp" line="870"/>
<source> (backup %1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1091"/>
+ <location filename="../src/gui/folderman.cpp" line="1079"/>
<source>Undefined State.</source>
<translation>Definitu gabeko egoera.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1094"/>
- <source>Waits to start syncing.</source>
- <translation>Itxoiten sinkronizazioa hasteko.</translation>
+ <location filename="../src/gui/folderman.cpp" line="1082"/>
+ <source>Waiting to start syncing.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1097"/>
+ <location filename="../src/gui/folderman.cpp" line="1085"/>
<source>Preparing for sync.</source>
<translation>Sinkronizazioa prestatzen.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1100"/>
+ <location filename="../src/gui/folderman.cpp" line="1088"/>
<source>Sync is running.</source>
<translation>Sinkronizazioa martxan da.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1103"/>
+ <location filename="../src/gui/folderman.cpp" line="1091"/>
<source>Last Sync was successful.</source>
<translation>Azkeneko sinkronizazioa ongi burutu zen.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1108"/>
+ <location filename="../src/gui/folderman.cpp" line="1096"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Azkenengo sinkronizazioa ongi burutu zen, baina banakako fitxategi batzuetan abisuak egon dira.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1111"/>
+ <location filename="../src/gui/folderman.cpp" line="1099"/>
<source>Setup Error.</source>
<translation>Konfigurazio errorea.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1114"/>
+ <location filename="../src/gui/folderman.cpp" line="1102"/>
<source>User Abort.</source>
<translation>Erabiltzaileak bertan behera utzi.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1117"/>
+ <location filename="../src/gui/folderman.cpp" line="1105"/>
<source>Sync is paused.</source>
<translation>Sinkronizazioa pausatuta dago.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1123"/>
+ <location filename="../src/gui/folderman.cpp" line="1111"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sinkronizazioa pausatuta dago)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1119"/>
<source>No valid folder selected!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1130"/>
<source>The selected path is not a folder!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1146"/>
+ <location filename="../src/gui/folderman.cpp" line="1134"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Ez daukazu hautatutako karpetan idazteko baimenik!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1161"/>
+ <location filename="../src/gui/folderman.cpp" line="1149"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1166"/>
+ <location filename="../src/gui/folderman.cpp" line="1154"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1173"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1168"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1186"/>
+ <location filename="../src/gui/folderman.cpp" line="1174"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="85"/>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="274"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="271"/>
<source>File</source>
<translation>Fitxategia</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="228"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="224"/>
<source>Syncing selected files in your account with</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="231"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="227"/>
<source>Remote path: %1</source>
<translation>Urruneko bidea: %1</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="121"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="122"/>
<source>You need to be connected to add a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="126"/>
- <source>Adding folder is disabled because your 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="131"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="132"/>
<source>Click this button to add a folder to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="141"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="142"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="156"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
<source>Error while loading the list of folders from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="182"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="192"/>
<source>Signed out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="727"/>
- <source>Discovering '%1'</source>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="127"/>
+ <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="787"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="163"/>
+ <source>Fetching folder list from server...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="789"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="849"/>
<source>Syncing %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="792"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="854"/>
<source>download %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="794"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="856"/>
<source>u2193 %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="800"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>upload %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="802"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="864"/>
<source>u2191 %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="807"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="869"/>
<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="811"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="873"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="827"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="889"/>
<source>%1 of %2, file %3 of %4
Total time left %5</source>
<translation> %2-tik %1, %4-tik %3 fitxategi
Geratzen den denbora %5</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
<source>file %1 of %2</source>
<translation>%1. fitxategia %2tik</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="932"/>
<source>Waiting...</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="934"/>
<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="878"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>Preparing to sync...</source>
<translation type="unfinished"/>
</message>
<name>OCC::FolderWizard</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <source>Add Folder Sync Connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderwizard.cpp" line="564"/>
- <source>Add Folder</source>
- <translation>Gehitu Karpeta</translation>
+ <source>Add Sync Connection</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Aurreratua</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="61"/>
+ <location filename="../src/gui/generalsettings.ui" line="109"/>
<source>Ask confirmation before downloading folders larger than</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
+ <location filename="../src/gui/generalsettings.ui" line="129"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="109"/>
+ <location filename="../src/gui/generalsettings.ui" line="159"/>
<source>Show crash reporter</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="118"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit Ignored Files</source>
<translation>Editatu Baztertutako Fitxategiak</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="142"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
<source>Add an Account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="167"/>
- <location filename="../src/gui/generalsettings.ui" line="173"/>
+ <location filename="../src/gui/generalsettings.ui" line="171"/>
+ <location filename="../src/gui/generalsettings.ui" line="177"/>
<source>About</source>
<translation>Honi buruz</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <location filename="../src/gui/generalsettings.ui" line="187"/>
<source>Updates</source>
<translation>Eguneraketak</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="208"/>
+ <location filename="../src/gui/generalsettings.ui" line="212"/>
<source>&Restart && Update</source>
<translation>Be&rrabiarazi eta Eguneratu</translation>
</message>
</context>
-<context>
- <name>OCC::HttpCredentials</name>
- <message>
- <location filename="../src/libsync/creds/httpcredentials.cpp" line="290"/>
- <source>Reading from keychain failed with error: '%1'</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="32"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
<source>Please enter %1 password:
User: %2
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="41"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <source>Reading from keychain failed with error: '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
<source>Enter Password</source>
<translation>Sartu Pasahitza</translation>
</message>
<translation>Ezabatu</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="40"/>
<source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="109"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
<source>Could not open file</source>
<translation>Ezin izan da fitxategia ireki</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="111"/>
<source>Cannot write changes to '%1'.</source>
<translation>Ezin izan dira aldaketa idatzi hemen '%1'.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="138"/>
<source>Add Ignore Pattern</source>
<translation>Gehitu Baztertzeko Eredua</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>Add a new ignore pattern:</source>
<translation>Gehitu baztertzeko eredu berria:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="45"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="46"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="163"/>
+ <location filename="../src/libsync/logger.cpp" line="190"/>
<source>Error</source>
<translation>Errorea</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="164"/>
+ <location filename="../src/libsync/logger.cpp" line="191"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>'%1' Fitxategia<br/> ezin da idazteko ireki.<br/><br/>Egunkariaren irteera <b>ezin</b> da gorde!</nobr></translation>
</message>
</message>
<message>
<location filename="../src/gui/networksettings.ui" line="203"/>
- <location filename="../src/gui/networksettings.ui" line="295"/>
+ <location filename="../src/gui/networksettings.ui" line="292"/>
<source>No limit</source>
<translation>Mugarik ez</translation>
</message>
<source>SOCKS5 proxy</source>
<translation>SOCKS5 proxy</translation>
</message>
+ <message>
+ <location filename="../src/gui/networksettings.cpp" line="128"/>
+ <source>Qt >= 5.4 is required in order to use the bandwidth limit</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::OCUpdater</name>
<source>Downloading version %1. Please wait...</source>
<translation>%1 Bertsioa deskargatzen. Mesedez itxoin...</translation>
</message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
- <source>Version %1 available. Restart application to start the update.</source>
- <translation>%1 Bertsioa eskuragarri. Abiarazi aplikazioa eguneraketa hasteko.</translation>
- </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="145"/>
<source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
<source>Could not check for new updates.</source>
<translation>Ezin da eguneraketarik bilatu.</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
+ <source>%1 version %2 available. Restart application to start the update.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
- <source>New version %1 available. Please use the system's update tool to install it.</source>
- <translation>%1 bertsio berria eskuragarri dago. Utziozu sistemaren eguneratzaileari instalatzen.</translation>
+ <source>New %1 version %2 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="151"/>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="114"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="110"/>
<source>Connection Timeout</source>
<translation>Konexioa denboraz kanpo</translation>
</message>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="171"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="167"/>
<source>Invalid JSON reply from the poll URL</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="435"/>
- <source>Sync was aborted by user.</source>
- <translation>Sinkronizazioa erabiltzaileak bertan behera utzi du</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="488"/>
- <source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation>Ez da E-Tagik jaso zerbitzaritik, egiaztatu Proxy/Gateway</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="494"/>
- <source>We received a different E-Tag for resuming. Retrying next time.</source>
- <translation>Jarraitzeko E-Tag ezberdina jaso dugu. Hurrengoan saiatuko gara berriz.</translation>
- </message>
+ <name>OCC::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="516"/>
- <source>Server returned wrong content-range</source>
+ <location filename="../src/libsync/propagatedownload.cpp" line="315"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="567"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
+ <source>The download would reduce free disk space below %1</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="315"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <location filename="../src/libsync/propagatedownload.cpp" line="372"/>
+ <source>Free space on disk is less than %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="457"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="482"/>
<source>File was deleted from server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="506"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="531"/>
<source>The file could not be downloaded completely.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="601"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="636"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="641"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="676"/>
<source>File has changed since discovery</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateItemJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="92"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
<source>; Restoration Failed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="138"/>
<source>Continue blacklisting:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="230"/>
<source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove folder '%1';</source>
+ <source>Could not remove folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="243"/>
- <location filename="../src/libsync/propagator_legacy.cpp" line="302"/>
- <source>Local file changed during sync, syncing once it arrived completely</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="246"/>
- <source>Sync was aborted by user.</source>
- <translation>Sinkronizazioa erabiltzaileak bertan behera utzi du</translation>
- </message>
+ <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="252"/>
- <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="205"/>
+ <source>File name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="226"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="262"/>
<source>File Removed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="274"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="250"/>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="286"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="665"/>
<source>Local file changed during sync.</source>
<translation>Fitxategi lokala aldatu da sinkronizazioan.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="558"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="592"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="566"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="600"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="597"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="631"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="620"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="654"/>
<source>The local file was removed during sync.</source>
<translation>Fitxategi lokala ezabatu da sinkronizazioan.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="646"/>
- <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="680"/>
+ <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
<source>Choose What to Sync</source>
<translation>Hautatu zer sinkronizatu</translation>
</message>
<translation>Tamaina</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
<source>No subfolders currently on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
<source>An error occured while loading the list of sub folders.</source>
<translation type="unfinished"/>
</message>
<translation>Ezarpenak</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="80"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="84"/>
<source>Activity</source>
<translation>Jarduera</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="86"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="90"/>
<source>General</source>
<translation>Orokorra</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>Network</source>
<translation>Sarea</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharedialog.ui" line="22"/>
- <location filename="../src/gui/sharedialog.ui" line="234"/>
+ <location filename="../src/gui/sharedialog.ui" line="258"/>
<source>TextLabel</source>
<translation>TestuEtiketa</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="182"/>
+ <location filename="../src/gui/sharedialog.ui" line="116"/>
<source>Set &password </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="196"/>
+ <location filename="../src/gui/sharedialog.ui" line="130"/>
<source>Set &expiration date</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/sharedialog.ui" line="214"/>
+ <source>Allow editing</source>
+ <translation>Baimendu editatzea</translation>
+ </message>
<message>
<location filename="../src/gui/sharedialog.ui" line="77"/>
<source>Share link</source>
<translation>Elkarbanatu lotura</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="125"/>
+ <location filename="../src/gui/sharedialog.ui" line="203"/>
<source>Copy &link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="142"/>
+ <location filename="../src/gui/sharedialog.ui" line="154"/>
<source>Set password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="692"/>
- <source>%1 path: %2</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="115"/>
+ <location filename="../src/gui/sharedialog.cpp" line="120"/>
<source>%1 Sharing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="103"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="112"/>
+ <location filename="../src/gui/sharedialog.cpp" line="117"/>
<source>Folder: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="121"/>
<source>P&assword protect</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="221"/>
+ <location filename="../src/gui/sharedialog.cpp" line="214"/>
<source>Password Protected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="382"/>
+ <location filename="../src/gui/sharedialog.cpp" line="338"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="528"/>
+ <location filename="../src/gui/sharedialog.cpp" line="475"/>
<source>Please Set Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="564"/>
- <location filename="../src/gui/sharedialog.cpp" line="565"/>
+ <location filename="../src/gui/sharedialog.cpp" line="538"/>
+ <location filename="../src/gui/sharedialog.cpp" line="539"/>
<source>&Share link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="583"/>
+ <location filename="../src/gui/sharedialog.cpp" line="552"/>
+ <location filename="../src/gui/sharedialog.cpp" line="564"/>
<source>OCS API error code: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="605"/>
- <source>There is no sync folder configured.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="639"/>
- <source>A sync file with the same name exists. The file cannot be registered to sync.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="684"/>
- <source>The file cannot be synced.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="624"/>
- <source>Sharing of external directories is not yet working.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="473"/>
- <location filename="../src/gui/sharedialog.cpp" line="506"/>
+ <location filename="../src/gui/sharedialog.cpp" line="418"/>
+ <location filename="../src/gui/sharedialog.cpp" line="460"/>
<source>Public sh&aring requires a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="617"/>
- <source>Cannot find a folder to upload to.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
- <source>Waiting to upload...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="653"/>
- <source>Unable to register in sync space.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="694"/>
- <source>Sync of registered file was not successful yet.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>Login Error</source>
<translation>Errorea sartzean</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>You must sign in as user %1</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="452"/>
+ <location filename="../src/gui/socketapi.cpp" line="447"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation type="unfinished"/>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="97"/>
+ <location filename="../src/libsync/syncengine.cpp" line="94"/>
<source>Success.</source>
<translation>Arrakasta.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="104"/>
+ <location filename="../src/libsync/syncengine.cpp" line="101"/>
<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="107"/>
+ <location filename="../src/libsync/syncengine.cpp" line="104"/>
<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="110"/>
+ <location filename="../src/libsync/syncengine.cpp" line="107"/>
<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="113"/>
+ <location filename="../src/libsync/syncengine.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>CSyncek huts egin du memoria alokatzean.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>CSync parametro larri errorea.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="119"/>
+ <location filename="../src/libsync/syncengine.cpp" line="116"/>
<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="122"/>
+ <location filename="../src/libsync/syncengine.cpp" line="119"/>
<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="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="122"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="125"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="128"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="131"/>
<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="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="134"/>
<source>A network connection timeout happened.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="137"/>
<source>A HTTP transmission error happened.</source>
<translation>HTTP transmisio errore bat gertatu da.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation>CSyncek huts egin du kudeatu gabeko baimen ukapen bat dela eta.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
<source>An error occurred while opening a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
<source>Error while reading folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="996"/>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
<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="1003"/>
+ <location filename="../src/libsync/syncengine.cpp" line="991"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="152"/>
<source>CSync unspecified error.</source>
<translation>CSyncen zehaztugabeko errorea.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="155"/>
<source>Aborted by the user</source>
<translation>Erabiltzaileak bertan behera utzita</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="392"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="143"/>
<source>CSync failed to access</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <location filename="../src/libsync/syncengine.cpp" line="97"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <source>CSync failed due to unhandled permission denied.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="146"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="158"/>
<source>The service is temporarily unavailable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="175"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>An internal error number %1 occurred.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="227"/>
<source>The item is not synced because of previous errors: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="389"/>
+ <location filename="../src/libsync/syncengine.cpp" line="386"/>
<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="392"/>
+ <location filename="../src/libsync/syncengine.cpp" line="389"/>
<source>File is listed on the ignore list.</source>
<translation>Fitxategia baztertutakoen zerrendan dago.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="398"/>
+ <location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename is too long.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="401"/>
+ <location filename="../src/libsync/syncengine.cpp" line="398"/>
<source>File is ignored because it's hidden.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="407"/>
+ <location filename="../src/libsync/syncengine.cpp" line="404"/>
<source>Stat failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="429"/>
+ <location filename="../src/libsync/syncengine.cpp" line="426"/>
<source>Filename encoding is not valid</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="561"/>
+ <location filename="../src/libsync/syncengine.cpp" line="558"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="631"/>
+ <location filename="../src/libsync/syncengine.cpp" line="612"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="645"/>
<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="718"/>
+ <location filename="../src/libsync/syncengine.cpp" line="723"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="965"/>
- <location filename="../src/libsync/syncengine.cpp" line="972"/>
+ <location filename="../src/libsync/syncengine.cpp" line="953"/>
+ <location filename="../src/libsync/syncengine.cpp" line="960"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <location filename="../src/libsync/syncengine.cpp" line="978"/>
<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="1023"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1011"/>
<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="1040"/>
- <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1028"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1048"/>
<source>Not allowed to remove, restoring</source>
<translation>Ezabatzeko baimenik gabe, berrezartzen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1073"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1061"/>
<source>Local files and share folder removed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1116"/>
<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="1137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1125"/>
<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="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the destination</source>
<translation>helburua</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the source</source>
<translation>jatorria</translation>
</message>
</message>
</context>
<context>
- <name>OCC::TransmissionChecksumValidator</name>
+ <name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="128"/>
<source>The checksum header is malformed.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+ <source>The checksum header contained an unknown checksum type '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="148"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation type="unfinished"/>
</message>
<source>Recent Changes</source>
<translation>Azkenengo Aldaketak</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="561"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="331"/>
<source>Managed Folders:</source>
<source>Open %1 in browser</source>
<translation>Ireki %1 arakatzailean</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="449"/>
- <source>Log out everywhere</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="457"/>
- <source>Log in everywhere...</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="513"/>
<source>Unknown status</source>
<source>Account %1: %2</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="449"/>
+ <source>Log out of all accounts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="457"/>
+ <source>Log in to all accounts...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="532"/>
<source>Crash now</source>
<source>No items synced recently</source>
<translation>Ez da azken aldian ezer sinkronizatu</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="561"/>
- <source>Discovering '%1'</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="566"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>%L1 B</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="306"/>
+ <location filename="../src/libsync/utility.cpp" line="303"/>
<source>%Ln year(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="307"/>
+ <location filename="../src/libsync/utility.cpp" line="304"/>
<source>%Ln month(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="308"/>
+ <location filename="../src/libsync/utility.cpp" line="305"/>
<source>%Ln day(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="309"/>
+ <location filename="../src/libsync/utility.cpp" line="306"/>
<source>%Ln hour(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="310"/>
+ <location filename="../src/libsync/utility.cpp" line="307"/>
<source>%Ln minute(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="311"/>
+ <location filename="../src/libsync/utility.cpp" line="308"/>
<source>%Ln second(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="318"/>
<source>0 seconds</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="336"/>
+ <location filename="../src/libsync/utility.cpp" line="333"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="73"/>
- <source>Remove the account configuration from the client</source>
+ <source>Enter your credentials to connect to the server</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="76"/>
+ <source>Sign in</source>
+ <translation>ورود</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="89"/>
+ <source>Remove the account configuration from the client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Remove Account</source>
<translation>حذف حساب کاربری</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="97"/>
+ <location filename="../src/gui/accountsettings.ui" line="113"/>
<source>Storage space: ...</source>
<translation>حجم فضای ذخیرهسازی: ...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="167"/>
+ <location filename="../src/gui/accountsettings.ui" line="183"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="230"/>
<source>Apply</source>
<translation>اعمال</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="198"/>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
- <location filename="../src/gui/accountsettings.cpp" line="571"/>
+ <location filename="../src/gui/accountsettings.ui" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="289"/>
+ <location filename="../src/gui/accountsettings.cpp" line="646"/>
<source>Cancel</source>
<translation>منصرف شدن</translation>
</message>
<translation>متصل به <server> به عنوان <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="115"/>
+ <location filename="../src/gui/accountsettings.cpp" line="121"/>
<source>No account configured.</source>
<translation>هیچ حسابکاربریای تنظیم نشده است.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="161"/>
+ <source>Choose what to sync</source>
+ <translation>انتخاب موارد همگامسازی</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="168"/>
+ <source>Remove folder sync connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="234"/>
<source>Folder creation failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="230"/>
+ <location filename="../src/gui/accountsettings.cpp" line="235"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="283"/>
- <source>Stop syncing</source>
- <translation>توقف بهنگامسازی</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
+ <source>Confirm Folder Sync Connection Removal</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="309"/>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>Remove Folder Sync Connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="314"/>
<source>Confirm Folder Reset</source>
<translation>قبول تنظیم مجدد پوشه</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="310"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="391"/>
+ <location filename="../src/gui/accountsettings.cpp" line="396"/>
<source>Sync Running</source>
<translation>همگام سازی در حال اجراست</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="392"/>
+ <location filename="../src/gui/accountsettings.cpp" line="397"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>عملیات همگام سازی در حال اجراست.<br/>آیا دوست دارید آن را متوقف کنید؟</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="472"/>
+ <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <source>%1 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="485"/>
<source>%1 as <i>%2</i></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="476"/>
+ <location filename="../src/gui/accountsettings.cpp" line="495"/>
<source>Connected to %1.</source>
<translation>متصل به %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="478"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>سرور %1 بصورت موقت خارج از دسترس است.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="480"/>
+ <location filename="../src/gui/accountsettings.cpp" line="499"/>
<source>Signed out from %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="482"/>
+ <location filename="../src/gui/accountsettings.cpp" line="501"/>
<source>No connection to %1 at %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
- <source>There are new folders that were not synchronized because they are too big: %1</source>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <source>There are new folders that were not synchronized because they are too big: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="536"/>
- <source>, </source>
- <translation>رشته های ترجمه نشده</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="563"/>
+ <location filename="../src/gui/accountsettings.cpp" line="638"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="564"/>
+ <location filename="../src/gui/accountsettings.cpp" line="639"/>
<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="570"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="158"/>
<source>Open folder</source>
<translation>بازکردن پوشه</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="168"/>
- <source>Choose What to Sync</source>
- <translation>انتخاب موارد همگامسازی</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Resume sync</source>
<translation>از سرگیری همگامسازی</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Pause sync</source>
<translation>توقف بههنگامسازی </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="176"/>
- <source>Remove sync</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="277"/>
- <source>Confirm Sync Removal</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="278"/>
+ <location filename="../src/gui/accountsettings.cpp" line="283"/>
<source><p>Do you really want to stop syncing the folder <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="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="452"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="448"/>
+ <location filename="../src/gui/accountsettings.cpp" line="453"/>
<source>%1 of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="453"/>
+ <location filename="../src/gui/accountsettings.cpp" line="462"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="507"/>
<source>No %1 connection configured.</source>
<translation>بدون %1 اتصال پیکربندی شده.</translation>
</message>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="95"/>
+ <location filename="../src/gui/accountstate.cpp" line="99"/>
<source>Signed out</source>
<translation>خارج شد</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="97"/>
+ <location filename="../src/gui/accountstate.cpp" line="101"/>
<source>Disconnected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="99"/>
+ <location filename="../src/gui/accountstate.cpp" line="103"/>
<source>Connected</source>
<translation>متصل</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="101"/>
+ <location filename="../src/gui/accountstate.cpp" line="105"/>
<source>Service unavailable</source>
<translation>سرویس خارج از دسترس</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="103"/>
+ <location filename="../src/gui/accountstate.cpp" line="107"/>
<source>Network error</source>
<translation>خطای شبکه</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="105"/>
+ <location filename="../src/gui/accountstate.cpp" line="109"/>
<source>Configuration error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="107"/>
+ <location filename="../src/gui/accountstate.cpp" line="111"/>
<source>Unknown account state</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>Reauthentication required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>You need to re-login to continue using the account %1.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="143"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="135"/>
<source>Authentication error: Either username or password are wrong.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="155"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="147"/>
<source>timeout</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="186"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="178"/>
<source>The provided credentials are not correct</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="524"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="537"/>
<source>Aborted by the user</source>
<translation>متوقف شده توسط کاربر</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="107"/>
+ <location filename="../src/gui/folder.cpp" line="108"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<translation>فعالیت همگام سازی</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="845"/>
+ <location filename="../src/gui/folder.cpp" line="870"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1102"/>
+ <location filename="../src/gui/folder.cpp" line="1127"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1115"/>
+ <location filename="../src/gui/folder.cpp" line="1140"/>
<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="1119"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Remove All Files?</source>
<translation>حذف تمام فایل ها؟</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1121"/>
+ <location filename="../src/gui/folder.cpp" line="1146"/>
<source>Remove all files</source>
<translation>حذف تمام فایل ها</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1122"/>
+ <location filename="../src/gui/folder.cpp" line="1147"/>
<source>Keep files</source>
<translation>نگه داشتن فایل ها</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="275"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<source>Could not reset folder state</source>
<translation>نمی تواند حالت پوشه را تنظیم مجدد کند</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="276"/>
+ <location filename="../src/gui/folderman.cpp" line="271"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="877"/>
+ <location filename="../src/gui/folderman.cpp" line="865"/>
<source> (backup)</source>
<translation> (backup)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="882"/>
+ <location filename="../src/gui/folderman.cpp" line="870"/>
<source> (backup %1)</source>
<translation> (پشتیبان %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1091"/>
+ <location filename="../src/gui/folderman.cpp" line="1079"/>
<source>Undefined State.</source>
<translation>موقعیت تعریف نشده</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1094"/>
- <source>Waits to start syncing.</source>
- <translation>صبر کنید تا همگام سازی آغاز شود</translation>
+ <location filename="../src/gui/folderman.cpp" line="1082"/>
+ <source>Waiting to start syncing.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1097"/>
+ <location filename="../src/gui/folderman.cpp" line="1085"/>
<source>Preparing for sync.</source>
<translation>آماده سازی برای همگام سازی کردن.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1100"/>
+ <location filename="../src/gui/folderman.cpp" line="1088"/>
<source>Sync is running.</source>
<translation>همگام سازی در حال اجراست</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1103"/>
+ <location filename="../src/gui/folderman.cpp" line="1091"/>
<source>Last Sync was successful.</source>
<translation>آخرین همگام سازی موفقیت آمیز بود</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1108"/>
+ <location filename="../src/gui/folderman.cpp" line="1096"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1111"/>
+ <location filename="../src/gui/folderman.cpp" line="1099"/>
<source>Setup Error.</source>
<translation>خطا در پیکر بندی.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1114"/>
+ <location filename="../src/gui/folderman.cpp" line="1102"/>
<source>User Abort.</source>
<translation>خارج کردن کاربر.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1117"/>
+ <location filename="../src/gui/folderman.cpp" line="1105"/>
<source>Sync is paused.</source>
<translation>همگام سازی فعلا متوقف شده است</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1123"/>
+ <location filename="../src/gui/folderman.cpp" line="1111"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (همگامسازی موقتا متوقف شده است)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1119"/>
<source>No valid folder selected!</source>
<translation>هیچ پوشهی معتبری انتخاب نشده است!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1130"/>
<source>The selected path is not a folder!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1146"/>
+ <location filename="../src/gui/folderman.cpp" line="1134"/>
<source>You have no permission to write to the selected folder!</source>
<translation>شما اجازه نوشتن در پوشه های انتخاب شده را ندارید!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1161"/>
+ <location filename="../src/gui/folderman.cpp" line="1149"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1166"/>
+ <location filename="../src/gui/folderman.cpp" line="1154"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1173"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1168"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1186"/>
+ <location filename="../src/gui/folderman.cpp" line="1174"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="85"/>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="274"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="271"/>
<source>File</source>
<translation>فایل</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="228"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="224"/>
<source>Syncing selected files in your account with</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="231"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="227"/>
<source>Remote path: %1</source>
<translation>مسیر از راه دور: %1</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="121"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="122"/>
<source>You need to be connected to add a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="126"/>
- <source>Adding folder is disabled because your 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="131"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="132"/>
<source>Click this button to add a folder to synchronize.</source>
<translation>برای افزودن پوشه به همگامسازی روی این دکمه کلیک کنید.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="141"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="142"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="156"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
<source>Error while loading the list of folders from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="182"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="192"/>
<source>Signed out</source>
<translation>خارج شد</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="727"/>
- <source>Discovering '%1'</source>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="127"/>
+ <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="163"/>
+ <source>Fetching folder list from server...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="787"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="789"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="849"/>
<source>Syncing %1</source>
<translation>همگامسازی %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="792"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="854"/>
<source>download %1/s</source>
<translation>دانلود %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="794"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="856"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="800"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>upload %1/s</source>
<translation>آپلود %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="802"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="864"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="807"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="869"/>
<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="811"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="873"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="827"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="889"/>
<source>%1 of %2, file %3 of %4
Total time left %5</source>
<translation>%1 از%2, فایل %3 از%4
مجموع زمان باقیمانده %5</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
<source>file %1 of %2</source>
<translation>فایل %1 از %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="932"/>
<source>Waiting...</source>
<translation>درحال انتظار...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="934"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>در انتظار برای %n پوشهی دیگر ...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="878"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>Preparing to sync...</source>
<translation>آمادهسازی همگامسازی ...</translation>
</message>
<name>OCC::FolderWizard</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <source>Add Folder Sync Connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderwizard.cpp" line="564"/>
- <source>Add Folder</source>
- <translation>ایجاد پوشه</translation>
+ <source>Add Sync Connection</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>پیشرفته</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="61"/>
+ <location filename="../src/gui/generalsettings.ui" line="109"/>
<source>Ask confirmation before downloading folders larger than</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
+ <location filename="../src/gui/generalsettings.ui" line="129"/>
<source>MB</source>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="109"/>
+ <location filename="../src/gui/generalsettings.ui" line="159"/>
<source>Show crash reporter</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="118"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit Ignored Files</source>
<translation>ویرایش فایل های در نظر گرفته نشده</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="142"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
<source>Add an Account</source>
<translation>ایحاد یک حسابکاربری</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="167"/>
- <location filename="../src/gui/generalsettings.ui" line="173"/>
+ <location filename="../src/gui/generalsettings.ui" line="171"/>
+ <location filename="../src/gui/generalsettings.ui" line="177"/>
<source>About</source>
<translation>درباره</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <location filename="../src/gui/generalsettings.ui" line="187"/>
<source>Updates</source>
<translation>به روز رسانی ها</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="208"/>
+ <location filename="../src/gui/generalsettings.ui" line="212"/>
<source>&Restart && Update</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>OCC::HttpCredentials</name>
- <message>
- <location filename="../src/libsync/creds/httpcredentials.cpp" line="290"/>
- <source>Reading from keychain failed with error: '%1'</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="32"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
<source>Please enter %1 password:
User: %2
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="41"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <source>Reading from keychain failed with error: '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
<source>Enter Password</source>
<translation>رمز را وارد کنید</translation>
</message>
<translation>حذف</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="40"/>
<source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="109"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
<source>Could not open file</source>
<translation>امکان باز کردن فایل وجود ندارد</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="111"/>
<source>Cannot write changes to '%1'.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="138"/>
<source>Add Ignore Pattern</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>Add a new ignore pattern:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="45"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="46"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="163"/>
+ <location filename="../src/libsync/logger.cpp" line="190"/>
<source>Error</source>
<translation>خطا</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="164"/>
+ <location filename="../src/libsync/logger.cpp" line="191"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation type="unfinished"/>
</message>
</message>
<message>
<location filename="../src/gui/networksettings.ui" line="203"/>
- <location filename="../src/gui/networksettings.ui" line="295"/>
+ <location filename="../src/gui/networksettings.ui" line="292"/>
<source>No limit</source>
<translation>بدون محدودیت</translation>
</message>
<source>SOCKS5 proxy</source>
<translation>پروکسی SOCKS5</translation>
</message>
+ <message>
+ <location filename="../src/gui/networksettings.cpp" line="128"/>
+ <source>Qt >= 5.4 is required in order to use the bandwidth limit</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::OCUpdater</name>
<source>Downloading version %1. Please wait...</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
- <source>Version %1 available. Restart application to start the update.</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="145"/>
<source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
<source>Could not check for new updates.</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
+ <source>%1 version %2 available. Restart application to start the update.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
- <source>New version %1 available. Please use the system's update tool to install it.</source>
+ <source>New %1 version %2 available. Please use the system's update tool to install it.</source>
<translation type="unfinished"/>
</message>
<message>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="114"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="110"/>
<source>Connection Timeout</source>
<translation>تایم اوت اتصال</translation>
</message>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="171"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="167"/>
<source>Invalid JSON reply from the poll URL</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="435"/>
- <source>Sync was aborted by user.</source>
- <translation>همگامسازی توسط کاربر متوقف شد.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="488"/>
- <source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="494"/>
- <source>We received a different E-Tag for resuming. Retrying next time.</source>
- <translation type="unfinished"/>
- </message>
+ <name>OCC::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="516"/>
- <source>Server returned wrong content-range</source>
+ <location filename="../src/libsync/propagatedownload.cpp" line="315"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="567"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
+ <source>The download would reduce free disk space below %1</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="315"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <location filename="../src/libsync/propagatedownload.cpp" line="372"/>
+ <source>Free space on disk is less than %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="457"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="482"/>
<source>File was deleted from server</source>
<translation>فایل از روی سرور حذف شد</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="506"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="531"/>
<source>The file could not be downloaded completely.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="601"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="636"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="641"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="676"/>
<source>File has changed since discovery</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateItemJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="92"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
<source>; Restoration Failed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="138"/>
<source>Continue blacklisting:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="230"/>
<source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove folder '%1';</source>
- <translation>امکان حذف پوشه '%1'وجود ندارد،</translation>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="243"/>
- <location filename="../src/libsync/propagator_legacy.cpp" line="302"/>
- <source>Local file changed during sync, syncing once it arrived completely</source>
- <translation type="unfinished"/>
- </message>
+ <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="246"/>
- <source>Sync was aborted by user.</source>
- <translation>Ù\87Ù\85گاÙ\85â\80\8cسازÛ\8c تÙ\88سط کاربر Ù\85تÙ\88Ù\82Ù\81 شد.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="205"/>
+ <source>File name contains at least one invalid character</source>
+ <translation>Ù\86اÙ\85 Ù\81اÛ\8cÙ\84 داراÛ\8c ØداÙ\82Ù\84 Û\8cÚ© کاراکتر Ù\86اÙ\85عتبر است</translation>
</message>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="252"/>
- <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
- <name>OCC::PropagateUploadFileQNAM</name>
- <message>
- <location filename="../src/libsync/propagateupload.cpp" line="226"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="262"/>
<source>File Removed</source>
<translation>فایل حذف شد</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="274"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="250"/>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="286"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="665"/>
<source>Local file changed during sync.</source>
<translation>فایل محلی در حین همگامسازی تغییر کرده است.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="558"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="592"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="566"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="600"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="597"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="631"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="620"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="654"/>
<source>The local file was removed during sync.</source>
<translation>فایل محلی در حین همگامسازی حذف شده است.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="646"/>
- <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="680"/>
+ <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
<source>Choose What to Sync</source>
<translation>انتخاب موارد همگامسازی</translation>
</message>
<translation>اندازه</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
<source>No subfolders currently on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
<source>An error occured while loading the list of sub folders.</source>
<translation type="unfinished"/>
</message>
<translation>تنظیمات</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="80"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="84"/>
<source>Activity</source>
<translation>فعالیت</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="86"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="90"/>
<source>General</source>
<translation>عمومی</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>Network</source>
<translation>شبکه</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharedialog.ui" line="22"/>
- <location filename="../src/gui/sharedialog.ui" line="234"/>
+ <location filename="../src/gui/sharedialog.ui" line="258"/>
<source>TextLabel</source>
<translation>برچسب متنی</translation>
</message>
<translation>مسیر ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="182"/>
+ <location filename="../src/gui/sharedialog.ui" line="116"/>
<source>Set &password </source>
<translation>تعیین &رمزعبور</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="196"/>
+ <location filename="../src/gui/sharedialog.ui" line="130"/>
<source>Set &expiration date</source>
<translation>تعیین &تاریخ انقضا</translation>
</message>
+ <message>
+ <location filename="../src/gui/sharedialog.ui" line="214"/>
+ <source>Allow editing</source>
+ <translation>اجازهی ویرایش</translation>
+ </message>
<message>
<location filename="../src/gui/sharedialog.ui" line="77"/>
<source>Share link</source>
<translation>اشتراک گذاشتن لینک</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="125"/>
+ <location filename="../src/gui/sharedialog.ui" line="203"/>
<source>Copy &link</source>
<translation>کپی & لینک</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="142"/>
+ <location filename="../src/gui/sharedialog.ui" line="154"/>
<source>Set password</source>
<translation>تعیین رمزعبور</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="692"/>
- <source>%1 path: %2</source>
- <translation>%1 مسیر: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="115"/>
+ <location filename="../src/gui/sharedialog.cpp" line="120"/>
<source>%1 Sharing</source>
<translation>%1 اشتراکگذاری</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="103"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="112"/>
+ <location filename="../src/gui/sharedialog.cpp" line="117"/>
<source>Folder: %2</source>
<translation>پوشه: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="121"/>
<source>P&assword protect</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="221"/>
+ <location filename="../src/gui/sharedialog.cpp" line="214"/>
<source>Password Protected</source>
<translation>محافظت شده توسط رمزعبور</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="382"/>
+ <location filename="../src/gui/sharedialog.cpp" line="338"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="528"/>
+ <location filename="../src/gui/sharedialog.cpp" line="475"/>
<source>Please Set Password</source>
<translation>لطفا رمزعبور را تعیین کنید</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="564"/>
- <location filename="../src/gui/sharedialog.cpp" line="565"/>
+ <location filename="../src/gui/sharedialog.cpp" line="538"/>
+ <location filename="../src/gui/sharedialog.cpp" line="539"/>
<source>&Share link</source>
<translation>&اشتراکگذاری لینک</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="583"/>
+ <location filename="../src/gui/sharedialog.cpp" line="552"/>
+ <location filename="../src/gui/sharedialog.cpp" line="564"/>
<source>OCS API error code: %1</source>
<translation>خطای OCS API با کد: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="605"/>
- <source>There is no sync folder configured.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="639"/>
- <source>A sync file with the same name exists. The file cannot be registered to sync.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="684"/>
- <source>The file cannot be synced.</source>
- <translation>امکان همگامسازی فایل وجود ندارد.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="624"/>
- <source>Sharing of external directories is not yet working.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="473"/>
- <location filename="../src/gui/sharedialog.cpp" line="506"/>
+ <location filename="../src/gui/sharedialog.cpp" line="418"/>
+ <location filename="../src/gui/sharedialog.cpp" line="460"/>
<source>Public sh&aring requires a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="617"/>
- <source>Cannot find a folder to upload to.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
- <source>Waiting to upload...</source>
- <translation>درحال انتظار آپلود...</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="653"/>
- <source>Unable to register in sync space.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="694"/>
- <source>Sync of registered file was not successful yet.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>Login Error</source>
<translation>خطای ورود</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>You must sign in as user %1</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="452"/>
+ <location filename="../src/gui/socketapi.cpp" line="447"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>اشتراکگذاری با %1</translation>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="97"/>
+ <location filename="../src/libsync/syncengine.cpp" line="94"/>
<source>Success.</source>
<translation>موفقیت</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="104"/>
+ <location filename="../src/libsync/syncengine.cpp" line="101"/>
<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="107"/>
+ <location filename="../src/libsync/syncengine.cpp" line="104"/>
<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="110"/>
+ <location filename="../src/libsync/syncengine.cpp" line="107"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync هنگام پردازش درختان داخلی یک خطا دریافت نمود.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="113"/>
+ <location filename="../src/libsync/syncengine.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync موفق به رزرو حافظه نشد است.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="119"/>
+ <location filename="../src/libsync/syncengine.cpp" line="116"/>
<source>CSync processing step update failed.</source>
<translation>مرحله به روز روسانی پردازش CSync ناموفق بود.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="122"/>
+ <location filename="../src/libsync/syncengine.cpp" line="119"/>
<source>CSync processing step reconcile failed.</source>
<translation>مرحله تطبیق پردازش CSync ناموفق بود.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="122"/>
<source>CSync could not authenticate at the proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="125"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>عدم موفقیت CSync برای مراجعه به پروکسی یا سرور.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="128"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>عدم موفقیت CSync برای اعتبار دادن در %1 سرور.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="131"/>
<source>CSync failed to connect to the network.</source>
<translation>عدم موفقیت CSync برای اتصال به شبکه.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="134"/>
<source>A network connection timeout happened.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="137"/>
<source>A HTTP transmission error happened.</source>
<translation>خطا در انتقال HTTP اتفاق افتاده است.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
<source>An error occurred while opening a folder</source>
<translation>یک خطا در هنگام باز کردن یک پوشه رخ داده است</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
<source>Error while reading folder.</source>
<translation>خطا در هنگام خواندن پوشه</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="996"/>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
<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="1003"/>
+ <location filename="../src/libsync/syncengine.cpp" line="991"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: فضا در %1 سرور در دسترس نیست.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="152"/>
<source>CSync unspecified error.</source>
<translation>خطای نامشخص CSync </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="155"/>
<source>Aborted by the user</source>
<translation>متوقف شده توسط کاربر</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="392"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="143"/>
<source>CSync failed to access</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <location filename="../src/libsync/syncengine.cpp" line="97"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <source>CSync failed due to unhandled permission denied.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="146"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="158"/>
<source>The service is temporarily unavailable</source>
<translation>سرویس بصورت موقت خارج از دسترس است</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="175"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>An internal error number %1 occurred.</source>
<translation>یک خطای داخلی با شماره خطای %1 رخ داده است.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="227"/>
<source>The item is not synced because of previous errors: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="389"/>
+ <location filename="../src/libsync/syncengine.cpp" line="386"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="392"/>
+ <location filename="../src/libsync/syncengine.cpp" line="389"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="398"/>
+ <location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename is too long.</source>
<translation>نام فایل خیلی طولانی است.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="401"/>
+ <location filename="../src/libsync/syncengine.cpp" line="398"/>
<source>File is ignored because it's hidden.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="407"/>
+ <location filename="../src/libsync/syncengine.cpp" line="404"/>
<source>Stat failed.</source>
<translation>وضعیت ناموفق</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="429"/>
+ <location filename="../src/libsync/syncengine.cpp" line="426"/>
<source>Filename encoding is not valid</source>
<translation>رمزگذاری نام فایل معتبر نیست</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="561"/>
+ <location filename="../src/libsync/syncengine.cpp" line="558"/>
<source>Invalid characters, please rename "%1"</source>
<translation>کاراکتر نامعتبر، لطفا "%1" را تغییر نام دهید</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="631"/>
+ <location filename="../src/libsync/syncengine.cpp" line="612"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="645"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="718"/>
+ <location filename="../src/libsync/syncengine.cpp" line="723"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="965"/>
- <location filename="../src/libsync/syncengine.cpp" line="972"/>
+ <location filename="../src/libsync/syncengine.cpp" line="953"/>
+ <location filename="../src/libsync/syncengine.cpp" line="960"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <location filename="../src/libsync/syncengine.cpp" line="978"/>
<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="1023"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1011"/>
<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="1040"/>
- <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1028"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1048"/>
<source>Not allowed to remove, restoring</source>
<translation>حذف مجاز نیست، در حال بازگردادن</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1073"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1061"/>
<source>Local files and share folder removed.</source>
<translation>فایلهای محلی و پوشهی اشتراک حذف شد.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1116"/>
<source>Move not allowed, item restored</source>
<translation>انتقال مجاز نیست، مورد بازگردانده شد</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1125"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the destination</source>
<translation>مقصد</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the source</source>
<translation>مبدا</translation>
</message>
</message>
</context>
<context>
- <name>OCC::TransmissionChecksumValidator</name>
+ <name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="128"/>
<source>The checksum header is malformed.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+ <source>The checksum header contained an unknown checksum type '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="148"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation type="unfinished"/>
</message>
<source>Recent Changes</source>
<translation>تغییرات اخیر</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="561"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="331"/>
<source>Managed Folders:</source>
<source>Open %1 in browser</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="449"/>
- <source>Log out everywhere</source>
- <translation>خروج از همهجا</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="457"/>
- <source>Log in everywhere...</source>
- <translation>ورود در همهجا</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="513"/>
<source>Unknown status</source>
<source>Account %1: %2</source>
<translation>حسابکاربری %1: %2</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="449"/>
+ <source>Log out of all accounts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="457"/>
+ <source>Log in to all accounts...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="532"/>
<source>Crash now</source>
<source>No items synced recently</source>
<translation>هیچ موردی به تازگی همگامسازی نشده است</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="561"/>
- <source>Discovering '%1'</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="566"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>%L1 B</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="306"/>
+ <location filename="../src/libsync/utility.cpp" line="303"/>
<source>%Ln year(s)</source>
<translation>%Ln سال(s)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="307"/>
+ <location filename="../src/libsync/utility.cpp" line="304"/>
<source>%Ln month(s)</source>
<translation>%Ln ماه(s)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="308"/>
+ <location filename="../src/libsync/utility.cpp" line="305"/>
<source>%Ln day(s)</source>
<translation>%Ln روز(s)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="309"/>
+ <location filename="../src/libsync/utility.cpp" line="306"/>
<source>%Ln hour(s)</source>
<translation>%Ln ساعت(s)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="310"/>
+ <location filename="../src/libsync/utility.cpp" line="307"/>
<source>%Ln minute(s)</source>
<translation>%Ln دقیقه (s)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="311"/>
+ <location filename="../src/libsync/utility.cpp" line="308"/>
<source>%Ln second(s)</source>
<translation>%Ln ثانیه(s)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="318"/>
<source>0 seconds</source>
<translation>0 ثانیه</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="336"/>
+ <location filename="../src/libsync/utility.cpp" line="333"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="73"/>
+ <source>Enter your credentials to connect to the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <source>Sign in</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="89"/>
<source>Remove the account configuration from the client</source>
<translation>Poista tiliasetukset asiakasohjelmasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Remove Account</source>
<translation>Poista tili</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="97"/>
+ <location filename="../src/gui/accountsettings.ui" line="113"/>
<source>Storage space: ...</source>
<translation>Tallennustila: ...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="167"/>
+ <location filename="../src/gui/accountsettings.ui" line="183"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Ilman valintaa olevat kansiot <b>poistetaan</b> paikallisesta tiedostojärjestelmästä, eikä niitä synkronoida enää jatkossa tämän tietokoneen kanssa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="230"/>
<source>Apply</source>
<translation>Toteuta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="198"/>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
- <location filename="../src/gui/accountsettings.cpp" line="571"/>
+ <location filename="../src/gui/accountsettings.ui" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="289"/>
+ <location filename="../src/gui/accountsettings.cpp" line="646"/>
<source>Cancel</source>
<translation>Peruuta</translation>
</message>
<translation>Yhdistetty palvelimeen <server> käyttäen tunnusta <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="115"/>
+ <location filename="../src/gui/accountsettings.cpp" line="121"/>
<source>No account configured.</source>
<translation>Tiliä ei ole määritelty.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="161"/>
+ <source>Choose what to sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="168"/>
+ <source>Remove folder sync connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="234"/>
<source>Folder creation failed</source>
<translation>Kansion luominen epäonnistui</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="230"/>
+ <location filename="../src/gui/accountsettings.cpp" line="235"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation><p>Paikallisen kansion <i>%1</i> luominen epäonnistui.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="283"/>
- <source>Stop syncing</source>
- <translation>Lopeta synkronointi</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
+ <source>Confirm Folder Sync Connection Removal</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="309"/>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>Remove Folder Sync Connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="314"/>
<source>Confirm Folder Reset</source>
<translation>Vahvista kansion alustus</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="310"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="391"/>
+ <location filename="../src/gui/accountsettings.cpp" line="396"/>
<source>Sync Running</source>
<translation>Synkronointi meneillään</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="392"/>
+ <location filename="../src/gui/accountsettings.cpp" line="397"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Synkronointioperaatio on meneillään.<br/>Haluatko keskeyttää sen?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="472"/>
+ <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <source>%1 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="485"/>
<source>%1 as <i>%2</i></source>
<translation>%1 käyttäjänä <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="476"/>
+ <location filename="../src/gui/accountsettings.cpp" line="495"/>
<source>Connected to %1.</source>
<translation>Yhteys muodostettu kohteeseen %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="478"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Palvelin %1 ei ole juuri nyt saatavilla.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="480"/>
+ <location filename="../src/gui/accountsettings.cpp" line="499"/>
<source>Signed out from %1.</source>
<translation>Kirjauduttu ulos kohteesta %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="482"/>
+ <location filename="../src/gui/accountsettings.cpp" line="501"/>
<source>No connection to %1 at %2.</source>
<translation>Ei yhteyttä kohteeseen %1 osoitteessa %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
- <source>There are new folders that were not synchronized because they are too big: %1</source>
- <translation>Havaittu uusia kansioita, joita ei ole synkronoitu niiden suuren koon vuoksi: %1</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="536"/>
- <source>, </source>
- <translation>, </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <source>There are new folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="563"/>
+ <location filename="../src/gui/accountsettings.cpp" line="638"/>
<source>Confirm Account Removal</source>
<translation>Vahvista tilin poistaminen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="564"/>
+ <location filename="../src/gui/accountsettings.cpp" line="639"/>
<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="570"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>Remove connection</source>
<translation>Poista yhteys</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="158"/>
<source>Open folder</source>
<translation>Avaa kansio</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="168"/>
- <source>Choose What to Sync</source>
- <translation>Valitse synkronoitavat tiedot</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Resume sync</source>
<translation>Palauta synkronointi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Pause sync</source>
<translation>Keskeytä synkronointi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="176"/>
- <source>Remove sync</source>
- <translation>Poista synkronointi</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="277"/>
- <source>Confirm Sync Removal</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="278"/>
+ <location filename="../src/gui/accountsettings.cpp" line="283"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>Haluatko varmasti lopettaa kansion <i>%1</i> synkronoinnin?</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="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="452"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1/%2 (%3 %) käytössä. Jotkin kansiot, mukaan lukien verkkojaot ja jaetut kansiot, voivat sisältää eri rajoitukset.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="448"/>
+ <location filename="../src/gui/accountsettings.cpp" line="453"/>
<source>%1 of %2 in use</source>
<translation>%1/%2 käytössä</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="453"/>
+ <location filename="../src/gui/accountsettings.cpp" line="462"/>
<source>Currently there is no storage usage information available.</source>
<translation>Tallennustilan käyttötietoja ei ole juuri nyt saatavilla.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="507"/>
<source>No %1 connection configured.</source>
<translation>%1-yhteyttä ei ole määritelty.</translation>
</message>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="95"/>
+ <location filename="../src/gui/accountstate.cpp" line="99"/>
<source>Signed out</source>
<translation>Kirjauduttu ulos</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="97"/>
+ <location filename="../src/gui/accountstate.cpp" line="101"/>
<source>Disconnected</source>
<translation>Yhteys katkaistu</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="99"/>
+ <location filename="../src/gui/accountstate.cpp" line="103"/>
<source>Connected</source>
<translation>Yhdistetty</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="101"/>
+ <location filename="../src/gui/accountstate.cpp" line="105"/>
<source>Service unavailable</source>
<translation>Palvelu ei ole käytettävissä</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="103"/>
+ <location filename="../src/gui/accountstate.cpp" line="107"/>
<source>Network error</source>
<translation>Verkkovirhe</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="105"/>
+ <location filename="../src/gui/accountstate.cpp" line="109"/>
<source>Configuration error</source>
<translation>Asetusvirhe</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="107"/>
+ <location filename="../src/gui/accountstate.cpp" line="111"/>
<source>Unknown account state</source>
<translation>Tuntematon tilin tila</translation>
</message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>Reauthentication required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>You need to re-login to continue using the account %1.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
<translation>Päivitä uusimpaan palvelinversioon ja käynnistä asiakasohjelmisto uudelleen.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="143"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="135"/>
<source>Authentication error: Either username or password are wrong.</source>
<translation>Tunnistautumisvirhe: käyttäjätunnus tai salasana on väärin.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="155"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="147"/>
<source>timeout</source>
<translation>aikakatkaisu</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="186"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="178"/>
<source>The provided credentials are not correct</source>
<translation>Annetut tilitiedot eivät ole oikein</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="524"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="537"/>
<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="107"/>
+ <location filename="../src/gui/folder.cpp" line="108"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<translation>Synkronointiaktiviteetti</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="845"/>
+ <location filename="../src/gui/folder.cpp" line="870"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1102"/>
+ <location filename="../src/gui/folder.cpp" line="1127"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Uusi kansio, joka on suurempi kuin %1 Mt, on lisätty: %2.
Siirry asetuksiin valitaksesi sen, jos haluat ladata kyseisen kansion.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1115"/>
+ <location filename="../src/gui/folder.cpp" line="1140"/>
<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="1119"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Remove All Files?</source>
<translation>Poistetaanko kaikki tiedostot?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1121"/>
+ <location filename="../src/gui/folder.cpp" line="1146"/>
<source>Remove all files</source>
<translation>Poista kaikki tiedostot</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1122"/>
+ <location filename="../src/gui/folder.cpp" line="1147"/>
<source>Keep files</source>
<translation>Säilytä tiedostot</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="275"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<source>Could not reset folder state</source>
<translation>Kansion tilaa ei voitu alustaa</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="276"/>
+ <location filename="../src/gui/folderman.cpp" line="271"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="877"/>
+ <location filename="../src/gui/folderman.cpp" line="865"/>
<source> (backup)</source>
<translation> (varmuuskopio)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="882"/>
+ <location filename="../src/gui/folderman.cpp" line="870"/>
<source> (backup %1)</source>
<translation> (varmuuskopio %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1091"/>
+ <location filename="../src/gui/folderman.cpp" line="1079"/>
<source>Undefined State.</source>
<translation>Määrittelemätön tila.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1094"/>
- <source>Waits to start syncing.</source>
- <translation>Odottaa synkronoinnin alkamista.</translation>
+ <location filename="../src/gui/folderman.cpp" line="1082"/>
+ <source>Waiting to start syncing.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1097"/>
+ <location filename="../src/gui/folderman.cpp" line="1085"/>
<source>Preparing for sync.</source>
<translation>Valmistellaan synkronointia.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1100"/>
+ <location filename="../src/gui/folderman.cpp" line="1088"/>
<source>Sync is running.</source>
<translation>Synkronointi on meneillään.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1103"/>
+ <location filename="../src/gui/folderman.cpp" line="1091"/>
<source>Last Sync was successful.</source>
<translation>Viimeisin synkronointi suoritettiin onnistuneesti.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1108"/>
+ <location filename="../src/gui/folderman.cpp" line="1096"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Viimeisin synkronointi onnistui, mutta yksittäisten tiedostojen kanssa ilmeni varoituksia.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1111"/>
+ <location filename="../src/gui/folderman.cpp" line="1099"/>
<source>Setup Error.</source>
<translation>Asetusvirhe.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1114"/>
+ <location filename="../src/gui/folderman.cpp" line="1102"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1117"/>
+ <location filename="../src/gui/folderman.cpp" line="1105"/>
<source>Sync is paused.</source>
<translation>Synkronointi on keskeytetty.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1123"/>
+ <location filename="../src/gui/folderman.cpp" line="1111"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synkronointi on keskeytetty)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1119"/>
<source>No valid folder selected!</source>
<translation>Kelvollista kansiota ei ole valittu!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1130"/>
<source>The selected path is not a folder!</source>
<translation>Valittu polku ei ole kansio!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1146"/>
+ <location filename="../src/gui/folderman.cpp" line="1134"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Sinulla ei ole kirjoitusoikeutta valittuun kansioon!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1161"/>
+ <location filename="../src/gui/folderman.cpp" line="1149"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1166"/>
+ <location filename="../src/gui/folderman.cpp" line="1154"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1173"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1168"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1186"/>
+ <location filename="../src/gui/folderman.cpp" line="1174"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<translation>Lisää kansion synkronointiyhteys</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="85"/>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="274"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="271"/>
<source>File</source>
<translation>Tiedosto</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="228"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="224"/>
<source>Syncing selected files in your account with</source>
<translation>Synkronoidaan valitut tiedostot tililläsi kohteeseen</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="231"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="227"/>
<source>Remote path: %1</source>
<translation>Etäpolku: %1</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="121"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="122"/>
<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="126"/>
- <source>Adding folder is disabled because your 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="131"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="132"/>
<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="141"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="142"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="156"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
<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="182"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="192"/>
<source>Signed out</source>
<translation>Kirjauduttu ulos</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="727"/>
- <source>Discovering '%1'</source>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="127"/>
+ <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="163"/>
+ <source>Fetching folder list from server...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="787"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="789"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="849"/>
<source>Syncing %1</source>
<translation>Synkronoidaan %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="792"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="854"/>
<source>download %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="794"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="856"/>
<source>u2193 %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="800"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>upload %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="802"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="864"/>
<source>u2191 %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="807"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="869"/>
<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="811"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="873"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="827"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="889"/>
<source>%1 of %2, file %3 of %4
Total time left %5</source>
<translation>%1/%2, tiedosto %3/%4
Aikaa jäljellä yhteensä %5</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
<source>file %1 of %2</source>
<translation>tiedosto %1/%2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="932"/>
<source>Waiting...</source>
<translation>Odotetaan...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="934"/>
<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="878"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>Preparing to sync...</source>
<translation>Valmistaudutaan synkronointiin...</translation>
</message>
<name>OCC::FolderWizard</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <source>Add Folder Sync Connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderwizard.cpp" line="564"/>
- <source>Add Folder</source>
- <translation>Lisää kansio</translation>
+ <source>Add Sync Connection</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Lisäasetukset</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="61"/>
+ <location filename="../src/gui/generalsettings.ui" line="109"/>
<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="81"/>
+ <location filename="../src/gui/generalsettings.ui" line="129"/>
<source>MB</source>
<translation>Mt</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="109"/>
+ <location filename="../src/gui/generalsettings.ui" line="159"/>
<source>Show crash reporter</source>
<translation>Näytä kaatumisraportti</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="118"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit Ignored Files</source>
<translation>Muokkaa sivuutettuja tiedostoja</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="142"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
<source>Add an Account</source>
<translation>Lisää tili</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="167"/>
- <location filename="../src/gui/generalsettings.ui" line="173"/>
+ <location filename="../src/gui/generalsettings.ui" line="171"/>
+ <location filename="../src/gui/generalsettings.ui" line="177"/>
<source>About</source>
<translation>Tietoja</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <location filename="../src/gui/generalsettings.ui" line="187"/>
<source>Updates</source>
<translation>Päivitykset</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="208"/>
+ <location filename="../src/gui/generalsettings.ui" line="212"/>
<source>&Restart && Update</source>
<translation>&Käynnistä uudelleen && päivitä</translation>
</message>
</context>
-<context>
- <name>OCC::HttpCredentials</name>
- <message>
- <location filename="../src/libsync/creds/httpcredentials.cpp" line="290"/>
- <source>Reading from keychain failed with error: '%1'</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="32"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
<source>Please enter %1 password:
User: %2
</translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="41"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <source>Reading from keychain failed with error: '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
<source>Enter Password</source>
<translation>Anna salasana</translation>
</message>
<translation>Poista</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="40"/>
<source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="109"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
<source>Could not open file</source>
<translation>Tiedoston avaaminen ei onnistunut</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="111"/>
<source>Cannot write changes to '%1'.</source>
<translation>Muutoksien kirjoittaminen kohteeseen '%1' epäonnistui.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="138"/>
<source>Add Ignore Pattern</source>
<translation>Lisää ohituskaava</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>Add a new ignore pattern:</source>
<translation>Lisää uusi ohituskaava:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="45"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="46"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="163"/>
+ <location filename="../src/libsync/logger.cpp" line="190"/>
<source>Error</source>
<translation>Virhe</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="164"/>
+ <location filename="../src/libsync/logger.cpp" line="191"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Tiedostoa '%1'<br/>ei voida avata kirjoittamista varten.<br/><br/>Lokitulostusta<b>ei</b>pystytä tallentamaan!</nobr></translation>
</message>
</message>
<message>
<location filename="../src/gui/networksettings.ui" line="203"/>
- <location filename="../src/gui/networksettings.ui" line="295"/>
+ <location filename="../src/gui/networksettings.ui" line="292"/>
<source>No limit</source>
<translation>Ei rajoitusta</translation>
</message>
<source>SOCKS5 proxy</source>
<translation>SOCKS5-välityspalvelin</translation>
</message>
+ <message>
+ <location filename="../src/gui/networksettings.cpp" line="128"/>
+ <source>Qt >= 5.4 is required in order to use the bandwidth limit</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::OCUpdater</name>
<source>Downloading version %1. Please wait...</source>
<translation>Ladataan versiota %1. Odota hetki...</translation>
</message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
- <source>Version %1 available. Restart application to start the update.</source>
- <translation>Versio %1 on saatavilla. Käynnistä sovellus uudelleen aloittaaksesi päivityksen.</translation>
- </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="145"/>
<source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
<source>Could not check for new updates.</source>
<translation>Päivitysten tarkistus epäonnistui.</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
+ <source>%1 version %2 available. Restart application to start the update.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
- <source>New version %1 available. Please use the system's update tool to install it.</source>
- <translation>Uusi versio %1 on saatavilla. Käytä järjestelmän päivitystyökalua sen asennusta varten.</translation>
+ <source>New %1 version %2 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="151"/>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="114"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="110"/>
<source>Connection Timeout</source>
<translation>Yhteys aikakatkaistiin</translation>
</message>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="171"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="167"/>
<source>Invalid JSON reply from the poll URL</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="435"/>
- <source>Sync was aborted by user.</source>
- <translation>Synkronointi peruttiin käyttäjän toimesta.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="488"/>
- <source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="494"/>
- <source>We received a different E-Tag for resuming. Retrying next time.</source>
- <translation type="unfinished"/>
- </message>
+ <name>OCC::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="516"/>
- <source>Server returned wrong content-range</source>
+ <location filename="../src/libsync/propagatedownload.cpp" line="315"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="567"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
+ <source>The download would reduce free disk space below %1</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="315"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <location filename="../src/libsync/propagatedownload.cpp" line="372"/>
+ <source>Free space on disk is less than %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="457"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="482"/>
<source>File was deleted from server</source>
<translation>Tiedosto poistettiin palvelimelta</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="506"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="531"/>
<source>The file could not be downloaded completely.</source>
<translation>Tiedostoa ei voitu ladata täysin.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="601"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="636"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="641"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="676"/>
<source>File has changed since discovery</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateItemJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="92"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
<source>; Restoration Failed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="138"/>
<source>Continue blacklisting:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="230"/>
<source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove folder '%1';</source>
- <translation>Ei voitu poistaa kansiota '%1';</translation>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="243"/>
- <location filename="../src/libsync/propagator_legacy.cpp" line="302"/>
- <source>Local file changed during sync, syncing once it arrived completely</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="246"/>
- <source>Sync was aborted by user.</source>
- <translation>Synkronointi peruttiin käyttäjän toimesta.</translation>
- </message>
+ <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="252"/>
- <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="205"/>
+ <source>File name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="226"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="262"/>
<source>File Removed</source>
<translation>Tiedosto poistettu</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="274"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="250"/>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="286"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="665"/>
<source>Local file changed during sync.</source>
<translation>Paikallinen tiedosto muuttui synkronoinnin aikana.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="558"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="592"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="566"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="600"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="597"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="631"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="620"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="654"/>
<source>The local file was removed during sync.</source>
<translation>Paikallinen tiedosto poistettiin synkronoinnin aikana.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="646"/>
- <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="680"/>
+ <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Ilman valintaa olevat kansiot <b>poistetaan</b> paikallisesta tiedostojärjestelmästä, eikä niitä synkronoida enää jatkossa tämän tietokoneen kanssa</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>Päätä mitä synkronoidaan: valitse etäkansiot, jotka haluat synkronoida.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>Päätä mitä synkronoidaan: jätä valitsematta etäkansiot, joita et halua synkronoitavan.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
<source>Choose What to Sync</source>
<translation>Valitse synkronoitavat tiedot</translation>
</message>
<translation>Koko</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
<source>No subfolders currently on the server.</source>
<translation>Palvelimella ei ole alihakemistoja juuri nyt.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>Virhe alihakemistolistausta ladattaessa.</translation>
</message>
<translation>Asetukset</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="80"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="84"/>
<source>Activity</source>
<translation>Toimet</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="86"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="90"/>
<source>General</source>
<translation>Yleiset</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>Network</source>
<translation>Verkko</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharedialog.ui" line="22"/>
- <location filename="../src/gui/sharedialog.ui" line="234"/>
+ <location filename="../src/gui/sharedialog.ui" line="258"/>
<source>TextLabel</source>
<translation>TekstiLeima</translation>
</message>
<translation>ownCloud-polku:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="182"/>
+ <location filename="../src/gui/sharedialog.ui" line="116"/>
<source>Set &password </source>
<translation>Aseta &salasana</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="196"/>
+ <location filename="../src/gui/sharedialog.ui" line="130"/>
<source>Set &expiration date</source>
<translation>Aseta &vanhenemispäivä</translation>
</message>
+ <message>
+ <location filename="../src/gui/sharedialog.ui" line="214"/>
+ <source>Allow editing</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/sharedialog.ui" line="77"/>
<source>Share link</source>
<translation>Jaa linkki</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="125"/>
+ <location filename="../src/gui/sharedialog.ui" line="203"/>
<source>Copy &link</source>
<translation>Kopioi &linkki</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="142"/>
+ <location filename="../src/gui/sharedialog.ui" line="154"/>
<source>Set password</source>
<translation>Aseta salasana</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="692"/>
- <source>%1 path: %2</source>
- <translation>%1-polku: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="115"/>
+ <location filename="../src/gui/sharedialog.cpp" line="120"/>
<source>%1 Sharing</source>
<translation>%1 - Jakaminen</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="103"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="112"/>
+ <location filename="../src/gui/sharedialog.cpp" line="117"/>
<source>Folder: %2</source>
<translation>Kansio: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="121"/>
<source>P&assword protect</source>
<translation>&Suojaa salasanalla</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="221"/>
+ <location filename="../src/gui/sharedialog.cpp" line="214"/>
<source>Password Protected</source>
<translation>Salasanasuojattu</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="382"/>
+ <location filename="../src/gui/sharedialog.cpp" line="338"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="528"/>
+ <location filename="../src/gui/sharedialog.cpp" line="475"/>
<source>Please Set Password</source>
<translation>Aseta salasana</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="564"/>
- <location filename="../src/gui/sharedialog.cpp" line="565"/>
+ <location filename="../src/gui/sharedialog.cpp" line="538"/>
+ <location filename="../src/gui/sharedialog.cpp" line="539"/>
<source>&Share link</source>
<translation>&Jaa linkki</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="583"/>
+ <location filename="../src/gui/sharedialog.cpp" line="552"/>
+ <location filename="../src/gui/sharedialog.cpp" line="564"/>
<source>OCS API error code: %1</source>
<translation>OCS API -virhekoodi: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="605"/>
- <source>There is no sync folder configured.</source>
- <translation>Synkronointikansiota ei ole määritetty.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="639"/>
- <source>A sync file with the same name exists. The file cannot be registered to sync.</source>
- <translation>Synkronointitiedosto samalla nimellä on jo olemassa. Tiedostoa ei voi rekisteröidä synkronoitavaksi.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="684"/>
- <source>The file cannot be synced.</source>
- <translation>Tiedostoa ei voi synkronoida.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="624"/>
- <source>Sharing of external directories is not yet working.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="473"/>
- <location filename="../src/gui/sharedialog.cpp" line="506"/>
+ <location filename="../src/gui/sharedialog.cpp" line="418"/>
+ <location filename="../src/gui/sharedialog.cpp" line="460"/>
<source>Public sh&aring requires a password</source>
<translation>&Julkinen jakaminen vaatii salasanan</translation>
</message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="617"/>
- <source>Cannot find a folder to upload to.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
- <source>Waiting to upload...</source>
- <translation>Odotetaan siirtoa...</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="653"/>
- <source>Unable to register in sync space.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="694"/>
- <source>Sync of registered file was not successful yet.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>Login Error</source>
<translation>Kirjautumisvirhe</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>You must sign in as user %1</source>
<translation>Sinun tulee kirjautua käyttäjänä %1</translation>
</message>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="452"/>
+ <location filename="../src/gui/socketapi.cpp" line="447"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation type="unfinished"/>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="97"/>
+ <location filename="../src/libsync/syncengine.cpp" line="94"/>
<source>Success.</source>
<translation>Onnistui.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="104"/>
+ <location filename="../src/libsync/syncengine.cpp" line="101"/>
<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="107"/>
+ <location filename="../src/libsync/syncengine.cpp" line="104"/>
<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="110"/>
+ <location filename="../src/libsync/syncengine.cpp" line="107"/>
<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="113"/>
+ <location filename="../src/libsync/syncengine.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync ei onnistunut varaamaan muistia.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="119"/>
+ <location filename="../src/libsync/syncengine.cpp" line="116"/>
<source>CSync processing step update failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="122"/>
+ <location filename="../src/libsync/syncengine.cpp" line="119"/>
<source>CSync processing step reconcile failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="122"/>
<source>CSync could not authenticate at the proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="125"/>
<source>CSync failed to lookup proxy or server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="128"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="131"/>
<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="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="134"/>
<source>A network connection timeout happened.</source>
<translation>Tapahtui verkon aikakatkaisu.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="137"/>
<source>A HTTP transmission error happened.</source>
<translation>Tapahtui HTTP-välitysvirhe.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
<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="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
<source>An error occurred while opening a folder</source>
<translation>Kansiota avatessa tapahtui virhe</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
<source>Error while reading folder.</source>
<translation>Kansiota lukiessa tapahtui virhe</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="996"/>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
<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="1003"/>
+ <location filename="../src/libsync/syncengine.cpp" line="991"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="152"/>
<source>CSync unspecified error.</source>
<translation>CSync - määrittämätön virhe.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="155"/>
<source>Aborted by the user</source>
<translation>Keskeytetty käyttäjän toimesta</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="392"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>Tiedoston nimi sisältää virheellisiä merkkejä, joita ei voi synkronoida alustariippumattomasti.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="143"/>
<source>CSync failed to access</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <location filename="../src/libsync/syncengine.cpp" line="97"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <source>CSync failed due to unhandled permission denied.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="146"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="158"/>
<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="175"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>An internal error number %1 occurred.</source>
<translation>Sisäinen virhe, numero %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="227"/>
<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="389"/>
+ <location filename="../src/libsync/syncengine.cpp" line="386"/>
<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="392"/>
+ <location filename="../src/libsync/syncengine.cpp" line="389"/>
<source>File is listed on the ignore list.</source>
<translation>Tiedosto on ohituslistalla.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="398"/>
+ <location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename is too long.</source>
<translation>Tiedoston nimi on liian pitkä.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="401"/>
+ <location filename="../src/libsync/syncengine.cpp" line="398"/>
<source>File is ignored because it's hidden.</source>
<translation>Tiedosto ohitetaan, koska se on piilotettu.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="407"/>
+ <location filename="../src/libsync/syncengine.cpp" line="404"/>
<source>Stat failed.</source>
<translation>Stat epäonnistui.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="429"/>
+ <location filename="../src/libsync/syncengine.cpp" line="426"/>
<source>Filename encoding is not valid</source>
<translation>Tiedostonimen merkistökoodaus ei ole kelvollista</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="561"/>
+ <location filename="../src/libsync/syncengine.cpp" line="558"/>
<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="631"/>
+ <location filename="../src/libsync/syncengine.cpp" line="612"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="645"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="718"/>
+ <location filename="../src/libsync/syncengine.cpp" line="723"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="965"/>
- <location filename="../src/libsync/syncengine.cpp" line="972"/>
+ <location filename="../src/libsync/syncengine.cpp" line="953"/>
+ <location filename="../src/libsync/syncengine.cpp" line="960"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <location filename="../src/libsync/syncengine.cpp" line="978"/>
<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="1023"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1011"/>
<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="1040"/>
- <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1028"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1048"/>
<source>Not allowed to remove, restoring</source>
<translation>Poistaminen ei ole sallittua, palautetaan</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1073"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1061"/>
<source>Local files and share folder removed.</source>
<translation>Paikalliset tiedostot ja jakokansio poistettu.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1116"/>
<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="1137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1125"/>
<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="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the destination</source>
<translation>kohde</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the source</source>
<translation>lähde</translation>
</message>
</message>
</context>
<context>
- <name>OCC::TransmissionChecksumValidator</name>
+ <name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="128"/>
<source>The checksum header is malformed.</source>
- <translation>Tarkistesumman otsake on muodostettu väärin.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+ <source>The checksum header contained an unknown checksum type '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="148"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation type="unfinished"/>
</message>
<source>Recent Changes</source>
<translation>Viimeisimmät muutokset</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="561"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="331"/>
<source>Managed Folders:</source>
<source>Open %1 in browser</source>
<translation>Avaa %1 selaimeen</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="449"/>
- <source>Log out everywhere</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="457"/>
- <source>Log in everywhere...</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="513"/>
<source>Unknown status</source>
<source>Account %1: %2</source>
<translation>Tili %1: %2</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="449"/>
+ <source>Log out of all accounts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="457"/>
+ <source>Log in to all accounts...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="532"/>
<source>Crash now</source>
<source>No items synced recently</source>
<translation>Kohteita ei ole synkronoitu äskettäin</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="561"/>
- <source>Discovering '%1'</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="566"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>%L1 t</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="306"/>
+ <location filename="../src/libsync/utility.cpp" line="303"/>
<source>%Ln year(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="307"/>
+ <location filename="../src/libsync/utility.cpp" line="304"/>
<source>%Ln month(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="308"/>
+ <location filename="../src/libsync/utility.cpp" line="305"/>
<source>%Ln day(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="309"/>
+ <location filename="../src/libsync/utility.cpp" line="306"/>
<source>%Ln hour(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="310"/>
+ <location filename="../src/libsync/utility.cpp" line="307"/>
<source>%Ln minute(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="311"/>
+ <location filename="../src/libsync/utility.cpp" line="308"/>
<source>%Ln second(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="318"/>
<source>0 seconds</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="336"/>
+ <location filename="../src/libsync/utility.cpp" line="333"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="73"/>
+ <source>Enter your credentials to connect to the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <source>Sign in</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="89"/>
<source>Remove the account configuration from the client</source>
<translation>Retirer la configuration de compte du client</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Remove Account</source>
<translation>Supprimer le compte</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="97"/>
+ <location filename="../src/gui/accountsettings.ui" line="113"/>
<source>Storage space: ...</source>
<translation>Espace de stockage : ...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="167"/>
+ <location filename="../src/gui/accountsettings.ui" line="183"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Décochez les dossiers qui doivent être <b>supprimés</b> de votre disque local et qui ne doivent pas être synchronisés avec cet ordinateur.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="230"/>
<source>Apply</source>
<translation>Appliquer</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="198"/>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
- <location filename="../src/gui/accountsettings.cpp" line="571"/>
+ <location filename="../src/gui/accountsettings.ui" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="289"/>
+ <location filename="../src/gui/accountsettings.cpp" line="646"/>
<source>Cancel</source>
<translation>Annuler</translation>
</message>
<translation>Connecté à <server> en tant que <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="115"/>
+ <location filename="../src/gui/accountsettings.cpp" line="121"/>
<source>No account configured.</source>
<translation>Aucun compte configuré.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="161"/>
+ <source>Choose what to sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="168"/>
+ <source>Remove folder sync connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="234"/>
<source>Folder creation failed</source>
<translation>Échec de création du dossier</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="230"/>
+ <location filename="../src/gui/accountsettings.cpp" line="235"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation><p>Impossible de créer le dossier local <i>%1</i>.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="283"/>
- <source>Stop syncing</source>
- <translation>Arrêter la synchronisation</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
+ <source>Confirm Folder Sync Connection Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>Remove Folder Sync Connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="309"/>
+ <location filename="../src/gui/accountsettings.cpp" line="314"/>
<source>Confirm Folder Reset</source>
<translation>Confirmez la réinitialisation du dossier</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="310"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Voulez-vous réellement réinitialiser le dossier <i>%1</i> et reconstruire votre base de données cliente ?</p><p><b>Note :</b> Cette fonctionnalité existe pour des besoins de maintenance uniquement. Aucun fichier ne sera supprimé, mais cela peut causer un trafic de données conséquent et peut durer de plusieurs minutes à plusieurs heures, en fonction de la taille du dossier. Utilisez cette option uniquement sur avis de votre administrateur.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="391"/>
+ <location filename="../src/gui/accountsettings.cpp" line="396"/>
<source>Sync Running</source>
<translation>Synchronisation en cours</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="392"/>
+ <location filename="../src/gui/accountsettings.cpp" line="397"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>La synchronisation est en cours.<br/>Voulez-vous l'arrêter ?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="472"/>
+ <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <source>%1 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="485"/>
<source>%1 as <i>%2</i></source>
<translation>%1 en tant que <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="476"/>
+ <location filename="../src/gui/accountsettings.cpp" line="495"/>
<source>Connected to %1.</source>
<translation>Connecté à %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="478"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Le serveur %1 est temporairement indisponible.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="480"/>
+ <location filename="../src/gui/accountsettings.cpp" line="499"/>
<source>Signed out from %1.</source>
<translation>Session sur %1 fermée.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="482"/>
+ <location filename="../src/gui/accountsettings.cpp" line="501"/>
<source>No connection to %1 at %2.</source>
<translation>Pas de connexion à %1 sur %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
- <source>There are new folders that were not synchronized because they are too big: %1</source>
- <translation>Certains nouveaux dossiers n'ont pas été synchronisés en raison de leur taille trop importante : %1</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="536"/>
- <source>, </source>
- <translation>, </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <source>There are new folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="563"/>
+ <location filename="../src/gui/accountsettings.cpp" line="638"/>
<source>Confirm Account Removal</source>
<translation>Confirmer la suppression du compte</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="564"/>
+ <location filename="../src/gui/accountsettings.cpp" line="639"/>
<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="570"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>Remove connection</source>
<translation>Supprimer la connexion</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="158"/>
<source>Open folder</source>
<translation>Ouvrir le dossier</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="168"/>
- <source>Choose What to Sync</source>
- <translation>Choisir le contenu à synchroniser</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Resume sync</source>
<translation>Reprendre</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Pause sync</source>
<translation>Mettre en pause</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="176"/>
- <source>Remove sync</source>
- <translation>Supprimer la synchronisation</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="277"/>
- <source>Confirm Sync Removal</source>
- <translation>Confirmation de suppression</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="278"/>
+ <location filename="../src/gui/accountsettings.cpp" line="283"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>Voulez-vous vraiment arrêter de synchroniser le dossier <i>%1</i> ?</p><p><b>Note :</b>Aucun fichier ne sera supprimé.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="452"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) de %2 utilisés. Certains dossiers, montés depuis le réseau ou partagés, peuvent avoir des limites différentes.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="448"/>
+ <location filename="../src/gui/accountsettings.cpp" line="453"/>
<source>%1 of %2 in use</source>
<translation>%1 sur %2 utilisés</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="453"/>
+ <location filename="../src/gui/accountsettings.cpp" line="462"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actuellement aucune information d'utilisation de stockage n'est disponible.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="507"/>
<source>No %1 connection configured.</source>
<translation>Aucune connexion à %1 configurée</translation>
</message>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="95"/>
+ <location filename="../src/gui/accountstate.cpp" line="99"/>
<source>Signed out</source>
<translation>Session fermée</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="97"/>
+ <location filename="../src/gui/accountstate.cpp" line="101"/>
<source>Disconnected</source>
<translation>Déconnecté</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="99"/>
+ <location filename="../src/gui/accountstate.cpp" line="103"/>
<source>Connected</source>
<translation>Connecté</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="101"/>
+ <location filename="../src/gui/accountstate.cpp" line="105"/>
<source>Service unavailable</source>
<translation>Service indisponible</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="103"/>
+ <location filename="../src/gui/accountstate.cpp" line="107"/>
<source>Network error</source>
<translation>Erreur réseau</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="105"/>
+ <location filename="../src/gui/accountstate.cpp" line="109"/>
<source>Configuration error</source>
<translation>Erreur de configuration</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="107"/>
+ <location filename="../src/gui/accountstate.cpp" line="111"/>
<source>Unknown account state</source>
<translation>Etat du compte inconnu</translation>
</message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>Reauthentication required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>You need to re-login to continue using the account %1.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
<translation>Veuillez mettre à jour le serveur vers la dernière version et redémarrer le client.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="143"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="135"/>
<source>Authentication error: Either username or password are wrong.</source>
<translation>Erreur d'authentification: nom d'utilisateur et/ou mot de passe incorrect(s).</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="155"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="147"/>
<source>timeout</source>
<translation>délai d'attente</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="186"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="178"/>
<source>The provided credentials are not correct</source>
<translation>Les informations d'identification fournies ne sont pas correctes</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="524"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="537"/>
<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="107"/>
+ <location filename="../src/gui/folder.cpp" line="108"/>
<source>Unable to create csync-context</source>
<translation>Impossible de créer le contexte csync</translation>
</message>
<translation>Activité de synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="845"/>
+ <location filename="../src/gui/folder.cpp" line="870"/>
<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="1102"/>
+ <location filename="../src/gui/folder.cpp" line="1127"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Un nouveau dossier de taille supérieure à %1 Mo a été ajouté : %2.
Veuillez le sélectionner dans la fenêtre des paramètres pour le télécharger.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1115"/>
+ <location filename="../src/gui/folder.cpp" line="1140"/>
<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="1119"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Remove All Files?</source>
<translation>Supprimer tous les fichiers ?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1121"/>
+ <location filename="../src/gui/folder.cpp" line="1146"/>
<source>Remove all files</source>
<translation>Supprimer tous les fichiers</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1122"/>
+ <location filename="../src/gui/folder.cpp" line="1147"/>
<source>Keep files</source>
<translation>Garder les fichiers</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="275"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<source>Could not reset folder state</source>
<translation>Impossible de réinitialiser l'état du dossier</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="276"/>
+ <location filename="../src/gui/folderman.cpp" line="271"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Un ancien fichier journal '%1' a été trouvé, mais ne peut être supprimé. Veuillez vous assurer qu’aucune application ne l'utilise en ce moment.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="877"/>
+ <location filename="../src/gui/folderman.cpp" line="865"/>
<source> (backup)</source>
<translation>(sauvegarde)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="882"/>
+ <location filename="../src/gui/folderman.cpp" line="870"/>
<source> (backup %1)</source>
<translation>(sauvegarde %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1091"/>
+ <location filename="../src/gui/folderman.cpp" line="1079"/>
<source>Undefined State.</source>
<translation>Statut indéfini.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1094"/>
- <source>Waits to start syncing.</source>
- <translation>En attente de synchronisation.</translation>
+ <location filename="../src/gui/folderman.cpp" line="1082"/>
+ <source>Waiting to start syncing.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1097"/>
+ <location filename="../src/gui/folderman.cpp" line="1085"/>
<source>Preparing for sync.</source>
<translation>Préparation de la synchronisation.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1100"/>
+ <location filename="../src/gui/folderman.cpp" line="1088"/>
<source>Sync is running.</source>
<translation>La synchronisation est en cours.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1103"/>
+ <location filename="../src/gui/folderman.cpp" line="1091"/>
<source>Last Sync was successful.</source>
<translation>Dernière synchronisation effectuée avec succès</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1108"/>
+ <location filename="../src/gui/folderman.cpp" line="1096"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>La dernière synchronisation s'est achevée avec succès mais avec des avertissement à propos de certains fichiers.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1111"/>
+ <location filename="../src/gui/folderman.cpp" line="1099"/>
<source>Setup Error.</source>
<translation>Erreur d'installation.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1114"/>
+ <location filename="../src/gui/folderman.cpp" line="1102"/>
<source>User Abort.</source>
<translation>Abandon par l'utilisateur.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1117"/>
+ <location filename="../src/gui/folderman.cpp" line="1105"/>
<source>Sync is paused.</source>
<translation>La synchronisation est en pause.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1123"/>
+ <location filename="../src/gui/folderman.cpp" line="1111"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisation en pause)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1119"/>
<source>No valid folder selected!</source>
<translation>Aucun dossier valable sélectionné !</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1130"/>
<source>The selected path is not a folder!</source>
<translation>Le chemin sélectionné n'est pas un dossier !</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1146"/>
+ <location filename="../src/gui/folderman.cpp" line="1134"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Vous n'avez pas la permission d'écrire dans le dossier sélectionné !</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1161"/>
+ <location filename="../src/gui/folderman.cpp" line="1149"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>Le dossier local %1 est déjà utilisé pour une synchronisation de dossiers. Veuillez en choisir un autre !</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1166"/>
+ <location filename="../src/gui/folderman.cpp" line="1154"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Le dossier local %1 contient un dossier déjà utilisé pour une synchronisation de dossiers. Veuillez en choisir un autre !</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1173"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Le dossier local %1 est un lien symbolique. Le dossier vers lequel le lien pointe contient un dossier déjà utilisé pour une synchronisation de dossier. Veuillez en choisir un autre !</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1168"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Le dossier local %1 se trouve dans un dossier déjà configuré pour une synchronisation de dossier. Veuillez en choisir un autre !</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1186"/>
+ <location filename="../src/gui/folderman.cpp" line="1174"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Le dossier local %1 est un lien symbolique. Le dossier vers lequel le lien pointe est inclus dans un dossier déjà configuré pour une synchronisation de dossier. Veuillez en choisir un autre !</translation>
</message>
<translation>Ajouter une synchronisation de dossier</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="85"/>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="274"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="271"/>
<source>File</source>
<translation>Fichier</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="228"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="224"/>
<source>Syncing selected files in your account with</source>
<translation>Configuré pour synchroniser les fichiers sélectionnés dans</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="231"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="227"/>
<source>Remote path: %1</source>
<translation>Chemin distant : %1</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="121"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="122"/>
<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="126"/>
- <source>Adding folder is disabled because your are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
- <translation>Ajouter un dossier n'est pas possible car vous synchronisez déjà tous vos fichiers. Si vous désirez synchroniser plusieurs dossiers, supprimez d'abord la configuration actuelle.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="131"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="132"/>
<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="141"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="142"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="156"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
<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="182"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="192"/>
<source>Signed out</source>
<translation>Session fermée</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="727"/>
- <source>Discovering '%1'</source>
- <translation>Découverte de '%1'</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="127"/>
+ <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="163"/>
+ <source>Fetching folder list from server...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="787"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="789"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="849"/>
<source>Syncing %1</source>
<translation>Synchronisation de %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="792"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="854"/>
<source>download %1/s</source>
<translation>réception %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="794"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="856"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="800"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>upload %1/s</source>
<translation>envoi %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="802"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="864"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="807"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="869"/>
<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="811"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="873"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="827"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="889"/>
<source>%1 of %2, file %3 of %4
Total time left %5</source>
<translation>%1 de %2, fichier %3 de %4
Temps restant total %5</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
<source>file %1 of %2</source>
<translation>fichier %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="932"/>
<source>Waiting...</source>
<translation>En attente ...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="934"/>
<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="878"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>Preparing to sync...</source>
<translation>Préparation à la synchronisation</translation>
</message>
<name>OCC::FolderWizard</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <source>Add Folder Sync Connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderwizard.cpp" line="564"/>
- <source>Add Folder</source>
- <translation>Ajouter un dossier</translation>
+ <source>Add Sync Connection</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Avancé</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="61"/>
+ <location filename="../src/gui/generalsettings.ui" line="109"/>
<source>Ask confirmation before downloading folders larger than</source>
<translation>Demander avant de télécharger les dossiers de taille supérieure à</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
+ <location filename="../src/gui/generalsettings.ui" line="129"/>
<source>MB</source>
<translation>Mo</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="109"/>
+ <location filename="../src/gui/generalsettings.ui" line="159"/>
<source>Show crash reporter</source>
<translation>Afficher le rapport d'incident</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="118"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit Ignored Files</source>
<translation>Modifier les fichiers ignorés</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="142"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
<source>Add an Account</source>
<translation>Ajouter un compte</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="167"/>
- <location filename="../src/gui/generalsettings.ui" line="173"/>
+ <location filename="../src/gui/generalsettings.ui" line="171"/>
+ <location filename="../src/gui/generalsettings.ui" line="177"/>
<source>About</source>
<translation>À propos de</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <location filename="../src/gui/generalsettings.ui" line="187"/>
<source>Updates</source>
<translation>Mises à jour</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="208"/>
+ <location filename="../src/gui/generalsettings.ui" line="212"/>
<source>&Restart && Update</source>
<translation>&Redémarrer && Mettre à jour</translation>
</message>
</context>
-<context>
- <name>OCC::HttpCredentials</name>
- <message>
- <location filename="../src/libsync/creds/httpcredentials.cpp" line="290"/>
- <source>Reading from keychain failed with error: '%1'</source>
- <translation>Erreur lors de l'accès au trousseau : '%1'</translation>
- </message>
-</context>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="32"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
<source>Please enter %1 password:
User: %2
</translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="41"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <source>Reading from keychain failed with error: '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
<source>Enter Password</source>
<translation>Saisissez le mot de passe</translation>
</message>
<translation>Supprimer</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="40"/>
<source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
Les éléments dont la suppression automatique est permise seront supprimés s'ils empêchent l'effacement d'un répertoire. C'est utile pour les fichiers de méta-données.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="109"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
<source>Could not open file</source>
<translation>Impossible d'ouvrir le fichier</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="111"/>
<source>Cannot write changes to '%1'.</source>
<translation>Impossible d'écrire les modifications sur '%1'.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="138"/>
<source>Add Ignore Pattern</source>
<translation>Ajouter un motif à ignorer</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>Add a new ignore pattern:</source>
<translation>Ajoutez un nouveau motif à ignorer :</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="45"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="46"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Cette entrée est fournie par le système dans '%1' et ne peut être modifiée dans cette vue.</translation>
</message>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="163"/>
+ <location filename="../src/libsync/logger.cpp" line="190"/>
<source>Error</source>
<translation>Erreur</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="164"/>
+ <location filename="../src/libsync/logger.cpp" line="191"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Le fichier '%1'<br/>ne peut être ouvert en écriture.<br/><br/>Le fichier de journalisation <b>ne peut pas</b> être enregistré !</nobr></translation>
</message>
</message>
<message>
<location filename="../src/gui/networksettings.ui" line="203"/>
- <location filename="../src/gui/networksettings.ui" line="295"/>
+ <location filename="../src/gui/networksettings.ui" line="292"/>
<source>No limit</source>
<translation>Aucune limite</translation>
</message>
<source>SOCKS5 proxy</source>
<translation>Proxy SOCKS5</translation>
</message>
+ <message>
+ <location filename="../src/gui/networksettings.cpp" line="128"/>
+ <source>Qt >= 5.4 is required in order to use the bandwidth limit</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::OCUpdater</name>
<source>Downloading version %1. Please wait...</source>
<translation>Téléchargement de la version %1. Merci de patienter...</translation>
</message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
- <source>Version %1 available. Restart application to start the update.</source>
- <translation>La version %1 est disponible. Redémarrez l'application pour appliquer la mise à jour.</translation>
- </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="145"/>
<source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
<source>Could not check for new updates.</source>
<translation>Impossible de vérifier la présence de nouvelles mises à jour.</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
+ <source>%1 version %2 available. Restart application to start the update.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
- <source>New version %1 available. Please use the system's update tool to install it.</source>
- <translation>La nouvelle version %1 est disponible. Veuillez utiliser l'utilitaire de mise à jour système afin de l'installer.</translation>
+ <source>New %1 version %2 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="151"/>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="114"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="110"/>
<source>Connection Timeout</source>
<translation>Délai d'attente de connexion dépassé</translation>
</message>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="171"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="167"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>L'URL interrogéé a renvoyé une réponse json non valide</translation>
</message>
</context>
-<context>
- <name>OCC::PropagateDownloadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="435"/>
- <source>Sync was aborted by user.</source>
- <translation>La synchronisation a été interrompue par l'utilisateur.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="488"/>
- <source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation>Aucun E-Tag reçu du serveur, vérifiez le proxy / la passerelle</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="494"/>
- <source>We received a different E-Tag for resuming. Retrying next time.</source>
- <translation>Nous avons reçu un E-Tag différent pour reprendre le téléchargement. Nouvel essai la prochaine fois.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="516"/>
- <source>Server returned wrong content-range</source>
- <translation>Le serveur a retourné une gamme de contenu erronée</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="567"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation>Le fichier %1 ne peut pas être téléchargé en raison d'un conflit sur le nom de fichier local. </translation>
- </message>
-</context>
<context>
<name>OCC::PropagateDownloadFileQNAM</name>
<message>
<translation>Le fichier %1 ne peut pas être téléchargé en raison d'un conflit sur le nom de fichier local. </translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="457"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
+ <source>The download would reduce free disk space below %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="372"/>
+ <source>Free space on disk is less than %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="482"/>
<source>File was deleted from server</source>
<translation>Le fichier a été supprimé du serveur</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="506"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="531"/>
<source>The file could not be downloaded completely.</source>
<translation>Le fichier n'a pas pu être téléchargé intégralement.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="601"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="636"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Le fichier %1 n'a pas pu être sauvegardé en raison d'un conflit sur le nom du fichier local !</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="641"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="676"/>
<source>File has changed since discovery</source>
<translation>Le fichier a changé depuis sa découverte</translation>
</message>
<context>
<name>OCC::PropagateItemJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="92"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
<source>; Restoration Failed: %1</source>
<translation>; Échec de la restauration : %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="138"/>
<source>Continue blacklisting:</source>
<translation>Conserver sur liste noire :</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="230"/>
<source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation>Un fichier ou un dossier a été supprimé d'un partage en lecture seule, mais la restauration a échoué : %1</translation>
</message>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove folder '%1';</source>
- <translation>Impossible de supprimer le répertoire '%1';</translation>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="243"/>
- <location filename="../src/libsync/propagator_legacy.cpp" line="302"/>
- <source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>Fichier local modifié pendant la synchronisation, la synchronisation redémarrera lorsque ce sera terminé</translation>
- </message>
+ <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="246"/>
- <source>Sync was aborted by user.</source>
- <translation>La synchronisation a été interrompue par l'utilisateur.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="205"/>
+ <source>File name contains at least one invalid character</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="252"/>
- <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
- <translation>Le fichier a été modifié localement mais appartient à un partage en lecture seule. Il a été restauré et vos modifications sont présentes dans le fichiers de confit.</translation>
- </message>
-</context>
-<context>
- <name>OCC::PropagateUploadFileQNAM</name>
- <message>
- <location filename="../src/libsync/propagateupload.cpp" line="226"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="262"/>
<source>File Removed</source>
<translation>Fichier supprimé</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="274"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Fichier local modifié pendant la synchronisation. Elle va reprendre. </translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="250"/>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="286"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="665"/>
<source>Local file changed during sync.</source>
<translation>Fichier local modifié pendant la synchronisation.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="558"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="592"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>Arrêt forcé du job après réinitialisation de connexion HTTP avec Qt < 5.4.2.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="566"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="600"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Le fichier a été modifié localement mais appartient à un partage en lecture seule. Il a été restauré et vos modifications sont présentes dans le fichiers de conflit.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="597"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="631"/>
<source>Poll URL missing</source>
<translation>URL de sondage manquante</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="620"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="654"/>
<source>The local file was removed during sync.</source>
<translation>Fichier local supprimé pendant la synchronisation.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="646"/>
- <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
- <translation>Le serveur n'a pas acquitté le dernier morceau (aucun e-tag n'était présent).</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="680"/>
+ <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Décochez les dossiers qui doivent être <b>supprimés</b> de votre disque local et qui ne doivent pas être synchronisés avec cet ordinateur.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>Choisir le contenu à synchroniser : Sélectionnez les sous-dossiers distants que vous voulez synchroniser.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>Choisir le contenu à synchroniser : Désélectionnez les sous-dossiers distants que vous ne voulez pas synchroniser.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
<source>Choose What to Sync</source>
<translation>Choisir le contenu à synchroniser</translation>
</message>
<translation>Taille</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
<source>No subfolders currently on the server.</source>
<translation>Aucun sous-dossier sur le serveur.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>Une erreur est survenue lors du chargement de la liste des sous-dossiers.</translation>
</message>
<translation>Paramètres</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="80"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="84"/>
<source>Activity</source>
<translation>Activité</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="86"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="90"/>
<source>General</source>
<translation>Généraux</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>Network</source>
<translation>Réseau</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharedialog.ui" line="22"/>
- <location filename="../src/gui/sharedialog.ui" line="234"/>
+ <location filename="../src/gui/sharedialog.ui" line="258"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<translation>Chemin ownCloud :</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="182"/>
+ <location filename="../src/gui/sharedialog.ui" line="116"/>
<source>Set &password </source>
<translation>Définir le mot de &passe</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="196"/>
+ <location filename="../src/gui/sharedialog.ui" line="130"/>
<source>Set &expiration date</source>
<translation>Spécifier la date d'&expiration</translation>
</message>
+ <message>
+ <location filename="../src/gui/sharedialog.ui" line="214"/>
+ <source>Allow editing</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/sharedialog.ui" line="77"/>
<source>Share link</source>
<translation>Partager par lien</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="125"/>
+ <location filename="../src/gui/sharedialog.ui" line="203"/>
<source>Copy &link</source>
<translation>Copier le &lien</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="142"/>
+ <location filename="../src/gui/sharedialog.ui" line="154"/>
<source>Set password</source>
<translation>Définir le mot de passe</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="692"/>
- <source>%1 path: %2</source>
- <translation>Chemin %1 : %2</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="115"/>
+ <location filename="../src/gui/sharedialog.cpp" line="120"/>
<source>%1 Sharing</source>
<translation>Partage %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="103"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="112"/>
+ <location filename="../src/gui/sharedialog.cpp" line="117"/>
<source>Folder: %2</source>
<translation>Dossier: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="121"/>
<source>P&assword protect</source>
<translation>Protéger par mot de p&asse</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="221"/>
+ <location filename="../src/gui/sharedialog.cpp" line="214"/>
<source>Password Protected</source>
<translation>Protégé par un mot de passe</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="382"/>
+ <location filename="../src/gui/sharedialog.cpp" line="338"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Le fichier ne peut pas être partagé car il a été partagé sans permission de repartage.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="528"/>
+ <location filename="../src/gui/sharedialog.cpp" line="475"/>
<source>Please Set Password</source>
<translation>Veuillez choisir un mot de passe</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="564"/>
- <location filename="../src/gui/sharedialog.cpp" line="565"/>
+ <location filename="../src/gui/sharedialog.cpp" line="538"/>
+ <location filename="../src/gui/sharedialog.cpp" line="539"/>
<source>&Share link</source>
<translation>&Partager par lien</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="583"/>
+ <location filename="../src/gui/sharedialog.cpp" line="552"/>
+ <location filename="../src/gui/sharedialog.cpp" line="564"/>
<source>OCS API error code: %1</source>
<translation>Code d'erreur OCS API : %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="605"/>
- <source>There is no sync folder configured.</source>
- <translation>Aucun dossier à synchroniser n'est configuré.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="639"/>
- <source>A sync file with the same name exists. The file cannot be registered to sync.</source>
- <translation>Un fichier synchronisé avec le même nom existe déjà. Le fichier ne peut être ajouté à la synchronisation.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="684"/>
- <source>The file cannot be synced.</source>
- <translation>Le fichier ne peut pas être synchronisé.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="624"/>
- <source>Sharing of external directories is not yet working.</source>
- <translation>Le partage de dossiers externes n'est pas encore pris en charge.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="473"/>
- <location filename="../src/gui/sharedialog.cpp" line="506"/>
+ <location filename="../src/gui/sharedialog.cpp" line="418"/>
+ <location filename="../src/gui/sharedialog.cpp" line="460"/>
<source>Public sh&aring requires a password</source>
<translation>Le p&artage public nécessite un mot de passe</translation>
</message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="617"/>
- <source>Cannot find a folder to upload to.</source>
- <translation>Impossible de trouver un dossier vers lequel téléverser.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
- <source>Waiting to upload...</source>
- <translation>En attente d'envoi...</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="653"/>
- <source>Unable to register in sync space.</source>
- <translation>Impossible de s'enregistrer à l'espace de synchronisation.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="694"/>
- <source>Sync of registered file was not successful yet.</source>
- <translation>La synchronisation du fichier n'a pas encore pu être effectuée.</translation>
- </message>
</context>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>Login Error</source>
<translation>Erreur de connexion</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>You must sign in as user %1</source>
<translation>Vous devez vous connecter en tant qu'utilisateur %1</translation>
</message>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="452"/>
+ <location filename="../src/gui/socketapi.cpp" line="447"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Partager avec %1</translation>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="97"/>
+ <location filename="../src/libsync/syncengine.cpp" line="94"/>
<source>Success.</source>
<translation>Succès.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="104"/>
+ <location filename="../src/libsync/syncengine.cpp" line="101"/>
<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="107"/>
+ <location filename="../src/libsync/syncengine.cpp" line="104"/>
<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="110"/>
+ <location filename="../src/libsync/syncengine.cpp" line="107"/>
<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="113"/>
+ <location filename="../src/libsync/syncengine.cpp" line="110"/>
<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="116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>Erreur fatale CSync : mauvais paramètre.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="119"/>
+ <location filename="../src/libsync/syncengine.cpp" line="116"/>
<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="122"/>
+ <location filename="../src/libsync/syncengine.cpp" line="119"/>
<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="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="122"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="125"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="128"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="131"/>
<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="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="134"/>
<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="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="137"/>
<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="143"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation>CSync a échoué en raison d'une erreur de permission non prise en charge.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
<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="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
<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="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
<source>Error while reading folder.</source>
<translation>Erreur lors de la lecture du dossier.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="996"/>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
<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="1003"/>
+ <location filename="../src/libsync/syncengine.cpp" line="991"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="152"/>
<source>CSync unspecified error.</source>
<translation>Erreur CSync inconnue.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="155"/>
<source>Aborted by the user</source>
<translation>Interrompu par l'utilisateur</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="392"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>Le nom de fichier contient des caractères non valides qui ne peuvent être synchronisés entre plate-formes.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="143"/>
<source>CSync failed to access</source>
<translation>CSync n'a pas pu accéder à</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <location filename="../src/libsync/syncengine.cpp" line="97"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <source>CSync failed due to unhandled permission denied.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="146"/>
<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="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="158"/>
<source>The service is temporarily unavailable</source>
<translation>Le service est temporairement indisponible.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="175"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<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="230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="227"/>
<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="389"/>
+ <location filename="../src/libsync/syncengine.cpp" line="386"/>
<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="392"/>
+ <location filename="../src/libsync/syncengine.cpp" line="389"/>
<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="398"/>
+ <location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename is too long.</source>
<translation>Le nom de fichier est trop long.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="401"/>
+ <location filename="../src/libsync/syncengine.cpp" line="398"/>
<source>File is ignored because it's hidden.</source>
<translation>Le fichier est ignoré car il est caché.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="407"/>
+ <location filename="../src/libsync/syncengine.cpp" line="404"/>
<source>Stat failed.</source>
<translation>Stat échoué.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="429"/>
+ <location filename="../src/libsync/syncengine.cpp" line="426"/>
<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="561"/>
+ <location filename="../src/libsync/syncengine.cpp" line="558"/>
<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="631"/>
+ <location filename="../src/libsync/syncengine.cpp" line="612"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="645"/>
<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="718"/>
+ <location filename="../src/libsync/syncengine.cpp" line="723"/>
<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="965"/>
- <location filename="../src/libsync/syncengine.cpp" line="972"/>
+ <location filename="../src/libsync/syncengine.cpp" line="953"/>
+ <location filename="../src/libsync/syncengine.cpp" line="960"/>
<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="990"/>
+ <location filename="../src/libsync/syncengine.cpp" line="978"/>
<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="1023"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1011"/>
<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="1040"/>
- <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1028"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1048"/>
<source>Not allowed to remove, restoring</source>
<translation>Non autorisé à supprimer. Restauration</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1073"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1061"/>
<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="1128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1116"/>
<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="1137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1125"/>
<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="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the destination</source>
<translation>la destination</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the source</source>
<translation>la source</translation>
</message>
</message>
</context>
<context>
- <name>OCC::TransmissionChecksumValidator</name>
+ <name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="128"/>
<source>The checksum header is malformed.</source>
- <translation>L'entête de somme de contrôle est mal formée.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+ <source>The checksum header contained an unknown checksum type '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="148"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
- <translation>Le fichier téléchargé ne correspond pas à la somme de contrôle, il va être téléchargé à nouveau.</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<source>Recent Changes</source>
<translation>Modifications récentes</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="561"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="331"/>
<source>Managed Folders:</source>
<source>Open %1 in browser</source>
<translation>Ouvrir %1 dans le navigateur</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="449"/>
- <source>Log out everywhere</source>
- <translation>Déconnecter tous les comptes</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="457"/>
- <source>Log in everywhere...</source>
- <translation>Connecter tous les comptes</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="513"/>
<source>Unknown status</source>
<source>Account %1: %2</source>
<translation>Compte %1 : %2</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="449"/>
+ <source>Log out of all accounts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="457"/>
+ <source>Log in to all accounts...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="532"/>
<source>Crash now</source>
<source>No items synced recently</source>
<translation>Aucun élément synchronisé récemment</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="561"/>
- <source>Discovering '%1'</source>
- <translation>Découverte de '%1'</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="566"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>%L1 octets</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="306"/>
+ <location filename="../src/libsync/utility.cpp" line="303"/>
<source>%Ln year(s)</source>
<translation>%Ln an(s)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="307"/>
+ <location filename="../src/libsync/utility.cpp" line="304"/>
<source>%Ln month(s)</source>
<translation>%Ln mois</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="308"/>
+ <location filename="../src/libsync/utility.cpp" line="305"/>
<source>%Ln day(s)</source>
<translation>%Ln jour(s)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="309"/>
+ <location filename="../src/libsync/utility.cpp" line="306"/>
<source>%Ln hour(s)</source>
<translation>%Ln heure(s)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="310"/>
+ <location filename="../src/libsync/utility.cpp" line="307"/>
<source>%Ln minute(s)</source>
<translation>%Ln minute(s)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="311"/>
+ <location filename="../src/libsync/utility.cpp" line="308"/>
<source>%Ln second(s)</source>
<translation>%Ln seconde(s)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="318"/>
<source>0 seconds</source>
<translation>0 seconde</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="336"/>
+ <location filename="../src/libsync/utility.cpp" line="333"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="73"/>
+ <source>Enter your credentials to connect to the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <source>Sign in</source>
+ <translation>Rexistrarse</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="89"/>
<source>Remove the account configuration from the client</source>
<translation>Retirar a configuración da conta do cliente</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Remove Account</source>
<translation>Retirar a conta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="97"/>
+ <location filename="../src/gui/accountsettings.ui" line="113"/>
<source>Storage space: ...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="167"/>
+ <location filename="../src/gui/accountsettings.ui" line="183"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Os cartafoles non seleccionados van seren <b>eliminados</b> do seu sistema de ficheiros local e non volverán sincronizarse con esta computadora</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="230"/>
<source>Apply</source>
<translation>Aplicar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="198"/>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
- <location filename="../src/gui/accountsettings.cpp" line="571"/>
+ <location filename="../src/gui/accountsettings.ui" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="289"/>
+ <location filename="../src/gui/accountsettings.cpp" line="646"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<translation>Conectado con <server> como <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="115"/>
+ <location filename="../src/gui/accountsettings.cpp" line="121"/>
<source>No account configured.</source>
<translation>Non hai contas configuradas.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="161"/>
+ <source>Choose what to sync</source>
+ <translation>Escolla que sincronizar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="168"/>
+ <source>Remove folder sync connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="234"/>
<source>Folder creation failed</source>
<translation>Non foi posíbel crear o cartafol</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="230"/>
+ <location filename="../src/gui/accountsettings.cpp" line="235"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation><p>Non foi posíbel crear o cartafol local <i>%1</i>.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="283"/>
- <source>Stop syncing</source>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
+ <source>Confirm Folder Sync Connection Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>Remove Folder Sync Connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="309"/>
+ <location filename="../src/gui/accountsettings.cpp" line="314"/>
<source>Confirm Folder Reset</source>
<translation>Confirmar o restabelecemento do cartafol</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="310"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Confirma que quere restabelecer o cartafol <i>%1</i> e reconstruír as súa base datos no cliente?</p><p><b>Nota:</b> Esta función está deseñada só para fins de mantemento. Non se retirará ningún ficheiro, porén, isto pode xerar un tráfico de datos significativo e levarlle varios minutos ou horas en completarse, dependendo do tamaño do cartafol. Utilice esta opción só se o aconsella o administrador.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="391"/>
+ <location filename="../src/gui/accountsettings.cpp" line="396"/>
<source>Sync Running</source>
<translation>Sincronización en proceso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="392"/>
+ <location filename="../src/gui/accountsettings.cpp" line="397"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Estase a realizar a sincronización.<br/>Quere interrompela e rematala?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="472"/>
+ <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <source>%1 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="485"/>
<source>%1 as <i>%2</i></source>
<translation>%1 como <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="476"/>
+ <location filename="../src/gui/accountsettings.cpp" line="495"/>
<source>Connected to %1.</source>
<translation>Conectado a %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="478"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>O servidor %1 non está dispoñíbel temporalmente.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="480"/>
+ <location filename="../src/gui/accountsettings.cpp" line="499"/>
<source>Signed out from %1.</source>
<translation>Desconectado de %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="482"/>
+ <location filename="../src/gui/accountsettings.cpp" line="501"/>
<source>No connection to %1 at %2.</source>
<translation>Non hai conexión con %1 en %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
- <source>There are new folders that were not synchronized because they are too big: %1</source>
- <translation>Hai cartafoles novos que non foron sincronizados, por seren grandes de máis: %1</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="536"/>
- <source>, </source>
- <translation>, </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <source>There are new folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="563"/>
+ <location filename="../src/gui/accountsettings.cpp" line="638"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="564"/>
+ <location filename="../src/gui/accountsettings.cpp" line="639"/>
<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="570"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="158"/>
<source>Open folder</source>
<translation>Abrir o cartafol</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="168"/>
- <source>Choose What to Sync</source>
- <translation>Escolla que sincronizar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Resume sync</source>
<translation>Continuar coa sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Pause sync</source>
<translation>Por en pausa a sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="176"/>
- <source>Remove sync</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="277"/>
- <source>Confirm Sync Removal</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="278"/>
+ <location filename="../src/gui/accountsettings.cpp" line="283"/>
<source><p>Do you really want to stop syncing the folder <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="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="452"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="448"/>
+ <location filename="../src/gui/accountsettings.cpp" line="453"/>
<source>%1 of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="453"/>
+ <location filename="../src/gui/accountsettings.cpp" line="462"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente non hai dispoñíbel ningunha información sobre o uso do almacenamento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="507"/>
<source>No %1 connection configured.</source>
<translation>Non se configurou a conexión %1.</translation>
</message>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="95"/>
+ <location filename="../src/gui/accountstate.cpp" line="99"/>
<source>Signed out</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="97"/>
+ <location filename="../src/gui/accountstate.cpp" line="101"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="99"/>
+ <location filename="../src/gui/accountstate.cpp" line="103"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="101"/>
+ <location filename="../src/gui/accountstate.cpp" line="105"/>
<source>Service unavailable</source>
<translation>Servizo non dispoñíbel</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="103"/>
+ <location filename="../src/gui/accountstate.cpp" line="107"/>
<source>Network error</source>
<translation>Produciuse un erro de rede</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="105"/>
+ <location filename="../src/gui/accountstate.cpp" line="109"/>
<source>Configuration error</source>
<translation>Produciuse un erro de configuración</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="107"/>
+ <location filename="../src/gui/accountstate.cpp" line="111"/>
<source>Unknown account state</source>
<translation>Estado da conta descoñecido</translation>
</message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>Reauthentication required</source>
+ <translation>É necesario volver autenticarse</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>You need to re-login to continue using the account %1.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
<translation>Actualice ao último servidor e reinicie o cliente.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="143"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="135"/>
<source>Authentication error: Either username or password are wrong.</source>
<translation>Produciuse un erro de autenticación: Ou o nome de usuario ou o contrasinal poderían ser erróneos</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="155"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="147"/>
<source>timeout</source>
<translation>caducidade</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="186"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="178"/>
<source>The provided credentials are not correct</source>
<translation>As credenciais fornecidas non son correctas</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="524"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="537"/>
<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="107"/>
+ <location filename="../src/gui/folder.cpp" line="108"/>
<source>Unable to create csync-context</source>
<translation>Non é posíbel crear o contexto csync</translation>
</message>
<translation>Actividade de sincronización</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="845"/>
+ <location filename="../src/gui/folder.cpp" line="870"/>
<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="1102"/>
+ <location filename="../src/gui/folder.cpp" line="1127"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Foi engadido un novo cartafol maior de %1 MB: %2.
Vaia aos axustes e seleccióneo se quere descargalo.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1115"/>
+ <location filename="../src/gui/folder.cpp" line="1140"/>
<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="1119"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Remove All Files?</source>
<translation>Retirar todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1121"/>
+ <location filename="../src/gui/folder.cpp" line="1146"/>
<source>Remove all files</source>
<translation>Retirar todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1122"/>
+ <location filename="../src/gui/folder.cpp" line="1147"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="275"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<source>Could not reset folder state</source>
<translation>Non foi posíbel restabelecer o estado do cartafol</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="276"/>
+ <location filename="../src/gui/folderman.cpp" line="271"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Atopouse un rexistro de sincronización antigo en «%1» máis non pode ser retirado. Asegúrese de que non o está a usar ningunha aplicación.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="877"/>
+ <location filename="../src/gui/folderman.cpp" line="865"/>
<source> (backup)</source>
<translation>(copia de seguranza)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="882"/>
+ <location filename="../src/gui/folderman.cpp" line="870"/>
<source> (backup %1)</source>
<translation>(copia de seguranza %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1091"/>
+ <location filename="../src/gui/folderman.cpp" line="1079"/>
<source>Undefined State.</source>
<translation>Estado sen definir.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1094"/>
- <source>Waits to start syncing.</source>
- <translation>Agardando polo comezo da sincronización.</translation>
+ <location filename="../src/gui/folderman.cpp" line="1082"/>
+ <source>Waiting to start syncing.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1097"/>
+ <location filename="../src/gui/folderman.cpp" line="1085"/>
<source>Preparing for sync.</source>
<translation>Preparando para sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1100"/>
+ <location filename="../src/gui/folderman.cpp" line="1088"/>
<source>Sync is running.</source>
<translation>Estase sincronizando.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1103"/>
+ <location filename="../src/gui/folderman.cpp" line="1091"/>
<source>Last Sync was successful.</source>
<translation>A última sincronización fíxose correctamente.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1108"/>
+ <location filename="../src/gui/folderman.cpp" line="1096"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>A última sincronización fíxose correctamente, mais con algún aviso en ficheiros individuais.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1111"/>
+ <location filename="../src/gui/folderman.cpp" line="1099"/>
<source>Setup Error.</source>
<translation>Erro de configuración.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1114"/>
+ <location filename="../src/gui/folderman.cpp" line="1102"/>
<source>User Abort.</source>
<translation>Interrompido polo usuario.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1117"/>
+ <location filename="../src/gui/folderman.cpp" line="1105"/>
<source>Sync is paused.</source>
<translation>Sincronización en pausa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1123"/>
+ <location filename="../src/gui/folderman.cpp" line="1111"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (sincronización en pausa)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1119"/>
<source>No valid folder selected!</source>
<translation>Non seleccionou ningún cartafol correcto!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1130"/>
<source>The selected path is not a folder!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1146"/>
+ <location filename="../src/gui/folderman.cpp" line="1134"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Vostede non ten permiso para escribir neste cartafol!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1161"/>
+ <location filename="../src/gui/folderman.cpp" line="1149"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1166"/>
+ <location filename="../src/gui/folderman.cpp" line="1154"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1173"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1168"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1186"/>
+ <location filename="../src/gui/folderman.cpp" line="1174"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="85"/>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="274"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="271"/>
<source>File</source>
<translation>Ficheiro</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="228"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="224"/>
<source>Syncing selected files in your account with</source>
<translation>Sincronizando todos os ficheiros seleccionados na súa conta con</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="231"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="227"/>
<source>Remote path: %1</source>
<translation>Ruta remota: %1</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="121"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="122"/>
<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="126"/>
- <source>Adding folder is disabled because your are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
- <translation>A acción de engadir cartafoles está desactivada xa que vostede xa sincronizou todos os seus ficheiros. Se quere sincronizar varios cartafoles, retire o cartafol raíz configurado actualmente.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="131"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="132"/>
<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="141"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="142"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="156"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
<source>Error while loading the list of folders from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="182"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="192"/>
<source>Signed out</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="727"/>
- <source>Discovering '%1'</source>
- <translation>Atopando «%1»</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="127"/>
+ <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="163"/>
+ <source>Fetching folder list from server...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="787"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="789"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="849"/>
<source>Syncing %1</source>
<translation>Sincronizando %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="792"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="854"/>
<source>download %1/s</source>
<translation>descargar %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="794"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="856"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="800"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>upload %1/s</source>
<translation>enviar %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="802"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="864"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="807"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="869"/>
<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="811"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="873"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="827"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="889"/>
<source>%1 of %2, file %3 of %4
Total time left %5</source>
<translation>%1 de %2, ficheiro %3 of %4
Tempo total restante %5</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
<source>file %1 of %2</source>
<translation>ficheiro %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="932"/>
<source>Waiting...</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="934"/>
<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="878"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>Preparing to sync...</source>
<translation type="unfinished"/>
</message>
<name>OCC::FolderWizard</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <source>Add Folder Sync Connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderwizard.cpp" line="564"/>
- <source>Add Folder</source>
- <translation>Engadir un cartafol</translation>
+ <source>Add Sync Connection</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Avanzado</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="61"/>
+ <location filename="../src/gui/generalsettings.ui" line="109"/>
<source>Ask confirmation before downloading folders larger than</source>
<translation>Pedir confirmación antes de descargar cartafoles máis grandes de</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
+ <location filename="../src/gui/generalsettings.ui" line="129"/>
<source>MB</source>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="109"/>
+ <location filename="../src/gui/generalsettings.ui" line="159"/>
<source>Show crash reporter</source>
<translation>Amosar o informe de quebra</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="118"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit Ignored Files</source>
<translation>Editar os ficheiros ignorados</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="142"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
<source>Add an Account</source>
<translation>Engadir unha conta</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="167"/>
- <location filename="../src/gui/generalsettings.ui" line="173"/>
+ <location filename="../src/gui/generalsettings.ui" line="171"/>
+ <location filename="../src/gui/generalsettings.ui" line="177"/>
<source>About</source>
<translation>Sobre</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <location filename="../src/gui/generalsettings.ui" line="187"/>
<source>Updates</source>
<translation>Actualizacións</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="208"/>
+ <location filename="../src/gui/generalsettings.ui" line="212"/>
<source>&Restart && Update</source>
<translation>&Reiniciar e actualizar</translation>
</message>
</context>
-<context>
- <name>OCC::HttpCredentials</name>
- <message>
- <location filename="../src/libsync/creds/httpcredentials.cpp" line="290"/>
- <source>Reading from keychain failed with error: '%1'</source>
- <translation>A lectura do chaveiro fallou co erro: «%1»</translation>
- </message>
-</context>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="32"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
<source>Please enter %1 password:
User: %2
</translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="41"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <source>Reading from keychain failed with error: '%1'</source>
+ <translation>A lectura do chaveiro fallou co erro: «%1»</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
<source>Enter Password</source>
<translation>Escriba o contrasinal</translation>
</message>
<translation>Retirar</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="40"/>
<source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="109"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
<source>Could not open file</source>
<translation>Non foi posíbel abrir o ficheiro</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="111"/>
<source>Cannot write changes to '%1'.</source>
<translation>Non é posíbel escribir os cambios en «%1».</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="138"/>
<source>Add Ignore Pattern</source>
<translation>Engadir o patrón a ignorar</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>Add a new ignore pattern:</source>
<translation>Engadir un novo patrón a ignorar:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="45"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="46"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Esta entrada é fornecida polo sistema en «%1» e non pode ser modificado nesta vista.</translation>
</message>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="163"/>
+ <location filename="../src/libsync/logger.cpp" line="190"/>
<source>Error</source>
<translation>Erro</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="164"/>
+ <location filename="../src/libsync/logger.cpp" line="191"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>O ficheiro «%1»<br/> non se pode abrir para escritura.<br/><br/>A saída do rexistro <b>non</n> se pode gardar!</nobr></translation>
</message>
</message>
<message>
<location filename="../src/gui/networksettings.ui" line="203"/>
- <location filename="../src/gui/networksettings.ui" line="295"/>
+ <location filename="../src/gui/networksettings.ui" line="292"/>
<source>No limit</source>
<translation>Sen límite</translation>
</message>
<source>SOCKS5 proxy</source>
<translation>Proxy SOCKS5</translation>
</message>
+ <message>
+ <location filename="../src/gui/networksettings.cpp" line="128"/>
+ <source>Qt >= 5.4 is required in order to use the bandwidth limit</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::OCUpdater</name>
<source>Downloading version %1. Please wait...</source>
<translation>Descargando a versión %1. Agarde...</translation>
</message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
- <source>Version %1 available. Restart application to start the update.</source>
- <translation>Dispoñíbel a versión %1. Reinicie a aplicación para iniciar a actualización.</translation>
- </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="145"/>
<source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
<source>Could not check for new updates.</source>
<translation>Non foi posíbel comprobar se hai novas actualizacións.</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
+ <source>%1 version %2 available. Restart application to start the update.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
- <source>New version %1 available. Please use the system's update tool to install it.</source>
- <translation>Está dispoñíbel unha nova versión %1. Utilice a ferramenta de actualización do sistema para instalala.</translation>
+ <source>New %1 version %2 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="151"/>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="114"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="110"/>
<source>Connection Timeout</source>
<translation>Esgotouse o tempo de conexión</translation>
</message>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="171"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="167"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>O URL requirido devolveu unha resposta JSON incorrecta</translation>
</message>
</context>
-<context>
- <name>OCC::PropagateDownloadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="435"/>
- <source>Sync was aborted by user.</source>
- <translation>A sincronización foi interrompida polo usuario.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="488"/>
- <source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation>Non se recibiu a «E-Tag» do servidor, comprobe o proxy e/ou a pasarela</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="494"/>
- <source>We received a different E-Tag for resuming. Retrying next time.</source>
- <translation>Recibiuse unha «E-Tag» diferente para continuar. Tentándoo outra vez.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="516"/>
- <source>Server returned wrong content-range</source>
- <translation>O servidor devolveu un intervalo de contidos estragado</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="567"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation>Non é posíbel descargar o ficheiro %1 por mor dunha colisión co nome dun ficheiro local!</translation>
- </message>
-</context>
<context>
<name>OCC::PropagateDownloadFileQNAM</name>
<message>
<translation>Non é posíbel descargar o ficheiro %1 por mor dunha colisión co nome dun ficheiro local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="457"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
+ <source>The download would reduce free disk space below %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="372"/>
+ <source>Free space on disk is less than %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="482"/>
<source>File was deleted from server</source>
<translation>O ficheiro vai seren eliminado do servidor</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="506"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="531"/>
<source>The file could not be downloaded completely.</source>
<translation>Non foi posíbel descargar completamente o ficheiro.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="601"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="636"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Non foi posíbel gardar o ficheiro %1 por mor dunha colisión co nome dun ficheiro local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="641"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="676"/>
<source>File has changed since discovery</source>
<translation>O ficheiro cambiou após seren atopado</translation>
</message>
<context>
<name>OCC::PropagateItemJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="92"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
<source>; Restoration Failed: %1</source>
<translation>; Fallou a restauración: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="138"/>
<source>Continue blacklisting:</source>
<translation>Continuar as listas negras:</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="230"/>
<source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove folder '%1';</source>
+ <source>Could not remove folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="243"/>
- <location filename="../src/libsync/propagator_legacy.cpp" line="302"/>
- <source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>O ficheiro local cambiou durante a sincronización, sincronizando unha vez quedou completado</translation>
- </message>
+ <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="246"/>
- <source>Sync was aborted by user.</source>
- <translation>A sincronización foi interrompida polo usuario.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="205"/>
+ <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/propagator_legacy.cpp" line="252"/>
- <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
- <translation>O ficheiro foi editado localmente mais é parte dunha compartición de só lectura. O ficheiro foi restaurado e a súa edición atopase no ficheiro de conflitos.</translation>
- </message>
-</context>
-<context>
- <name>OCC::PropagateUploadFileQNAM</name>
- <message>
- <location filename="../src/libsync/propagateupload.cpp" line="226"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="262"/>
<source>File Removed</source>
<translation>Ficheiro retirado</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="274"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>O ficheiro local cambiou durante a sincronización. Retomase.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="250"/>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="286"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="665"/>
<source>Local file changed during sync.</source>
<translation>O ficheiro local cambiou durante a sincronización.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="558"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="592"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>Forzando a interrupción do traballo na conexión HTTP reiniciandoa con Qt <5.4.2.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="566"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="600"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>O ficheiro foi editado localmente mais é parte dunha compartición de só lectura. O ficheiro foi restaurado e a súa edición atopase no ficheiro de conflitos.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="597"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="631"/>
<source>Poll URL missing</source>
<translation>Non se atopa o URL requirido</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="620"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="654"/>
<source>The local file was removed during sync.</source>
<translation>O ficheiro local retirarase durante a sincronización.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="646"/>
- <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
- <translation>O servidor non recoñeceu o último fragmento. (Non hai e-tag presente)</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="680"/>
+ <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Os cartafoles non seleccionados van seren <b>eliminados</b> do seu sistema de ficheiros local e non volverán sincronizarse con esta computadora</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>Escolla que sincronizar: Seleccione os subcartafoles remotos que quere sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>Escolla que sincronizar: Desmarque os subcartafoles remotos que non queira sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
<source>Choose What to Sync</source>
<translation>Escolla que sincronizar</translation>
</message>
<translation>Tamaño</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
<source>No subfolders currently on the server.</source>
<translation>Actualmente non hai subcartafoles no servidor.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>Produciuse un erro mentres se cargaba a lista de subcartafoles.</translation>
</message>
<translation>Axustes</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="80"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="84"/>
<source>Activity</source>
<translation>Actividade</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="86"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="90"/>
<source>General</source>
<translation>Xeral</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>Network</source>
<translation>Rede</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharedialog.ui" line="22"/>
- <location filename="../src/gui/sharedialog.ui" line="234"/>
+ <location filename="../src/gui/sharedialog.ui" line="258"/>
<source>TextLabel</source>
<translation>Etiqueta de texto</translation>
</message>
<translation>Ruta ao ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="182"/>
+ <location filename="../src/gui/sharedialog.ui" line="116"/>
<source>Set &password </source>
<translation>Estabelecer o &contrasinal</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="196"/>
+ <location filename="../src/gui/sharedialog.ui" line="130"/>
<source>Set &expiration date</source>
<translation>Definir a &data de caducidade</translation>
</message>
+ <message>
+ <location filename="../src/gui/sharedialog.ui" line="214"/>
+ <source>Allow editing</source>
+ <translation>Permitir a edición</translation>
+ </message>
<message>
<location filename="../src/gui/sharedialog.ui" line="77"/>
<source>Share link</source>
<translation>Ligazón para compartir</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="125"/>
+ <location filename="../src/gui/sharedialog.ui" line="203"/>
<source>Copy &link</source>
<translation>Copiar a &ligazón</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="142"/>
+ <location filename="../src/gui/sharedialog.ui" line="154"/>
<source>Set password</source>
<translation>Estabelecer o contrasinal</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="692"/>
- <source>%1 path: %2</source>
- <translation>Ruta a %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="115"/>
+ <location filename="../src/gui/sharedialog.cpp" line="120"/>
<source>%1 Sharing</source>
<translation>Compartindo %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="103"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="112"/>
+ <location filename="../src/gui/sharedialog.cpp" line="117"/>
<source>Folder: %2</source>
<translation>Cartafol: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="121"/>
<source>P&assword protect</source>
<translation>Contr&asinal de protección</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="221"/>
+ <location filename="../src/gui/sharedialog.cpp" line="214"/>
<source>Password Protected</source>
<translation>Protexido con contrasinal</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="382"/>
+ <location filename="../src/gui/sharedialog.cpp" line="338"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Non é posíbel compartir o ficheiro, xa que foi compartido sen permisis para compartir.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="528"/>
+ <location filename="../src/gui/sharedialog.cpp" line="475"/>
<source>Please Set Password</source>
<translation>Estabeleza o contrasinal</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="564"/>
- <location filename="../src/gui/sharedialog.cpp" line="565"/>
+ <location filename="../src/gui/sharedialog.cpp" line="538"/>
+ <location filename="../src/gui/sharedialog.cpp" line="539"/>
<source>&Share link</source>
<translation>&Ligazón para compartir</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="583"/>
+ <location filename="../src/gui/sharedialog.cpp" line="552"/>
+ <location filename="../src/gui/sharedialog.cpp" line="564"/>
<source>OCS API error code: %1</source>
<translation>API OCS API código de erro: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="605"/>
- <source>There is no sync folder configured.</source>
- <translation>Non hai ningún cartafol de sincronización configurado.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="639"/>
- <source>A sync file with the same name exists. The file cannot be registered to sync.</source>
- <translation>Xa existe un ficheiro de sincronización co mesmo nome. Non é posíbel rexistrar o ficheiro para sincronizar.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="684"/>
- <source>The file cannot be synced.</source>
- <translation>Non é posíbel sincronizar o ficheiro.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="624"/>
- <source>Sharing of external directories is not yet working.</source>
- <translation>A compartición de directorios externos aínda non está a funcionar.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="473"/>
- <location filename="../src/gui/sharedialog.cpp" line="506"/>
+ <location filename="../src/gui/sharedialog.cpp" line="418"/>
+ <location filename="../src/gui/sharedialog.cpp" line="460"/>
<source>Public sh&aring requires a password</source>
<translation>A comp&artición pública precisa de contrasinal </translation>
</message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="617"/>
- <source>Cannot find a folder to upload to.</source>
- <translation>Non é posíbel atopar un cartafol que enviar.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
- <source>Waiting to upload...</source>
- <translation>Agardando polo envío...</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="653"/>
- <source>Unable to register in sync space.</source>
- <translation>Non é posíbel facer un rexistro no espazo de sincronización.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="694"/>
- <source>Sync of registered file was not successful yet.</source>
- <translation>A sincronización di ficheiro rexistrado no non foi satisfactoria.</translation>
- </message>
</context>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>Login Error</source>
<translation>Erro de acceso</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>You must sign in as user %1</source>
<translation>Ten que rexistrarse como usuario %1</translation>
</message>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="452"/>
+ <location filename="../src/gui/socketapi.cpp" line="447"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Compartir con %1</translation>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="97"/>
+ <location filename="../src/libsync/syncengine.cpp" line="94"/>
<source>Success.</source>
<translation>Correcto.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="104"/>
+ <location filename="../src/libsync/syncengine.cpp" line="101"/>
<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="107"/>
+ <location filename="../src/libsync/syncengine.cpp" line="104"/>
<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="110"/>
+ <location filename="../src/libsync/syncengine.cpp" line="107"/>
<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="113"/>
+ <location filename="../src/libsync/syncengine.cpp" line="110"/>
<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="116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="113"/>
<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="119"/>
+ <location filename="../src/libsync/syncengine.cpp" line="116"/>
<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="122"/>
+ <location filename="../src/libsync/syncengine.cpp" line="119"/>
<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="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="122"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="125"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="128"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="131"/>
<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="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="134"/>
<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="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="137"/>
<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="143"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation>Produciuse un fallo en CSync por mor dun permiso denegado.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
<source>An error occurred while opening a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
<source>Error while reading folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="996"/>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
<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="1003"/>
+ <location filename="../src/libsync/syncengine.cpp" line="991"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="152"/>
<source>CSync unspecified error.</source>
<translation>Produciuse un erro non especificado de CSync</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="155"/>
<source>Aborted by the user</source>
<translation>Interrompido polo usuario</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="392"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>O nome de ficheiro conten caracteres incorrectos que non poden sincronizarse entre distintas plataformas.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="143"/>
<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="100"/>
+ <location filename="../src/libsync/syncengine.cpp" line="97"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <source>CSync failed due to unhandled permission denied.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="146"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="158"/>
<source>The service is temporarily unavailable</source>
<translation>O servizo está temporalmente inaccesíbel.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="175"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<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="230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="227"/>
<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="389"/>
+ <location filename="../src/libsync/syncengine.cpp" line="386"/>
<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="392"/>
+ <location filename="../src/libsync/syncengine.cpp" line="389"/>
<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="398"/>
+ <location filename="../src/libsync/syncengine.cpp" line="395"/>
<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="401"/>
+ <location filename="../src/libsync/syncengine.cpp" line="398"/>
<source>File is ignored because it's hidden.</source>
<translation>O ficheiro foi ignorado por estaren agochado.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="407"/>
+ <location filename="../src/libsync/syncengine.cpp" line="404"/>
<source>Stat failed.</source>
<translation>Fallou a obtención de estatísticas.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="429"/>
+ <location filename="../src/libsync/syncengine.cpp" line="426"/>
<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="561"/>
+ <location filename="../src/libsync/syncengine.cpp" line="558"/>
<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="631"/>
+ <location filename="../src/libsync/syncengine.cpp" line="612"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="645"/>
<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="718"/>
+ <location filename="../src/libsync/syncengine.cpp" line="723"/>
<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="965"/>
- <location filename="../src/libsync/syncengine.cpp" line="972"/>
+ <location filename="../src/libsync/syncengine.cpp" line="953"/>
+ <location filename="../src/libsync/syncengine.cpp" line="960"/>
<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="990"/>
+ <location filename="../src/libsync/syncengine.cpp" line="978"/>
<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="1023"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1011"/>
<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="1040"/>
- <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1028"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1048"/>
<source>Not allowed to remove, restoring</source>
<translation>Non está permitido retiralo, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1073"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1061"/>
<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="1128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1116"/>
<source>Move not allowed, item restored</source>
<translation>Nos está permitido movelo, elemento restaurado</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1125"/>
<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="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the destination</source>
<translation>o destino</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the source</source>
<translation>a orixe</translation>
</message>
</message>
</context>
<context>
- <name>OCC::TransmissionChecksumValidator</name>
+ <name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="128"/>
<source>The checksum header is malformed.</source>
<translation>A cabeceira da suma de comprobación é incorrecta.</translation>
</message>
<message>
<location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+ <source>The checksum header contained an unknown checksum type '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="148"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>O ficheiro descargado non coincide coa suma de comprobación. Retomase.</translation>
</message>
<source>Recent Changes</source>
<translation>Cambios recentes</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="561"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="331"/>
<source>Managed Folders:</source>
<source>Open %1 in browser</source>
<translation>Abrir %1 nun navegador</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="449"/>
- <source>Log out everywhere</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="457"/>
- <source>Log in everywhere...</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="513"/>
<source>Unknown status</source>
<source>Account %1: %2</source>
<translation>Conta %1: %2</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="449"/>
+ <source>Log out of all accounts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="457"/>
+ <source>Log in to all accounts...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="532"/>
<source>Crash now</source>
<source>No items synced recently</source>
<translation>Non hai elementos sincronizados recentemente</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="561"/>
- <source>Discovering '%1'</source>
- <translation>Atopando «%1»</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="566"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>%L1 B</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="306"/>
+ <location filename="../src/libsync/utility.cpp" line="303"/>
<source>%Ln year(s)</source>
<translation>%Ln ano(s)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="307"/>
+ <location filename="../src/libsync/utility.cpp" line="304"/>
<source>%Ln month(s)</source>
<translation>%Ln mes(es)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="308"/>
+ <location filename="../src/libsync/utility.cpp" line="305"/>
<source>%Ln day(s)</source>
<translation>%Ln día(s)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="309"/>
+ <location filename="../src/libsync/utility.cpp" line="306"/>
<source>%Ln hour(s)</source>
<translation>%Ln hora(s)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="310"/>
+ <location filename="../src/libsync/utility.cpp" line="307"/>
<source>%Ln minute(s)</source>
<translation>%Ln minuto(s)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="311"/>
+ <location filename="../src/libsync/utility.cpp" line="308"/>
<source>%Ln second(s)</source>
<translation>%Ln segundo(s)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="318"/>
<source>0 seconds</source>
<translation>0 segundos</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="336"/>
+ <location filename="../src/libsync/utility.cpp" line="333"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="73"/>
+ <source>Enter your credentials to connect to the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <source>Sign in</source>
+ <translation>Belépés</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="89"/>
<source>Remove the account configuration from the client</source>
<translation>Fiók beállítások eltávolítása a kliensből</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Remove Account</source>
<translation>Fiók eltávolítása</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="97"/>
+ <location filename="../src/gui/accountsettings.ui" line="113"/>
<source>Storage space: ...</source>
<translation>Tárhely mérete: ...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="167"/>
+ <location filename="../src/gui/accountsettings.ui" line="183"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>A jelöletlen könyvtárak <b>törlésre kerülnek</b> a helyi fájlrendszeredről és a továbbiakban nem lesz szinkronizálva ezzel a számítógéppel</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="230"/>
<source>Apply</source>
<translation>Alkalmaz</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="198"/>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
- <location filename="../src/gui/accountsettings.cpp" line="571"/>
+ <location filename="../src/gui/accountsettings.ui" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="289"/>
+ <location filename="../src/gui/accountsettings.cpp" line="646"/>
<source>Cancel</source>
<translation>Mégsem</translation>
</message>
<translation>Csatlakoztatva <user> felhasználóval ehhez: <server></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="115"/>
+ <location filename="../src/gui/accountsettings.cpp" line="121"/>
<source>No account configured.</source>
<translation>Nincs beállított kapcsolat.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="161"/>
+ <source>Choose what to sync</source>
+ <translation>Szinkronizálandó elemek kiválasztása</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="168"/>
+ <source>Remove folder sync connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="234"/>
<source>Folder creation failed</source>
<translation>Könyvtár létrehozása nem sikerült</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="230"/>
+ <location filename="../src/gui/accountsettings.cpp" line="235"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation><p>Nem lehet helyi könyvtárat létrehozni: <i>%1</i>.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="283"/>
- <source>Stop syncing</source>
- <translation>Szinkronizálás leállítása</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
+ <source>Confirm Folder Sync Connection Removal</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="309"/>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>Remove Folder Sync Connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="314"/>
<source>Confirm Folder Reset</source>
<translation>Könyvtár visszaállítás megerősítése</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="310"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="391"/>
+ <location filename="../src/gui/accountsettings.cpp" line="396"/>
<source>Sync Running</source>
<translation>Szinkronizálás fut</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="392"/>
+ <location filename="../src/gui/accountsettings.cpp" line="397"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>A szinkronizálás folyamatban van. <br/>Szakítsuk meg?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="472"/>
+ <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <source>%1 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="485"/>
<source>%1 as <i>%2</i></source>
<translation>%1, mint <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="476"/>
+ <location filename="../src/gui/accountsettings.cpp" line="495"/>
<source>Connected to %1.</source>
<translation>Csatlakozva: %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="478"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>%1 szerver jelenleg nem elérhető.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="480"/>
+ <location filename="../src/gui/accountsettings.cpp" line="499"/>
<source>Signed out from %1.</source>
<translation>Kijelentkezve innen: %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="482"/>
+ <location filename="../src/gui/accountsettings.cpp" line="501"/>
<source>No connection to %1 at %2.</source>
<translation>Nincs kapcsolat ehhez: %1 ekkor: %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
- <source>There are new folders that were not synchronized because they are too big: %1</source>
- <translation>Néhány új könyvtár nem lett szinkronizálva, mert túl nagyok: %1</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="536"/>
- <source>, </source>
- <translation>, </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <source>There are new folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="563"/>
+ <location filename="../src/gui/accountsettings.cpp" line="638"/>
<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="564"/>
+ <location filename="../src/gui/accountsettings.cpp" line="639"/>
<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éd 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="570"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>Remove connection</source>
<translation>Kapcsolat törlése</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="158"/>
<source>Open folder</source>
<translation>Könyvtár megnyitása</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="168"/>
- <source>Choose What to Sync</source>
- <translation>Szinkronizálandó elemek kiválasztása</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Resume sync</source>
<translation>Szinkronizálás folytatása</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Pause sync</source>
<translation>Szinkronizálás szüneteltetése</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="176"/>
- <source>Remove sync</source>
- <translation>Szinkronizálás törlése</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="277"/>
- <source>Confirm Sync Removal</source>
- <translation>Szinkronizálás törlésének megerősítése</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="278"/>
+ <location filename="../src/gui/accountsettings.cpp" line="283"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>Tényleg leszeretnéd állítani <i>%1</i> könyvtár szinkronizálását?</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="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="452"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) / %2 használatban. Néhány könyvtár - beleértve a hálózati megosztásokat és a megosztott könyvtárakat - eltérő korlátozással rendelkezhet.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="448"/>
+ <location filename="../src/gui/accountsettings.cpp" line="453"/>
<source>%1 of %2 in use</source>
<translation>%1 / %2 használatban</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="453"/>
+ <location filename="../src/gui/accountsettings.cpp" line="462"/>
<source>Currently there is no storage usage information available.</source>
<translation>Jelenleg nem érhető el tárhelyhasználati információ.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="507"/>
<source>No %1 connection configured.</source>
<translation>Nincs beállított kapcsolat: %1.</translation>
</message>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="95"/>
+ <location filename="../src/gui/accountstate.cpp" line="99"/>
<source>Signed out</source>
<translation>Kijelentkezve</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="97"/>
+ <location filename="../src/gui/accountstate.cpp" line="101"/>
<source>Disconnected</source>
<translation>Szétcsatlakozva</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="99"/>
+ <location filename="../src/gui/accountstate.cpp" line="103"/>
<source>Connected</source>
<translation>Csatlakozva</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="101"/>
+ <location filename="../src/gui/accountstate.cpp" line="105"/>
<source>Service unavailable</source>
<translation>Szolgáltatás nem érhető el</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="103"/>
+ <location filename="../src/gui/accountstate.cpp" line="107"/>
<source>Network error</source>
<translation>Hálózati hiba</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="105"/>
+ <location filename="../src/gui/accountstate.cpp" line="109"/>
<source>Configuration error</source>
<translation>Beállítási hiba</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="107"/>
+ <location filename="../src/gui/accountstate.cpp" line="111"/>
<source>Unknown account state</source>
<translation>Ismeretlen fiók állapot</translation>
</message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>Reauthentication required</source>
+ <translation>Felhasználóazonosítás szükséges</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>You need to re-login to continue using the account %1.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="143"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="135"/>
<source>Authentication error: Either username or password are wrong.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="155"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="147"/>
<source>timeout</source>
<translation>időtúllépés</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="186"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="178"/>
<source>The provided credentials are not correct</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="524"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="537"/>
<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="107"/>
+ <location filename="../src/gui/folder.cpp" line="108"/>
<source>Unable to create csync-context</source>
<translation type="unfinished"/>
</message>
<translation>Szinkronizálási aktivitás</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="845"/>
+ <location filename="../src/gui/folder.cpp" line="870"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1102"/>
+ <location filename="../src/gui/folder.cpp" line="1127"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1115"/>
+ <location filename="../src/gui/folder.cpp" line="1140"/>
<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="1119"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Remove All Files?</source>
<translation>El legyen távolítva az összes fájl?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1121"/>
+ <location filename="../src/gui/folder.cpp" line="1146"/>
<source>Remove all files</source>
<translation>Összes fájl eltávolítása</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1122"/>
+ <location filename="../src/gui/folder.cpp" line="1147"/>
<source>Keep files</source>
<translation>Fájlok megtartása</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="275"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<source>Could not reset folder state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="276"/>
+ <location filename="../src/gui/folderman.cpp" line="271"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="877"/>
+ <location filename="../src/gui/folderman.cpp" line="865"/>
<source> (backup)</source>
<translation>(biztonsági mentés)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="882"/>
+ <location filename="../src/gui/folderman.cpp" line="870"/>
<source> (backup %1)</source>
<translation>(biztonsági mentés: %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1091"/>
+ <location filename="../src/gui/folderman.cpp" line="1079"/>
<source>Undefined State.</source>
<translation>Ismeretlen állapot.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1094"/>
- <source>Waits to start syncing.</source>
- <translation>Várakozás a szinkronizálás elindítására.</translation>
+ <location filename="../src/gui/folderman.cpp" line="1082"/>
+ <source>Waiting to start syncing.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1097"/>
+ <location filename="../src/gui/folderman.cpp" line="1085"/>
<source>Preparing for sync.</source>
<translation>Előkészítés szinkronizációhoz.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1100"/>
+ <location filename="../src/gui/folderman.cpp" line="1088"/>
<source>Sync is running.</source>
<translation>Szinkronizálás fut.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1103"/>
+ <location filename="../src/gui/folderman.cpp" line="1091"/>
<source>Last Sync was successful.</source>
<translation>Legutolsó szinkronizálás sikeres volt.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1108"/>
+ <location filename="../src/gui/folderman.cpp" line="1096"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Az utolsó szinkronizáció sikeresen lefutott, de néhány figyelmeztetés van.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1111"/>
+ <location filename="../src/gui/folderman.cpp" line="1099"/>
<source>Setup Error.</source>
<translation>Beállítás hiba.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1114"/>
+ <location filename="../src/gui/folderman.cpp" line="1102"/>
<source>User Abort.</source>
<translation>Felhasználó megszakította.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1117"/>
+ <location filename="../src/gui/folderman.cpp" line="1105"/>
<source>Sync is paused.</source>
<translation>Szinkronizálás megállítva.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1123"/>
+ <location filename="../src/gui/folderman.cpp" line="1111"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (szinkronizálás megállítva)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1119"/>
<source>No valid folder selected!</source>
<translation>Nincs érvényes könyvtár kiválasztva!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1130"/>
<source>The selected path is not a folder!</source>
<translation>A kiválasztott elérési út nem könyvtár!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1146"/>
+ <location filename="../src/gui/folderman.cpp" line="1134"/>
<source>You have no permission to write to the selected folder!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1161"/>
+ <location filename="../src/gui/folderman.cpp" line="1149"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1166"/>
+ <location filename="../src/gui/folderman.cpp" line="1154"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1173"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1168"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1186"/>
+ <location filename="../src/gui/folderman.cpp" line="1174"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="85"/>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="274"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="271"/>
<source>File</source>
<translation>Fájl</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="228"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="224"/>
<source>Syncing selected files in your account with</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="231"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="227"/>
<source>Remote path: %1</source>
<translation>Távoli elérési út: %1</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="121"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="122"/>
<source>You need to be connected to add a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="126"/>
- <source>Adding folder is disabled because your 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="131"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="132"/>
<source>Click this button to add a folder to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="141"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="142"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="156"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
<source>Error while loading the list of folders from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="182"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="192"/>
<source>Signed out</source>
<translation>Kijelentkezve</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="727"/>
- <source>Discovering '%1'</source>
- <translation>'%1' felderítése</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="127"/>
+ <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="163"/>
+ <source>Fetching folder list from server...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="789"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="787"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="849"/>
<source>Syncing %1</source>
<translation>%1 szinkronizálása</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="792"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="854"/>
<source>download %1/s</source>
<translation>letöltés %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="794"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="856"/>
<source>u2193 %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="800"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>upload %1/s</source>
<translation>feltöltés: %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="802"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="864"/>
<source>u2191 %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="807"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="869"/>
<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="811"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="873"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="827"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="889"/>
<source>%1 of %2, file %3 of %4
Total time left %5</source>
<translation>%1 / %2, fájl %3 / %4
Hátralévő idő: %5</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
<source>file %1 of %2</source>
<translation>%1 / %2 fájl</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="932"/>
<source>Waiting...</source>
<translation>Várakozás...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="934"/>
<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="878"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>Preparing to sync...</source>
<translation>Felkészülés szinkronizálásra...</translation>
</message>
<name>OCC::FolderWizard</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <source>Add Folder Sync Connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderwizard.cpp" line="564"/>
- <source>Add Folder</source>
- <translation>Mappa hozzáadása</translation>
+ <source>Add Sync Connection</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Haladó</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="61"/>
+ <location filename="../src/gui/generalsettings.ui" line="109"/>
<source>Ask confirmation before downloading folders larger than</source>
<translation>Megerősítés kérése, mielőtt letölti a nagyobb fájlokat, mint</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
+ <location filename="../src/gui/generalsettings.ui" line="129"/>
<source>MB</source>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="109"/>
+ <location filename="../src/gui/generalsettings.ui" line="159"/>
<source>Show crash reporter</source>
<translation>Hibajelentő megjelenítése</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="118"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit Ignored Files</source>
<translation>Kihagyott fájlok szerkesztése</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="142"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
<source>Add an Account</source>
<translation>Fiók hozzáadása</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="167"/>
- <location filename="../src/gui/generalsettings.ui" line="173"/>
+ <location filename="../src/gui/generalsettings.ui" line="171"/>
+ <location filename="../src/gui/generalsettings.ui" line="177"/>
<source>About</source>
<translation>Rólunk</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <location filename="../src/gui/generalsettings.ui" line="187"/>
<source>Updates</source>
<translation>Frissítések</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="208"/>
+ <location filename="../src/gui/generalsettings.ui" line="212"/>
<source>&Restart && Update</source>
<translation>&Újraindítás és frissítés</translation>
</message>
</context>
-<context>
- <name>OCC::HttpCredentials</name>
- <message>
- <location filename="../src/libsync/creds/httpcredentials.cpp" line="290"/>
- <source>Reading from keychain failed with error: '%1'</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="32"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
<source>Please enter %1 password:
User: %2
</translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="41"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <source>Reading from keychain failed with error: '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
<source>Enter Password</source>
<translation>Jelszómegadás</translation>
</message>
<translation>Eltávolítás</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="40"/>
<source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="109"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
<source>Could not open file</source>
<translation>Nem sikerült a fájl megnyitása</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="111"/>
<source>Cannot write changes to '%1'.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="138"/>
<source>Add Ignore Pattern</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>Add a new ignore pattern:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="45"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="46"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="163"/>
+ <location filename="../src/libsync/logger.cpp" line="190"/>
<source>Error</source>
<translation>Hiba</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="164"/>
+ <location filename="../src/libsync/logger.cpp" line="191"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>'%1' fájlt<br/>nem lehet írásra megnyitni.<br/><br/>A naplózás kimenete <b>nem</b> menthető!</nobr></translation>
</message>
</message>
<message>
<location filename="../src/gui/networksettings.ui" line="203"/>
- <location filename="../src/gui/networksettings.ui" line="295"/>
+ <location filename="../src/gui/networksettings.ui" line="292"/>
<source>No limit</source>
<translation>Nincs korlát</translation>
</message>
<source>SOCKS5 proxy</source>
<translation>SOCKS5 proxy</translation>
</message>
+ <message>
+ <location filename="../src/gui/networksettings.cpp" line="128"/>
+ <source>Qt >= 5.4 is required in order to use the bandwidth limit</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::OCUpdater</name>
<source>Downloading version %1. Please wait...</source>
<translation>%1 verzió letöltése. Kérjük, várjon...</translation>
</message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
- <source>Version %1 available. Restart application to start the update.</source>
- <translation>%1 verzió rendelkezésre áll. a frissítéshez indítsd újra az alkalmazást.</translation>
- </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="145"/>
<source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
<source>Could not check for new updates.</source>
<translation>Nem lehet ellenőrzi a frissítéseket.</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
+ <source>%1 version %2 available. Restart application to start the update.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
- <source>New version %1 available. Please use the system's update tool to install it.</source>
- <translation>%1 új verzió elérhető. Kérjük, használd a rendszer frissítő eszközét a telepítésre.</translation>
+ <source>New %1 version %2 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="151"/>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="114"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="110"/>
<source>Connection Timeout</source>
<translation>Kapcsolat időtúllépés</translation>
</message>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="171"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="167"/>
<source>Invalid JSON reply from the poll URL</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="435"/>
- <source>Sync was aborted by user.</source>
- <translation>A szinkronizálást a felhasználó megszakította.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="488"/>
- <source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="494"/>
- <source>We received a different E-Tag for resuming. Retrying next time.</source>
- <translation type="unfinished"/>
- </message>
+ <name>OCC::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="516"/>
- <source>Server returned wrong content-range</source>
+ <location filename="../src/libsync/propagatedownload.cpp" line="315"/>
+ <source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="567"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
+ <source>The download would reduce free disk space below %1</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="315"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
+ <location filename="../src/libsync/propagatedownload.cpp" line="372"/>
+ <source>Free space on disk is less than %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="457"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="482"/>
<source>File was deleted from server</source>
<translation>A fájl törlésre került a szerverről</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="506"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="531"/>
<source>The file could not be downloaded completely.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="601"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="636"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="641"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="676"/>
<source>File has changed since discovery</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateItemJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="92"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
<source>; Restoration Failed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="138"/>
<source>Continue blacklisting:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="230"/>
<source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove folder '%1';</source>
+ <source>Could not remove folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="243"/>
- <location filename="../src/libsync/propagator_legacy.cpp" line="302"/>
- <source>Local file changed during sync, syncing once it arrived completely</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="246"/>
- <source>Sync was aborted by user.</source>
- <translation>A szinkronizálást a felhasználó megszakította.</translation>
- </message>
+ <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="252"/>
- <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="205"/>
+ <source>File name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="226"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="262"/>
<source>File Removed</source>
<translation>Fájl törölve</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="274"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="250"/>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="286"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="665"/>
<source>Local file changed during sync.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="558"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="592"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="566"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="600"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="597"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="631"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="620"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="654"/>
<source>The local file was removed during sync.</source>
<translation>A helyi fájl el lett távolítva a szinkronizálás alatt.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="646"/>
- <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="680"/>
+ <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>A jelöletlen könyvtárak <b>törlésre kerülnek</b> a helyi fájlrendszeredről és a továbbiakban nem lesz szinkronizálva ezzel a számítógéppel</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
<source>Choose What to Sync</source>
<translation>Szinkronizálandó elemek kiválasztása</translation>
</message>
<translation>Méret</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
<source>No subfolders currently on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
<source>An error occured while loading the list of sub folders.</source>
<translation type="unfinished"/>
</message>
<translation>Beállítások</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="80"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="84"/>
<source>Activity</source>
<translation>Aktivitás</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="86"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="90"/>
<source>General</source>
<translation>Általános</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>Network</source>
<translation>Hálózat</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharedialog.ui" line="22"/>
- <location filename="../src/gui/sharedialog.ui" line="234"/>
+ <location filename="../src/gui/sharedialog.ui" line="258"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<translation>ownCloud útvonala:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="182"/>
+ <location filename="../src/gui/sharedialog.ui" line="116"/>
<source>Set &password </source>
<translation>&Jelszó beállítása</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="196"/>
+ <location filename="../src/gui/sharedialog.ui" line="130"/>
<source>Set &expiration date</source>
<translation>&Lejárati dátum beállítása</translation>
</message>
+ <message>
+ <location filename="../src/gui/sharedialog.ui" line="214"/>
+ <source>Allow editing</source>
+ <translation>Szerkesztés engedélyezése</translation>
+ </message>
<message>
<location filename="../src/gui/sharedialog.ui" line="77"/>
<source>Share link</source>
<translation>Megosztás hivatkozással</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="125"/>
+ <location filename="../src/gui/sharedialog.ui" line="203"/>
<source>Copy &link</source>
<translation>&Hivatkozás másolása</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="142"/>
+ <location filename="../src/gui/sharedialog.ui" line="154"/>
<source>Set password</source>
<translation>Jelszó beállítása</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="692"/>
- <source>%1 path: %2</source>
- <translation>%1 útvonala: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="115"/>
+ <location filename="../src/gui/sharedialog.cpp" line="120"/>
<source>%1 Sharing</source>
<translation>%1 megosztás</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="103"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="112"/>
+ <location filename="../src/gui/sharedialog.cpp" line="117"/>
<source>Folder: %2</source>
<translation>Könyvtár: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="121"/>
<source>P&assword protect</source>
<translation>J&elszóval védve</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="221"/>
+ <location filename="../src/gui/sharedialog.cpp" line="214"/>
<source>Password Protected</source>
<translation>Jelszóval védett</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="382"/>
+ <location filename="../src/gui/sharedialog.cpp" line="338"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>A fájlt nem lehetett megosztani, mert megosztási jogosultság nélkül lett megosztva.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="528"/>
+ <location filename="../src/gui/sharedialog.cpp" line="475"/>
<source>Please Set Password</source>
<translation>Kérjük, állíts be egy jelszót</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="564"/>
- <location filename="../src/gui/sharedialog.cpp" line="565"/>
+ <location filename="../src/gui/sharedialog.cpp" line="538"/>
+ <location filename="../src/gui/sharedialog.cpp" line="539"/>
<source>&Share link</source>
<translation>Hivatkozás &megosztása</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="583"/>
+ <location filename="../src/gui/sharedialog.cpp" line="552"/>
+ <location filename="../src/gui/sharedialog.cpp" line="564"/>
<source>OCS API error code: %1</source>
<translation>OCS API hibakód: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="605"/>
- <source>There is no sync folder configured.</source>
- <translation>Nincs szinkronizálási könyvtár beállítva.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="639"/>
- <source>A sync file with the same name exists. The file cannot be registered to sync.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="684"/>
- <source>The file cannot be synced.</source>
- <translation>A fájlt nem lehetett szinkronizálni.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="624"/>
- <source>Sharing of external directories is not yet working.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="473"/>
- <location filename="../src/gui/sharedialog.cpp" line="506"/>
+ <location filename="../src/gui/sharedialog.cpp" line="418"/>
+ <location filename="../src/gui/sharedialog.cpp" line="460"/>
<source>Public sh&aring requires a password</source>
<translation>Nyilvános me&gosztáshoz szükség van jelszóra</translation>
</message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="617"/>
- <source>Cannot find a folder to upload to.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
- <source>Waiting to upload...</source>
- <translation>Várakozás feltöltésre...</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="653"/>
- <source>Unable to register in sync space.</source>
- <translation>Nem lehet regisztrálni a szinkronizálási helyen.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="694"/>
- <source>Sync of registered file was not successful yet.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>Login Error</source>
<translation>Bejelentkezési hiba</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>You must sign in as user %1</source>
<translation>%1 felhasználóként kell belépned</translation>
</message>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="452"/>
+ <location filename="../src/gui/socketapi.cpp" line="447"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Megosztás vele: %1</translation>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="97"/>
+ <location filename="../src/libsync/syncengine.cpp" line="94"/>
<source>Success.</source>
<translation>Sikerült.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="104"/>
+ <location filename="../src/libsync/syncengine.cpp" line="101"/>
<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="107"/>
+ <location filename="../src/libsync/syncengine.cpp" line="104"/>
<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="110"/>
+ <location filename="../src/libsync/syncengine.cpp" line="107"/>
<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="113"/>
+ <location filename="../src/libsync/syncengine.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>Hiba a CSync memórifoglalásakor.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>CSync hibás paraméterhiba.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="119"/>
+ <location filename="../src/libsync/syncengine.cpp" line="116"/>
<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="122"/>
+ <location filename="../src/libsync/syncengine.cpp" line="119"/>
<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="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="122"/>
<source>CSync could not authenticate at the proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="125"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="128"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="131"/>
<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="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="134"/>
<source>A network connection timeout happened.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="137"/>
<source>A HTTP transmission error happened.</source>
<translation>HTTP átviteli hiba történt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation>CSync hiba, nincs kezelési jogosultság.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
<source>An error occurred while opening a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
<source>Error while reading folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="996"/>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
<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="1003"/>
+ <location filename="../src/libsync/syncengine.cpp" line="991"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="152"/>
<source>CSync unspecified error.</source>
<translation>CSync ismeretlen hiba.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="155"/>
<source>Aborted by the user</source>
<translation>Felhasználó megszakította</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="392"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="143"/>
<source>CSync failed to access</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <location filename="../src/libsync/syncengine.cpp" line="97"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <source>CSync failed due to unhandled permission denied.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="146"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="158"/>
<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="175"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>An internal error number %1 occurred.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="227"/>
<source>The item is not synced because of previous errors: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="389"/>
+ <location filename="../src/libsync/syncengine.cpp" line="386"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="392"/>
+ <location filename="../src/libsync/syncengine.cpp" line="389"/>
<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="398"/>
+ <location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename is too long.</source>
<translation>Fájlnév túl nagy.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="401"/>
+ <location filename="../src/libsync/syncengine.cpp" line="398"/>
<source>File is ignored because it's hidden.</source>
<translation>Fájl kihagyva, mert rejtett.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="407"/>
+ <location filename="../src/libsync/syncengine.cpp" line="404"/>
<source>Stat failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="429"/>
+ <location filename="../src/libsync/syncengine.cpp" line="426"/>
<source>Filename encoding is not valid</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="561"/>
+ <location filename="../src/libsync/syncengine.cpp" line="558"/>
<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="631"/>
+ <location filename="../src/libsync/syncengine.cpp" line="612"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="645"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="718"/>
+ <location filename="../src/libsync/syncengine.cpp" line="723"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="965"/>
- <location filename="../src/libsync/syncengine.cpp" line="972"/>
+ <location filename="../src/libsync/syncengine.cpp" line="953"/>
+ <location filename="../src/libsync/syncengine.cpp" line="960"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <location filename="../src/libsync/syncengine.cpp" line="978"/>
<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="1023"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1011"/>
<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="1040"/>
- <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1028"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1048"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1073"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1061"/>
<source>Local files and share folder removed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1116"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1125"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the destination</source>
<translation>a cél</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the source</source>
<translation>a forrás</translation>
</message>
</message>
</context>
<context>
- <name>OCC::TransmissionChecksumValidator</name>
+ <name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="128"/>
<source>The checksum header is malformed.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+ <source>The checksum header contained an unknown checksum type '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="148"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation type="unfinished"/>
</message>
<source>Recent Changes</source>
<translation>Legutóbbi változások</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="561"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="331"/>
<source>Managed Folders:</source>
<source>Open %1 in browser</source>
<translation>%1 megnyitása böngészőben</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="449"/>
- <source>Log out everywhere</source>
- <translation>Kijelentkezés mindenhonnan</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="457"/>
- <source>Log in everywhere...</source>
- <translation>Bejelentkezés mindenhova</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="513"/>
<source>Unknown status</source>
<source>Account %1: %2</source>
<translation>%1 fiók: %2</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="449"/>
+ <source>Log out of all accounts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="457"/>
+ <source>Log in to all accounts...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="532"/>
<source>Crash now</source>
<source>No items synced recently</source>
<translation>Mostanában nincs szinkronizált elem</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="561"/>
- <source>Discovering '%1'</source>
- <translation>'%1' felderítése</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="566"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>%L1 B</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="306"/>
+ <location filename="../src/libsync/utility.cpp" line="303"/>
<source>%Ln year(s)</source>
<translation>%ln év</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="307"/>
+ <location filename="../src/libsync/utility.cpp" line="304"/>
<source>%Ln month(s)</source>
<translation>%ln hónap</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="308"/>
+ <location filename="../src/libsync/utility.cpp" line="305"/>
<source>%Ln day(s)</source>
<translation>%Ln nap</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="309"/>
+ <location filename="../src/libsync/utility.cpp" line="306"/>
<source>%Ln hour(s)</source>
<translation>%Ln óra</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="310"/>
+ <location filename="../src/libsync/utility.cpp" line="307"/>
<source>%Ln minute(s)</source>
<translation>%Ln perc</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="311"/>
+ <location filename="../src/libsync/utility.cpp" line="308"/>
<source>%Ln second(s)</source>
<translation>%Ln másodperc</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="318"/>
<source>0 seconds</source>
<translation>0 másodperc</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="336"/>
+ <location filename="../src/libsync/utility.cpp" line="333"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="73"/>
+ <source>Enter your credentials to connect to the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <source>Sign in</source>
+ <translation>Accedi</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="89"/>
<source>Remove the account configuration from the client</source>
<translation>Rimuovi la configurazione dell'account dal client</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Remove Account</source>
<translation>Rimuovi account</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="97"/>
+ <location filename="../src/gui/accountsettings.ui" line="113"/>
<source>Storage space: ...</source>
<translation>Spazio di archiviazione: ...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="167"/>
+ <location filename="../src/gui/accountsettings.ui" line="183"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Le cartelle non marcate saranno <b>rimosse</b> dal file system locale e non saranno sincronizzate più con questo computer</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="230"/>
<source>Apply</source>
<translation>Applica</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="198"/>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
- <location filename="../src/gui/accountsettings.cpp" line="571"/>
+ <location filename="../src/gui/accountsettings.ui" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="289"/>
+ <location filename="../src/gui/accountsettings.cpp" line="646"/>
<source>Cancel</source>
<translation>Annulla</translation>
</message>
<translation>Connesso a <server> come <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="115"/>
+ <location filename="../src/gui/accountsettings.cpp" line="121"/>
<source>No account configured.</source>
<translation>Nessun account configurato.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="161"/>
+ <source>Choose what to sync</source>
+ <translation>Scegli cosa sincronizzare</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="168"/>
+ <source>Remove folder sync connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="234"/>
<source>Folder creation failed</source>
<translation>Creazione della cartella non riuscita</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="230"/>
+ <location filename="../src/gui/accountsettings.cpp" line="235"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation><p>Impossibile creare la cartella locale <i>%1</i>.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="283"/>
- <source>Stop syncing</source>
- <translation>Ferma la sincronizzazione</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
+ <source>Confirm Folder Sync Connection Removal</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="309"/>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>Remove Folder Sync Connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="314"/>
<source>Confirm Folder Reset</source>
<translation>Conferma il ripristino della cartella</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="310"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Vuoi davvero ripristinare la cartella <i>%1</i> e ricostruire il database del client?</p><p><b>Nota:</b> questa funzione è destinata solo a scopi di manutenzione. Nessun file sarà rimosso, ma può causare un significativo traffico di dati e richiedere diversi minuti oppure ore, in base alla dimensione della cartella. Utilizza questa funzione solo se consigliata dal tuo amministratore.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="391"/>
+ <location filename="../src/gui/accountsettings.cpp" line="396"/>
<source>Sync Running</source>
<translation>La sincronizzazione è in corso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="392"/>
+ <location filename="../src/gui/accountsettings.cpp" line="397"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>L'operazione di sincronizzazione è in corso.<br/>Vuoi terminarla?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="472"/>
+ <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <source>%1 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="485"/>
<source>%1 as <i>%2</i></source>
<translation>%1 come <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="476"/>
+ <location filename="../src/gui/accountsettings.cpp" line="495"/>
<source>Connected to %1.</source>
<translation>Connesso a %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="478"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Il server %1 è temporaneamente non disponibile.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="480"/>
+ <location filename="../src/gui/accountsettings.cpp" line="499"/>
<source>Signed out from %1.</source>
<translation>Disconnesso da %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="482"/>
+ <location filename="../src/gui/accountsettings.cpp" line="501"/>
<source>No connection to %1 at %2.</source>
<translation>Nessuna connessione a %1 su %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
- <source>There are new folders that were not synchronized because they are too big: %1</source>
- <translation>Ci sono nuove cartelle condivise che non sono state sincronizzate poiché sono troppo grandi: %1</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="536"/>
- <source>, </source>
- <translation>, </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <source>There are new folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="563"/>
+ <location filename="../src/gui/accountsettings.cpp" line="638"/>
<source>Confirm Account Removal</source>
<translation>Conferma rimozione account</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="564"/>
+ <location filename="../src/gui/accountsettings.cpp" line="639"/>
<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="570"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>Remove connection</source>
<translation>Rimuovi connessione</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="158"/>
<source>Open folder</source>
<translation>Apri cartella</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="168"/>
- <source>Choose What to Sync</source>
- <translation>Scegli cosa sincronizzare</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Resume sync</source>
<translation>Riprendi la sincronizzazione</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Pause sync</source>
<translation>Sospendi la sincronizzazione</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="176"/>
- <source>Remove sync</source>
- <translation>Rimuovi sincronizzazione</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="277"/>
- <source>Confirm Sync Removal</source>
- <translation>Conferma rimozione sincronizzazione</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="278"/>
+ <location filename="../src/gui/accountsettings.cpp" line="283"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>Vuoi davvero fermare la sincronizzazione della cartella <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="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="452"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) di %2 in uso. Alcune cartelle, incluse quelle montate in rete o le cartelle condivise, potrebbero avere limiti diversi.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="448"/>
+ <location filename="../src/gui/accountsettings.cpp" line="453"/>
<source>%1 of %2 in use</source>
<translation>%1% di %2 in uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="453"/>
+ <location filename="../src/gui/accountsettings.cpp" line="462"/>
<source>Currently there is no storage usage information available.</source>
<translation>Non ci sono informazioni disponibili sull'utilizzo dello spazio di archiviazione.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="507"/>
<source>No %1 connection configured.</source>
<translation>Nessuna connessione di %1 configurata.</translation>
</message>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="95"/>
+ <location filename="../src/gui/accountstate.cpp" line="99"/>
<source>Signed out</source>
<translation>Disconnesso</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="97"/>
+ <location filename="../src/gui/accountstate.cpp" line="101"/>
<source>Disconnected</source>
<translation>Disconnesso</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="99"/>
+ <location filename="../src/gui/accountstate.cpp" line="103"/>
<source>Connected</source>
<translation>Connesso</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="101"/>
+ <location filename="../src/gui/accountstate.cpp" line="105"/>
<source>Service unavailable</source>
<translation>Servizio non disponibile</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="103"/>
+ <location filename="../src/gui/accountstate.cpp" line="107"/>
<source>Network error</source>
<translation>Errore di rete</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="105"/>
+ <location filename="../src/gui/accountstate.cpp" line="109"/>
<source>Configuration error</source>
<translation>Errore di configurazione</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="107"/>
+ <location filename="../src/gui/accountstate.cpp" line="111"/>
<source>Unknown account state</source>
<translation>Stato dell'account sconosciuto</translation>
</message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>Reauthentication required</source>
+ <translation>Nuova autenticazione richiesta</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>You need to re-login to continue using the account %1.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
<translation>Aggiorna all'ultima versione del server e riavvia il client.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="143"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="135"/>
<source>Authentication error: Either username or password are wrong.</source>
<translation>Errore di autenticazione: nome utente o password errati.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="155"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="147"/>
<source>timeout</source>
<translation>timeout</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="186"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="178"/>
<source>The provided credentials are not correct</source>
<translation>Le credenziali fornite non sono corrette</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="524"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="537"/>
<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="107"/>
+ <location filename="../src/gui/folder.cpp" line="108"/>
<source>Unable to create csync-context</source>
<translation>Impossibile creare il contesto csync</translation>
</message>
<translation>Sincronizza attività</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="845"/>
+ <location filename="../src/gui/folder.cpp" line="870"/>
<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="1102"/>
+ <location filename="../src/gui/folder.cpp" line="1127"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Una nuova cartella più grande di %1 MB è stata aggiunta: %2.
Vai nelle impostazioni per selezionarla se desideri scaricarla.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1115"/>
+ <location filename="../src/gui/folder.cpp" line="1140"/>
<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="1119"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Remove All Files?</source>
<translation>Vuoi rimuovere tutti i file?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1121"/>
+ <location filename="../src/gui/folder.cpp" line="1146"/>
<source>Remove all files</source>
<translation>Rimuovi tutti i file</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1122"/>
+ <location filename="../src/gui/folder.cpp" line="1147"/>
<source>Keep files</source>
<translation>Mantieni i file</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="275"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<source>Could not reset folder state</source>
<translation>Impossibile ripristinare lo stato della cartella</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="276"/>
+ <location filename="../src/gui/folderman.cpp" line="271"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>È stato trovato un vecchio registro di sincronizzazione '%1', ma non può essere rimosso. Assicurati che nessuna applicazione lo stia utilizzando.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="877"/>
+ <location filename="../src/gui/folderman.cpp" line="865"/>
<source> (backup)</source>
<translation>(copia di sicurezza)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="882"/>
+ <location filename="../src/gui/folderman.cpp" line="870"/>
<source> (backup %1)</source>
<translation>(copia di sicurezza %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1091"/>
+ <location filename="../src/gui/folderman.cpp" line="1079"/>
<source>Undefined State.</source>
<translation>Stato non definito.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1094"/>
- <source>Waits to start syncing.</source>
- <translation>Attende l'inizio della sincronizzazione.</translation>
+ <location filename="../src/gui/folderman.cpp" line="1082"/>
+ <source>Waiting to start syncing.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1097"/>
+ <location filename="../src/gui/folderman.cpp" line="1085"/>
<source>Preparing for sync.</source>
<translation>Preparazione della sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1100"/>
+ <location filename="../src/gui/folderman.cpp" line="1088"/>
<source>Sync is running.</source>
<translation>La sincronizzazione è in corso.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1103"/>
+ <location filename="../src/gui/folderman.cpp" line="1091"/>
<source>Last Sync was successful.</source>
<translation>L'ultima sincronizzazione è stata completata correttamente.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1108"/>
+ <location filename="../src/gui/folderman.cpp" line="1096"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Ultima sincronizzazione avvenuta, ma con avvisi relativi a singoli file.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1111"/>
+ <location filename="../src/gui/folderman.cpp" line="1099"/>
<source>Setup Error.</source>
<translation>Errore di configurazione.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1114"/>
+ <location filename="../src/gui/folderman.cpp" line="1102"/>
<source>User Abort.</source>
<translation>Interrotto dall'utente.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1117"/>
+ <location filename="../src/gui/folderman.cpp" line="1105"/>
<source>Sync is paused.</source>
<translation>La sincronizzazione è sospesa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1123"/>
+ <location filename="../src/gui/folderman.cpp" line="1111"/>
<source>%1 (Sync is paused)</source>
<translation> %1 (La sincronizzazione è sospesa)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1119"/>
<source>No valid folder selected!</source>
<translation>Nessuna cartella valida selezionata!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1130"/>
<source>The selected path is not a folder!</source>
<translation>Il percorso selezionato non è una cartella!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1146"/>
+ <location filename="../src/gui/folderman.cpp" line="1134"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Non hai i permessi di scrittura per la cartella selezionata!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1161"/>
+ <location filename="../src/gui/folderman.cpp" line="1149"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>La cartella locale %1 è già utilizzata in una connessione di sincronizzazione delle cartelle. Selezionane un'altra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1166"/>
+ <location filename="../src/gui/folderman.cpp" line="1154"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>La cartella locale %1 contiene già una cartella utilizzata in una connessione di sincronizzazione delle cartelle. Selezionane un'altra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1173"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>La cartella locale %1 è un collegamento simbolico. La destinazione del collegamento contiene già una cartella utilizzata in una connessione di sincronizzazione delle cartelle. Selezionane un'altra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1168"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>La cartella locale %1 è già contenuta in una cartella utilizzata in una connessione di sincronizzazione delle cartelle. Selezionane un'altra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1186"/>
+ <location filename="../src/gui/folderman.cpp" line="1174"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>La cartella locale %1 è un collegamento simbolico. La destinazione del collegamento è già contenuta in una cartella utilizzata in una connessione di sincronizzazione delle cartelle. Selezionane un'altra!</translation>
</message>
<translation>Aggiungi connessioni di sincronizzazione cartelle</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="85"/>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="274"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="271"/>
<source>File</source>
<translation>File</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="228"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="224"/>
<source>Syncing selected files in your account with</source>
<translation>Sincronizzazione dei file selezionati nel tuo account con</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="231"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="227"/>
<source>Remote path: %1</source>
<translation>Percorso remoto: %1</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="121"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="122"/>
<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="126"/>
- <source>Adding folder is disabled because your 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="131"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="132"/>
<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="141"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="142"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="156"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
<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="182"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="192"/>
<source>Signed out</source>
<translation>Disconnesso</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="727"/>
- <source>Discovering '%1'</source>
- <translation>Rilevamento '%1'</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="127"/>
+ <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="787"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="163"/>
+ <source>Fetching folder list from server...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="789"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="849"/>
<source>Syncing %1</source>
<translation>Sincronizzazione di %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="792"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="854"/>
<source>download %1/s</source>
<translation>ricezione %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="794"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="856"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="800"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>upload %1/s</source>
<translation>invio %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="802"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="864"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="807"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="869"/>
<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="811"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="873"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="827"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="889"/>
<source>%1 of %2, file %3 of %4
Total time left %5</source>
<translation>%1 di %2, file %3 di %4
Totale tempo rimanente %5</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
<source>file %1 of %2</source>
<translation>file %1 di %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="932"/>
<source>Waiting...</source>
<translation>Attendere...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="934"/>
<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="878"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>Preparing to sync...</source>
<translation>Preparazione della sincronizzazione...</translation>
</message>
<name>OCC::FolderWizard</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <source>Add Folder Sync Connection</source>
+ <translation>Aggiungi connessioni di sincronizzazione cartelle</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderwizard.cpp" line="564"/>
- <source>Add Folder</source>
- <translation>Aggiungi cartella</translation>
+ <source>Add Sync Connection</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Avanzate</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="61"/>
+ <location filename="../src/gui/generalsettings.ui" line="109"/>
<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="81"/>
+ <location filename="../src/gui/generalsettings.ui" line="129"/>
<source>MB</source>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="109"/>
+ <location filename="../src/gui/generalsettings.ui" line="159"/>
<source>Show crash reporter</source>
<translation>Mostra il rapporto di chiusura inattesa</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="118"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit Ignored Files</source>
<translation>Modifica file ignorati</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="142"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
<source>Add an Account</source>
<translation>Aggiungi un account</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="167"/>
- <location filename="../src/gui/generalsettings.ui" line="173"/>
+ <location filename="../src/gui/generalsettings.ui" line="171"/>
+ <location filename="../src/gui/generalsettings.ui" line="177"/>
<source>About</source>
<translation>Informazioni</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <location filename="../src/gui/generalsettings.ui" line="187"/>
<source>Updates</source>
<translation>Aggiornamenti</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="208"/>
+ <location filename="../src/gui/generalsettings.ui" line="212"/>
<source>&Restart && Update</source>
<translation>&Riavvia e aggiorna</translation>
</message>
</context>
-<context>
- <name>OCC::HttpCredentials</name>
- <message>
- <location filename="../src/libsync/creds/httpcredentials.cpp" line="290"/>
- <source>Reading from keychain failed with error: '%1'</source>
- <translation>Lettura dal portachiavi non riuscita con errore: '%1'</translation>
- </message>
-</context>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="32"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
<source>Please enter %1 password:
User: %2
</translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="41"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <source>Reading from keychain failed with error: '%1'</source>
+ <translation>Lettura dal portachiavi non riuscita con errore: '%1'</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
<source>Enter Password</source>
<translation>Digita password</translation>
</message>
<translation>Rimuovi</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="40"/>
<source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
Gli elementi per i quali è consentita l'eliminazione, saranno eliminati se impediscono la rimozione di una cartella. Utile per i metadati.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="109"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
<source>Could not open file</source>
<translation>Impossibile aprire il file</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="111"/>
<source>Cannot write changes to '%1'.</source>
<translation>Impossibile scrivere le modifiche in '%1'.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="138"/>
<source>Add Ignore Pattern</source>
<translation>Aggiungi modello Ignora</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>Add a new ignore pattern:</source>
<translation>Aggiungi un nuovo modello di esclusione:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="45"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="46"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Questa voce è fornita dal sistema in '%1' e non può essere modificata in questa vista.</translation>
</message>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="163"/>
+ <location filename="../src/libsync/logger.cpp" line="190"/>
<source>Error</source>
<translation>Errore</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="164"/>
+ <location filename="../src/libsync/logger.cpp" line="191"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Il file '%1'<br/>non può essere aperto in scrittura.<br/><br/>Il risultato del log <b>non</b> può essere salvato!</nobr></translation>
</message>
</message>
<message>
<location filename="../src/gui/networksettings.ui" line="203"/>
- <location filename="../src/gui/networksettings.ui" line="295"/>
+ <location filename="../src/gui/networksettings.ui" line="292"/>
<source>No limit</source>
<translation>Nessun limite</translation>
</message>
<source>SOCKS5 proxy</source>
<translation>Proxy SOCKS5</translation>
</message>
+ <message>
+ <location filename="../src/gui/networksettings.cpp" line="128"/>
+ <source>Qt >= 5.4 is required in order to use the bandwidth limit</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::OCUpdater</name>
<source>Downloading version %1. Please wait...</source>
<translation>Scaricamento della versione %1. Attendi...</translation>
</message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
- <source>Version %1 available. Restart application to start the update.</source>
- <translation>La versione %1 è disponibile. Riavvia l'applicazione per iniziare l'aggiornamento.</translation>
- </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="145"/>
<source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
<source>Could not check for new updates.</source>
<translation>Impossibile verificare la presenza di nuovi aggiornamenti.</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
+ <source>%1 version %2 available. Restart application to start the update.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
- <source>New version %1 available. Please use the system's update tool to install it.</source>
- <translation>Nuova versione %1 disponibile. Utilizza lo strumento di aggiornamento di sistema per installarla.</translation>
+ <source>New %1 version %2 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="151"/>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="114"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="110"/>
<source>Connection Timeout</source>
<translation>Connessione scaduta</translation>
</message>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="171"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="167"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Risposta JSON non valida dall'URL di richiesta</translation>
</message>
</context>
-<context>
- <name>OCC::PropagateDownloadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="435"/>
- <source>Sync was aborted by user.</source>
- <translation>Sincronizzazione interrotta dall'utente.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="488"/>
- <source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation>Nessun e-tag ricevuto dal server, controlla il proxy/gateway</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="494"/>
- <source>We received a different E-Tag for resuming. Retrying next time.</source>
- <translation>Abbiamo ricevuto un e-tag diverso per il recupero. Riprova più tardi.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="516"/>
- <source>Server returned wrong content-range</source>
- <translation>Il server ha restituito un content-range errato</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="567"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation>Il file %1 non può essere scaricato a causa di un conflitto con un file locale.</translation>
- </message>
-</context>
<context>
<name>OCC::PropagateDownloadFileQNAM</name>
<message>
<translation>Il file %1 non può essere scaricato a causa di un conflitto con un file locale.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="457"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
+ <source>The download would reduce free disk space below %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="372"/>
+ <source>Free space on disk is less than %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="482"/>
<source>File was deleted from server</source>
<translation>Il file è stato eliminato dal server</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="506"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="531"/>
<source>The file could not be downloaded completely.</source>
<translation>Il file non può essere scaricato completamente.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="601"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="636"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Il file %1 non può essere salvato a causa di un conflitto con un file locale.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="641"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="676"/>
<source>File has changed since discovery</source>
<translation>Il file è stato modificato dal suo rilevamento</translation>
</message>
<context>
<name>OCC::PropagateItemJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="92"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
<source>; Restoration Failed: %1</source>
<translation>; Ripristino non riuscito: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="138"/>
<source>Continue blacklisting:</source>
<translation>Continua la lista nera:</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="230"/>
<source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation>Un file o una cartella è stato rimosso da una condivisione in sola lettura, ma il ripristino non è riuscito: %1</translation>
</message>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove folder '%1';</source>
- <translation>Impossibile rimuovere la cartella '%1';</translation>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="243"/>
- <location filename="../src/libsync/propagator_legacy.cpp" line="302"/>
- <source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>Un file locale è cambiato durante la sincronizzazione, nuova sincronizzazione alla ricezione.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="246"/>
- <source>Sync was aborted by user.</source>
- <translation>Sincronizzazione interrotta dall'utente.</translation>
- </message>
+ <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="252"/>
- <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
- <translation>Il file è stato modificato localmente, ma è parte di una condivisione in sola lettura. È stato ripristinato e la tua modifica è nel file di conflitto.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="205"/>
+ <source>File name contains at least one invalid character</source>
+ <translation>Il nome del file contiene almeno un carattere non valido</translation>
</message>
-</context>
-<context>
- <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="226"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="262"/>
<source>File Removed</source>
<translation>File rimosso</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="274"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Il file locale è stato modificato durante la sincronizzazione. Sarà ripristinato.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="250"/>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="286"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="665"/>
<source>Local file changed during sync.</source>
<translation>Un file locale è cambiato durante la sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="558"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="592"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>Forzare l'interruzione dell'operazione in caso di ripristino della connessione HTTP con Qt < 5.4.2.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="566"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="600"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Il file è stato modificato localmente, ma è parte di una condivisione in sola lettura. È stato ripristinato e la tua modifica è nel file di conflitto.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="597"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="631"/>
<source>Poll URL missing</source>
<translation>URL di richiesta mancante</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="620"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="654"/>
<source>The local file was removed during sync.</source>
<translation>Il file locale è stato rimosso durante la sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="646"/>
- <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
- <translation>Il server non ha riconosciuto l'ultimo pezzo. (Non era presente alcun e-tag)</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="680"/>
+ <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Le cartelle non marcate saranno <b>rimosse</b> dal file system locale e non saranno sincronizzate più con questo computer</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>Scegli cosa sincronizzare: seleziona le sottocartelle remote che desideri sincronizzare.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>Scegli cosa sincronizzare: deseleziona le sottocartelle remote che non desideri sincronizzare.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
<source>Choose What to Sync</source>
<translation>Scegli cosa sincronizzare</translation>
</message>
<translation>Dimensione</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
<source>No subfolders currently on the server.</source>
<translation>Attualmente non ci sono sottocartelle sul server.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>Si è verificato un errore durante il caricamento dell'elenco delle sottocartelle.</translation>
</message>
<translation>Impostazioni</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="80"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="84"/>
<source>Activity</source>
<translation>Attività</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="86"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="90"/>
<source>General</source>
<translation>Generale</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>Network</source>
<translation>Rete</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharedialog.ui" line="22"/>
- <location filename="../src/gui/sharedialog.ui" line="234"/>
+ <location filename="../src/gui/sharedialog.ui" line="258"/>
<source>TextLabel</source>
<translation>EtichettaTesto</translation>
</message>
<translation>Percorso di ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="182"/>
+ <location filename="../src/gui/sharedialog.ui" line="116"/>
<source>Set &password </source>
<translation>Imposta &password</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="196"/>
+ <location filename="../src/gui/sharedialog.ui" line="130"/>
<source>Set &expiration date</source>
<translation>Imposta data di scad&enza</translation>
</message>
+ <message>
+ <location filename="../src/gui/sharedialog.ui" line="214"/>
+ <source>Allow editing</source>
+ <translation>Consenti la modifica</translation>
+ </message>
<message>
<location filename="../src/gui/sharedialog.ui" line="77"/>
<source>Share link</source>
<translation>Condividi collegamento</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="125"/>
+ <location filename="../src/gui/sharedialog.ui" line="203"/>
<source>Copy &link</source>
<translation>Copia co&llegamento</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="142"/>
+ <location filename="../src/gui/sharedialog.ui" line="154"/>
<source>Set password</source>
<translation>imposta la password</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="692"/>
- <source>%1 path: %2</source>
- <translation>Percorso %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="115"/>
+ <location filename="../src/gui/sharedialog.cpp" line="120"/>
<source>%1 Sharing</source>
<translation>Condivisione %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="103"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="112"/>
+ <location filename="../src/gui/sharedialog.cpp" line="117"/>
<source>Folder: %2</source>
<translation>Cartella: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="121"/>
<source>P&assword protect</source>
<translation>Proteggi con p&assword</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="221"/>
+ <location filename="../src/gui/sharedialog.cpp" line="214"/>
<source>Password Protected</source>
<translation>Protetta da password</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="382"/>
+ <location filename="../src/gui/sharedialog.cpp" line="338"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Il file non può essere condiviso poiché è stato condiviso senza il permesso di condivisione.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="528"/>
+ <location filename="../src/gui/sharedialog.cpp" line="475"/>
<source>Please Set Password</source>
<translation>imposta la password</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="564"/>
- <location filename="../src/gui/sharedialog.cpp" line="565"/>
+ <location filename="../src/gui/sharedialog.cpp" line="538"/>
+ <location filename="../src/gui/sharedialog.cpp" line="539"/>
<source>&Share link</source>
<translation>Condividi colle&gamento</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="583"/>
+ <location filename="../src/gui/sharedialog.cpp" line="552"/>
+ <location filename="../src/gui/sharedialog.cpp" line="564"/>
<source>OCS API error code: %1</source>
<translation>Codice di errore API OCS: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="605"/>
- <source>There is no sync folder configured.</source>
- <translation>Non è stata configurata alcuna cartella per la sincronizzazione.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="639"/>
- <source>A sync file with the same name exists. The file cannot be registered to sync.</source>
- <translation>Un file di sincronizzazione con lo stesso nome esiste già. Il file non può essere registrato per la sincronizzazione.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="684"/>
- <source>The file cannot be synced.</source>
- <translation>Il file non può essere sincronizzato.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="624"/>
- <source>Sharing of external directories is not yet working.</source>
- <translation>La condivisione di cartelle esterne non funziona ancora.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="473"/>
- <location filename="../src/gui/sharedialog.cpp" line="506"/>
+ <location filename="../src/gui/sharedialog.cpp" line="418"/>
+ <location filename="../src/gui/sharedialog.cpp" line="460"/>
<source>Public sh&aring requires a password</source>
<translation>La condivisione pubblic&a richiede una password</translation>
</message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="617"/>
- <source>Cannot find a folder to upload to.</source>
- <translation>Impossibile trovare una cartella di destinazione.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
- <source>Waiting to upload...</source>
- <translation>In attesa di caricamento...</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="653"/>
- <source>Unable to register in sync space.</source>
- <translation>Impossibile registrare nello spazio di sincronizzazione.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="694"/>
- <source>Sync of registered file was not successful yet.</source>
- <translation>La sincronizzazione del file registrato non è stata ancora completata.</translation>
- </message>
</context>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>Login Error</source>
<translation>Errore di accesso</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>You must sign in as user %1</source>
<translation>Devi accedere con l'utente %1</translation>
</message>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="452"/>
+ <location filename="../src/gui/socketapi.cpp" line="447"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Condividi con %1</translation>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="97"/>
+ <location filename="../src/libsync/syncengine.cpp" line="94"/>
<source>Success.</source>
<translation>Successo.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="104"/>
+ <location filename="../src/libsync/syncengine.cpp" line="101"/>
<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="107"/>
+ <location filename="../src/libsync/syncengine.cpp" line="104"/>
<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="110"/>
+ <location filename="../src/libsync/syncengine.cpp" line="107"/>
<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="113"/>
+ <location filename="../src/libsync/syncengine.cpp" line="110"/>
<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="116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>Errore grave di parametro di CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="119"/>
+ <location filename="../src/libsync/syncengine.cpp" line="116"/>
<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="122"/>
+ <location filename="../src/libsync/syncengine.cpp" line="119"/>
<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="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="122"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="125"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="128"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="131"/>
<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="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="134"/>
<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="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="137"/>
<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="143"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation>Problema di CSync dovuto alla mancata gestione dei permessi.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
<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="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
<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="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
<source>Error while reading folder.</source>
<translation>Errore durante la lettura della cartella.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="996"/>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
<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="1003"/>
+ <location filename="../src/libsync/syncengine.cpp" line="991"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="152"/>
<source>CSync unspecified error.</source>
<translation>Errore non specificato di CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="155"/>
<source>Aborted by the user</source>
<translation>Interrotto dall'utente</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="392"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>Il nome del file contiene caratteri non validi che non possono essere sincronizzati su diverse piattaforme.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="143"/>
<source>CSync failed to access</source>
<translation>CSync non è riuscito ad accedere</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <location filename="../src/libsync/syncengine.cpp" line="97"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <source>CSync failed due to unhandled permission denied.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="146"/>
<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="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="158"/>
<source>The service is temporarily unavailable</source>
<translation>Il servizio è temporaneamente non disponibile</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="175"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<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="230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="227"/>
<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="389"/>
+ <location filename="../src/libsync/syncengine.cpp" line="386"/>
<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="392"/>
+ <location filename="../src/libsync/syncengine.cpp" line="389"/>
<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="398"/>
+ <location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename is too long.</source>
<translation>Il nome del file è troppo lungo.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="401"/>
+ <location filename="../src/libsync/syncengine.cpp" line="398"/>
<source>File is ignored because it's hidden.</source>
<translation>Il file è ignorato poiché è nascosto.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="407"/>
+ <location filename="../src/libsync/syncengine.cpp" line="404"/>
<source>Stat failed.</source>
<translation>Stat non riuscita.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="429"/>
+ <location filename="../src/libsync/syncengine.cpp" line="426"/>
<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="561"/>
+ <location filename="../src/libsync/syncengine.cpp" line="558"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Caratteri non validi, rinomina "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="631"/>
+ <location filename="../src/libsync/syncengine.cpp" line="612"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="645"/>
<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="718"/>
+ <location filename="../src/libsync/syncengine.cpp" line="723"/>
<source>Cannot open the sync journal</source>
<translation>Impossibile aprire il registro di sincronizzazione</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="965"/>
- <location filename="../src/libsync/syncengine.cpp" line="972"/>
+ <location filename="../src/libsync/syncengine.cpp" line="953"/>
+ <location filename="../src/libsync/syncengine.cpp" line="960"/>
<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="990"/>
+ <location filename="../src/libsync/syncengine.cpp" line="978"/>
<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="1023"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1011"/>
<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="1040"/>
- <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1028"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1048"/>
<source>Not allowed to remove, restoring</source>
<translation>Rimozione non consentita, ripristino</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1073"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1061"/>
<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="1128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1116"/>
<source>Move not allowed, item restored</source>
<translation>Spostamento non consentito, elemento ripristinato</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1125"/>
<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="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the destination</source>
<translation>la destinazione</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the source</source>
<translation>l'origine</translation>
</message>
</message>
</context>
<context>
- <name>OCC::TransmissionChecksumValidator</name>
+ <name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="128"/>
<source>The checksum header is malformed.</source>
<translation>L'intestazione del codice di controllo è malformata.</translation>
</message>
<message>
<location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+ <source>The checksum header contained an unknown checksum type '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="148"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>Il file scaricato non verifica il codice di controllo, sarà ripristinato.</translation>
</message>
<source>Recent Changes</source>
<translation>Modifiche recenti</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="561"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="331"/>
<source>Managed Folders:</source>
<source>Open %1 in browser</source>
<translation>Apri %1 nel browser...</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="449"/>
- <source>Log out everywhere</source>
- <translation>Disconnetti ovunque</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="457"/>
- <source>Log in everywhere...</source>
- <translation>Accedi ovunque...</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="513"/>
<source>Unknown status</source>
<source>Account %1: %2</source>
<translation>Account %1: %2</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="449"/>
+ <source>Log out of all accounts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="457"/>
+ <source>Log in to all accounts...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="532"/>
<source>Crash now</source>
<source>No items synced recently</source>
<translation>Nessun elemento sincronizzato di recente</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="561"/>
- <source>Discovering '%1'</source>
- <translation>Rilevamento '%1'</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="566"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>%L1 B</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="306"/>
+ <location filename="../src/libsync/utility.cpp" line="303"/>
<source>%Ln year(s)</source>
<translation>%Ln anno(i)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="307"/>
+ <location filename="../src/libsync/utility.cpp" line="304"/>
<source>%Ln month(s)</source>
<translation>%Ln mese(i)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="308"/>
+ <location filename="../src/libsync/utility.cpp" line="305"/>
<source>%Ln day(s)</source>
<translation>%Ln giorno(i)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="309"/>
+ <location filename="../src/libsync/utility.cpp" line="306"/>
<source>%Ln hour(s)</source>
<translation>%Ln ora(e)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="310"/>
+ <location filename="../src/libsync/utility.cpp" line="307"/>
<source>%Ln minute(s)</source>
<translation>%Ln minuto(i)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="311"/>
+ <location filename="../src/libsync/utility.cpp" line="308"/>
<source>%Ln second(s)</source>
<translation>%Ln secondo(i)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="318"/>
<source>0 seconds</source>
<translation>0 secondi</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="336"/>
+ <location filename="../src/libsync/utility.cpp" line="333"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="73"/>
+ <source>Enter your credentials to connect to the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <source>Sign in</source>
+ <translation>ログイン</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="89"/>
<source>Remove the account configuration from the client</source>
<translation>クライアントからアカウント設定を削除</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Remove Account</source>
<translation>アカウント削除</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="97"/>
+ <location filename="../src/gui/accountsettings.ui" line="113"/>
<source>Storage space: ...</source>
<translation>ストレージ空き容量: ...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="167"/>
+ <location filename="../src/gui/accountsettings.ui" line="183"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>チェックしていないフォルダーはローカルファイルシステムから <b>削除</b>され､このコンピューターと同期されなくなります。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="230"/>
<source>Apply</source>
<translation>適用</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="198"/>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
- <location filename="../src/gui/accountsettings.cpp" line="571"/>
+ <location filename="../src/gui/accountsettings.ui" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="289"/>
+ <location filename="../src/gui/accountsettings.cpp" line="646"/>
<source>Cancel</source>
<translation>キャンセル</translation>
</message>
<translation><server> に <user> で接続中</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="115"/>
+ <location filename="../src/gui/accountsettings.cpp" line="121"/>
<source>No account configured.</source>
<translation>アカウントが未設定です。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="161"/>
+ <source>Choose what to sync</source>
+ <translation>同期フォルダーを選択</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="168"/>
+ <source>Remove folder sync connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="234"/>
<source>Folder creation failed</source>
<translation>フォルダーの作成に失敗しました</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="230"/>
+ <location filename="../src/gui/accountsettings.cpp" line="235"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation><p>ローカルフォルダー <i>%1</i> を作成できません。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="283"/>
- <source>Stop syncing</source>
- <translation>同期停止中</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
+ <source>Confirm Folder Sync Connection Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>Remove Folder Sync Connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="309"/>
+ <location filename="../src/gui/accountsettings.cpp" line="314"/>
<source>Confirm Folder Reset</source>
<translation>フォルダーのリセットを確認</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="310"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>本当にフォルダー <i>%1</i> をリセットしてクライアントのデータベースを再構築しますか?</p><p><b>注意:</b>この機能は保守目的のためだけにデザインされています。ファイルは削除されませんが、完了するまでにデータ通信が明らかに増大し、数分、あるいはフォルダーのサイズによっては数時間かかります。このオプションは管理者に指示された場合にのみ使用してください。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="391"/>
+ <location filename="../src/gui/accountsettings.cpp" line="396"/>
<source>Sync Running</source>
<translation>同期を実行中</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="392"/>
+ <location filename="../src/gui/accountsettings.cpp" line="397"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>同期作業を実行中です。<br/>終了しますか？</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="472"/>
+ <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <source>%1 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="485"/>
<source>%1 as <i>%2</i></source>
<translation><i>%2</i> の %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="476"/>
+ <location filename="../src/gui/accountsettings.cpp" line="495"/>
<source>Connected to %1.</source>
<translation>%1 に接続</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="478"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>サーバー %1 は一時的に利用できません</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="480"/>
+ <location filename="../src/gui/accountsettings.cpp" line="499"/>
<source>Signed out from %1.</source>
<translation>%1 からサインアウトしました。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="482"/>
+ <location filename="../src/gui/accountsettings.cpp" line="501"/>
<source>No connection to %1 at %2.</source>
<translation>%2 の %1 への接続がありません。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
- <source>There are new folders that were not synchronized because they are too big: %1</source>
- <translation>転送容量が大きいため、同期されていない新しいフォルダーがあります: %1</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="536"/>
- <source>, </source>
- <translation>, </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <source>There are new folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="563"/>
+ <location filename="../src/gui/accountsettings.cpp" line="638"/>
<source>Confirm Account Removal</source>
<translation>アカウント削除確認</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="564"/>
+ <location filename="../src/gui/accountsettings.cpp" line="639"/>
<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="570"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>Remove connection</source>
<translation>接続削除</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="158"/>
<source>Open folder</source>
<translation>フォルダーを開く</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="168"/>
- <source>Choose What to Sync</source>
- <translation>同期フォルダーを選択</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Resume sync</source>
<translation>再開</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Pause sync</source>
<translation>一時停止</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="176"/>
- <source>Remove sync</source>
- <translation>同期削除</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="277"/>
- <source>Confirm Sync Removal</source>
- <translation>同期削除確認</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="278"/>
+ <location filename="../src/gui/accountsettings.cpp" line="283"/>
<source><p>Do you really want to stop syncing the folder <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="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="452"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%2 の %1(%3%) 利用中。外部ネットワークストレージや共有フォルダーを含むフォルダーがある場合は、容量の上限値が異なる可能性があります。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="448"/>
+ <location filename="../src/gui/accountsettings.cpp" line="453"/>
<source>%1 of %2 in use</source>
<translation>%2 のうち %1 を使用中</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="453"/>
+ <location filename="../src/gui/accountsettings.cpp" line="462"/>
<source>Currently there is no storage usage information available.</source>
<translation>現在、利用できるストレージ利用状況はありません。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="507"/>
<source>No %1 connection configured.</source>
<translation>%1 の接続は設定されていません。</translation>
</message>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="95"/>
+ <location filename="../src/gui/accountstate.cpp" line="99"/>
<source>Signed out</source>
<translation>サインアウト</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="97"/>
+ <location filename="../src/gui/accountstate.cpp" line="101"/>
<source>Disconnected</source>
<translation>切断しました</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="99"/>
+ <location filename="../src/gui/accountstate.cpp" line="103"/>
<source>Connected</source>
<translation>接続しました</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="101"/>
+ <location filename="../src/gui/accountstate.cpp" line="105"/>
<source>Service unavailable</source>
<translation>サービスが利用できません</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="103"/>
+ <location filename="../src/gui/accountstate.cpp" line="107"/>
<source>Network error</source>
<translation>ネットワークエラー</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="105"/>
+ <location filename="../src/gui/accountstate.cpp" line="109"/>
<source>Configuration error</source>
<translation>設定エラー</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="107"/>
+ <location filename="../src/gui/accountstate.cpp" line="111"/>
<source>Unknown account state</source>
<translation>不明なアカウント状態</translation>
</message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>Reauthentication required</source>
+ <translation>再認証が必要</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>You need to re-login to continue using the account %1.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
<translation>サーバーを最新にアップデートして、クライアントを再起動してください。</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="143"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="135"/>
<source>Authentication error: Either username or password are wrong.</source>
<translation>認証エラー: ユーザー名またはパスワードが間違っています。</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="155"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="147"/>
<source>timeout</source>
<translation>タイムアウト</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="186"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="178"/>
<source>The provided credentials are not correct</source>
<translation>入力された資格情報が正しくありません</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="524"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="537"/>
<source>Aborted by the user</source>
<translation>ユーザーによって中止されました</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="107"/>
+ <location filename="../src/gui/folder.cpp" line="108"/>
<source>Unable to create csync-context</source>
<translation>csync-context を作成できません</translation>
</message>
<translation>同期アクティビティ</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="845"/>
+ <location filename="../src/gui/folder.cpp" line="870"/>
<source>Could not read system exclude file</source>
<translation>システム上の除外ファイルを読み込めません</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1102"/>
+ <location filename="../src/gui/folder.cpp" line="1127"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>新しい %1 MB以上のフォルダーが追加されました: %2
ダウンロードしたい場合は、設定画面で選択してください。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1115"/>
+ <location filename="../src/gui/folder.cpp" line="1140"/>
<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="1119"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Remove All Files?</source>
<translation>すべてのファイルを削除しますか？</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1121"/>
+ <location filename="../src/gui/folder.cpp" line="1146"/>
<source>Remove all files</source>
<translation>すべてのファイルを削除</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1122"/>
+ <location filename="../src/gui/folder.cpp" line="1147"/>
<source>Keep files</source>
<translation>ファイルを残す</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="275"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<source>Could not reset folder state</source>
<translation>フォルダーの状態をリセットできませんでした</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="276"/>
+ <location filename="../src/gui/folderman.cpp" line="271"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>古い同期ジャーナル '%1' が見つかりましたが、削除できませんでした。それを現在使用しているアプリケーションが存在しないか確認してください。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="877"/>
+ <location filename="../src/gui/folderman.cpp" line="865"/>
<source> (backup)</source>
<translation>(バックアップ)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="882"/>
+ <location filename="../src/gui/folderman.cpp" line="870"/>
<source> (backup %1)</source>
<translation>(%1をバックアップ)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1091"/>
+ <location filename="../src/gui/folderman.cpp" line="1079"/>
<source>Undefined State.</source>
<translation>未定義の状態。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1094"/>
- <source>Waits to start syncing.</source>
- <translation>同期開始を待機中</translation>
+ <location filename="../src/gui/folderman.cpp" line="1082"/>
+ <source>Waiting to start syncing.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1097"/>
+ <location filename="../src/gui/folderman.cpp" line="1085"/>
<source>Preparing for sync.</source>
<translation>同期の準備中。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1100"/>
+ <location filename="../src/gui/folderman.cpp" line="1088"/>
<source>Sync is running.</source>
<translation>同期を実行中です。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1103"/>
+ <location filename="../src/gui/folderman.cpp" line="1091"/>
<source>Last Sync was successful.</source>
<translation>最後の同期は成功しました。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1108"/>
+ <location filename="../src/gui/folderman.cpp" line="1096"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>最新の同期は成功しました。しかし、一部のファイルに問題がありました。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1111"/>
+ <location filename="../src/gui/folderman.cpp" line="1099"/>
<source>Setup Error.</source>
<translation>設定エラー。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1114"/>
+ <location filename="../src/gui/folderman.cpp" line="1102"/>
<source>User Abort.</source>
<translation>ユーザーによる中止。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1117"/>
+ <location filename="../src/gui/folderman.cpp" line="1105"/>
<source>Sync is paused.</source>
<translation>同期を一時停止しました。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1123"/>
+ <location filename="../src/gui/folderman.cpp" line="1111"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (同期を一時停止)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1119"/>
<source>No valid folder selected!</source>
<translation>有効なフォルダーが選択されていません！</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1130"/>
<source>The selected path is not a folder!</source>
<translation>指定のパスは、フォルダーではありません！</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1146"/>
+ <location filename="../src/gui/folderman.cpp" line="1134"/>
<source>You have no permission to write to the selected folder!</source>
<translation>選択されたフォルダーに書き込み権限がありません</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1161"/>
+ <location filename="../src/gui/folderman.cpp" line="1149"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>ローカルフォルダー %1 はすでに同期フォルダーとして利用されています。他のフォルダーを選択してください。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1166"/>
+ <location filename="../src/gui/folderman.cpp" line="1154"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>ローカルフォルダー %1 にはすでに同期フォルダーとして利用されてるフォルダを含んでいます。他のフォルダーを選択してください。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1173"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>ローカルフォルダー %1 はシンボリックリンクです。リンク先のフォルダにはすでに同期フォルダーとして利用されているフォルダーを含みます。他のフォルダーを選択してください。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1168"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>ローカルフォルダー %1 には同期フォルダーとして利用されているフォルダーがあります。他のフォルダーを選択してください。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1186"/>
+ <location filename="../src/gui/folderman.cpp" line="1174"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>ローカルフォルダー %1 には同期フォルダーとして利用されているフォルダーがあります。他のフォルダーを選択してください！</translation>
</message>
<translation>同期フォルダーを追加</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="85"/>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="274"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="271"/>
<source>File</source>
<translation>ファイル</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="228"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="224"/>
<source>Syncing selected files in your account with</source>
<translation>アカウントの指定ファイルは同期済み</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="231"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="227"/>
<source>Remote path: %1</source>
<translation>リモートパス: %1</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="121"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="122"/>
<source>You need to be connected to add a folder</source>
<translation>フォルダーを追加するためには、接続している必要があります。</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="126"/>
- <source>Adding folder is disabled because your 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="131"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="132"/>
<source>Click this button to add a folder to synchronize.</source>
<translation>このボタンをクリックして同期フォルダーを追加してください。</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="141"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="142"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="156"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
<source>Error while loading the list of folders from the server.</source>
<translation>サーバーからフォルダーのリスト取得時にエラー</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="182"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="192"/>
<source>Signed out</source>
<translation>サインアウト</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="727"/>
- <source>Discovering '%1'</source>
- <translation> '%1'を検索中</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="127"/>
+ <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="163"/>
+ <source>Fetching folder list from server...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="789"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="787"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="849"/>
<source>Syncing %1</source>
<translation>同期中 %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="792"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="854"/>
<source>download %1/s</source>
<translation>ダウンロード %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="794"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="856"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="800"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>upload %1/s</source>
<translation>アップロード %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="802"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="864"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="807"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="869"/>
<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="811"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="873"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="827"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="889"/>
<source>%1 of %2, file %3 of %4
Total time left %5</source>
<translation>%2 のうち %1 , ファイル%4個のうち%3個
残り時間 %5</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
<source>file %1 of %2</source>
<translation>%1 / %2 ファイル</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="932"/>
<source>Waiting...</source>
<translation>待機中...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="934"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>%n 他のフォルダーの完了待ち...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="878"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>Preparing to sync...</source>
<translation>同期の準備中...</translation>
</message>
<name>OCC::FolderWizard</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <source>Add Folder Sync Connection</source>
+ <translation>同期フォルダーを追加</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderwizard.cpp" line="564"/>
- <source>Add Folder</source>
- <translation>フォルダーを追加</translation>
+ <source>Add Sync Connection</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>詳細設定</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="61"/>
+ <location filename="../src/gui/generalsettings.ui" line="109"/>
<source>Ask confirmation before downloading folders larger than</source>
<translation>次の容量より大きい場合は、ダウンロード前に確認する</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
+ <location filename="../src/gui/generalsettings.ui" line="129"/>
<source>MB</source>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="109"/>
+ <location filename="../src/gui/generalsettings.ui" line="159"/>
<source>Show crash reporter</source>
<translation>クラッシュ報告を表示</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="118"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit Ignored Files</source>
<translation>除外ファイルリストを編集</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="142"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
<source>Add an Account</source>
<translation>アカウントを追加</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="167"/>
- <location filename="../src/gui/generalsettings.ui" line="173"/>
+ <location filename="../src/gui/generalsettings.ui" line="171"/>
+ <location filename="../src/gui/generalsettings.ui" line="177"/>
<source>About</source>
<translation>バージョン情報</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <location filename="../src/gui/generalsettings.ui" line="187"/>
<source>Updates</source>
<translation>アップデート</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="208"/>
+ <location filename="../src/gui/generalsettings.ui" line="212"/>
<source>&Restart && Update</source>
<translation>再起動してアップデート(&R)</translation>
</message>
</context>
-<context>
- <name>OCC::HttpCredentials</name>
- <message>
- <location filename="../src/libsync/creds/httpcredentials.cpp" line="290"/>
- <source>Reading from keychain failed with error: '%1'</source>
- <translation>鍵情報の読み込みに失敗しました。エラー： '%1'</translation>
- </message>
-</context>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="32"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
<source>Please enter %1 password:
User: %2
</translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="41"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <source>Reading from keychain failed with error: '%1'</source>
+ <translation>鍵情報の読み込みに失敗しました。エラー： '%1'</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
<source>Enter Password</source>
<translation>パスワードを入力してください</translation>
</message>
<translation>削除</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="40"/>
<source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
パターンによってディレクトリを削除から除外する場合は，パターンに含まれた項目も削除されます。例えばメタデータファイルに有用です。</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="109"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
<source>Could not open file</source>
<translation>ファイルが開けませんでした</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="111"/>
<source>Cannot write changes to '%1'.</source>
<translation>'%1'を更新できません。</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="138"/>
<source>Add Ignore Pattern</source>
<translation>除外するファイルパターンを追加</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>Add a new ignore pattern:</source>
<translation>除外するファイルパターンを新しく追加:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="45"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="46"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>このエントリーは、システム '%1' から提供されています。この画面では変更できません。</translation>
</message>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="163"/>
+ <location filename="../src/libsync/logger.cpp" line="190"/>
<source>Error</source>
<translation>エラー</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="164"/>
+ <location filename="../src/libsync/logger.cpp" line="191"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>ファイル '%1'<br/>を書き込み用で開けませんでした。<br/><br/>ログ出力を<b>保存できません</b>でした！</nobr></translation>
</message>
</message>
<message>
<location filename="../src/gui/networksettings.ui" line="203"/>
- <location filename="../src/gui/networksettings.ui" line="295"/>
+ <location filename="../src/gui/networksettings.ui" line="292"/>
<source>No limit</source>
<translation>無制限</translation>
</message>
<source>SOCKS5 proxy</source>
<translation>SOCKS5プロキシ</translation>
</message>
+ <message>
+ <location filename="../src/gui/networksettings.cpp" line="128"/>
+ <source>Qt >= 5.4 is required in order to use the bandwidth limit</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::OCUpdater</name>
<source>Downloading version %1. Please wait...</source>
<translation>バージョン %1 をダウンロードしています。しばらくお待ちください...</translation>
</message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
- <source>Version %1 available. Restart application to start the update.</source>
- <translation>バージョン %1 が利用可能です。アプリケーションを再起動してアップデートを開始してください。</translation>
- </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="145"/>
<source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
<source>Could not check for new updates.</source>
<translation>アップデートを確認できませんでした。</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
+ <source>%1 version %2 available. Restart application to start the update.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
- <source>New version %1 available. Please use the system's update tool to install it.</source>
- <translation>新しいバージョン %1 が利用可能です。インストールするには、システムのアップデートツールを利用してください。</translation>
+ <source>New %1 version %2 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="151"/>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="114"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="110"/>
<source>Connection Timeout</source>
<translation>接続タイムアウト</translation>
</message>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="171"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="167"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>不正なJSONがポーリングURLから返りました</translation>
</message>
</context>
-<context>
- <name>OCC::PropagateDownloadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="435"/>
- <source>Sync was aborted by user.</source>
- <translation>同期はユーザーによって中止されました。</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="488"/>
- <source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation>サーバーからE-Tagを受信できません。プロキシ/ゲートウェイを確認してください。</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="494"/>
- <source>We received a different E-Tag for resuming. Retrying next time.</source>
- <translation>同期再開時に違う E-Tagを受信しました。次回リトライします。</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="516"/>
- <source>Server returned wrong content-range</source>
- <translation>サーバーが間違ったcontent-rangeを返しました</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="567"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation>ファイル %1 はローカルファイル名が衝突しているためダウンロードできません！</translation>
- </message>
-</context>
<context>
<name>OCC::PropagateDownloadFileQNAM</name>
<message>
<translation>ファイル %1 はローカルファイル名が衝突しているためダウンロードできません！</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="457"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
+ <source>The download would reduce free disk space below %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="372"/>
+ <source>Free space on disk is less than %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="482"/>
<source>File was deleted from server</source>
<translation>ファイルはサーバーから削除されました</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="506"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="531"/>
<source>The file could not be downloaded completely.</source>
<translation>このファイルのダウンロードは完了しませんでした</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="601"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="636"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>%1 はローカルファイル名が衝突しているため保存できません！</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="641"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="676"/>
<source>File has changed since discovery</source>
<translation>ファイルは発見以降に変更されました</translation>
</message>
<context>
<name>OCC::PropagateItemJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="92"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
<source>; Restoration Failed: %1</source>
<translation>; 復元に失敗: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="138"/>
<source>Continue blacklisting:</source>
<translation>ブラックリストの続き:</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="230"/>
<source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation>ファイルまたはフォルダーが読み込み専用の共有から削除されましたが、復元に失敗しました: %1</translation>
</message>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove folder '%1';</source>
- <translation>ディレクトリ '%1'を削除できません;</translation>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="243"/>
- <location filename="../src/libsync/propagator_legacy.cpp" line="302"/>
- <source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>同期中にローカルファイルが変更されました。完了してからもう一度同期してください。</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="246"/>
- <source>Sync was aborted by user.</source>
- <translation>同期はユーザーによって中止されました。</translation>
- </message>
+ <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="252"/>
- <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
- <translation>ファイルがローカルで編集されましたが、読み込み専用の共有の一部です。ファイルは復元され、あなたの編集は競合するファイル内にあります。</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="205"/>
+ <source>File name contains at least one invalid character</source>
+ <translation>ファイル名に1文字以上の無効な文字が含まれています</translation>
</message>
-</context>
-<context>
- <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="226"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="262"/>
<source>File Removed</source>
<translation>ファイルを削除しました</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="274"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>ローカルファイルが同期中に変更されました。再開されます。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="250"/>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="286"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="665"/>
<source>Local file changed during sync.</source>
<translation>ローカルのファイルが同期中に変更されました。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="558"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="592"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>5.4.2 以下のQt でHTTP 接続リセットが強制終了されました</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="566"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="600"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>ファイルがローカルで編集されましたが、読み込み専用の共有の一部です。ファイルは復元され、あなたの編集は競合するファイル内にあります。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="597"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="631"/>
<source>Poll URL missing</source>
<translation>ポーリングURLがありません</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="620"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="654"/>
<source>The local file was removed during sync.</source>
<translation>ローカルファイルを同期中に削除します。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="646"/>
- <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
- <translation>サーバーは最終チャンクを認識しません。(e-tag が存在しません)</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="680"/>
+ <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>チェックしていないフォルダーはローカルファイルシステムから <b>削除</b>され､このコンピューターと同期されなくなります。</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>同期対象の選択: 同期したいリモートのサブフォルダーを選択してください。</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>同期対象の選択: 同期したくないリモートのサブフォルダーは、同期対象から外せます。</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
<source>Choose What to Sync</source>
<translation>同期フォルダーを選択</translation>
</message>
<translation>サイズ</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
<source>No subfolders currently on the server.</source>
<translation>現在サーバーにサブフォルダーはありません。</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>サーバーからフォルダーのリスト取得時にエラーが発生しました。</translation>
</message>
<translation>設定</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="80"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="84"/>
<source>Activity</source>
<translation>アクティビティ</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="86"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="90"/>
<source>General</source>
<translation>一般</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>Network</source>
<translation>ネットワーク</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharedialog.ui" line="22"/>
- <location filename="../src/gui/sharedialog.ui" line="234"/>
+ <location filename="../src/gui/sharedialog.ui" line="258"/>
<source>TextLabel</source>
<translation>テキストラベル</translation>
</message>
<translation>OwnCloudのパス:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="182"/>
+ <location filename="../src/gui/sharedialog.ui" line="116"/>
<source>Set &password </source>
<translation>パスワードを設定(&P)</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="196"/>
+ <location filename="../src/gui/sharedialog.ui" line="130"/>
<source>Set &expiration date</source>
<translation>有効期限を設定(&E)</translation>
</message>
+ <message>
+ <location filename="../src/gui/sharedialog.ui" line="214"/>
+ <source>Allow editing</source>
+ <translation>編集を許可</translation>
+ </message>
<message>
<location filename="../src/gui/sharedialog.ui" line="77"/>
<source>Share link</source>
<translation>URLで共有</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="125"/>
+ <location filename="../src/gui/sharedialog.ui" line="203"/>
<source>Copy &link</source>
<translation>&linkをコピー</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="142"/>
+ <location filename="../src/gui/sharedialog.ui" line="154"/>
<source>Set password</source>
<translation>パスワードを設定</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="692"/>
- <source>%1 path: %2</source>
- <translation>%1 のパス: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="115"/>
+ <location filename="../src/gui/sharedialog.cpp" line="120"/>
<source>%1 Sharing</source>
<translation>%1 を共有中</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="103"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="112"/>
+ <location filename="../src/gui/sharedialog.cpp" line="117"/>
<source>Folder: %2</source>
<translation>フォルダー: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="121"/>
<source>P&assword protect</source>
<translation>パスワード保護(&A)</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="221"/>
+ <location filename="../src/gui/sharedialog.cpp" line="214"/>
<source>Password Protected</source>
<translation>パスワード保護</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="382"/>
+ <location filename="../src/gui/sharedialog.cpp" line="338"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>再共有権限がない共有ため、このファイルは共有できません。</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="528"/>
+ <location filename="../src/gui/sharedialog.cpp" line="475"/>
<source>Please Set Password</source>
<translation>パスワードを入力してください</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="564"/>
- <location filename="../src/gui/sharedialog.cpp" line="565"/>
+ <location filename="../src/gui/sharedialog.cpp" line="538"/>
+ <location filename="../src/gui/sharedialog.cpp" line="539"/>
<source>&Share link</source>
<translation>リンク共有(&S)</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="583"/>
+ <location filename="../src/gui/sharedialog.cpp" line="552"/>
+ <location filename="../src/gui/sharedialog.cpp" line="564"/>
<source>OCS API error code: %1</source>
<translation>OCS APIエラーコード: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="605"/>
- <source>There is no sync folder configured.</source>
- <translation>同期フォルダーが設定されていません。</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="639"/>
- <source>A sync file with the same name exists. The file cannot be registered to sync.</source>
- <translation>同じ名前の同期ファイルがあります。このファイルは同期対象にできません。</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="684"/>
- <source>The file cannot be synced.</source>
- <translation>このファイルは同期されません。</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="624"/>
- <source>Sharing of external directories is not yet working.</source>
- <translation>外部ディレクトリの共有はまだ動作していません。</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="473"/>
- <location filename="../src/gui/sharedialog.cpp" line="506"/>
+ <location filename="../src/gui/sharedialog.cpp" line="418"/>
+ <location filename="../src/gui/sharedialog.cpp" line="460"/>
<source>Public sh&aring requires a password</source>
<translation>共有するにはパスワードが必要(&A)</translation>
</message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="617"/>
- <source>Cannot find a folder to upload to.</source>
- <translation>アップロード先のフォルダーが見つかりません。</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
- <source>Waiting to upload...</source>
- <translation>アップロード待ち...</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="653"/>
- <source>Unable to register in sync space.</source>
- <translation>同期スペースの登録ができません。</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="694"/>
- <source>Sync of registered file was not successful yet.</source>
- <translation>登録ファイルの同期はまだ成功していません</translation>
- </message>
</context>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>Login Error</source>
<translation>ログインエラー</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>You must sign in as user %1</source>
<translation>ユーザー %1 としてログインする必要があります</translation>
</message>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="452"/>
+ <location filename="../src/gui/socketapi.cpp" line="447"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>%1 と共有</translation>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="97"/>
+ <location filename="../src/libsync/syncengine.cpp" line="94"/>
<source>Success.</source>
<translation>成功。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="104"/>
+ <location filename="../src/libsync/syncengine.cpp" line="101"/>
<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="107"/>
+ <location filename="../src/libsync/syncengine.cpp" line="104"/>
<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="110"/>
+ <location filename="../src/libsync/syncengine.cpp" line="107"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSyncは内部ツリーの処理中にエラーに遭遇しました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="113"/>
+ <location filename="../src/libsync/syncengine.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>CSyncで使用するメモリの確保に失敗しました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>CSyncの致命的なパラメータエラーです。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="119"/>
+ <location filename="../src/libsync/syncengine.cpp" line="116"/>
<source>CSync processing step update failed.</source>
<translation>CSyncの処理ステップの更新に失敗しました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="122"/>
+ <location filename="../src/libsync/syncengine.cpp" line="119"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSyncの処理ステップの調停に失敗しました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="122"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSyncはそのプロキシで認証できませんでした。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="125"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSyncはプロキシもしくはサーバーの参照に失敗しました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="128"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSyncは %1 サーバーでの認証に失敗しました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="131"/>
<source>CSync failed to connect to the network.</source>
<translation>CSyncはネットワークへの接続に失敗しました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="134"/>
<source>A network connection timeout happened.</source>
<translation>ネットワーク接続のタイムアウトが発生しました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="137"/>
<source>A HTTP transmission error happened.</source>
<translation>HTTPの伝送エラーが発生しました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation>CSyncは対応できないパーミッション拒否が原因で失敗しました。</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation>サーバー上のマウント済フォルダーが一時的に利用できません。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
<source>An error occurred while opening a folder</source>
<translation>フォルダーを開く際にエラーが発生しました</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
<source>Error while reading folder.</source>
<translation>フォルダーの読み込みエラー</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="996"/>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
<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="1003"/>
+ <location filename="../src/libsync/syncengine.cpp" line="991"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: %1 サーバーには利用可能な空き領域がありません。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="152"/>
<source>CSync unspecified error.</source>
<translation>CSyncの未指定のエラーです。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="155"/>
<source>Aborted by the user</source>
<translation>ユーザーによって中止されました</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="392"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>異なるプラットフォームOS間で利用できない不正な文字コードがファイル名に含まれているため、同期できません。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="143"/>
<source>CSync failed to access</source>
<translation>CSync は接続できませんでした</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <location filename="../src/libsync/syncengine.cpp" line="97"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <source>CSync failed due to unhandled permission denied.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="146"/>
<source>CSync tried to create a folder that already exists.</source>
<translation>CSyncはすでに存在するフォルダーを作成しようとしました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="158"/>
<source>The service is temporarily unavailable</source>
<translation>サーバーは一時的に利用できません</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="175"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>An internal error number %1 occurred.</source>
<translation>内部エラー番号 %1 が発生しました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="227"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>このアイテムは以前にエラーが発生したため同期しません: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="389"/>
+ <location filename="../src/libsync/syncengine.cpp" line="386"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>同期機能はシンボリックリンクをサポートしていません。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="392"/>
+ <location filename="../src/libsync/syncengine.cpp" line="389"/>
<source>File is listed on the ignore list.</source>
<translation>ファイルは除外リストに登録されています。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="398"/>
+ <location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename is too long.</source>
<translation>ファイル名が長すぎます</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="401"/>
+ <location filename="../src/libsync/syncengine.cpp" line="398"/>
<source>File is ignored because it's hidden.</source>
<translation>隠しファイルのため無視されました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="407"/>
+ <location filename="../src/libsync/syncengine.cpp" line="404"/>
<source>Stat failed.</source>
<translation>情報取得エラー</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="429"/>
+ <location filename="../src/libsync/syncengine.cpp" line="426"/>
<source>Filename encoding is not valid</source>
<translation>ファイル名のエンコーディングが無効です。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="561"/>
+ <location filename="../src/libsync/syncengine.cpp" line="558"/>
<source>Invalid characters, please rename "%1"</source>
<translation>無効な文字です、"%1" を変更してください。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="631"/>
+ <location filename="../src/libsync/syncengine.cpp" line="612"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="645"/>
<source>Unable to initialize a sync journal.</source>
<translation>同期ジャーナルの初期化ができません。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="718"/>
+ <location filename="../src/libsync/syncengine.cpp" line="723"/>
<source>Cannot open the sync journal</source>
<translation>同期ジャーナルを開くことができません</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="965"/>
- <location filename="../src/libsync/syncengine.cpp" line="972"/>
+ <location filename="../src/libsync/syncengine.cpp" line="953"/>
+ <location filename="../src/libsync/syncengine.cpp" line="960"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>"同期対象先" ブラックリストにより無視されました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <location filename="../src/libsync/syncengine.cpp" line="978"/>
<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="1023"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1011"/>
<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="1040"/>
- <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1028"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1048"/>
<source>Not allowed to remove, restoring</source>
<translation>削除できないので復元しています</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1073"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1061"/>
<source>Local files and share folder removed.</source>
<translation>ローカルファイルと共有フォルダーを削除しました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1116"/>
<source>Move not allowed, item restored</source>
<translation>移動できないので項目を復元しました</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1125"/>
<source>Move not allowed because %1 is read-only</source>
<translation>%1 は読み取り専用のため移動できません</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the destination</source>
<translation>移動先</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the source</source>
<translation>移動元</translation>
</message>
</message>
</context>
<context>
- <name>OCC::TransmissionChecksumValidator</name>
+ <name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="128"/>
<source>The checksum header is malformed.</source>
<translation>ヘッダーのチェックサムが異常です。</translation>
</message>
<message>
<location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+ <source>The checksum header contained an unknown checksum type '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="148"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>ダウンロードしたファイルがチェックサムエラーです。再ダウンロードします。</translation>
</message>
<source>Recent Changes</source>
<translation>最近変更されたファイル</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="561"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="331"/>
<source>Managed Folders:</source>
<source>Open %1 in browser</source>
<translation>%1をブラウザーで開く</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="449"/>
- <source>Log out everywhere</source>
- <translation>全サーバーからログアウト</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="457"/>
- <source>Log in everywhere...</source>
- <translation>全サーバーにログイン...</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="513"/>
<source>Unknown status</source>
<source>Account %1: %2</source>
<translation>アカウント %1: %2</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="449"/>
+ <source>Log out of all accounts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="457"/>
+ <source>Log in to all accounts...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="532"/>
<source>Crash now</source>
<source>No items synced recently</source>
<translation>最近同期されたアイテムはありません。</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="561"/>
- <source>Discovering '%1'</source>
- <translation> '%1'を検索中</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="566"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>%L1 B</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="306"/>
+ <location filename="../src/libsync/utility.cpp" line="303"/>
<source>%Ln year(s)</source>
<translation>%Ln年</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="307"/>
+ <location filename="../src/libsync/utility.cpp" line="304"/>
<source>%Ln month(s)</source>
<translation>%Lnヶ月</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="308"/>
+ <location filename="../src/libsync/utility.cpp" line="305"/>
<source>%Ln day(s)</source>
<translation>%Ln日</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="309"/>
+ <location filename="../src/libsync/utility.cpp" line="306"/>
<source>%Ln hour(s)</source>
<translation>%Ln時間</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="310"/>
+ <location filename="../src/libsync/utility.cpp" line="307"/>
<source>%Ln minute(s)</source>
<translation>%Ln分</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="311"/>
+ <location filename="../src/libsync/utility.cpp" line="308"/>
<source>%Ln second(s)</source>
<translation>%Ln秒</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="318"/>
<source>0 seconds</source>
<translation>0秒</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="336"/>
+ <location filename="../src/libsync/utility.cpp" line="333"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="73"/>
+ <source>Enter your credentials to connect to the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <source>Sign in</source>
+ <translation>Logg inn</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="89"/>
<source>Remove the account configuration from the client</source>
<translation>Fjern konto-konfigurasjonen fra klienten</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Remove Account</source>
<translation>Fjern konto</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="97"/>
+ <location filename="../src/gui/accountsettings.ui" line="113"/>
<source>Storage space: ...</source>
<translation>Lagringsplass: ...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="167"/>
+ <location filename="../src/gui/accountsettings.ui" line="183"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Umarkerte mapper vil bli <b>fjernet</b> fra ditt lokale filsystem og vil ikke bli synkronisert med denne maskinen lenger</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="230"/>
<source>Apply</source>
<translation>Bruk</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="198"/>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
- <location filename="../src/gui/accountsettings.cpp" line="571"/>
+ <location filename="../src/gui/accountsettings.ui" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="289"/>
+ <location filename="../src/gui/accountsettings.cpp" line="646"/>
<source>Cancel</source>
<translation>Avbryt</translation>
</message>
<translation>Tilkoblet <server> som <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="115"/>
+ <location filename="../src/gui/accountsettings.cpp" line="121"/>
<source>No account configured.</source>
<translation>Ingen konto konfigurert.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="161"/>
+ <source>Choose what to sync</source>
+ <translation>Velg hva som synkroniseres</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="168"/>
+ <source>Remove folder sync connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="234"/>
<source>Folder creation failed</source>
<translation>Oppretting av mappe feilet</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="230"/>
+ <location filename="../src/gui/accountsettings.cpp" line="235"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation><p>Klarte ikke å opprette lokal mappe <i>%1</i>.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="283"/>
- <source>Stop syncing</source>
- <translation>Stopp synkronisering</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
+ <source>Confirm Folder Sync Connection Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>Remove Folder Sync Connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="309"/>
+ <location filename="../src/gui/accountsettings.cpp" line="314"/>
<source>Confirm Folder Reset</source>
<translation>Bekreft tilbakestilling av mappe</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="310"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Vil du virkelig tilbakestille mappe <i>%1</i> og bygge klientdatabaesn på nytt?</p><p><b>NB:</b> Denne funksjonen er bare til bruk for vedlikehold. Ingen filer vil bli fjernet, men dette kan forårsake betydelig nettverkstrafikk og ta flere minutter eller timer å utføre, avhengig av størrelsen på mappen. Bruk denne muligheten bare hvis en administrator har rådet deg til det.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="391"/>
+ <location filename="../src/gui/accountsettings.cpp" line="396"/>
<source>Sync Running</source>
<translation>Synkroniserer...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="392"/>
+ <location filename="../src/gui/accountsettings.cpp" line="397"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Synkronisering kjører.<br/>Vil du avbryte den?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="472"/>
+ <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <source>%1 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="485"/>
<source>%1 as <i>%2</i></source>
<translation>%1 som <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="476"/>
+ <location filename="../src/gui/accountsettings.cpp" line="495"/>
<source>Connected to %1.</source>
<translation>Tilkoblet %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="478"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Server %1 er midlertidig utilgjengelig.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="480"/>
+ <location filename="../src/gui/accountsettings.cpp" line="499"/>
<source>Signed out from %1.</source>
<translation>Logget ut fra %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="482"/>
+ <location filename="../src/gui/accountsettings.cpp" line="501"/>
<source>No connection to %1 at %2.</source>
<translation>Ingen tilkobling til %1 på %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
- <source>There are new folders that were not synchronized because they are too big: %1</source>
- <translation>Det finnes nye mapper som ikke ble synkronisert fordi de er for store: %1</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="536"/>
- <source>, </source>
- <translation>, </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <source>There are new folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="563"/>
+ <location filename="../src/gui/accountsettings.cpp" line="638"/>
<source>Confirm Account Removal</source>
<translation>Bekreft fjerning av konto</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="564"/>
+ <location filename="../src/gui/accountsettings.cpp" line="639"/>
<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="570"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>Remove connection</source>
<translation>Fjern tilkobling</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="158"/>
<source>Open folder</source>
<translation>Åpne mappe</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="168"/>
- <source>Choose What to Sync</source>
- <translation>Velg hva som synkroniseres</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Resume sync</source>
<translation>Fortsett synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Pause sync</source>
<translation>Sett synkronisering på pause</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="176"/>
- <source>Remove sync</source>
- <translation>Fjern synkronoisering</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="277"/>
- <source>Confirm Sync Removal</source>
- <translation>Bekreft fjerning ved synkronisering</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="278"/>
+ <location filename="../src/gui/accountsettings.cpp" line="283"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>Vil du virkelig stoppe synkronisering av mappen <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="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="452"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) av %2 i bruk. Noen mapper, inkludert nettverkstilkoblede eller delte mapper, kan ha andre begrensninger.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="448"/>
+ <location filename="../src/gui/accountsettings.cpp" line="453"/>
<source>%1 of %2 in use</source>
<translation>%1 av %2 i bruk</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="453"/>
+ <location filename="../src/gui/accountsettings.cpp" line="462"/>
<source>Currently there is no storage usage information available.</source>
<translation>Ingen informasjon om bruk av lagringsplass tilgjengelig for øyeblikket.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="507"/>
<source>No %1 connection configured.</source>
<translation>Ingen %1-forbindelse konfigurert.</translation>
</message>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="95"/>
+ <location filename="../src/gui/accountstate.cpp" line="99"/>
<source>Signed out</source>
<translation>Logget ut</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="97"/>
+ <location filename="../src/gui/accountstate.cpp" line="101"/>
<source>Disconnected</source>
<translation>Frakoblet</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="99"/>
+ <location filename="../src/gui/accountstate.cpp" line="103"/>
<source>Connected</source>
<translation>Tilkoblet</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="101"/>
+ <location filename="../src/gui/accountstate.cpp" line="105"/>
<source>Service unavailable</source>
<translation>Tjeneste utilgjengelig</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="103"/>
+ <location filename="../src/gui/accountstate.cpp" line="107"/>
<source>Network error</source>
<translation>Nettverksfeil</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="105"/>
+ <location filename="../src/gui/accountstate.cpp" line="109"/>
<source>Configuration error</source>
<translation>Konfigurasjonsfeil</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="107"/>
+ <location filename="../src/gui/accountstate.cpp" line="111"/>
<source>Unknown account state</source>
<translation>Ukjent kontotilstand</translation>
</message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>Reauthentication required</source>
+ <translation>Ny autentisering kreves</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>You need to re-login to continue using the account %1.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
<translation>Vennligst oppdatert til den nyeste serveren og start klienten på nytt.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="143"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="135"/>
<source>Authentication error: Either username or password are wrong.</source>
<translation>Autentiseringsfeil: Bruker navn eller passord er feil.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="155"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="147"/>
<source>timeout</source>
<translation>tidsavbrudd</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="186"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="178"/>
<source>The provided credentials are not correct</source>
<translation>Oppgitt påloggingsinformasjon er feil</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="524"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="537"/>
<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="107"/>
+ <location filename="../src/gui/folder.cpp" line="108"/>
<source>Unable to create csync-context</source>
<translation>Klarte ikke å opprette csync-kontekst</translation>
</message>
<translation>Synkroniseringsaktivitet</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="845"/>
+ <location filename="../src/gui/folder.cpp" line="870"/>
<source>Could not read system exclude file</source>
<translation>Klarte ikke å lese systemets ekskluderingsfil</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1102"/>
+ <location filename="../src/gui/folder.cpp" line="1127"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>En ny mappe større enn %1 MB er blitt lagt til: %2.
Gå til Innstillinger og velg mappen hvis du ønsker å laste den ned.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1115"/>
+ <location filename="../src/gui/folder.cpp" line="1140"/>
<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="1119"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Remove All Files?</source>
<translation>Fjerne alle filer?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1121"/>
+ <location filename="../src/gui/folder.cpp" line="1146"/>
<source>Remove all files</source>
<translation>Fjern alle filer</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1122"/>
+ <location filename="../src/gui/folder.cpp" line="1147"/>
<source>Keep files</source>
<translation>Behold filer</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="275"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<source>Could not reset folder state</source>
<translation>Klarte ikke å tilbakestille mappetilstand</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="276"/>
+ <location filename="../src/gui/folderman.cpp" line="271"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>En gammel synkroniseringsjournal '%1' ble funnet men kunne ikke fjernes. Pass på at ingen applikasjoner bruker den.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="877"/>
+ <location filename="../src/gui/folderman.cpp" line="865"/>
<source> (backup)</source>
<translation> (sikkerhetskopi)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="882"/>
+ <location filename="../src/gui/folderman.cpp" line="870"/>
<source> (backup %1)</source>
<translation> (sikkerhetskopi %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1091"/>
+ <location filename="../src/gui/folderman.cpp" line="1079"/>
<source>Undefined State.</source>
<translation>Udefinert tilstand.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1094"/>
- <source>Waits to start syncing.</source>
- <translation>Venter på å starte synkronisering.</translation>
+ <location filename="../src/gui/folderman.cpp" line="1082"/>
+ <source>Waiting to start syncing.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1097"/>
+ <location filename="../src/gui/folderman.cpp" line="1085"/>
<source>Preparing for sync.</source>
<translation>Forbereder synkronisering.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1100"/>
+ <location filename="../src/gui/folderman.cpp" line="1088"/>
<source>Sync is running.</source>
<translation>Synkronisering kjører.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1103"/>
+ <location filename="../src/gui/folderman.cpp" line="1091"/>
<source>Last Sync was successful.</source>
<translation>Siste synkronisering var vellykket.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1108"/>
+ <location filename="../src/gui/folderman.cpp" line="1096"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Siste synkronisering var vellykket, men med advarsler på enkelte filer.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1111"/>
+ <location filename="../src/gui/folderman.cpp" line="1099"/>
<source>Setup Error.</source>
<translation>Feil med oppsett.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1114"/>
+ <location filename="../src/gui/folderman.cpp" line="1102"/>
<source>User Abort.</source>
<translation>Brukeravbrudd.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1117"/>
+ <location filename="../src/gui/folderman.cpp" line="1105"/>
<source>Sync is paused.</source>
<translation>Synkronisering er satt på pause.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1123"/>
+ <location filename="../src/gui/folderman.cpp" line="1111"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synkronisering er satt på pause)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1119"/>
<source>No valid folder selected!</source>
<translation>Ingen gyldig mappe valgt!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1130"/>
<source>The selected path is not a folder!</source>
<translation>Den valgte stien er ikke en mappe!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1146"/>
+ <location filename="../src/gui/folderman.cpp" line="1134"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Du har ikke skrivetilgang til den valgte mappen!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1161"/>
+ <location filename="../src/gui/folderman.cpp" line="1149"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>Den lokale mappen %1 er allerede brukt i en mappe-synkronisering. Velg en annen!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1166"/>
+ <location filename="../src/gui/folderman.cpp" line="1154"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Den lokale mappen %1 inneholder allerede en mappe brukt i en mappe-synkronisering. Velg en annen!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1173"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Den lokale mappen %1 er en symbolsk lenke. Målet for lenken inneholder allerede en mappe brukt i en mappe-synkronisering. Velg en annen!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1168"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Den lokale mappen %1 er allerede en undermappe av en mappe brukt i en mappe-synkronisering. Velg en annen!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1186"/>
+ <location filename="../src/gui/folderman.cpp" line="1174"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Den lokale mappen %1 er en symbolsk lenke. Målet for lenken er allerede en undermappe av en mappe brukt i en mappe-synkronisering. Velg en annen!</translation>
</message>
<translation>Legg til mappe-synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="85"/>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="274"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="271"/>
<source>File</source>
<translation>Fil</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="228"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="224"/>
<source>Syncing selected files in your account with</source>
<translation>Synkroniserer valgte filer i kontoen din med</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="231"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="227"/>
<source>Remote path: %1</source>
<translation>Ekstern mappe: %1</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="121"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="122"/>
<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="126"/>
- <source>Adding folder is disabled because your 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="131"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="132"/>
<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="141"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="142"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="156"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
<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="182"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="192"/>
<source>Signed out</source>
<translation>Logget ut</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="727"/>
- <source>Discovering '%1'</source>
- <translation>Påviser '%1'</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="127"/>
+ <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="163"/>
+ <source>Fetching folder list from server...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="789"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="787"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="849"/>
<source>Syncing %1</source>
<translation>Synkroniserer %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="792"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="854"/>
<source>download %1/s</source>
<translation>nedlasting %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="794"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="856"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="800"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>upload %1/s</source>
<translation>opplasting %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="802"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="864"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="807"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="869"/>
<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="811"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="873"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="827"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="889"/>
<source>%1 of %2, file %3 of %4
Total time left %5</source>
<translation>%1 av %2, fil %3 av %4
Tid som gjenstår %5</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
<source>file %1 of %2</source>
<translation>fil %1 av %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="932"/>
<source>Waiting...</source>
<translation>Venter..</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="934"/>
<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="878"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>Preparing to sync...</source>
<translation>Forbereder synkronisering...</translation>
</message>
<name>OCC::FolderWizard</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <source>Add Folder Sync Connection</source>
+ <translation>Legg til mappe-synkronisering</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderwizard.cpp" line="564"/>
- <source>Add Folder</source>
- <translation>Legg til mappe</translation>
+ <source>Add Sync Connection</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Avansert</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="61"/>
+ <location filename="../src/gui/generalsettings.ui" line="109"/>
<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="81"/>
+ <location filename="../src/gui/generalsettings.ui" line="129"/>
<source>MB</source>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="109"/>
+ <location filename="../src/gui/generalsettings.ui" line="159"/>
<source>Show crash reporter</source>
<translation>Vis krasj-rapportering</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="118"/>
+ <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="142"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
<source>Add an Account</source>
<translation>Legg til en konto</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="167"/>
- <location filename="../src/gui/generalsettings.ui" line="173"/>
+ <location filename="../src/gui/generalsettings.ui" line="171"/>
+ <location filename="../src/gui/generalsettings.ui" line="177"/>
<source>About</source>
<translation>Om</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <location filename="../src/gui/generalsettings.ui" line="187"/>
<source>Updates</source>
<translation>Oppdateringer</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="208"/>
+ <location filename="../src/gui/generalsettings.ui" line="212"/>
<source>&Restart && Update</source>
<translation>&Omstart && Oppdater</translation>
</message>
</context>
-<context>
- <name>OCC::HttpCredentials</name>
- <message>
- <location filename="../src/libsync/creds/httpcredentials.cpp" line="290"/>
- <source>Reading from keychain failed with error: '%1'</source>
- <translation>Lesing fra nøkkelring feilet med feil: '%1'</translation>
- </message>
-</context>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="32"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
<source>Please enter %1 password:
User: %2
</translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="41"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <source>Reading from keychain failed with error: '%1'</source>
+ <translation>Lesing fra nøkkelring feilet med feil: '%1'</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
<source>Enter Password</source>
<translation>Legg inn passord</translation>
</message>
<translation>Fjern</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="40"/>
<source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
Elementer hvor sletting er tillatt, vil bli slettet hvis de forhindrer fjerning av en mappe. Dette er hendig for metadata.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="109"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
<source>Could not open file</source>
<translation>Klarte ikke å åpne fil</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="111"/>
<source>Cannot write changes to '%1'.</source>
<translation>Kan ikke skrive endringer til '%1'.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="138"/>
<source>Add Ignore Pattern</source>
<translation>Nytt mønster</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>Add a new ignore pattern:</source>
<translation>Legg til ignoreringsmønster:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="45"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="46"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Denne oppføringen er gitt av systemet på '%1' og kan ikke endres i denne visningen.</translation>
</message>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="163"/>
+ <location filename="../src/libsync/logger.cpp" line="190"/>
<source>Error</source>
<translation>Feil</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="164"/>
+ <location filename="../src/libsync/logger.cpp" line="191"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Fil '%1'<br/>kan ikke åpnes for skriving.<br/><br/>Loggen kan <b>ikke</b> lagres!</nobr></translation>
</message>
</message>
<message>
<location filename="../src/gui/networksettings.ui" line="203"/>
- <location filename="../src/gui/networksettings.ui" line="295"/>
+ <location filename="../src/gui/networksettings.ui" line="292"/>
<source>No limit</source>
<translation>Ingen begrensning</translation>
</message>
<source>SOCKS5 proxy</source>
<translation>SOCKS5 proxy</translation>
</message>
+ <message>
+ <location filename="../src/gui/networksettings.cpp" line="128"/>
+ <source>Qt >= 5.4 is required in order to use the bandwidth limit</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::OCUpdater</name>
<source>Downloading version %1. Please wait...</source>
<translation>Laster ned versjon %1. Vennligst vent...</translation>
</message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
- <source>Version %1 available. Restart application to start the update.</source>
- <translation>Versjon %1 tilgjengelig. Start applikasjonen på nytt for å begynne oppdateringen.</translation>
- </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="145"/>
<source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
<source>Could not check for new updates.</source>
<translation>Klarte ikke å se etter nye oppdateringer.</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
+ <source>%1 version %2 available. Restart application to start the update.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
- <source>New version %1 available. Please use the system's update tool to install it.</source>
- <translation>Ny versjon %1 tilgjengelig. Bruk systemets oppdateringsverktøy til å installere den.</translation>
+ <source>New %1 version %2 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="151"/>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="114"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="110"/>
<source>Connection Timeout</source>
<translation>Tidsavbrudd ved tilkobling</translation>
</message>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="171"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="167"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Ugyldig JSON-svar fra forespørsels-URL</translation>
</message>
</context>
-<context>
- <name>OCC::PropagateDownloadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="435"/>
- <source>Sync was aborted by user.</source>
- <translation>Synkronisering ble avbrutt av bruker.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="488"/>
- <source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation>Ingen E-Tag mottatt fra server. Sjekk proxy/gateway.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="494"/>
- <source>We received a different E-Tag for resuming. Retrying next time.</source>
- <translation>Vi mottok en forskjellig E-Tag for å fortsette. Prøver igjen neste gang.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="516"/>
- <source>Server returned wrong content-range</source>
- <translation>Serveren returnerte feil content-range</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="567"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation>Fil %1 kan ikke lastes ned på grunn av lokalt sammenfall av filnavn!</translation>
- </message>
-</context>
<context>
<name>OCC::PropagateDownloadFileQNAM</name>
<message>
<translation>Fil %1 kan ikke lastes ned på grunn av lokalt sammenfall av filnavn!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="457"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
+ <source>The download would reduce free disk space below %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="372"/>
+ <source>Free space on disk is less than %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="482"/>
<source>File was deleted from server</source>
<translation>Filen ble slettet fra serveren</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="506"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="531"/>
<source>The file could not be downloaded completely.</source>
<translation>Hele filen kunne ikke lastes ned.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="601"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="636"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Fil %1 kan ikke lagres på grunn av lokal konflikt med filnavn.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="641"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="676"/>
<source>File has changed since discovery</source>
<translation>Filen er endret siden den ble oppdaget</translation>
</message>
<context>
<name>OCC::PropagateItemJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="92"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
<source>; Restoration Failed: %1</source>
<translation>; Gjenoppretting feilet: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="138"/>
<source>Continue blacklisting:</source>
<translation>Fortsett svartelisting:</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="230"/>
<source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation>En fil eller mappe ble fjernet fra en deling med lesetilgang, men gjenoppretting feilet: %1</translation>
</message>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove folder '%1';</source>
- <translation>Klarte ikke å fjerne mappe '%1';</translation>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="243"/>
- <location filename="../src/libsync/propagator_legacy.cpp" line="302"/>
- <source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>Lokal fil ble endret under synkroniseringen. Synkroniserer når den har ankommet fullstendig</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="246"/>
- <source>Sync was aborted by user.</source>
- <translation>Synkronisering ble avbrutt av bruker.</translation>
- </message>
+ <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="252"/>
- <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
- <translation>Filen ble redigert lokalt men er en del av en deling med lesetilgang. Den er blitt gjenopprettet og din endring er i konfliktfilen.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="205"/>
+ <source>File name contains at least one invalid character</source>
+ <translation>Filnavnet inneholder minst ett ulovlig tegn</translation>
</message>
-</context>
-<context>
- <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="226"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="262"/>
<source>File Removed</source>
<translation>Fil fjernet</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="274"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Lokal fil endret under synkronisering. Den vil gjenopptas.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="250"/>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="286"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="665"/>
<source>Local file changed during sync.</source>
<translation>Lokal fil endret under synkronisering.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="558"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="592"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>Tvinger avbryting av jobb ved HTTP connection reset med Qt < 5.4.2.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="566"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="600"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Filen ble redigert lokalt men er en del av en deling med lesetilgang. Den er blitt gjenopprettet og din endring er i konfliktfilen.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="597"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="631"/>
<source>Poll URL missing</source>
<translation>Forespørsels-URL mangler</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="620"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="654"/>
<source>The local file was removed during sync.</source>
<translation>Den lokale filen ble fjernet under synkronisering.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="646"/>
- <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
- <translation>Serveren godtok ikke den siste deloverføringen. (Ingen e-tag var tilstede)</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="680"/>
+ <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Umarkerte mapper vil bli <b>fjernet</b> fra ditt lokale filsystem og vil ikke bli synkronisert med denne maskinen lenger</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>Velg hva som skal synkroniseres: Velg eksterne undermapper som du vil synkronisere.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>Velg hva som skal synkroniseres: Velg bort eksterne undermapper som du ikke vil synkronisere.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
<source>Choose What to Sync</source>
<translation>Velg hva som synkroniseres</translation>
</message>
<translation>Størrelse</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
<source>No subfolders currently on the server.</source>
<translation>Ingen undermapper på serveren nå</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>Det oppstod en feil ved lasting av liste av undermapper.</translation>
</message>
<translation>Innstillinger</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="80"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="84"/>
<source>Activity</source>
<translation>Aktivitet</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="86"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="90"/>
<source>General</source>
<translation>Generelt</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>Network</source>
<translation>Nettverk</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharedialog.ui" line="22"/>
- <location filename="../src/gui/sharedialog.ui" line="234"/>
+ <location filename="../src/gui/sharedialog.ui" line="258"/>
<source>TextLabel</source>
<translation>Tekst-etikett</translation>
</message>
<translation>ownCloud-sti:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="182"/>
+ <location filename="../src/gui/sharedialog.ui" line="116"/>
<source>Set &password </source>
<translation>Sett &passord </translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="196"/>
+ <location filename="../src/gui/sharedialog.ui" line="130"/>
<source>Set &expiration date</source>
<translation>Sett &utløpsdato</translation>
</message>
+ <message>
+ <location filename="../src/gui/sharedialog.ui" line="214"/>
+ <source>Allow editing</source>
+ <translation>Tillat redigering</translation>
+ </message>
<message>
<location filename="../src/gui/sharedialog.ui" line="77"/>
<source>Share link</source>
<translation>Del lenke</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="125"/>
+ <location filename="../src/gui/sharedialog.ui" line="203"/>
<source>Copy &link</source>
<translation>Kopier &lenke</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="142"/>
+ <location filename="../src/gui/sharedialog.ui" line="154"/>
<source>Set password</source>
<translation>Sett passord</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="692"/>
- <source>%1 path: %2</source>
- <translation>%1-sti: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="115"/>
+ <location filename="../src/gui/sharedialog.cpp" line="120"/>
<source>%1 Sharing</source>
<translation>%1-deling</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="103"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="112"/>
+ <location filename="../src/gui/sharedialog.cpp" line="117"/>
<source>Folder: %2</source>
<translation>Mappe: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="121"/>
<source>P&assword protect</source>
<translation>P&assordbeskyttelse</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="221"/>
+ <location filename="../src/gui/sharedialog.cpp" line="214"/>
<source>Password Protected</source>
<translation>Passordbeskyttet</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="382"/>
+ <location filename="../src/gui/sharedialog.cpp" line="338"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Filen kan ikke deles fordi den ble delt uten adgang til å dele.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="528"/>
+ <location filename="../src/gui/sharedialog.cpp" line="475"/>
<source>Please Set Password</source>
<translation>Sett passord</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="564"/>
- <location filename="../src/gui/sharedialog.cpp" line="565"/>
+ <location filename="../src/gui/sharedialog.cpp" line="538"/>
+ <location filename="../src/gui/sharedialog.cpp" line="539"/>
<source>&Share link</source>
<translation>&Del lenke</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="583"/>
+ <location filename="../src/gui/sharedialog.cpp" line="552"/>
+ <location filename="../src/gui/sharedialog.cpp" line="564"/>
<source>OCS API error code: %1</source>
<translation>OCS API feilkode: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="605"/>
- <source>There is no sync folder configured.</source>
- <translation>Synkroniseringsmappe er ikke konfigurert.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="639"/>
- <source>A sync file with the same name exists. The file cannot be registered to sync.</source>
- <translation>Det finnes en synkroniseringsfil med samme navn. Filen kan ikke registreres for synkronisering.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="684"/>
- <source>The file cannot be synced.</source>
- <translation>Filen kan ikke synkroniseres.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="624"/>
- <source>Sharing of external directories is not yet working.</source>
- <translation>Deling av eksterne mapper virker ikke ennå.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="473"/>
- <location filename="../src/gui/sharedialog.cpp" line="506"/>
+ <location filename="../src/gui/sharedialog.cpp" line="418"/>
+ <location filename="../src/gui/sharedialog.cpp" line="460"/>
<source>Public sh&aring requires a password</source>
<translation>Offentlig d&eling krever et passord</translation>
</message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="617"/>
- <source>Cannot find a folder to upload to.</source>
- <translation>Finner ikke en mappe å laste opp til.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
- <source>Waiting to upload...</source>
- <translation>Venter på å laste opp...</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="653"/>
- <source>Unable to register in sync space.</source>
- <translation>Klarte ikke å registrere filen på synkroniseringsplass.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="694"/>
- <source>Sync of registered file was not successful yet.</source>
- <translation>Synkronisering av registrert fil ikke vellykket ennå.</translation>
- </message>
</context>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>Login Error</source>
<translation>Innloggingsfeil</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>You must sign in as user %1</source>
<translation>Du må logge inn som bruker %1</translation>
</message>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="452"/>
+ <location filename="../src/gui/socketapi.cpp" line="447"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Del med %1</translation>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="97"/>
+ <location filename="../src/libsync/syncengine.cpp" line="94"/>
<source>Success.</source>
<translation>Suksess.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="104"/>
+ <location filename="../src/libsync/syncengine.cpp" line="101"/>
<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="107"/>
+ <location filename="../src/libsync/syncengine.cpp" line="104"/>
<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="110"/>
+ <location filename="../src/libsync/syncengine.cpp" line="107"/>
<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="113"/>
+ <location filename="../src/libsync/syncengine.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync klarte ikke å reservere minne.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>CSync fatal parmeterfeil.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="119"/>
+ <location filename="../src/libsync/syncengine.cpp" line="116"/>
<source>CSync processing step update failed.</source>
<translation>CSync-behandlingssteg oppdatering feilet.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="122"/>
+ <location filename="../src/libsync/syncengine.cpp" line="119"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync-behandlingssteg overensstemming feilet.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="122"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="125"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="128"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="131"/>
<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="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="134"/>
<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="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="137"/>
<source>A HTTP transmission error happened.</source>
<translation>En HTTP-overføringsfeil oppstod.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation>CSync feilet pga. at nektet tilgang ikke ble håndtert.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
<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="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
<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="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
<source>Error while reading folder.</source>
<translation>Feil ved lesing av mappe.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="996"/>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
<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="1003"/>
+ <location filename="../src/libsync/syncengine.cpp" line="991"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="152"/>
<source>CSync unspecified error.</source>
<translation>CSync uspesifisert feil.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="155"/>
<source>Aborted by the user</source>
<translation>Avbrutt av brukeren</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="392"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>Filnavnet inneholder ugyldige tegn som ikke kan synkroniseres på tvers av plattformer.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="143"/>
<source>CSync failed to access</source>
<translation>CSync klarte ikke å aksessere</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <location filename="../src/libsync/syncengine.cpp" line="97"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <source>CSync failed due to unhandled permission denied.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="146"/>
<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="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="158"/>
<source>The service is temporarily unavailable</source>
<translation>Tjenesten er midlertidig utilgjengelig</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="175"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<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="230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="227"/>
<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="389"/>
+ <location filename="../src/libsync/syncengine.cpp" line="386"/>
<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="392"/>
+ <location filename="../src/libsync/syncengine.cpp" line="389"/>
<source>File is listed on the ignore list.</source>
<translation>Filen ligger på ignoreringslisten.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="398"/>
+ <location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename is too long.</source>
<translation>Filnavn er for langt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="401"/>
+ <location filename="../src/libsync/syncengine.cpp" line="398"/>
<source>File is ignored because it's hidden.</source>
<translation>Filen ignoreres fordi den er skjult.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="407"/>
+ <location filename="../src/libsync/syncengine.cpp" line="404"/>
<source>Stat failed.</source>
<translation>Stat feilet.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="429"/>
+ <location filename="../src/libsync/syncengine.cpp" line="426"/>
<source>Filename encoding is not valid</source>
<translation>Filnavn-koding er ikke gyldig</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="561"/>
+ <location filename="../src/libsync/syncengine.cpp" line="558"/>
<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="631"/>
+ <location filename="../src/libsync/syncengine.cpp" line="612"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="645"/>
<source>Unable to initialize a sync journal.</source>
<translation>Kan ikke initialisere en synkroniseringsjournal.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="718"/>
+ <location filename="../src/libsync/syncengine.cpp" line="723"/>
<source>Cannot open the sync journal</source>
<translation>Kan ikke åpne synkroniseringsjournalen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="965"/>
- <location filename="../src/libsync/syncengine.cpp" line="972"/>
+ <location filename="../src/libsync/syncengine.cpp" line="953"/>
+ <location filename="../src/libsync/syncengine.cpp" line="960"/>
<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="990"/>
+ <location filename="../src/libsync/syncengine.cpp" line="978"/>
<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="1023"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1011"/>
<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="1040"/>
- <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1028"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1048"/>
<source>Not allowed to remove, restoring</source>
<translation>Ikke tillatt å fjerne, gjenoppretter</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1073"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1061"/>
<source>Local files and share folder removed.</source>
<translation>Lokale filer og delingsmappe fjernet.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1116"/>
<source>Move not allowed, item restored</source>
<translation>Flytting ikke tillatt, element gjenopprettet</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1125"/>
<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="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the destination</source>
<translation>målet</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the source</source>
<translation>kilden</translation>
</message>
</message>
</context>
<context>
- <name>OCC::TransmissionChecksumValidator</name>
+ <name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="128"/>
<source>The checksum header is malformed.</source>
<translation>Sjekksum-headeren har feil format.</translation>
</message>
<message>
<location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+ <source>The checksum header contained an unknown checksum type '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="148"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>Den nedlastede filen passer ikke med sjekksummen, den vil bli gjenopptatt.</translation>
</message>
<source>Recent Changes</source>
<translation>Siste endringer</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="561"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="331"/>
<source>Managed Folders:</source>
<source>Open %1 in browser</source>
<translation>Åpne %1 i nettleser</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="449"/>
- <source>Log out everywhere</source>
- <translation>Logg ut alle steder</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="457"/>
- <source>Log in everywhere...</source>
- <translation>Logg inn alle steder..</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="513"/>
<source>Unknown status</source>
<source>Account %1: %2</source>
<translation>Konto %1: %2</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="449"/>
+ <source>Log out of all accounts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="457"/>
+ <source>Log in to all accounts...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="532"/>
<source>Crash now</source>
<source>No items synced recently</source>
<translation>Ingenting synkronisert nylig</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="561"/>
- <source>Discovering '%1'</source>
- <translation>Påviser '%1'</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="566"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>%L1 B</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="306"/>
+ <location filename="../src/libsync/utility.cpp" line="303"/>
<source>%Ln year(s)</source>
<translation>%Ln år</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="307"/>
+ <location filename="../src/libsync/utility.cpp" line="304"/>
<source>%Ln month(s)</source>
<translation>%Ln måned(er)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="308"/>
+ <location filename="../src/libsync/utility.cpp" line="305"/>
<source>%Ln day(s)</source>
<translation>%Ln dag(er)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="309"/>
+ <location filename="../src/libsync/utility.cpp" line="306"/>
<source>%Ln hour(s)</source>
<translation>%Ln time(r)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="310"/>
+ <location filename="../src/libsync/utility.cpp" line="307"/>
<source>%Ln minute(s)</source>
<translation>%Ln minutt(er)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="311"/>
+ <location filename="../src/libsync/utility.cpp" line="308"/>
<source>%Ln second(s)</source>
<translation>%Ln sekund(er)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="318"/>
<source>0 seconds</source>
<translation>0 sekunder</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="336"/>
+ <location filename="../src/libsync/utility.cpp" line="333"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="73"/>
+ <source>Enter your credentials to connect to the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <source>Sign in</source>
+ <translation>Inloggen</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="89"/>
<source>Remove the account configuration from the client</source>
<translation>Verwijder de accountconfiguratie uit de client</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Remove Account</source>
<translation>Verwijder account</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="97"/>
+ <location filename="../src/gui/accountsettings.ui" line="113"/>
<source>Storage space: ...</source>
<translation>Opslagruimte: ...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="167"/>
+ <location filename="../src/gui/accountsettings.ui" line="183"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Niet geselecteerde mappen worden <b>verwijderd</b> van uw lokale bestandssysteem en worden niet meer gesynchroniseerd met deze computer</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="230"/>
<source>Apply</source>
<translation>Toepassen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="198"/>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
- <location filename="../src/gui/accountsettings.cpp" line="571"/>
+ <location filename="../src/gui/accountsettings.ui" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="289"/>
+ <location filename="../src/gui/accountsettings.cpp" line="646"/>
<source>Cancel</source>
<translation>Annuleren</translation>
</message>
<translation>Verbonden met <server> als <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="115"/>
+ <location filename="../src/gui/accountsettings.cpp" line="121"/>
<source>No account configured.</source>
<translation>Geen account ingesteld.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="161"/>
+ <source>Choose what to sync</source>
+ <translation>Selectieve synchronisatie</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="168"/>
+ <source>Remove folder sync connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="234"/>
<source>Folder creation failed</source>
<translation>Maken map mislukt</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="230"/>
+ <location filename="../src/gui/accountsettings.cpp" line="235"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation><p>Kon lokale map <i>%1</i> niet maken.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="283"/>
- <source>Stop syncing</source>
- <translation>Stop synchroniseren</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
+ <source>Confirm Folder Sync Connection Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>Remove Folder Sync Connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="309"/>
+ <location filename="../src/gui/accountsettings.cpp" line="314"/>
<source>Confirm Folder Reset</source>
<translation>Bevestig map reset</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="310"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Wilt u map <i>%1</i> echt resetten en de database opnieuw opbouwen?</p><p><b>Let op:</b> Deze functie is alleen ontworpen voor onderhoudsdoeleinden. Hoewel er geen bestanden worden verwijderd, kan dit een aanzienlijke hoeveelheid dataverkeer tot gevolg hebben en minuten tot zelfs uren duren, afhankelijk van de omvang van de map. Gebruik deze functie alleen als dit wordt geadviseerd door uw applicatiebeheerder.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="391"/>
+ <location filename="../src/gui/accountsettings.cpp" line="396"/>
<source>Sync Running</source>
<translation>Bezig met synchroniseren</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="392"/>
+ <location filename="../src/gui/accountsettings.cpp" line="397"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Bezig met synchroniseren.<br/>Wilt u stoppen met synchroniseren?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="472"/>
+ <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <source>%1 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="485"/>
<source>%1 as <i>%2</i></source>
<translation>%1 als <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="476"/>
+ <location filename="../src/gui/accountsettings.cpp" line="495"/>
<source>Connected to %1.</source>
<translation>Verbonden met %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="478"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Server %1 is tijdelijk niet beschikbaar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="480"/>
+ <location filename="../src/gui/accountsettings.cpp" line="499"/>
<source>Signed out from %1.</source>
<translation>Uitgelogd van %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="482"/>
+ <location filename="../src/gui/accountsettings.cpp" line="501"/>
<source>No connection to %1 at %2.</source>
<translation>Geen verbinding met %1 op %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
- <source>There are new folders that were not synchronized because they are too big: %1</source>
- <translation>Er zijn nieuwe mappen die niet gesynchroniseerd werden omdat ze te groot zijn: %1</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="536"/>
- <source>, </source>
- <translation>, </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <source>There are new folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="563"/>
+ <location filename="../src/gui/accountsettings.cpp" line="638"/>
<source>Confirm Account Removal</source>
<translation>Bevestig verwijderen account</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="564"/>
+ <location filename="../src/gui/accountsettings.cpp" line="639"/>
<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="570"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>Remove connection</source>
<translation>Verwijderen verbinding</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="158"/>
<source>Open folder</source>
<translation>Openen map</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="168"/>
- <source>Choose What to Sync</source>
- <translation>Wat synchroniseren</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Resume sync</source>
<translation>Hervatten sync</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Pause sync</source>
<translation>Pauzeren sync</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="176"/>
- <source>Remove sync</source>
- <translation>Verwijderen sync</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="277"/>
- <source>Confirm Sync Removal</source>
- <translation>Bevestig Sync verwijdering</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="278"/>
+ <location filename="../src/gui/accountsettings.cpp" line="283"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>Weet u zeker dat u de synchronisatie van map <i>%1</i> wilt stoppen?</p><p><b>Opmerking:</b> Dit zal <b>geen</b> bestanden verwijderen.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="452"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) van %2 in gebruik. Sommige mappen, inclusief netwerkmappen en gedeelde mappen, kunnen andere limieten hebben.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="448"/>
+ <location filename="../src/gui/accountsettings.cpp" line="453"/>
<source>%1 of %2 in use</source>
<translation>%1 van %2 in gebruik</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="453"/>
+ <location filename="../src/gui/accountsettings.cpp" line="462"/>
<source>Currently there is no storage usage information available.</source>
<translation>Er is nu geen informatie over het gebruik van de opslagruimte beschikbaar.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="507"/>
<source>No %1 connection configured.</source>
<translation>Geen %1 connectie geconfigureerd.</translation>
</message>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="95"/>
+ <location filename="../src/gui/accountstate.cpp" line="99"/>
<source>Signed out</source>
<translation>Afgemeld</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="97"/>
+ <location filename="../src/gui/accountstate.cpp" line="101"/>
<source>Disconnected</source>
<translation>Niet verbonden</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="99"/>
+ <location filename="../src/gui/accountstate.cpp" line="103"/>
<source>Connected</source>
<translation>Verbonden</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="101"/>
+ <location filename="../src/gui/accountstate.cpp" line="105"/>
<source>Service unavailable</source>
<translation>Dienst niet beschikbaar</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="103"/>
+ <location filename="../src/gui/accountstate.cpp" line="107"/>
<source>Network error</source>
<translation>Netwerkfout</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="105"/>
+ <location filename="../src/gui/accountstate.cpp" line="109"/>
<source>Configuration error</source>
<translation>Configuratiefout</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="107"/>
+ <location filename="../src/gui/accountstate.cpp" line="111"/>
<source>Unknown account state</source>
<translation>Onbekende account-status</translation>
</message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>Reauthentication required</source>
+ <translation>Hernieuwde authenticatie nodig</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>You need to re-login to continue using the account %1.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
<translation>Werk de server bij naar de nieuwste versie en herstart het programma.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="143"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="135"/>
<source>Authentication error: Either username or password are wrong.</source>
<translation>Authenticatiefout: Gebruikersnaam of wachtwoord is onjuist.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="155"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="147"/>
<source>timeout</source>
<translation>time-out</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="186"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="178"/>
<source>The provided credentials are not correct</source>
<translation>De verstrekte inloggegevens zijn niet juist</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="524"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="537"/>
<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="107"/>
+ <location filename="../src/gui/folder.cpp" line="108"/>
<source>Unable to create csync-context</source>
<translation>Onmogelijk om een csync-context te maken</translation>
</message>
<translation>Synchronisatie-activiteit</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="845"/>
+ <location filename="../src/gui/folder.cpp" line="870"/>
<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="1102"/>
+ <location filename="../src/gui/folder.cpp" line="1127"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Een nieuwe map groter dan %1 MB is toegevoegd: %2
Ga naar de instellingen om het te selecteren als u deze wilt downloaden.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1115"/>
+ <location filename="../src/gui/folder.cpp" line="1140"/>
<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="1119"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Remove All Files?</source>
<translation>Verwijder alle bestanden?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1121"/>
+ <location filename="../src/gui/folder.cpp" line="1146"/>
<source>Remove all files</source>
<translation>Verwijder alle bestanden</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1122"/>
+ <location filename="../src/gui/folder.cpp" line="1147"/>
<source>Keep files</source>
<translation>Bewaar bestanden</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="275"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<source>Could not reset folder state</source>
<translation>Kan de beginstaat van de map niet terugzetten</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="276"/>
+ <location filename="../src/gui/folderman.cpp" line="271"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Een oud synchronisatieverslag '%1' is gevonden maar kan niet worden verwijderd. Zorg ervoor dat geen applicatie dit bestand gebruikt.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="877"/>
+ <location filename="../src/gui/folderman.cpp" line="865"/>
<source> (backup)</source>
<translation>(backup)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="882"/>
+ <location filename="../src/gui/folderman.cpp" line="870"/>
<source> (backup %1)</source>
<translation>(backup %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1091"/>
+ <location filename="../src/gui/folderman.cpp" line="1079"/>
<source>Undefined State.</source>
<translation>Ongedefiniëerde staat</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1094"/>
- <source>Waits to start syncing.</source>
- <translation>In afwachting van synchronisatie.</translation>
+ <location filename="../src/gui/folderman.cpp" line="1082"/>
+ <source>Waiting to start syncing.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1097"/>
+ <location filename="../src/gui/folderman.cpp" line="1085"/>
<source>Preparing for sync.</source>
<translation>Synchronisatie wordt voorbereid</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1100"/>
+ <location filename="../src/gui/folderman.cpp" line="1088"/>
<source>Sync is running.</source>
<translation>Bezig met synchroniseren.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1103"/>
+ <location filename="../src/gui/folderman.cpp" line="1091"/>
<source>Last Sync was successful.</source>
<translation>Laatste synchronisatie was geslaagd.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1108"/>
+ <location filename="../src/gui/folderman.cpp" line="1096"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Laatste synchronisatie geslaagd, maar met waarschuwingen over individuele bestanden.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1111"/>
+ <location filename="../src/gui/folderman.cpp" line="1099"/>
<source>Setup Error.</source>
<translation>Installatiefout.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1114"/>
+ <location filename="../src/gui/folderman.cpp" line="1102"/>
<source>User Abort.</source>
<translation>Afgebroken door gebruiker.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1117"/>
+ <location filename="../src/gui/folderman.cpp" line="1105"/>
<source>Sync is paused.</source>
<translation>Synchronisatie gepauzeerd.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1123"/>
+ <location filename="../src/gui/folderman.cpp" line="1111"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisatie onderbroken)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1119"/>
<source>No valid folder selected!</source>
<translation>Geen geldige map geselecteerd!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1130"/>
<source>The selected path is not a folder!</source>
<translation>Het geselecteerde pad is geen map!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1146"/>
+ <location filename="../src/gui/folderman.cpp" line="1134"/>
<source>You have no permission to write to the selected folder!</source>
<translation>U heeft geen permissie om te schrijven naar de geselecteerde map!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1161"/>
+ <location filename="../src/gui/folderman.cpp" line="1149"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>Lokale map %1 wordt al in de mapsync gebruikt. Kies een andere map!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1166"/>
+ <location filename="../src/gui/folderman.cpp" line="1154"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Lokale map %1 bevat al een map die wordt gebruikt voor een mapsync verbinding. Kies een andere!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1173"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Lokale map %1 is een symbolische link. De doellink bevat al een map die in een mapsync verbinding wordt gebruikt. Kies een andere!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1168"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Lokale map %1 zit al in een map die wordt gebruikt voor een mapsync verbinding. Kies een andere!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1186"/>
+ <location filename="../src/gui/folderman.cpp" line="1174"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Lokale map %1 is een symbolische link. De doellink zit al in een map die in een mapsync verbinding wordt gebruikt. Kies een andere!</translation>
</message>
<translation>Toevoegen mapsync verbinding</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="85"/>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="274"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="271"/>
<source>File</source>
<translation>Bestand</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="228"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="224"/>
<source>Syncing selected files in your account with</source>
<translation>Synchroniseren geselecteerde bestanden in uw account met</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="231"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="227"/>
<source>Remote path: %1</source>
<translation>Extern pad: %1</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="121"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="122"/>
<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="126"/>
- <source>Adding folder is disabled because your 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="131"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="132"/>
<source>Click this button to add a folder to synchronize.</source>
<translation>Klik op deze button om een map ter synchroniseren toe te voegen.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="141"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="142"/>
<source>%1 (%2)</source>
<translation>
%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="156"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
<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="182"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="192"/>
<source>Signed out</source>
<translation>Afgemeld</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="727"/>
- <source>Discovering '%1'</source>
- <translation>'%1' onderzoeken</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="127"/>
+ <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="163"/>
+ <source>Fetching folder list from server...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="789"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="787"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="849"/>
<source>Syncing %1</source>
<translation>Synchroniseren %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="792"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="854"/>
<source>download %1/s</source>
<translation>download %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="794"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="856"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="800"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>upload %1/s</source>
<translation>upload %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="802"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="864"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="807"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="869"/>
<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="811"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="873"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="827"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="889"/>
<source>%1 of %2, file %3 of %4
Total time left %5</source>
<translation>%1 van %2, file %3 van %4
Totaal resterende tijd %5</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
<source>file %1 of %2</source>
<translation>bestand %1 van %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="932"/>
<source>Waiting...</source>
<translation>Aan het wachten...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="934"/>
<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="878"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>Preparing to sync...</source>
<translation>Voorbereiden op sync...</translation>
</message>
<name>OCC::FolderWizard</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <source>Add Folder Sync Connection</source>
+ <translation>Toevoegen mapsync verbinding</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderwizard.cpp" line="564"/>
- <source>Add Folder</source>
- <translation>Voeg map toe</translation>
+ <source>Add Sync Connection</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Geavanceerd</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="61"/>
+ <location filename="../src/gui/generalsettings.ui" line="109"/>
<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="81"/>
+ <location filename="../src/gui/generalsettings.ui" line="129"/>
<source>MB</source>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="109"/>
+ <location filename="../src/gui/generalsettings.ui" line="159"/>
<source>Show crash reporter</source>
<translation>Toon crash reporter</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="118"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit Ignored Files</source>
<translation>Bewerk genegeerde bestanden</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="142"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
<source>Add an Account</source>
<translation>Een account toevoegen</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="167"/>
- <location filename="../src/gui/generalsettings.ui" line="173"/>
+ <location filename="../src/gui/generalsettings.ui" line="171"/>
+ <location filename="../src/gui/generalsettings.ui" line="177"/>
<source>About</source>
<translation>Over</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <location filename="../src/gui/generalsettings.ui" line="187"/>
<source>Updates</source>
<translation>Updates</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="208"/>
+ <location filename="../src/gui/generalsettings.ui" line="212"/>
<source>&Restart && Update</source>
<translation>&Herstarten en &Bijwerken</translation>
</message>
</context>
-<context>
- <name>OCC::HttpCredentials</name>
- <message>
- <location filename="../src/libsync/creds/httpcredentials.cpp" line="290"/>
- <source>Reading from keychain failed with error: '%1'</source>
- <translation>Het lezen van de sleutelhanger is mislukt met fout: '%1'</translation>
- </message>
-</context>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="32"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
<source>Please enter %1 password:
User: %2
</translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="41"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <source>Reading from keychain failed with error: '%1'</source>
+ <translation>Het lezen van de sleutelhanger is mislukt met fout: '%1'</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
<source>Enter Password</source>
<translation>Vul het wachtwoord in</translation>
</message>
<translation>Verwijder</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="40"/>
<source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
Onderdelen die gewist mogen worden worden verwijderd als ze voorkomen dat een map verdwijnt. Dit is nuttig voor metadata.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="109"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
<source>Could not open file</source>
<translation>Kon het bestand niet openen</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="111"/>
<source>Cannot write changes to '%1'.</source>
<translation>Er kunnen geen wijzigingen worden geschreven naar %1</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="138"/>
<source>Add Ignore Pattern</source>
<translation>Toevoegen negeerpatroon</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>Add a new ignore pattern:</source>
<translation>Voeg nieuw negeerpatroon toe:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="45"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="46"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Deze entry is door het systeem geleverd op '%1' en kan niet worden aangepast in deze sessie.</translation>
</message>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="163"/>
+ <location filename="../src/libsync/logger.cpp" line="190"/>
<source>Error</source>
<translation>Fout</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="164"/>
+ <location filename="../src/libsync/logger.cpp" line="191"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Bestand '%1'<br/>kan niet worden geopend voor schrijven.<br/><br/>De logging output kan <b>niet</b> worden weggeschreven!</nobr></translation>
</message>
</message>
<message>
<location filename="../src/gui/networksettings.ui" line="203"/>
- <location filename="../src/gui/networksettings.ui" line="295"/>
+ <location filename="../src/gui/networksettings.ui" line="292"/>
<source>No limit</source>
<translation>Geen beperking</translation>
</message>
<source>SOCKS5 proxy</source>
<translation>SOCKS5 proxy</translation>
</message>
+ <message>
+ <location filename="../src/gui/networksettings.cpp" line="128"/>
+ <source>Qt >= 5.4 is required in order to use the bandwidth limit</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::OCUpdater</name>
<source>Downloading version %1. Please wait...</source>
<translation>Downloaden versie %1. Even geduld...</translation>
</message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
- <source>Version %1 available. Restart application to start the update.</source>
- <translation>Versie %1 is beschikbaar. Herstart de applicatie om de update te starten.</translation>
- </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="145"/>
<source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
<source>Could not check for new updates.</source>
<translation>Kon niet controleren op updates.</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
+ <source>%1 version %2 available. Restart application to start the update.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
- <source>New version %1 available. Please use the system's update tool to install it.</source>
- <translation>Nieuwe versie %1 beschikbaar. Gebruik de systeemupdate tool om te installeren.</translation>
+ <source>New %1 version %2 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="151"/>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="114"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="110"/>
<source>Connection Timeout</source>
<translation>Verbindingstime-out</translation>
</message>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="171"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="167"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Ongeldig JSON antwoord van de peilingen URL</translation>
</message>
</context>
-<context>
- <name>OCC::PropagateDownloadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="435"/>
- <source>Sync was aborted by user.</source>
- <translation>Synchronisatie afgebroken door gebruiker.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="488"/>
- <source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation>Geen E-Tag ontvangen van de server, controleer Proxy/Gateway</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="494"/>
- <source>We received a different E-Tag for resuming. Retrying next time.</source>
- <translation>We ontvingen een afwijkende E-Tag om door te gaan. We proberen het later opnieuw.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="516"/>
- <source>Server returned wrong content-range</source>
- <translation>Server retourneerde verkeerde content-bandbreedte</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="567"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation>Bestand %1 kan niet worden gedownload omdat de naam conflicteert met een lokaal bestand</translation>
- </message>
-</context>
<context>
<name>OCC::PropagateDownloadFileQNAM</name>
<message>
<translation>Bestand %1 kan niet worden gedownload omdat de naam conflicteert met een lokaal bestand</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="457"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
+ <source>The download would reduce free disk space below %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="372"/>
+ <source>Free space on disk is less than %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="482"/>
<source>File was deleted from server</source>
<translation>Bestand was verwijderd van de server</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="506"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="531"/>
<source>The file could not be downloaded completely.</source>
<translation>Het bestand kon niet volledig worden gedownload.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="601"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="636"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Bestand %1 kan niet worden opgeslagen wegens een lokaal bestandsnaam conflict!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="641"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="676"/>
<source>File has changed since discovery</source>
<translation>Het bestand is gewijzigd sinds het is gevonden</translation>
</message>
<context>
<name>OCC::PropagateItemJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="92"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
<source>; Restoration Failed: %1</source>
<translation>; Herstel mislukte: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="138"/>
<source>Continue blacklisting:</source>
<translation>Doorgaan met zwarte lijst:</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="230"/>
<source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation>Er is een bestand of map verwijderd van een alleen-lezen share, maar herstellen is mislukt: %1</translation>
</message>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove folder '%1';</source>
- <translation>Kon map '%1' niet verwijderen;</translation>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="243"/>
- <location filename="../src/libsync/propagator_legacy.cpp" line="302"/>
- <source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>Een lokaal bestand is gewijzigd tijdens het synchroniseren, wordt gesynchroniseerd als het volledig is aangekomen.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="246"/>
- <source>Sync was aborted by user.</source>
- <translation>Synchronisatie afgebroken door gebruiker.</translation>
- </message>
+ <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="252"/>
- <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
- <translation>Het bestand is lokaal bewerkt, maar hoort bij een alleen-lezen share. Het originele bestand is teruggezet en uw bewerking staat in het conflicten bestand.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="205"/>
+ <source>File name contains at least one invalid character</source>
+ <translation>De bestandsnaam bevat ten minste één ongeldig teken</translation>
</message>
-</context>
-<context>
- <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="226"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="262"/>
<source>File Removed</source>
<translation>Bestand verwijderd</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="274"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Lokaal bestand gewijzigd bij sync. Wordt opnieuw meengenomen.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="250"/>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="286"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="665"/>
<source>Local file changed during sync.</source>
<translation>Lokaal bestand gewijzigd bij sync.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="558"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="592"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>Forceren job-beëindiging op HTTP verbindingsreset met Qt < 5.4.2.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="566"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="600"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Het bestand is lokaal bewerkt, maar hoort bij een alleen-lezen share. Het originele bestand is teruggezet en uw bewerking staat in het conflicten bestand.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="597"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="631"/>
<source>Poll URL missing</source>
<translation>URL peiling ontbreekt</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="620"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="654"/>
<source>The local file was removed during sync.</source>
<translation>Het lokale bestand werd verwijderd tijdens sync.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="646"/>
- <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
- <translation>De server heeft het laatste deel niet bevestigd (er was geen e-tag aanwezig)</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="680"/>
+ <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Niet geselecteerde mappen worden <b>verwijderd</b> van uw lokale bestandssysteem en worden niet meer gesynchroniseerd met deze computer</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>Kies wat u wilt synchroniseren: Selecteer externe submappen die u wilt synchroniseren.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>Kies wat u wilt synchroniseren: u kunt submappen die u niet wilt synchroniseren deselecteren.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
<source>Choose What to Sync</source>
<translation>Wat synchroniseren</translation>
</message>
<translation>Grootte</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
<source>No subfolders currently on the server.</source>
<translation>Momenteel geen submappen op de server.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>Er trad een fout op bij het laden van de lijst met submappen.</translation>
</message>
<translation>Instellingen</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="80"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="84"/>
<source>Activity</source>
<translation>Activiteit</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="86"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="90"/>
<source>General</source>
<translation>Algemeen</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>Network</source>
<translation>Netwerk</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharedialog.ui" line="22"/>
- <location filename="../src/gui/sharedialog.ui" line="234"/>
+ <location filename="../src/gui/sharedialog.ui" line="258"/>
<source>TextLabel</source>
<translation>Tekstlabel</translation>
</message>
<translation>OwnCloud Pad:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="182"/>
+ <location filename="../src/gui/sharedialog.ui" line="116"/>
<source>Set &password </source>
<translation>Instellen &wachtwoord</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="196"/>
+ <location filename="../src/gui/sharedialog.ui" line="130"/>
<source>Set &expiration date</source>
<translation>Instellen &vervaldatum in</translation>
</message>
+ <message>
+ <location filename="../src/gui/sharedialog.ui" line="214"/>
+ <source>Allow editing</source>
+ <translation>Toestaan bewerken</translation>
+ </message>
<message>
<location filename="../src/gui/sharedialog.ui" line="77"/>
<source>Share link</source>
<translation>Deel link</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="125"/>
+ <location filename="../src/gui/sharedialog.ui" line="203"/>
<source>Copy &link</source>
<translation>Link &kopiëren</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="142"/>
+ <location filename="../src/gui/sharedialog.ui" line="154"/>
<source>Set password</source>
<translation>Instellen wachtwoord</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="692"/>
- <source>%1 path: %2</source>
- <translation>%1 pad: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="115"/>
+ <location filename="../src/gui/sharedialog.cpp" line="120"/>
<source>%1 Sharing</source>
<translation>%1 Delen</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="103"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="112"/>
+ <location filename="../src/gui/sharedialog.cpp" line="117"/>
<source>Folder: %2</source>
<translation>Map: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="121"/>
<source>P&assword protect</source>
<translation>&Wachtwoord beveiligd</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="221"/>
+ <location filename="../src/gui/sharedialog.cpp" line="214"/>
<source>Password Protected</source>
<translation>Wachtwoord beveiligd</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="382"/>
+ <location filename="../src/gui/sharedialog.cpp" line="338"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Het bestand kan niet worden gedeeld, omdat het werd gedeeld zonder verder delen toestemming.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="528"/>
+ <location filename="../src/gui/sharedialog.cpp" line="475"/>
<source>Please Set Password</source>
<translation>Stel uw wachtwoord in</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="564"/>
- <location filename="../src/gui/sharedialog.cpp" line="565"/>
+ <location filename="../src/gui/sharedialog.cpp" line="538"/>
+ <location filename="../src/gui/sharedialog.cpp" line="539"/>
<source>&Share link</source>
<translation>$Delen link</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="583"/>
+ <location filename="../src/gui/sharedialog.cpp" line="552"/>
+ <location filename="../src/gui/sharedialog.cpp" line="564"/>
<source>OCS API error code: %1</source>
<translation>OCS API foutcode: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="605"/>
- <source>There is no sync folder configured.</source>
- <translation>Er is geen sync map geconfigureerd.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="639"/>
- <source>A sync file with the same name exists. The file cannot be registered to sync.</source>
- <translation>Er bestaat al een sync bestand met dezelfde naam. Het bestand kan niet worden aangemeld voor sync.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="684"/>
- <source>The file cannot be synced.</source>
- <translation>Het bestand kan niet worden gesynchroniseerd.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="624"/>
- <source>Sharing of external directories is not yet working.</source>
- <translation>Delen van externe mappen werkt nog niet.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="473"/>
- <location filename="../src/gui/sharedialog.cpp" line="506"/>
+ <location filename="../src/gui/sharedialog.cpp" line="418"/>
+ <location filename="../src/gui/sharedialog.cpp" line="460"/>
<source>Public sh&aring requires a password</source>
<translation>Openbaar de&len vereist een wachtwoord</translation>
</message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="617"/>
- <source>Cannot find a folder to upload to.</source>
- <translation>Kan geen map vinden om naar te uploaden.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
- <source>Waiting to upload...</source>
- <translation>Wachten om te uploaden...</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="653"/>
- <source>Unable to register in sync space.</source>
- <translation>Kan niet aanmelden in sync ruimte.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="694"/>
- <source>Sync of registered file was not successful yet.</source>
- <translation>Sync van aangemeld bestand nog niet succesvol.</translation>
- </message>
</context>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>Login Error</source>
<translation>Inlogfout</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>You must sign in as user %1</source>
<translation>U moet inloggen als gebruiker %1</translation>
</message>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="452"/>
+ <location filename="../src/gui/socketapi.cpp" line="447"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Delen met %1</translation>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="97"/>
+ <location filename="../src/libsync/syncengine.cpp" line="94"/>
<source>Success.</source>
<translation>Succes.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="104"/>
+ <location filename="../src/libsync/syncengine.cpp" line="101"/>
<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="107"/>
+ <location filename="../src/libsync/syncengine.cpp" line="104"/>
<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="110"/>
+ <location filename="../src/libsync/syncengine.cpp" line="107"/>
<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="113"/>
+ <location filename="../src/libsync/syncengine.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync kon geen geheugen reserveren.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>CSync fatale parameter fout.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="119"/>
+ <location filename="../src/libsync/syncengine.cpp" line="116"/>
<source>CSync processing step update failed.</source>
<translation>CSync verwerkingsstap bijwerken mislukt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="122"/>
+ <location filename="../src/libsync/syncengine.cpp" line="119"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync verwerkingsstap verzamelen mislukt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="122"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="125"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="128"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="131"/>
<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="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="134"/>
<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="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="137"/>
<source>A HTTP transmission error happened.</source>
<translation>Er trad een HTTP transmissiefout plaats.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation>CSync mislukt omdat de benodigde toegang werd geweigerd.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
<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="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
<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="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
<source>Error while reading folder.</source>
<translation>Fout tijdens lezen map.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="996"/>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
<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="1003"/>
+ <location filename="../src/libsync/syncengine.cpp" line="991"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="152"/>
<source>CSync unspecified error.</source>
<translation>CSync ongedefinieerde fout.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="155"/>
<source>Aborted by the user</source>
<translation>Afgebroken door de gebruiker</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="392"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>Bestandsnaam bevat ongeldige karakters die niet tussen platformen gesynchroniseerd kunnen worden.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="143"/>
<source>CSync failed to access</source>
<translation>CSync kreeg geen toegang</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <location filename="../src/libsync/syncengine.cpp" line="97"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <source>CSync failed due to unhandled permission denied.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="146"/>
<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="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="158"/>
<source>The service is temporarily unavailable</source>
<translation>De dienst is tijdelijk niet beschikbaar</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="175"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<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="230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="227"/>
<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="389"/>
+ <location filename="../src/libsync/syncengine.cpp" line="386"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symbolic links worden niet ondersteund bij het synchroniseren.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="392"/>
+ <location filename="../src/libsync/syncengine.cpp" line="389"/>
<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="398"/>
+ <location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename is too long.</source>
<translation>De bestandsnaam is te lang.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="401"/>
+ <location filename="../src/libsync/syncengine.cpp" line="398"/>
<source>File is ignored because it's hidden.</source>
<translation>Bestand is genegeerd omdat het verborgen is.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="407"/>
+ <location filename="../src/libsync/syncengine.cpp" line="404"/>
<source>Stat failed.</source>
<translation>Stat mislukt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="429"/>
+ <location filename="../src/libsync/syncengine.cpp" line="426"/>
<source>Filename encoding is not valid</source>
<translation>Bestandsnaamcodering is niet geldig</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="561"/>
+ <location filename="../src/libsync/syncengine.cpp" line="558"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Ongeldige karakters, hernoem "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="631"/>
+ <location filename="../src/libsync/syncengine.cpp" line="612"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="645"/>
<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="718"/>
+ <location filename="../src/libsync/syncengine.cpp" line="723"/>
<source>Cannot open the sync journal</source>
<translation>Kan het sync transactielog niet openen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="965"/>
- <location filename="../src/libsync/syncengine.cpp" line="972"/>
+ <location filename="../src/libsync/syncengine.cpp" line="953"/>
+ <location filename="../src/libsync/syncengine.cpp" line="960"/>
<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="990"/>
+ <location filename="../src/libsync/syncengine.cpp" line="978"/>
<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="1023"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1011"/>
<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="1040"/>
- <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1028"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1048"/>
<source>Not allowed to remove, restoring</source>
<translation>Niet toegestaan om te verwijderen, herstellen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1073"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1061"/>
<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="1128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1116"/>
<source>Move not allowed, item restored</source>
<translation>Verplaatsen niet toegestaan, object hersteld</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1125"/>
<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="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the destination</source>
<translation>bestemming</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the source</source>
<translation>bron</translation>
</message>
</message>
</context>
<context>
- <name>OCC::TransmissionChecksumValidator</name>
+ <name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="128"/>
<source>The checksum header is malformed.</source>
<translation>De kop van het controlegetal is misvormd.</translation>
</message>
<message>
<location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+ <source>The checksum header contained an unknown checksum type '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="148"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>Het gedownloade bestand komt niet overeen met het controlegetal. Het wordt opnieuw verwerkt.</translation>
</message>
<source>Recent Changes</source>
<translation>Recente wijzigingen</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="561"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="331"/>
<source>Managed Folders:</source>
<source>Open %1 in browser</source>
<translation>Open %1 in browser</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="449"/>
- <source>Log out everywhere</source>
- <translation>Overal uitloggen</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="457"/>
- <source>Log in everywhere...</source>
- <translation>Overal inloggen...</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="513"/>
<source>Unknown status</source>
<source>Account %1: %2</source>
<translation>Account %1: %2</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="449"/>
+ <source>Log out of all accounts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="457"/>
+ <source>Log in to all accounts...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="532"/>
<source>Crash now</source>
<source>No items synced recently</source>
<translation>Recent niets gesynchroniseerd</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="561"/>
- <source>Discovering '%1'</source>
- <translation>'%1' onderzoeken</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="566"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>%L1 B</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="306"/>
+ <location filename="../src/libsync/utility.cpp" line="303"/>
<source>%Ln year(s)</source>
<translation>%Ln ja(a)r(en)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="307"/>
+ <location filename="../src/libsync/utility.cpp" line="304"/>
<source>%Ln month(s)</source>
<translation>%Ln maand(en)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="308"/>
+ <location filename="../src/libsync/utility.cpp" line="305"/>
<source>%Ln day(s)</source>
<translation>%Ln dag(en)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="309"/>
+ <location filename="../src/libsync/utility.cpp" line="306"/>
<source>%Ln hour(s)</source>
<translation>%Ln u(u)r(en)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="310"/>
+ <location filename="../src/libsync/utility.cpp" line="307"/>
<source>%Ln minute(s)</source>
<translation>%Ln minu(u)t(en)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="311"/>
+ <location filename="../src/libsync/utility.cpp" line="308"/>
<source>%Ln second(s)</source>
<translation>%Ln seconde(n)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="318"/>
<source>0 seconds</source>
<translation>0 seconden</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="336"/>
+ <location filename="../src/libsync/utility.cpp" line="333"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="73"/>
+ <source>Enter your credentials to connect to the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <source>Sign in</source>
+ <translation>Zaloguj</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="89"/>
<source>Remove the account configuration from the client</source>
<translation>Usuń konfigurację konta z klienta.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Remove Account</source>
<translation>Usuń Konto</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="97"/>
+ <location filename="../src/gui/accountsettings.ui" line="113"/>
<source>Storage space: ...</source>
<translation>Przestrzeń: ...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="167"/>
+ <location filename="../src/gui/accountsettings.ui" line="183"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Niezaznaczone katalogi zostaną <b>usunięte</b> z lokalnego systemu plików i nie będą już więcej synchronizowane na tym komputerze.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="230"/>
<source>Apply</source>
<translation>Zastosuj</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="198"/>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
- <location filename="../src/gui/accountsettings.cpp" line="571"/>
+ <location filename="../src/gui/accountsettings.ui" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="289"/>
+ <location filename="../src/gui/accountsettings.cpp" line="646"/>
<source>Cancel</source>
<translation>Anuluj</translation>
</message>
<translation>Połączony z <server> jako <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="115"/>
+ <location filename="../src/gui/accountsettings.cpp" line="121"/>
<source>No account configured.</source>
<translation>Brak skonfigurowanych kont.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="161"/>
+ <source>Choose what to sync</source>
+ <translation>Wybierz co synchronizować</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="168"/>
+ <source>Remove folder sync connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="234"/>
<source>Folder creation failed</source>
<translation>Nie udało się stworzyć katalogu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="230"/>
+ <location filename="../src/gui/accountsettings.cpp" line="235"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation><p>Nie można stworzyć lokalnego katalogu <i>%1</i>.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="283"/>
- <source>Stop syncing</source>
- <translation>Zatrzymaj synchronizację</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
+ <source>Confirm Folder Sync Connection Removal</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="309"/>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>Remove Folder Sync Connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="314"/>
<source>Confirm Folder Reset</source>
<translation>Potwierdź reset folderu </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="310"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Czy rzeczywiście chcesz zresetować folder <i>%1</i> i przebudować bazę klientów?</p><p><b>Uwaga:</b> Ta funkcja została przewidziana wyłącznie do czynności technicznych. Nie zostaną usunięte żadne pliki, ale może to spowodować znaczący wzrost ruchu sieciowego i potrwać kilka minut lub godzin, w zależności od rozmiaru folderu. Używaj tej opcji wyłącznie, jeśli Twój administrator doradził Ci takie działanie.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="391"/>
+ <location filename="../src/gui/accountsettings.cpp" line="396"/>
<source>Sync Running</source>
<translation>Synchronizacja uruchomiona</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="392"/>
+ <location filename="../src/gui/accountsettings.cpp" line="397"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Operacja synchronizacji jest uruchomiona.<br>Czy chcesz ją zakończyć?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="472"/>
+ <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <source>%1 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="485"/>
<source>%1 as <i>%2</i></source>
<translation>%1 jako <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="476"/>
+ <location filename="../src/gui/accountsettings.cpp" line="495"/>
<source>Connected to %1.</source>
<translation>Podłączony do %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="478"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Serwer %1 jest tymczasowo niedostępny.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="480"/>
+ <location filename="../src/gui/accountsettings.cpp" line="499"/>
<source>Signed out from %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="482"/>
+ <location filename="../src/gui/accountsettings.cpp" line="501"/>
<source>No connection to %1 at %2.</source>
<translation>Brak połączenia do %1 z %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
- <source>There are new folders that were not synchronized because they are too big: %1</source>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <source>There are new folders that were not synchronized because they are too big: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="536"/>
- <source>, </source>
- <translation>, </translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="563"/>
+ <location filename="../src/gui/accountsettings.cpp" line="638"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="564"/>
+ <location filename="../src/gui/accountsettings.cpp" line="639"/>
<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="570"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>Remove connection</source>
<translation>Usuwanie połączenia</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="158"/>
<source>Open folder</source>
<translation>Otwórz katalog</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="168"/>
- <source>Choose What to Sync</source>
- <translation>Wybierz co synchronizować</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Resume sync</source>
<translation>Przywróć synchronizację</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Pause sync</source>
<translation>Zatrzymaj synchronizację</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="176"/>
- <source>Remove sync</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="277"/>
- <source>Confirm Sync Removal</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="278"/>
+ <location filename="../src/gui/accountsettings.cpp" line="283"/>
<source><p>Do you really want to stop syncing the folder <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="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="452"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="448"/>
+ <location filename="../src/gui/accountsettings.cpp" line="453"/>
<source>%1 of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="453"/>
+ <location filename="../src/gui/accountsettings.cpp" line="462"/>
<source>Currently there is no storage usage information available.</source>
<translation>Obecnie nie ma dostępnych informacji o wykorzystaniu pamięci masowej.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="507"/>
<source>No %1 connection configured.</source>
<translation>Połączenie %1 nie skonfigurowane.</translation>
</message>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="95"/>
+ <location filename="../src/gui/accountstate.cpp" line="99"/>
<source>Signed out</source>
<translation>Odłączony</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="97"/>
+ <location filename="../src/gui/accountstate.cpp" line="101"/>
<source>Disconnected</source>
<translation>Rozłączony</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="99"/>
+ <location filename="../src/gui/accountstate.cpp" line="103"/>
<source>Connected</source>
<translation>Połączony</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="101"/>
+ <location filename="../src/gui/accountstate.cpp" line="105"/>
<source>Service unavailable</source>
<translation>Usługa niedostępna</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="103"/>
+ <location filename="../src/gui/accountstate.cpp" line="107"/>
<source>Network error</source>
<translation>Błąd sieci</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="105"/>
+ <location filename="../src/gui/accountstate.cpp" line="109"/>
<source>Configuration error</source>
<translation>Błąd konfiguracji</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="107"/>
+ <location filename="../src/gui/accountstate.cpp" line="111"/>
<source>Unknown account state</source>
<translation>Status konta nieznany</translation>
</message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>Reauthentication required</source>
+ <translation>Wymagana powtórna autoryzacja</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>You need to re-login to continue using the account %1.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
<translation>Proszę zaaktualizować serwer do najnowszej wersji i zrestartować klienta.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="143"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="135"/>
<source>Authentication error: Either username or password are wrong.</source>
<translation>Błąd autentykacji: nazwa użytkownika lub hasło są nieprawidłowe.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="155"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="147"/>
<source>timeout</source>
<translation>wygaśnięcie</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="186"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="178"/>
<source>The provided credentials are not correct</source>
<translation>Podane dane logowania są nieprawidłowe</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="524"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="537"/>
<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="107"/>
+ <location filename="../src/gui/folder.cpp" line="108"/>
<source>Unable to create csync-context</source>
<translation>Nie można utworzyć kontekstu csync</translation>
</message>
<translation>Aktywności synchronizacji</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="845"/>
+ <location filename="../src/gui/folder.cpp" line="870"/>
<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="1102"/>
+ <location filename="../src/gui/folder.cpp" line="1127"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1115"/>
+ <location filename="../src/gui/folder.cpp" line="1140"/>
<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="1119"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Remove All Files?</source>
<translation>Usunąć wszystkie pliki?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1121"/>
+ <location filename="../src/gui/folder.cpp" line="1146"/>
<source>Remove all files</source>
<translation>Usuń wszystkie pliki</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1122"/>
+ <location filename="../src/gui/folder.cpp" line="1147"/>
<source>Keep files</source>
<translation>Pozostaw pliki</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="275"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<source>Could not reset folder state</source>
<translation>Nie udało się zresetować stanu folderu</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="276"/>
+ <location filename="../src/gui/folderman.cpp" line="271"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Stary sync journal '%1' został znaleziony, lecz nie mógł być usunięty. Proszę się upewnić, że żaden program go obecnie nie używa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="877"/>
+ <location filename="../src/gui/folderman.cpp" line="865"/>
<source> (backup)</source>
<translation>(kopia zapasowa)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="882"/>
+ <location filename="../src/gui/folderman.cpp" line="870"/>
<source> (backup %1)</source>
<translation>(kopia zapasowa %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1091"/>
+ <location filename="../src/gui/folderman.cpp" line="1079"/>
<source>Undefined State.</source>
<translation>Niezdefiniowany stan</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1094"/>
- <source>Waits to start syncing.</source>
- <translation>Czekają na uruchomienie synchronizacji.</translation>
+ <location filename="../src/gui/folderman.cpp" line="1082"/>
+ <source>Waiting to start syncing.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1097"/>
+ <location filename="../src/gui/folderman.cpp" line="1085"/>
<source>Preparing for sync.</source>
<translation>Przygotowuję do synchronizacji</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1100"/>
+ <location filename="../src/gui/folderman.cpp" line="1088"/>
<source>Sync is running.</source>
<translation>Synchronizacja w toku</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1103"/>
+ <location filename="../src/gui/folderman.cpp" line="1091"/>
<source>Last Sync was successful.</source>
<translation>Ostatnia synchronizacja zakończona powodzeniem.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1108"/>
+ <location filename="../src/gui/folderman.cpp" line="1096"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Ostatnia synchronizacja udana, ale istnieją ostrzeżenia z pojedynczymi plikami.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1111"/>
+ <location filename="../src/gui/folderman.cpp" line="1099"/>
<source>Setup Error.</source>
<translation>Błąd ustawień.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1114"/>
+ <location filename="../src/gui/folderman.cpp" line="1102"/>
<source>User Abort.</source>
<translation>Użytkownik anulował.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1117"/>
+ <location filename="../src/gui/folderman.cpp" line="1105"/>
<source>Sync is paused.</source>
<translation>Synchronizacja wstrzymana</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1123"/>
+ <location filename="../src/gui/folderman.cpp" line="1111"/>
<source>%1 (Sync is paused)</source>
<translation> %1 (Synchronizacja jest zatrzymana)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1119"/>
<source>No valid folder selected!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1130"/>
<source>The selected path is not a folder!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1146"/>
+ <location filename="../src/gui/folderman.cpp" line="1134"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Nie masz uprawnień, aby zapisywać w tym katalogu!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1161"/>
+ <location filename="../src/gui/folderman.cpp" line="1149"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1166"/>
+ <location filename="../src/gui/folderman.cpp" line="1154"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1173"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1168"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1186"/>
+ <location filename="../src/gui/folderman.cpp" line="1174"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="85"/>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="274"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="271"/>
<source>File</source>
<translation>Plik</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="228"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="224"/>
<source>Syncing selected files in your account with</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="231"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="227"/>
<source>Remote path: %1</source>
<translation>Zdalna ścieżka: %1</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="121"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="122"/>
<source>You need to be connected to add a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="126"/>
- <source>Adding folder is disabled because your 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="131"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="132"/>
<source>Click this button to add a folder to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="141"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="142"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="156"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
<source>Error while loading the list of folders from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="182"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="192"/>
<source>Signed out</source>
<translation>Odłączony</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="727"/>
- <source>Discovering '%1'</source>
- <translation>Rozpoznaję '%1'</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="127"/>
+ <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="163"/>
+ <source>Fetching folder list from server...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="787"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="789"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="849"/>
<source>Syncing %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="792"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="854"/>
<source>download %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="794"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="856"/>
<source>u2193 %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="800"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>upload %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="802"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="864"/>
<source>u2191 %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="807"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="869"/>
<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="811"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="873"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="827"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="889"/>
<source>%1 of %2, file %3 of %4
Total time left %5</source>
<translation>%1 z %2, plik %3 z %4
Pozostało czasu %5</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
<source>file %1 of %2</source>
<translation>plik %1 z %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="932"/>
<source>Waiting...</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="934"/>
<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="878"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>Preparing to sync...</source>
<translation type="unfinished"/>
</message>
<name>OCC::FolderWizard</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <source>Add Folder Sync Connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderwizard.cpp" line="564"/>
- <source>Add Folder</source>
- <translation>Dodaj folder</translation>
+ <source>Add Sync Connection</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Zaawansowane</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="61"/>
+ <location filename="../src/gui/generalsettings.ui" line="109"/>
<source>Ask confirmation before downloading folders larger than</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
+ <location filename="../src/gui/generalsettings.ui" line="129"/>
<source>MB</source>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="109"/>
+ <location filename="../src/gui/generalsettings.ui" line="159"/>
<source>Show crash reporter</source>
<translation>Pokaż raport awarii</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="118"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit Ignored Files</source>
<translation>Edytuj pliki ignorowane</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="142"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
<source>Add an Account</source>
<translation>Dodaj konto</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="167"/>
- <location filename="../src/gui/generalsettings.ui" line="173"/>
+ <location filename="../src/gui/generalsettings.ui" line="171"/>
+ <location filename="../src/gui/generalsettings.ui" line="177"/>
<source>About</source>
<translation>O aplikacji</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <location filename="../src/gui/generalsettings.ui" line="187"/>
<source>Updates</source>
<translation>Aktualizacje</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="208"/>
+ <location filename="../src/gui/generalsettings.ui" line="212"/>
<source>&Restart && Update</source>
<translation>&Zrestartuj && Aktualizuj</translation>
</message>
</context>
-<context>
- <name>OCC::HttpCredentials</name>
- <message>
- <location filename="../src/libsync/creds/httpcredentials.cpp" line="290"/>
- <source>Reading from keychain failed with error: '%1'</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="32"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
<source>Please enter %1 password:
User: %2
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="41"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <source>Reading from keychain failed with error: '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
<source>Enter Password</source>
<translation>Wprowadź hasło</translation>
</message>
<translation>Usuń</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="40"/>
<source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="109"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
<source>Could not open file</source>
<translation>Nie można otworzyć plików</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="111"/>
<source>Cannot write changes to '%1'.</source>
<translation>Nie mogę zapisać zmian do '%1'.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="138"/>
<source>Add Ignore Pattern</source>
<translation>Dodaj ignorowany</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>Add a new ignore pattern:</source>
<translation>Dodaj nowy ignorowany:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="45"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="46"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Ten wpis jest podawany przez system w '%1' i nie może być zmieniony w tym widoku.</translation>
</message>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="163"/>
+ <location filename="../src/libsync/logger.cpp" line="190"/>
<source>Error</source>
<translation>Błąd</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="164"/>
+ <location filename="../src/libsync/logger.cpp" line="191"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Plik '%1'<br>nie może zostać otwarty do zapisu.<br/><br/>Dane wyjściowe dziennika <b>nie</b> mogą być zapisane!</nobr></translation>
</message>
</message>
<message>
<location filename="../src/gui/networksettings.ui" line="203"/>
- <location filename="../src/gui/networksettings.ui" line="295"/>
+ <location filename="../src/gui/networksettings.ui" line="292"/>
<source>No limit</source>
<translation>Brak limitu</translation>
</message>
<source>SOCKS5 proxy</source>
<translation>SOCKS5 proxy</translation>
</message>
+ <message>
+ <location filename="../src/gui/networksettings.cpp" line="128"/>
+ <source>Qt >= 5.4 is required in order to use the bandwidth limit</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::OCUpdater</name>
<source>Downloading version %1. Please wait...</source>
<translation>Pobieranie wersji %1. Proszę czekać...</translation>
</message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
- <source>Version %1 available. Restart application to start the update.</source>
- <translation>Wersja %1 jest dostępna. Uruchom ponownie aplikację aby uruchomić aktualizację.</translation>
- </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="145"/>
<source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
<source>Could not check for new updates.</source>
<translation>Nie można sprawdzić dostępności nowych aktualizacji.</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
+ <source>%1 version %2 available. Restart application to start the update.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
- <source>New version %1 available. Please use the system's update tool to install it.</source>
- <translation>Nowa wersja %1 jest dostępna. Aby ją zainstalować, użyj systemowego narzędzia do aktualizacji.</translation>
+ <source>New %1 version %2 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="151"/>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="114"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="110"/>
<source>Connection Timeout</source>
<translation>Limit czasu połączenia</translation>
</message>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="171"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="167"/>
<source>Invalid JSON reply from the poll URL</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>OCC::PropagateDownloadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="435"/>
- <source>Sync was aborted by user.</source>
- <translation>Synchronizacja anulowane przez użytkownika.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="488"/>
- <source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation>Nie otrzymano E-Tag z serwera, sprawdź Proxy/Bramę</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="494"/>
- <source>We received a different E-Tag for resuming. Retrying next time.</source>
- <translation>Otrzymaliśmy inny E-Tag wznowienia. Spróbuje ponownie następnym razem.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="516"/>
- <source>Server returned wrong content-range</source>
- <translation>Serwer zwrócił błędną zakres zawartości</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="567"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation>Nie można pobrać pliku %1 ze względu na konflikt nazwy pliku lokalnego!</translation>
- </message>
-</context>
<context>
<name>OCC::PropagateDownloadFileQNAM</name>
<message>
<translation>Nie można pobrać pliku %1 ze względu na konflikt nazwy pliku lokalnego!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="457"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
+ <source>The download would reduce free disk space below %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="372"/>
+ <source>Free space on disk is less than %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="482"/>
<source>File was deleted from server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="506"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="531"/>
<source>The file could not be downloaded completely.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="601"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="636"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="641"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="676"/>
<source>File has changed since discovery</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateItemJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="92"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
<source>; Restoration Failed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="138"/>
<source>Continue blacklisting:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="230"/>
<source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove folder '%1';</source>
+ <source>Could not remove folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="243"/>
- <location filename="../src/libsync/propagator_legacy.cpp" line="302"/>
- <source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>Lokalny plik zmienił się podczas synchronizacji, synchronizuję ponownie ponieważ dotarł w całości.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="246"/>
- <source>Sync was aborted by user.</source>
- <translation>Synchronizacja anulowane przez użytkownika.</translation>
- </message>
+ <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="252"/>
- <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
- <translation>Plik był edytowany lokalnie ale jest częścią udziału z prawem tylko do odczytu. Został przywrócony i Twoja edycja jest w pliku konfliktu</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="205"/>
+ <source>File name contains at least one invalid character</source>
+ <translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="226"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="262"/>
<source>File Removed</source>
<translation>Usunięto plik</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="274"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="250"/>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="286"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="665"/>
<source>Local file changed during sync.</source>
<translation>Lokalny plik zmienił się podczas synchronizacji.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="558"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="592"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="566"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="600"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Plik był edytowany lokalnie ale jest częścią udziału z prawem tylko do odczytu. Został przywrócony i Twoja edycja jest w pliku konfliktu</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="597"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="631"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="620"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="654"/>
<source>The local file was removed during sync.</source>
<translation>Pliki lokalny został usunięty podczas synchronizacji.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="646"/>
- <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
- <translation>Serwer nie potwierdził ostatniego łańcucha danych. (Nie było żadnego e-tag-u)</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="680"/>
+ <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Niezaznaczone katalogi zostaną <b>usunięte</b> z lokalnego systemu plików i nie będą już więcej synchronizowane na tym komputerze.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
<source>Choose What to Sync</source>
<translation>Wybierz co synchronizować</translation>
</message>
<translation>Rozmiar</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
<source>No subfolders currently on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
<source>An error occured while loading the list of sub folders.</source>
<translation type="unfinished"/>
</message>
<translation>Ustawienia</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="80"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="84"/>
<source>Activity</source>
<translation>Aktywność</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="86"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="90"/>
<source>General</source>
<translation>Ogólne</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>Network</source>
<translation>Sieć</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharedialog.ui" line="22"/>
- <location filename="../src/gui/sharedialog.ui" line="234"/>
+ <location filename="../src/gui/sharedialog.ui" line="258"/>
<source>TextLabel</source>
<translation>Etykieta</translation>
</message>
<translation>Ścieżka ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="182"/>
+ <location filename="../src/gui/sharedialog.ui" line="116"/>
<source>Set &password </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="196"/>
+ <location filename="../src/gui/sharedialog.ui" line="130"/>
<source>Set &expiration date</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/sharedialog.ui" line="214"/>
+ <source>Allow editing</source>
+ <translation>Pozwól na edycję</translation>
+ </message>
<message>
<location filename="../src/gui/sharedialog.ui" line="77"/>
<source>Share link</source>
<translation>Udostępnij link</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="125"/>
+ <location filename="../src/gui/sharedialog.ui" line="203"/>
<source>Copy &link</source>
<translation>Kopiuj &link</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="142"/>
+ <location filename="../src/gui/sharedialog.ui" line="154"/>
<source>Set password</source>
<translation>Ustaw hasło</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="692"/>
- <source>%1 path: %2</source>
- <translation>%1 ścieżka: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="115"/>
+ <location filename="../src/gui/sharedialog.cpp" line="120"/>
<source>%1 Sharing</source>
<translation>%1 udostępnione</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="103"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="112"/>
+ <location filename="../src/gui/sharedialog.cpp" line="117"/>
<source>Folder: %2</source>
<translation>Folder: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="121"/>
<source>P&assword protect</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="221"/>
+ <location filename="../src/gui/sharedialog.cpp" line="214"/>
<source>Password Protected</source>
<translation>Zabezpieczone hasłem</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="382"/>
+ <location filename="../src/gui/sharedialog.cpp" line="338"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="528"/>
+ <location filename="../src/gui/sharedialog.cpp" line="475"/>
<source>Please Set Password</source>
<translation>Proszę podać hasło</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="564"/>
- <location filename="../src/gui/sharedialog.cpp" line="565"/>
+ <location filename="../src/gui/sharedialog.cpp" line="538"/>
+ <location filename="../src/gui/sharedialog.cpp" line="539"/>
<source>&Share link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="583"/>
+ <location filename="../src/gui/sharedialog.cpp" line="552"/>
+ <location filename="../src/gui/sharedialog.cpp" line="564"/>
<source>OCS API error code: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="605"/>
- <source>There is no sync folder configured.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="639"/>
- <source>A sync file with the same name exists. The file cannot be registered to sync.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="684"/>
- <source>The file cannot be synced.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="624"/>
- <source>Sharing of external directories is not yet working.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="473"/>
- <location filename="../src/gui/sharedialog.cpp" line="506"/>
+ <location filename="../src/gui/sharedialog.cpp" line="418"/>
+ <location filename="../src/gui/sharedialog.cpp" line="460"/>
<source>Public sh&aring requires a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="617"/>
- <source>Cannot find a folder to upload to.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
- <source>Waiting to upload...</source>
- <translation>Oczekuję na przesyłanie</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="653"/>
- <source>Unable to register in sync space.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="694"/>
- <source>Sync of registered file was not successful yet.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>Login Error</source>
<translation>Błąd logowania</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>You must sign in as user %1</source>
<translation>Musisz zalogować się jako użytkownik %1</translation>
</message>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="452"/>
+ <location filename="../src/gui/socketapi.cpp" line="447"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Współdzielone z %1</translation>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="97"/>
+ <location filename="../src/libsync/syncengine.cpp" line="94"/>
<source>Success.</source>
<translation>Sukces.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="104"/>
+ <location filename="../src/libsync/syncengine.cpp" line="101"/>
<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="107"/>
+ <location filename="../src/libsync/syncengine.cpp" line="104"/>
<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="110"/>
+ <location filename="../src/libsync/syncengine.cpp" line="107"/>
<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="113"/>
+ <location filename="../src/libsync/syncengine.cpp" line="110"/>
<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="116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>Krytyczny błąd parametru CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="119"/>
+ <location filename="../src/libsync/syncengine.cpp" line="116"/>
<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="122"/>
+ <location filename="../src/libsync/syncengine.cpp" line="119"/>
<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="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="122"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="125"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="128"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="131"/>
<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="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="134"/>
<source>A network connection timeout happened.</source>
<translation>Upłynął limit czasu połączenia.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="137"/>
<source>A HTTP transmission error happened.</source>
<translation>Wystąpił błąd transmisji HTTP.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation>CSync nie obsługiwane, odmowa uprawnień.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
<source>An error occurred while opening a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
<source>Error while reading folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="996"/>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
<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="1003"/>
+ <location filename="../src/libsync/syncengine.cpp" line="991"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="152"/>
<source>CSync unspecified error.</source>
<translation>Nieokreślony błąd CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="155"/>
<source>Aborted by the user</source>
<translation>Anulowane przez użytkownika</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="392"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="143"/>
<source>CSync failed to access</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <location filename="../src/libsync/syncengine.cpp" line="97"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <source>CSync failed due to unhandled permission denied.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="146"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="158"/>
<source>The service is temporarily unavailable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="175"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>An internal error number %1 occurred.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="227"/>
<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="389"/>
+ <location filename="../src/libsync/syncengine.cpp" line="386"/>
<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="392"/>
+ <location filename="../src/libsync/syncengine.cpp" line="389"/>
<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="398"/>
+ <location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename is too long.</source>
<translation>Nazwa pliku zbyt długa</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="401"/>
+ <location filename="../src/libsync/syncengine.cpp" line="398"/>
<source>File is ignored because it's hidden.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="407"/>
+ <location filename="../src/libsync/syncengine.cpp" line="404"/>
<source>Stat failed.</source>
<translation>Błąd statystyk.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="429"/>
+ <location filename="../src/libsync/syncengine.cpp" line="426"/>
<source>Filename encoding is not valid</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="561"/>
+ <location filename="../src/libsync/syncengine.cpp" line="558"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="631"/>
+ <location filename="../src/libsync/syncengine.cpp" line="612"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="645"/>
<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="718"/>
+ <location filename="../src/libsync/syncengine.cpp" line="723"/>
<source>Cannot open the sync journal</source>
<translation>Nie można otworzyć dziennika synchronizacji</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="965"/>
- <location filename="../src/libsync/syncengine.cpp" line="972"/>
+ <location filename="../src/libsync/syncengine.cpp" line="953"/>
+ <location filename="../src/libsync/syncengine.cpp" line="960"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <location filename="../src/libsync/syncengine.cpp" line="978"/>
<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="1023"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1011"/>
<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="1040"/>
- <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1028"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1048"/>
<source>Not allowed to remove, restoring</source>
<translation>Brak uprawnień by usunąć, przywracanie</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1073"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1061"/>
<source>Local files and share folder removed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1116"/>
<source>Move not allowed, item restored</source>
<translation>Przenoszenie niedozwolone, obiekt przywrócony</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1125"/>
<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="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the destination</source>
<translation>docelowy</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the source</source>
<translation>źródło</translation>
</message>
</message>
</context>
<context>
- <name>OCC::TransmissionChecksumValidator</name>
+ <name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="128"/>
<source>The checksum header is malformed.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+ <source>The checksum header contained an unknown checksum type '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="148"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation type="unfinished"/>
</message>
<source>Recent Changes</source>
<translation>Ostatnie zmiany</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="561"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="331"/>
<source>Managed Folders:</source>
<source>Open %1 in browser</source>
<translation>Otwórz %1 w przeglądarce</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="449"/>
- <source>Log out everywhere</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="457"/>
- <source>Log in everywhere...</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="513"/>
<source>Unknown status</source>
<source>Account %1: %2</source>
<translation>Dostęp %1: %2</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="449"/>
+ <source>Log out of all accounts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="457"/>
+ <source>Log in to all accounts...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="532"/>
<source>Crash now</source>
<source>No items synced recently</source>
<translation>Brak ostatnich synchronizacji</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="561"/>
- <source>Discovering '%1'</source>
- <translation>Rozpoznaję '%1'</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="566"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>%L1 B</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="306"/>
+ <location filename="../src/libsync/utility.cpp" line="303"/>
<source>%Ln year(s)</source>
<translation>%Ln rok(lat)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="307"/>
+ <location filename="../src/libsync/utility.cpp" line="304"/>
<source>%Ln month(s)</source>
<translation>%Ln miesiąc(ęcy)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="308"/>
+ <location filename="../src/libsync/utility.cpp" line="305"/>
<source>%Ln day(s)</source>
<translation>%Ln dzień(dni)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="309"/>
+ <location filename="../src/libsync/utility.cpp" line="306"/>
<source>%Ln hour(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="310"/>
+ <location filename="../src/libsync/utility.cpp" line="307"/>
<source>%Ln minute(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="311"/>
+ <location filename="../src/libsync/utility.cpp" line="308"/>
<source>%Ln second(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="318"/>
<source>0 seconds</source>
<translation>0 sekund</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="336"/>
+ <location filename="../src/libsync/utility.cpp" line="333"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="73"/>
+ <source>Enter your credentials to connect to the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <source>Sign in</source>
+ <translation>Iniciar Sessão</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="89"/>
<source>Remove the account configuration from the client</source>
<translation>Remova a configuração de conta do cliente</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Remove Account</source>
<translation>Remover Conta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="97"/>
+ <location filename="../src/gui/accountsettings.ui" line="113"/>
<source>Storage space: ...</source>
<translation>Espaço de armazenamento: ...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="167"/>
+ <location filename="../src/gui/accountsettings.ui" line="183"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Pastas não selecionadas serão <b>removidas</b> do seu sistema local de ficheiros e não serão sincronizadas neste computador</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="230"/>
<source>Apply</source>
<translation>Aplicar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="198"/>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
- <location filename="../src/gui/accountsettings.cpp" line="571"/>
+ <location filename="../src/gui/accountsettings.ui" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="289"/>
+ <location filename="../src/gui/accountsettings.cpp" line="646"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<translation>Conetado com <server> como <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="115"/>
+ <location filename="../src/gui/accountsettings.cpp" line="121"/>
<source>No account configured.</source>
<translation>Nenhuma conta configurada.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="161"/>
+ <source>Choose what to sync</source>
+ <translation>Escolher o que sincronizar</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="168"/>
+ <source>Remove folder sync connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="234"/>
<source>Folder creation failed</source>
<translation>Falhou a criação da pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="230"/>
+ <location filename="../src/gui/accountsettings.cpp" line="235"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation><p>Não foi posssível criar a pasta local<i>%1</i>.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="283"/>
- <source>Stop syncing</source>
- <translation>Parar sincronização</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
+ <source>Confirm Folder Sync Connection Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>Remove Folder Sync Connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="309"/>
+ <location filename="../src/gui/accountsettings.cpp" line="314"/>
<source>Confirm Folder Reset</source>
<translation>Confirmar Repor Pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="310"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Deseja mesmo repor a pasta <i>%1</i> e reconstruir a base de dados do seu cliente?</p><p><b>Nota:</b> Esta função é desenhada apenas para efeitos de manutenção. Os ficheiros não irão ser removidos, mas este processo pode aumentar o tráfego de dados e demorar alguns minutos ou horas a completar, dependendo do tamanho da pasta. Utilize esta funcionalidade apenas se aconselhado pelo seu administrador.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="391"/>
+ <location filename="../src/gui/accountsettings.cpp" line="396"/>
<source>Sync Running</source>
<translation>Sincronização em Execução</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="392"/>
+ <location filename="../src/gui/accountsettings.cpp" line="397"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>A operação de sincronização está a ser executada.<br/>Deseja terminar?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="472"/>
+ <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <source>%1 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="485"/>
<source>%1 as <i>%2</i></source>
<translation>%1 como <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="476"/>
+ <location filename="../src/gui/accountsettings.cpp" line="495"/>
<source>Connected to %1.</source>
<translation>Conetado a %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="478"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>O servidor %1 está temporariamente indisponível.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="480"/>
+ <location filename="../src/gui/accountsettings.cpp" line="499"/>
<source>Signed out from %1.</source>
<translation>Terminou a sesão de %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="482"/>
+ <location filename="../src/gui/accountsettings.cpp" line="501"/>
<source>No connection to %1 at %2.</source>
<translation>Sem ligação para %1 em %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
- <source>There are new folders that were not synchronized because they are too big: %1</source>
- <translation>Existem pastas novas que não foram sincronizadas porque estas eram muito grandes: %1</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="536"/>
- <source>, </source>
- <translation>, </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <source>There are new folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="563"/>
+ <location filename="../src/gui/accountsettings.cpp" line="638"/>
<source>Confirm Account Removal</source>
<translation>Confirmar Remoção da Conta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="564"/>
+ <location filename="../src/gui/accountsettings.cpp" line="639"/>
<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 a esta conta <i>%1</i>?</p><p><b>Nota:</b> Isto <b>não</b> apaga quaisquer ficheiros.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="570"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>Remove connection</source>
<translation>Remover ligação</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="158"/>
<source>Open folder</source>
<translation>Abrir a pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="168"/>
- <source>Choose What to Sync</source>
- <translation>Escolher o Que Sincronizar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Resume sync</source>
<translation>Retomar sincronização</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Pause sync</source>
<translation>Pausar sincronização</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="176"/>
- <source>Remove sync</source>
- <translation>Remover sincronização</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="277"/>
- <source>Confirm Sync Removal</source>
- <translation>Confirmar Remoção da Sincronização</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="278"/>
+ <location filename="../src/gui/accountsettings.cpp" line="283"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>Deseja mesmo parar a sincronização da pasta <i>%1</i>?</p><p><b>Nota:</b> Isto <b>não</b> apaga quaisquer ficheiros.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="452"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) de %2 em uso. Algumas pastas, incluindo pastas de rede ou partilhadas, podem ter limites diferentes.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="448"/>
+ <location filename="../src/gui/accountsettings.cpp" line="453"/>
<source>%1 of %2 in use</source>
<translation>%1 de %2 em uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="453"/>
+ <location filename="../src/gui/accountsettings.cpp" line="462"/>
<source>Currently there is no storage usage information available.</source>
<translation>Atualmente não está disponível nenhuma informação da utilização do armazenamento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="507"/>
<source>No %1 connection configured.</source>
<translation>%1 sem ligação configurada.</translation>
</message>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="95"/>
+ <location filename="../src/gui/accountstate.cpp" line="99"/>
<source>Signed out</source>
<translation>Sessão terminada</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="97"/>
+ <location filename="../src/gui/accountstate.cpp" line="101"/>
<source>Disconnected</source>
<translation>Desconetado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="99"/>
+ <location filename="../src/gui/accountstate.cpp" line="103"/>
<source>Connected</source>
<translation>Conetado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="101"/>
+ <location filename="../src/gui/accountstate.cpp" line="105"/>
<source>Service unavailable</source>
<translation>Servidor indisponível</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="103"/>
+ <location filename="../src/gui/accountstate.cpp" line="107"/>
<source>Network error</source>
<translation>Erro de rede</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="105"/>
+ <location filename="../src/gui/accountstate.cpp" line="109"/>
<source>Configuration error</source>
<translation>Erro de configuração</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="107"/>
+ <location filename="../src/gui/accountstate.cpp" line="111"/>
<source>Unknown account state</source>
<translation>Estado de conta desconhecido</translation>
</message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>Reauthentication required</source>
+ <translation>Requerido reautenticação</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>You need to re-login to continue using the account %1.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
<translation>Por favor actualize para a ultima versão do servidor e reinicie o cliente.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="143"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="135"/>
<source>Authentication error: Either username or password are wrong.</source>
<translation>Erro de autenticação: O nome de utilizador ou a senha estão errados.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="155"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="147"/>
<source>timeout</source>
<translation>tempo expirado</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="186"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="178"/>
<source>The provided credentials are not correct</source>
<translation>As credenciais fornecidas não estão correctas</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="524"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="537"/>
<source>Aborted by the user</source>
<translation>Cancelado pelo utilizador</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="107"/>
+ <location filename="../src/gui/folder.cpp" line="108"/>
<source>Unable to create csync-context</source>
<translation>Não é possível criar 'csync-context'</translation>
</message>
<translation>Atividade de Sincronização</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="845"/>
+ <location filename="../src/gui/folder.cpp" line="870"/>
<source>Could not read system exclude file</source>
<translation>Não foi possível ler o ficheiro system exclude</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1102"/>
+ <location filename="../src/gui/folder.cpp" line="1127"/>
<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 definições para a selecionar, se a desejar transferir.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1115"/>
+ <location filename="../src/gui/folder.cpp" line="1140"/>
<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="1119"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Remove All Files?</source>
<translation>Remover todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1121"/>
+ <location filename="../src/gui/folder.cpp" line="1146"/>
<source>Remove all files</source>
<translation>Remover todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1122"/>
+ <location filename="../src/gui/folder.cpp" line="1147"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="275"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<source>Could not reset folder state</source>
<translation>Não foi possível repor o estado da pasta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="276"/>
+ <location filename="../src/gui/folderman.cpp" line="271"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Não foi possível remover o antigo 'journal sync' '%1'. Por favor certifique-se que nenhuma aplicação o está a utilizar.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="877"/>
+ <location filename="../src/gui/folderman.cpp" line="865"/>
<source> (backup)</source>
<translation>(cópia de segurança)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="882"/>
+ <location filename="../src/gui/folderman.cpp" line="870"/>
<source> (backup %1)</source>
<translation>(cópia de segurança %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1091"/>
+ <location filename="../src/gui/folderman.cpp" line="1079"/>
<source>Undefined State.</source>
<translation>Estado indefinido.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1094"/>
- <source>Waits to start syncing.</source>
- <translation>A aguardar para iniciar a sincronização.</translation>
+ <location filename="../src/gui/folderman.cpp" line="1082"/>
+ <source>Waiting to start syncing.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1097"/>
+ <location filename="../src/gui/folderman.cpp" line="1085"/>
<source>Preparing for sync.</source>
<translation>A preparar para sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1100"/>
+ <location filename="../src/gui/folderman.cpp" line="1088"/>
<source>Sync is running.</source>
<translation>A sincronização está em execução.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1103"/>
+ <location filename="../src/gui/folderman.cpp" line="1091"/>
<source>Last Sync was successful.</source>
<translation>A última sincronização foi efetuada com sucesso.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1108"/>
+ <location filename="../src/gui/folderman.cpp" line="1096"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>A última sincronização foi efectuada com sucesso, mas existem avisos sobre alguns ficheiros.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1111"/>
+ <location filename="../src/gui/folderman.cpp" line="1099"/>
<source>Setup Error.</source>
<translation>Erro na instalação.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1114"/>
+ <location filename="../src/gui/folderman.cpp" line="1102"/>
<source>User Abort.</source>
<translation>Cancelado pelo utilizador.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1117"/>
+ <location filename="../src/gui/folderman.cpp" line="1105"/>
<source>Sync is paused.</source>
<translation>A sincronização está pausada.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1123"/>
+ <location filename="../src/gui/folderman.cpp" line="1111"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (A sincronização está pausada)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1119"/>
<source>No valid folder selected!</source>
<translation>Não foi selecionada nenhuma pasta válida!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1130"/>
<source>The selected path is not a folder!</source>
<translation>O caminho selecionado não é uma pasta!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1146"/>
+ <location filename="../src/gui/folderman.cpp" line="1134"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Não tem permissões de escrina na pasta seleccionada!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1161"/>
+ <location filename="../src/gui/folderman.cpp" line="1149"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>A pasta local %1 já foi usada numa ligação da sincronização da pasta. Por favor, escolha outra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1166"/>
+ <location filename="../src/gui/folderman.cpp" line="1154"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>A pasta local %1 já contém uma pasta utilizada nua sincronização de pasta. Por favor, escolha outra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1173"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>A pasta local %1 é uma hiperligação simbólica. A hiperligação de destino já contém uma pasta usada numa ligação de sincronização de pasta. Por favor, escolha outra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1168"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>A pasta local %1 já contém uma pasta usada numa ligação de sincronização de pasta. Por favor, escolha outra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1186"/>
+ <location filename="../src/gui/folderman.cpp" line="1174"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>A pasta local %1 é uma hiperligação simbólica. A hiperligação de destino já contém uma pasta usada numa ligação de sincronização de pasta. Por favor, escolha outra!</translation>
</message>
<translation>Adicionar Ligação de Sincronização de Pasta</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="85"/>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="274"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="271"/>
<source>File</source>
<translation>Ficheiro</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="228"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="224"/>
<source>Syncing selected files in your account with</source>
<translation>A sincronizar os ficheiros selecionados na sua conta com</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="231"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="227"/>
<source>Remote path: %1</source>
<translation>Caminho remoto: %1</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="121"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="122"/>
<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="126"/>
- <source>Adding folder is disabled because your 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á desactivado porque já estão a ser sincronizados todos os ficheiros. Se desejar sincronizar várias pastas, por favor, remova a pasta raiz actualmente configurada.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="131"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="132"/>
<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="141"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="142"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="156"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
<source>Error while loading the list of folders from the server.</source>
<translation>Erro ao carregar a lista das pastas a partir do servidor.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="182"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="192"/>
<source>Signed out</source>
<translation>Sessão terminada</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="727"/>
- <source>Discovering '%1'</source>
- <translation>Descobrindo '%1'</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="127"/>
+ <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="163"/>
+ <source>Fetching folder list from server...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="789"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="787"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="849"/>
<source>Syncing %1</source>
<translation>A sincronizar %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="792"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="854"/>
<source>download %1/s</source>
<translation>transerfência %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="794"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="856"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="800"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>upload %1/s</source>
<translation>envio %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="802"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="864"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="807"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="869"/>
<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="811"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="873"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="827"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="889"/>
<source>%1 of %2, file %3 of %4
Total time left %5</source>
<translation>%1 of %2, ficheiro %3 de %4
Tempo total restante %5</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
<source>file %1 of %2</source>
<translation>ficheiro %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="932"/>
<source>Waiting...</source>
<translation>A aguardar...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="934"/>
<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="878"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>Preparing to sync...</source>
<translation>A preparar para sincronizar...</translation>
</message>
<name>OCC::FolderWizard</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <source>Add Folder Sync Connection</source>
+ <translation>Adicionar Ligação de Sincronização de Pasta</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderwizard.cpp" line="564"/>
- <source>Add Folder</source>
- <translation>Adicionar Pasta</translation>
+ <source>Add Sync Connection</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Avançado</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="61"/>
+ <location filename="../src/gui/generalsettings.ui" line="109"/>
<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="81"/>
+ <location filename="../src/gui/generalsettings.ui" line="129"/>
<source>MB</source>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="109"/>
+ <location filename="../src/gui/generalsettings.ui" line="159"/>
<source>Show crash reporter</source>
<translation>Visualizar registo de crash</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="118"/>
+ <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="142"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
<source>Add an Account</source>
<translation>Adicionar uma Conta</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="167"/>
- <location filename="../src/gui/generalsettings.ui" line="173"/>
+ <location filename="../src/gui/generalsettings.ui" line="171"/>
+ <location filename="../src/gui/generalsettings.ui" line="177"/>
<source>About</source>
<translation>Sobre</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <location filename="../src/gui/generalsettings.ui" line="187"/>
<source>Updates</source>
<translation>Atualizações</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="208"/>
+ <location filename="../src/gui/generalsettings.ui" line="212"/>
<source>&Restart && Update</source>
<translation>&Reiniciar && Atualizar</translation>
</message>
</context>
-<context>
- <name>OCC::HttpCredentials</name>
- <message>
- <location filename="../src/libsync/creds/httpcredentials.cpp" line="290"/>
- <source>Reading from keychain failed with error: '%1'</source>
- <translation>A leitura da "keychain" falhou com um erro: '%1'</translation>
- </message>
-</context>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="32"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
<source>Please enter %1 password:
User: %2
</translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="41"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <source>Reading from keychain failed with error: '%1'</source>
+ <translation>A leitura da "keychain" falhou com um erro: '%1'</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
<source>Enter Password</source>
<translation>Insira a Senha</translation>
</message>
<translation>Remover</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="40"/>
<source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
Os itens onde é permitido a eliminação serão eliminados se estes impedirem a remoção de uma diretoria. Isto é útil para os metadados.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="109"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
<source>Could not open file</source>
<translation>Não foi possível abrir o ficheiro</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="111"/>
<source>Cannot write changes to '%1'.</source>
<translation>Não foi possível escrever as alterações para '%1'</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="138"/>
<source>Add Ignore Pattern</source>
<translation>Adicione regra para ignorar ficheiros</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>Add a new ignore pattern:</source>
<translation>Adicione nova regra para ignorar ficheiros:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="45"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="46"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Esta entrada é fornecida pelo sistema em '%1' e não pode ser modificada nesta vista.</translation>
</message>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="163"/>
+ <location filename="../src/libsync/logger.cpp" line="190"/>
<source>Error</source>
<translation>Erro</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="164"/>
+ <location filename="../src/libsync/logger.cpp" line="191"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>O ficheiro '%1'<br/>não pode ser aberto para escrita.<br/><br/>O ficheiro de registo <b>not</b> pode ser guardado!</nobr></translation>
</message>
</message>
<message>
<location filename="../src/gui/networksettings.ui" line="203"/>
- <location filename="../src/gui/networksettings.ui" line="295"/>
+ <location filename="../src/gui/networksettings.ui" line="292"/>
<source>No limit</source>
<translation>Sem limite</translation>
</message>
<source>SOCKS5 proxy</source>
<translation>Proxy SOCKS5</translation>
</message>
+ <message>
+ <location filename="../src/gui/networksettings.cpp" line="128"/>
+ <source>Qt >= 5.4 is required in order to use the bandwidth limit</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::OCUpdater</name>
<source>Downloading version %1. Please wait...</source>
<translation>A transferir a versão %1. Por favor aguarde...</translation>
</message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
- <source>Version %1 available. Restart application to start the update.</source>
- <translation>Versão %1 disponível. Reinicie a aplicação para iniciar atualização.</translation>
- </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="145"/>
<source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
<source>Could not check for new updates.</source>
<translation>Não foi possível verificar por novas actualizações.</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
+ <source>%1 version %2 available. Restart application to start the update.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
- <source>New version %1 available. Please use the system's update tool to install it.</source>
- <translation>Nova versão %1 disponível. Por favor use a ferramenta de atualização do sistema para a instalar.</translation>
+ <source>New %1 version %2 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="151"/>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="114"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="110"/>
<source>Connection Timeout</source>
<translation>O tempo de ligação expirou</translation>
</message>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="171"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="167"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Resposta JSON inválida do URL poll</translation>
</message>
</context>
-<context>
- <name>OCC::PropagateDownloadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="435"/>
- <source>Sync was aborted by user.</source>
- <translation>A sincronização foi cancelada pelo utilizador.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="488"/>
- <source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation>Nenhum E-Tag recebido do servidor, verifique Proxy / gateway</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="494"/>
- <source>We received a different E-Tag for resuming. Retrying next time.</source>
- <translation>Recebemos um e-Tag diferente para resumir. Tentando uma próxima vez.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="516"/>
- <source>Server returned wrong content-range</source>
- <translation>O servidor retornou o alcance-conteúdo errado</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="567"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation>O ficheiro %1 não pode ser descarregado devido a conflito com um nome de ficheiro local!</translation>
- </message>
-</context>
<context>
<name>OCC::PropagateDownloadFileQNAM</name>
<message>
<translation>O ficheiro %1 não pode ser descarregado devido a conflito com um nome de ficheiro local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="457"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
+ <source>The download would reduce free disk space below %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="372"/>
+ <source>Free space on disk is less than %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="482"/>
<source>File was deleted from server</source>
<translation>O ficheiro foi eliminado do servidor</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="506"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="531"/>
<source>The file could not be downloaded completely.</source>
<translation>Não foi possível transferir o ficheiro na totalidade.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="601"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="636"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Ficheiro %1 não pode ser guardado devido à existência de um ficheiro local com o mesmo nome.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="641"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="676"/>
<source>File has changed since discovery</source>
<translation>O ficheiro alterou-se desde a sua descoberta</translation>
</message>
<context>
<name>OCC::PropagateItemJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="92"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
<source>; Restoration Failed: %1</source>
<translation>; Restauro Falhou: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="138"/>
<source>Continue blacklisting:</source>
<translation>Continue a enviar para lista negra:</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="230"/>
<source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation>Um ficheiro ou pasta foi removido de uma partilha só de leitura, mas o restauro falhou: %1</translation>
</message>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove folder '%1';</source>
- <translation>Não foi possivel remover a pasta '%1';</translation>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="243"/>
- <location filename="../src/libsync/propagator_legacy.cpp" line="302"/>
- <source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>Ficheiro local foi alterado durante a sincronização. A sincronizar quando chegar na totalidade</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="246"/>
- <source>Sync was aborted by user.</source>
- <translation>A sincronização foi cancelada pelo utilizador.</translation>
- </message>
+ <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="252"/>
- <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
- <translation>O ficheiro foi editado localmente mas faz parte de uma prtilha só de leitura. Foi restaurado mas a edição está no ficheiro de conflito.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="205"/>
+ <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>
-</context>
-<context>
- <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="226"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="262"/>
<source>File Removed</source>
<translation>Ficheiro Eliminado</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="274"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>O ficheiro local foi alterado durante a sincronização. Vai ser finalizado.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="250"/>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="286"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="665"/>
<source>Local file changed during sync.</source>
<translation>Ficheiro local alterado durante a sincronização.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="558"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="592"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>A forçar aborto no trabalho de redefinição de conexão HTTP com Qt < 5.4.3</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="566"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="600"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>O ficheiro foi editado localmente mas faz parte de uma prtilha só de leitura. Foi restaurado mas a edição está no ficheiro de conflito.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="597"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="631"/>
<source>Poll URL missing</source>
<translation>URL poll em falta</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="620"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="654"/>
<source>The local file was removed during sync.</source>
<translation>O arquivo local foi removido durante a sincronização.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="646"/>
- <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
- <translation>O servidor não reconheceu o último bloco. (Nenhuma e-tag estava presente)</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="680"/>
+ <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Pastas não selecionadas serão <b>removidas</b> do seu sistema local de ficheiros e não serão sincronizadas neste computador</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>Escolher o que Sincronizar: Marque as sub pastas remotas que deseja sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>Escolher o que Sincronizar: Desmarque as sub pastas remotas que não deseja sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
<source>Choose What to Sync</source>
<translation>Escolher o Que Sincronizar</translation>
</message>
<translation>Tamanho</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
<source>No subfolders currently on the server.</source>
<translation>Atualmente não há sub-pastas no servidor.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>Ocorreu um erro ao carregar a lista de sub-pastas.</translation>
</message>
<translation>Definições</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="80"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="84"/>
<source>Activity</source>
<translation>Atividade</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="86"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="90"/>
<source>General</source>
<translation>Geral</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>Network</source>
<translation>Rede</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharedialog.ui" line="22"/>
- <location filename="../src/gui/sharedialog.ui" line="234"/>
+ <location filename="../src/gui/sharedialog.ui" line="258"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<translation>Caminho OwnCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="182"/>
+ <location filename="../src/gui/sharedialog.ui" line="116"/>
<source>Set &password </source>
<translation>Defina a &senha</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="196"/>
+ <location filename="../src/gui/sharedialog.ui" line="130"/>
<source>Set &expiration date</source>
<translation>Defina a data de &expiração</translation>
</message>
+ <message>
+ <location filename="../src/gui/sharedialog.ui" line="214"/>
+ <source>Allow editing</source>
+ <translation>Permitir edição</translation>
+ </message>
<message>
<location filename="../src/gui/sharedialog.ui" line="77"/>
<source>Share link</source>
<translation>Compartilhar hiperligação</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="125"/>
+ <location filename="../src/gui/sharedialog.ui" line="203"/>
<source>Copy &link</source>
<translation>Copie a &hiperligação</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="142"/>
+ <location filename="../src/gui/sharedialog.ui" line="154"/>
<source>Set password</source>
<translation>Defina a senha</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="692"/>
- <source>%1 path: %2</source>
- <translation>%1 caminho: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="115"/>
+ <location filename="../src/gui/sharedialog.cpp" line="120"/>
<source>%1 Sharing</source>
<translation>%1 Partilhando</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="103"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="112"/>
+ <location filename="../src/gui/sharedialog.cpp" line="117"/>
<source>Folder: %2</source>
<translation>Pasta: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="121"/>
<source>P&assword protect</source>
<translation>Protegida por senha</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="221"/>
+ <location filename="../src/gui/sharedialog.cpp" line="214"/>
<source>Password Protected</source>
<translation>Protegido com Senha</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="382"/>
+ <location filename="../src/gui/sharedialog.cpp" line="338"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>O ficheiro não pode ser partilhado porque foi partilhado sem permissão de partilha.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="528"/>
+ <location filename="../src/gui/sharedialog.cpp" line="475"/>
<source>Please Set Password</source>
<translation>Por favor, Definir Senha</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="564"/>
- <location filename="../src/gui/sharedialog.cpp" line="565"/>
+ <location filename="../src/gui/sharedialog.cpp" line="538"/>
+ <location filename="../src/gui/sharedialog.cpp" line="539"/>
<source>&Share link</source>
<translation>&Compartilhe a hiperligação </translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="583"/>
+ <location filename="../src/gui/sharedialog.cpp" line="552"/>
+ <location filename="../src/gui/sharedialog.cpp" line="564"/>
<source>OCS API error code: %1</source>
<translation>Código de erro OCS API: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="605"/>
- <source>There is no sync folder configured.</source>
- <translation>Não há pasta de sincronização configurada.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="639"/>
- <source>A sync file with the same name exists. The file cannot be registered to sync.</source>
- <translation>Existe um ficheiro sincronizado com o mesmo nome. O ficheiro não pode ser registado para sincronização.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="684"/>
- <source>The file cannot be synced.</source>
- <translation>O ficheiro não pode ser sincronizado.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="624"/>
- <source>Sharing of external directories is not yet working.</source>
- <translation>Partilha de directórios externos ainda não funciona.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="473"/>
- <location filename="../src/gui/sharedialog.cpp" line="506"/>
+ <location filename="../src/gui/sharedialog.cpp" line="418"/>
+ <location filename="../src/gui/sharedialog.cpp" line="460"/>
<source>Public sh&aring requires a password</source>
<translation>A pa&rtilha pública requer uma palavra-passe:</translation>
</message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="617"/>
- <source>Cannot find a folder to upload to.</source>
- <translation>Não é possível encontrar uma pasta para enviar para:</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
- <source>Waiting to upload...</source>
- <translation>Esperando para carregar...</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="653"/>
- <source>Unable to register in sync space.</source>
- <translation>Não foi possível registar no espaço de sincronização.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="694"/>
- <source>Sync of registered file was not successful yet.</source>
- <translation>Sincronização do ficheiro registado não foi bem sucedida.</translation>
- </message>
</context>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>Login Error</source>
<translation>Erro de login</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>You must sign in as user %1</source>
<translation>Deve fazer o login como utilizador %1.</translation>
</message>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="452"/>
+ <location filename="../src/gui/socketapi.cpp" line="447"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Partilhar com %1</translation>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="97"/>
+ <location filename="../src/libsync/syncengine.cpp" line="94"/>
<source>Success.</source>
<translation>Sucesso</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="104"/>
+ <location filename="../src/libsync/syncengine.cpp" line="101"/>
<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="107"/>
+ <location filename="../src/libsync/syncengine.cpp" line="104"/>
<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="110"/>
+ <location filename="../src/libsync/syncengine.cpp" line="107"/>
<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="113"/>
+ <location filename="../src/libsync/syncengine.cpp" line="110"/>
<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="116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>Parametro errado, CSync falhou</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="119"/>
+ <location filename="../src/libsync/syncengine.cpp" line="116"/>
<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="122"/>
+ <location filename="../src/libsync/syncengine.cpp" line="119"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync: Processo de reconciliação falhou.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="122"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync: erro ao autenticar-se no servidor proxy.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="125"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync: Erro a contactar o proxy ou o servidor.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="128"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="131"/>
<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="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="134"/>
<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="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="137"/>
<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="143"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation>CSync: Erro devido a permissões de negação não tratadas.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
<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="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
<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="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
<source>Error while reading folder.</source>
<translation>Erro ao ler o ficheiro.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="996"/>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
<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="1003"/>
+ <location filename="../src/libsync/syncengine.cpp" line="991"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="152"/>
<source>CSync unspecified error.</source>
<translation>CSync: erro não especificado</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="155"/>
<source>Aborted by the user</source>
<translation>Cancelado pelo utilizador</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="392"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>O nome do ficheiro contém carateres inválidos que não podem ser sincronizados através das plataformas.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="143"/>
<source>CSync failed to access</source>
<translation>CSync falhou o acesso</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <location filename="../src/libsync/syncengine.cpp" line="97"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <source>CSync failed due to unhandled permission denied.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="146"/>
<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="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="158"/>
<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="175"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<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="230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="227"/>
<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="389"/>
+ <location filename="../src/libsync/syncengine.cpp" line="386"/>
<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="392"/>
+ <location filename="../src/libsync/syncengine.cpp" line="389"/>
<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="398"/>
+ <location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename is too long.</source>
<translation>O nome do ficheiro é muito grande</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="401"/>
+ <location filename="../src/libsync/syncengine.cpp" line="398"/>
<source>File is ignored because it's hidden.</source>
<translation>O ficheiro é ignorado porque está ocultado.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="407"/>
+ <location filename="../src/libsync/syncengine.cpp" line="404"/>
<source>Stat failed.</source>
<translation>Estado falhou.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="429"/>
+ <location filename="../src/libsync/syncengine.cpp" line="426"/>
<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="561"/>
+ <location filename="../src/libsync/syncengine.cpp" line="558"/>
<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="631"/>
+ <location filename="../src/libsync/syncengine.cpp" line="612"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="645"/>
<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="718"/>
+ <location filename="../src/libsync/syncengine.cpp" line="723"/>
<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="965"/>
- <location filename="../src/libsync/syncengine.cpp" line="972"/>
+ <location filename="../src/libsync/syncengine.cpp" line="953"/>
+ <location filename="../src/libsync/syncengine.cpp" line="960"/>
<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="990"/>
+ <location filename="../src/libsync/syncengine.cpp" line="978"/>
<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="1023"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1011"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Não é permitido fazer o envio deste ficheiro porque é só de leitura no servidor, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1040"/>
- <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1028"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1048"/>
<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="1073"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1061"/>
<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="1128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1116"/>
<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="1137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1125"/>
<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="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the destination</source>
<translation>o destino</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the source</source>
<translation>a origem</translation>
</message>
</message>
</context>
<context>
- <name>OCC::TransmissionChecksumValidator</name>
+ <name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="128"/>
<source>The checksum header is malformed.</source>
<translation>O cabeçalho de "checksum" está com problemas.</translation>
</message>
<message>
<location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+ <source>The checksum header contained an unknown checksum type '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="148"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>O ficheiro transferido não corresponde ao "checksum", Este irá ser retomado.</translation>
</message>
<source>Recent Changes</source>
<translation>Alterações recentes</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="561"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="331"/>
<source>Managed Folders:</source>
<source>Open %1 in browser</source>
<translation>Abrir %1 no browser</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="449"/>
- <source>Log out everywhere</source>
- <translation>Terminar a sessão em todo o lado</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="457"/>
- <source>Log in everywhere...</source>
- <translation>Iniciar a sessão em todo o lado...</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="513"/>
<source>Unknown status</source>
<source>Account %1: %2</source>
<translation>Conta %1: %2</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="449"/>
+ <source>Log out of all accounts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="457"/>
+ <source>Log in to all accounts...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="532"/>
<source>Crash now</source>
<source>No items synced recently</source>
<translation>Sem itens sincronizados recentemente</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="561"/>
- <source>Discovering '%1'</source>
- <translation>Descobrindo '%1'</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="566"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>%L1 B</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="306"/>
+ <location filename="../src/libsync/utility.cpp" line="303"/>
<source>%Ln year(s)</source>
<translation>%Ln ano(s)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="307"/>
+ <location filename="../src/libsync/utility.cpp" line="304"/>
<source>%Ln month(s)</source>
<translation>%Ln mês/meses</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="308"/>
+ <location filename="../src/libsync/utility.cpp" line="305"/>
<source>%Ln day(s)</source>
<translation>%Ln dia(s)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="309"/>
+ <location filename="../src/libsync/utility.cpp" line="306"/>
<source>%Ln hour(s)</source>
<translation>%Ln hora(s)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="310"/>
+ <location filename="../src/libsync/utility.cpp" line="307"/>
<source>%Ln minute(s)</source>
<translation>%Ln minuto(s)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="311"/>
+ <location filename="../src/libsync/utility.cpp" line="308"/>
<source>%Ln second(s)</source>
<translation>%Ln segundo(s)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="318"/>
<source>0 seconds</source>
<translation>0 segundos</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="336"/>
+ <location filename="../src/libsync/utility.cpp" line="333"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="73"/>
+ <source>Enter your credentials to connect to the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <source>Sign in</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="89"/>
<source>Remove the account configuration from the client</source>
<translation>Remova a configuração da conta do cliente</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Remove Account</source>
<translation>Remover Conta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="97"/>
+ <location filename="../src/gui/accountsettings.ui" line="113"/>
<source>Storage space: ...</source>
<translation>Espaço de armazenamento: ...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="167"/>
+ <location filename="../src/gui/accountsettings.ui" line="183"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Pastas não marcadas serão <b>removidos</b> de seu sistema de arquivos local e não serão mais sincronizadas com este computador</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="230"/>
<source>Apply</source>
<translation>Aplicar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="198"/>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
- <location filename="../src/gui/accountsettings.cpp" line="571"/>
+ <location filename="../src/gui/accountsettings.ui" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="289"/>
+ <location filename="../src/gui/accountsettings.cpp" line="646"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<translation>Conectado com <server> como <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="115"/>
+ <location filename="../src/gui/accountsettings.cpp" line="121"/>
<source>No account configured.</source>
<translation>Nenhuma conta configurada.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="161"/>
+ <source>Choose what to sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="168"/>
+ <source>Remove folder sync connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="234"/>
<source>Folder creation failed</source>
<translation>Falha na criação de pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="230"/>
+ <location filename="../src/gui/accountsettings.cpp" line="235"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation><p>Não foi possível criar pasta local <i>%1</i>.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="283"/>
- <source>Stop syncing</source>
- <translation>Parar de sincronizar</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
+ <source>Confirm Folder Sync Connection Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>Remove Folder Sync Connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="309"/>
+ <location filename="../src/gui/accountsettings.cpp" line="314"/>
<source>Confirm Folder Reset</source>
<translation>Confirme Reiniciar Pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="310"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Você realmente deseja redefinir a pasta <i>%1</i> e reconstruir seu banco de dados de clientes?</p><p><b>Nota:</b> Esta função é usada somente para manutenção. Nenhum arquivo será removido, mas isso pode causar significativo tráfego de dados e levar vários minutos ou horas, dependendo do tamanho da pasta. Somente use esta opção se adivertido por seu administrador.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="391"/>
+ <location filename="../src/gui/accountsettings.cpp" line="396"/>
<source>Sync Running</source>
<translation>Sincronização Acontecendo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="392"/>
+ <location filename="../src/gui/accountsettings.cpp" line="397"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>A operação de sincronização está acontecendo.<br/>Você deseja finaliza-la?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="472"/>
+ <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <source>%1 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="485"/>
<source>%1 as <i>%2</i></source>
<translation>%1 como <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="476"/>
+ <location filename="../src/gui/accountsettings.cpp" line="495"/>
<source>Connected to %1.</source>
<translation>Conectado a %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="478"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>O Servidor %1 está temporariamente indisponível.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="480"/>
+ <location filename="../src/gui/accountsettings.cpp" line="499"/>
<source>Signed out from %1.</source>
<translation>Assibndado por %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="482"/>
+ <location filename="../src/gui/accountsettings.cpp" line="501"/>
<source>No connection to %1 at %2.</source>
<translation>Sem conexão para %1 em %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
- <source>There are new folders that were not synchronized because they are too big: %1</source>
- <translation>Há novas pastas que não foram sincronizados, porque elas são muito grandes: %1</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="536"/>
- <source>, </source>
- <translation>,</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <source>There are new folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="563"/>
+ <location filename="../src/gui/accountsettings.cpp" line="638"/>
<source>Confirm Account Removal</source>
<translation>Confirmar a Remoção da Conta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="564"/>
+ <location filename="../src/gui/accountsettings.cpp" line="639"/>
<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="570"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>Remove connection</source>
<translation>Remover conexão</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="158"/>
<source>Open folder</source>
<translation>Abrir pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="168"/>
- <source>Choose What to Sync</source>
- <translation>Escolher o que Sincronizar</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Resume sync</source>
<translation>Resumir sincronização</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Pause sync</source>
<translation>Pausar sincronização</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="176"/>
- <source>Remove sync</source>
- <translation>Remover sincronização</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="277"/>
- <source>Confirm Sync Removal</source>
- <translation>Confirmar a Remoção de Sincronização</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="278"/>
+ <location filename="../src/gui/accountsettings.cpp" line="283"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>Você realmente deseja para a sincronização desta pasta <i>%1</i>?</p><p><b>Nota:</b> Isto <b>não</b> vai deletar qualquer arquivo.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="452"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) de%2 em uso. Algumas pastas, incluindo montadas na rede ou pastas compartilhadas, podem ter limites diferenes.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="448"/>
+ <location filename="../src/gui/accountsettings.cpp" line="453"/>
<source>%1 of %2 in use</source>
<translation>%1 de %2 em uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="453"/>
+ <location filename="../src/gui/accountsettings.cpp" line="462"/>
<source>Currently there is no storage usage information available.</source>
<translation>Atualmente, não há informações de uso de armazenamento disponível.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="507"/>
<source>No %1 connection configured.</source>
<translation>Nenhuma %1 conexão configurada.</translation>
</message>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="95"/>
+ <location filename="../src/gui/accountstate.cpp" line="99"/>
<source>Signed out</source>
<translation>Assinado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="97"/>
+ <location filename="../src/gui/accountstate.cpp" line="101"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="99"/>
+ <location filename="../src/gui/accountstate.cpp" line="103"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="101"/>
+ <location filename="../src/gui/accountstate.cpp" line="105"/>
<source>Service unavailable</source>
<translation>Serviço indisponível</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="103"/>
+ <location filename="../src/gui/accountstate.cpp" line="107"/>
<source>Network error</source>
<translation>Erro de rede</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="105"/>
+ <location filename="../src/gui/accountstate.cpp" line="109"/>
<source>Configuration error</source>
<translation>Erro de configuração</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="107"/>
+ <location filename="../src/gui/accountstate.cpp" line="111"/>
<source>Unknown account state</source>
<translation>Estado da conta desconhecido</translation>
</message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>Reauthentication required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>You need to re-login to continue using the account %1.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
<translation>Por favor, atualize para o último servidor e reinicie o cliente.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="143"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="135"/>
<source>Authentication error: Either username or password are wrong.</source>
<translation>Erro de autenticação. Ou nome de usuário ou senha está errada.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="155"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="147"/>
<source>timeout</source>
<translation>tempo limite</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="186"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="178"/>
<source>The provided credentials are not correct</source>
<translation>As credenciais fornecidas não estão corretas</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="524"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="537"/>
<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="107"/>
+ <location filename="../src/gui/folder.cpp" line="108"/>
<source>Unable to create csync-context</source>
<translation>Não é possível criar csync-context</translation>
</message>
<translation>Atividade de Sincronização</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="845"/>
+ <location filename="../src/gui/folder.cpp" line="870"/>
<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="1102"/>
+ <location filename="../src/gui/folder.cpp" line="1127"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Uma nova pasta maior que %1 MB foi adicionada: %2.
Por favor, vá nas configurações para selecionar o que você deseja para fazer o download.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1115"/>
+ <location filename="../src/gui/folder.cpp" line="1140"/>
<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="1119"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Remove All Files?</source>
<translation>Deseja Remover Todos os Arquivos?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1121"/>
+ <location filename="../src/gui/folder.cpp" line="1146"/>
<source>Remove all files</source>
<translation>Remover todos os arquivos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1122"/>
+ <location filename="../src/gui/folder.cpp" line="1147"/>
<source>Keep files</source>
<translation>Manter arquivos</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="275"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<source>Could not reset folder state</source>
<translation>Não foi possível redefinir o estado da pasta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="276"/>
+ <location filename="../src/gui/folderman.cpp" line="271"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Uma velha revista de sincronização '%1' foi encontrada, mas não pôde ser removida. Por favor, certifique-se de que nenhuma aplicação está a usá-la.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="877"/>
+ <location filename="../src/gui/folderman.cpp" line="865"/>
<source> (backup)</source>
<translation> (backup)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="882"/>
+ <location filename="../src/gui/folderman.cpp" line="870"/>
<source> (backup %1)</source>
<translation> (backup %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1091"/>
+ <location filename="../src/gui/folderman.cpp" line="1079"/>
<source>Undefined State.</source>
<translation>Estado indefinido.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1094"/>
- <source>Waits to start syncing.</source>
- <translation>Aguardando o inicio da sincronização.</translation>
+ <location filename="../src/gui/folderman.cpp" line="1082"/>
+ <source>Waiting to start syncing.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1097"/>
+ <location filename="../src/gui/folderman.cpp" line="1085"/>
<source>Preparing for sync.</source>
<translation>Preparando para sincronização.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1100"/>
+ <location filename="../src/gui/folderman.cpp" line="1088"/>
<source>Sync is running.</source>
<translation>A sincronização está ocorrendo.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1103"/>
+ <location filename="../src/gui/folderman.cpp" line="1091"/>
<source>Last Sync was successful.</source>
<translation>A última sincronização foi feita com sucesso.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1108"/>
+ <location filename="../src/gui/folderman.cpp" line="1096"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>A última sincronização foi executada com sucesso, mas com advertências em arquivos individuais.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1111"/>
+ <location filename="../src/gui/folderman.cpp" line="1099"/>
<source>Setup Error.</source>
<translation>Erro de Configuração.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1114"/>
+ <location filename="../src/gui/folderman.cpp" line="1102"/>
<source>User Abort.</source>
<translation>Usuário Abortou.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1117"/>
+ <location filename="../src/gui/folderman.cpp" line="1105"/>
<source>Sync is paused.</source>
<translation>Sincronização pausada.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1123"/>
+ <location filename="../src/gui/folderman.cpp" line="1111"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Pausa na Sincronização) </translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1119"/>
<source>No valid folder selected!</source>
<translation>Nenhuma pasta válida selecionada!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1130"/>
<source>The selected path is not a folder!</source>
<translation>O caminho selecionado não é uma pasta!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1146"/>
+ <location filename="../src/gui/folderman.cpp" line="1134"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Voce não tem permissão para escrita na pasta selecionada!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1161"/>
+ <location filename="../src/gui/folderman.cpp" line="1149"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>A pasta local %1 já está sendo utilizada em uma conexão de sincronização de pastas. Por favor, escolha uma outra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1166"/>
+ <location filename="../src/gui/folderman.cpp" line="1154"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>A pasta local %1 já contém uma pasta utilizada numa ligação de sincronização de pasta. Por favor, escolha outra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1173"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>A pasta local %1 é um link simbólico. O destino do link já contém uma pasta usada em uma conexão de sincronização de pastas. Por favor, escolha outra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1168"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>A pasta local %1 já está contida em uma pasta usada em uma conexão de sincronização de pastas. Por favor, escolha outra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1186"/>
+ <location filename="../src/gui/folderman.cpp" line="1174"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>A pasta local %1 é um link simbólico. O destino do link já está contido em uma pasta usada em uma conexão de sincronização de pastas. Por favor, escolha outra!</translation>
</message>
<translation>Adicionar Connection de Sincronização de pasta</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="85"/>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="274"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="271"/>
<source>File</source>
<translation>Arquivo</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="228"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="224"/>
<source>Syncing selected files in your account with</source>
<translation>Sincronizar arquivos selecionados na sua conta com</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="231"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="227"/>
<source>Remote path: %1</source>
<translation>Caminho remoto: %1</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="121"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="122"/>
<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="126"/>
- <source>Adding folder is disabled because your are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
- <translation>Adicionamento 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 que está configurada.</translation>
- </message>
- <message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="131"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="132"/>
<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="141"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="142"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="156"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
<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="182"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="192"/>
<source>Signed out</source>
<translation>Assinado</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="727"/>
- <source>Discovering '%1'</source>
- <translation>Descobrir '%1'</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="127"/>
+ <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="163"/>
+ <source>Fetching folder list from server...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="787"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="789"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="849"/>
<source>Syncing %1</source>
<translation>Sincronizando %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="792"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="854"/>
<source>download %1/s</source>
<translation>baixar %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="794"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="856"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="800"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>upload %1/s</source>
<translation>enviar %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="802"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="864"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="807"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="869"/>
<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="811"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="873"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="827"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="889"/>
<source>%1 of %2, file %3 of %4
Total time left %5</source>
<translation>%1 de %2, arquivo %3 de %4
Total de tempo que falta %5</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
<source>file %1 of %2</source>
<translation>arquivo %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="932"/>
<source>Waiting...</source>
<translation>Esperando...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="934"/>
<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="878"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>Preparing to sync...</source>
<translation>Preparando para sincronizar...</translation>
</message>
<name>OCC::FolderWizard</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <source>Add Folder Sync Connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderwizard.cpp" line="564"/>
- <source>Add Folder</source>
- <translation>Adicionar Pasta</translation>
+ <source>Add Sync Connection</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Avançado</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="61"/>
+ <location filename="../src/gui/generalsettings.ui" line="109"/>
<source>Ask confirmation before downloading folders larger than</source>
<translation>Perguntar por confirmação antes de baixar pastas maior do que</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
+ <location filename="../src/gui/generalsettings.ui" line="129"/>
<source>MB</source>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="109"/>
+ <location filename="../src/gui/generalsettings.ui" line="159"/>
<source>Show crash reporter</source>
<translation>Mostrar relatório de acidente</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="118"/>
+ <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="142"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
<source>Add an Account</source>
<translation>Adicionar uma Conta</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="167"/>
- <location filename="../src/gui/generalsettings.ui" line="173"/>
+ <location filename="../src/gui/generalsettings.ui" line="171"/>
+ <location filename="../src/gui/generalsettings.ui" line="177"/>
<source>About</source>
<translation>Sobre</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <location filename="../src/gui/generalsettings.ui" line="187"/>
<source>Updates</source>
<translation>Atualizações</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="208"/>
+ <location filename="../src/gui/generalsettings.ui" line="212"/>
<source>&Restart && Update</source>
<translation>&Reiniciar && Atualização
</translation>
</message>
</context>
-<context>
- <name>OCC::HttpCredentials</name>
- <message>
- <location filename="../src/libsync/creds/httpcredentials.cpp" line="290"/>
- <source>Reading from keychain failed with error: '%1'</source>
- <translation>Leitura de chaveiro falhou com o erro: '%1'</translation>
- </message>
-</context>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="32"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
<source>Please enter %1 password:
User: %2
</translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="41"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <source>Reading from keychain failed with error: '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
<source>Enter Password</source>
<translation>Entrar Senha</translation>
</message>
<translation>Remover</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="40"/>
<source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
Itens onde a eliminação é permitida serão excluídos se eles evitarem que um diretório seja removido. Isso é útil para meta dados.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="109"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
<source>Could not open file</source>
<translation>Não foi possível abrir o arquivo</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="111"/>
<source>Cannot write changes to '%1'.</source>
<translation>Não é possível gravar as alterações em '%1'.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="138"/>
<source>Add Ignore Pattern</source>
<translation>Adicionar Ignorar Padrão</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>Add a new ignore pattern:</source>
<translation>Adicionar um novo padrão ignorar:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="45"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="46"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Esta entrada é fornecida pelo sistema em '%1' e não pode ser modificado aqui.</translation>
</message>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="163"/>
+ <location filename="../src/libsync/logger.cpp" line="190"/>
<source>Error</source>
<translation>Erro</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="164"/>
+ <location filename="../src/libsync/logger.cpp" line="191"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Arquivo '%1'<br/>não pode ser aberto para escrita.<br/><br/>A saída de log <b>não</b> pode ser salva!</nobr></translation>
</message>
</message>
<message>
<location filename="../src/gui/networksettings.ui" line="203"/>
- <location filename="../src/gui/networksettings.ui" line="295"/>
+ <location filename="../src/gui/networksettings.ui" line="292"/>
<source>No limit</source>
<translation>Sem Limite</translation>
</message>
<source>SOCKS5 proxy</source>
<translation>SOCKS5 proxy</translation>
</message>
+ <message>
+ <location filename="../src/gui/networksettings.cpp" line="128"/>
+ <source>Qt >= 5.4 is required in order to use the bandwidth limit</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::OCUpdater</name>
<source>Downloading version %1. Please wait...</source>
<translation>Baixando a versão %1. Por favor aguarde...</translation>
</message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
- <source>Version %1 available. Restart application to start the update.</source>
- <translation>Versão %1 disponível. Reiniciar a aplicação para iniciar a atualização.</translation>
- </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="145"/>
<source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
<source>Could not check for new updates.</source>
<translation>Não foi possível verificar a existência de novas atualizações.</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
+ <source>%1 version %2 available. Restart application to start the update.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
- <source>New version %1 available. Please use the system's update tool to install it.</source>
- <translation>Nova versão %1 disponível. Por favor use a ferramenta de atualização do sistema para instalar.</translation>
+ <source>New %1 version %2 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="151"/>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="114"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="110"/>
<source>Connection Timeout</source>
<translation>Conexão Finalizada</translation>
</message>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="171"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="167"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Resposta JSON inválida a partir do conjunto de URL</translation>
</message>
</context>
-<context>
- <name>OCC::PropagateDownloadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="435"/>
- <source>Sync was aborted by user.</source>
- <translation>A sincronização foi abortada pelo usuário.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="488"/>
- <source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation>Nenhuma E-Tag recebida do servidor, verifique Proxy / gateway</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="494"/>
- <source>We received a different E-Tag for resuming. Retrying next time.</source>
- <translation>Recebemos um e-Tag diferente para resumir. Tente uma próxima vez.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="516"/>
- <source>Server returned wrong content-range</source>
- <translation>O servidor retornou erro numa série-de-conteúdo</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="567"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation>O arquivo %1 não pode ser baixado por causa de um confronto local no nome do arquivo!</translation>
- </message>
-</context>
<context>
<name>OCC::PropagateDownloadFileQNAM</name>
<message>
<translation>O arquivo %1 não pode ser baixado por causa de um confronto local no nome do arquivo!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="457"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
+ <source>The download would reduce free disk space below %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="372"/>
+ <source>Free space on disk is less than %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="482"/>
<source>File was deleted from server</source>
<translation>O arquivo foi eliminado do servidor</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="506"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="531"/>
<source>The file could not be downloaded completely.</source>
<translation>O arquivo não pode ser baixado completamente.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="601"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="636"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>O arquivo %1 não pode ser salvo por causa de um confronto com um nome de arquivo local!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="641"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="676"/>
<source>File has changed since discovery</source>
<translation>Arquivo foi alterado desde a descoberta</translation>
</message>
<context>
<name>OCC::PropagateItemJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="92"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
<source>; Restoration Failed: %1</source>
<translation>; Falha na Restauração: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="138"/>
<source>Continue blacklisting:</source>
<translation>Continuar na lista negra:</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="230"/>
<source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation>Um arquivo ou pasta foi removido de um compartilhamento de somente leitura, mas a restauração falhou: %1</translation>
</message>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove folder '%1';</source>
- <translation>Não foi possível remover a pasta '%1';</translation>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="243"/>
- <location filename="../src/libsync/propagator_legacy.cpp" line="302"/>
- <source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>Arquivo local alterado durante a sincronização, sincronizando uma vez que chegou completamente</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="246"/>
- <source>Sync was aborted by user.</source>
- <translation>A sincronização foi abortada pelo usuário.</translation>
- </message>
+ <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="252"/>
- <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
- <translation>O arquivo foi editado localmente mas faz parte de compartilhamento só de leitura. Ele foi restaurado mas sua edição está em conflito com o arquivo.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="205"/>
+ <source>File name contains at least one invalid character</source>
+ <translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="226"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="262"/>
<source>File Removed</source>
<translation>Arquivo Removido</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="274"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Arquivo local alterado durante a sincronização. Ele será retomado.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="250"/>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="286"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="665"/>
<source>Local file changed during sync.</source>
<translation>Arquivo local modificado durante a sincronização.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="558"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="592"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>Forçando cancelamento do trabalho em redefinição de conexão HTTP com o Qt < 5.4.2.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="566"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="600"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>O arquivo foi editado localmente mas faz parte de compartilhamento só de leitura. Ele foi restaurado mas sua edição está em conflito com o arquivo.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="597"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="631"/>
<source>Poll URL missing</source>
<translation>Faltando conjunto de URL</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="620"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="654"/>
<source>The local file was removed during sync.</source>
<translation>O arquivo local foi removido durante a sincronização.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="646"/>
- <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
- <translation>O servidor não reconheceu o último bloco. (Nenhuma e-tag estava presente)</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="680"/>
+ <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Pastas não marcadas serão <b>removidos</b> de seu sistema de arquivos local e não serão mais sincronizadas com este computador</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>Escolha o que Sincronizar: Selecione subpastas remotas que você deseja sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>Escolha o que Sincronizar: Desmarque subpastas remotas que você não deseja sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
<source>Choose What to Sync</source>
<translation>Escolher o que Sincronizar</translation>
</message>
<translation>Tamanho</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
<source>No subfolders currently on the server.</source>
<translation>Nenhuma sub-pasta atualmente no servidor.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>Ocorreu um erro ao carregar a lista de sub-pastas.</translation>
</message>
<translation>Configurações</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="80"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="84"/>
<source>Activity</source>
<translation>Atividade</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="86"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="90"/>
<source>General</source>
<translation>Geral</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>Network</source>
<translation>Rede</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharedialog.ui" line="22"/>
- <location filename="../src/gui/sharedialog.ui" line="234"/>
+ <location filename="../src/gui/sharedialog.ui" line="258"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<translation>Caminho ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="182"/>
+ <location filename="../src/gui/sharedialog.ui" line="116"/>
<source>Set &password </source>
<translation>Configurar &senha</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="196"/>
+ <location filename="../src/gui/sharedialog.ui" line="130"/>
<source>Set &expiration date</source>
<translation>Configurar data de &expiração</translation>
</message>
+ <message>
+ <location filename="../src/gui/sharedialog.ui" line="214"/>
+ <source>Allow editing</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/sharedialog.ui" line="77"/>
<source>Share link</source>
<translation>Compartilhar link</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="125"/>
+ <location filename="../src/gui/sharedialog.ui" line="203"/>
<source>Copy &link</source>
<translation>Copiar &link</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="142"/>
+ <location filename="../src/gui/sharedialog.ui" line="154"/>
<source>Set password</source>
<translation>Configurar senha</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="692"/>
- <source>%1 path: %2</source>
- <translation>Caminho %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="115"/>
+ <location filename="../src/gui/sharedialog.cpp" line="120"/>
<source>%1 Sharing</source>
<translation>Compartilhamento %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="103"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="112"/>
+ <location filename="../src/gui/sharedialog.cpp" line="117"/>
<source>Folder: %2</source>
<translation>Pasta: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="121"/>
<source>P&assword protect</source>
<translation>S&enha de proteção</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="221"/>
+ <location filename="../src/gui/sharedialog.cpp" line="214"/>
<source>Password Protected</source>
<translation>Protegido por Senha</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="382"/>
+ <location filename="../src/gui/sharedialog.cpp" line="338"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>O arquivo não pode ser partilhado, pois foi compartilhado sem permissão de compartilhamento.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="528"/>
+ <location filename="../src/gui/sharedialog.cpp" line="475"/>
<source>Please Set Password</source>
<translation>Por favor, Definir senha</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="564"/>
- <location filename="../src/gui/sharedialog.cpp" line="565"/>
+ <location filename="../src/gui/sharedialog.cpp" line="538"/>
+ <location filename="../src/gui/sharedialog.cpp" line="539"/>
<source>&Share link</source>
<translation>Link de &Compartilhamento</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="583"/>
+ <location filename="../src/gui/sharedialog.cpp" line="552"/>
+ <location filename="../src/gui/sharedialog.cpp" line="564"/>
<source>OCS API error code: %1</source>
<translation>Código de erro OCS API: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="605"/>
- <source>There is no sync folder configured.</source>
- <translation>Não há nenhuma pasta de sincronização configurada.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="639"/>
- <source>A sync file with the same name exists. The file cannot be registered to sync.</source>
- <translation>Um arquivo de sincronia com o mesmo nome já existe. O arquivo não pode ser registrado para sincronizar.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="684"/>
- <source>The file cannot be synced.</source>
- <translation>O arquivo não pode ser sincronizado.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="624"/>
- <source>Sharing of external directories is not yet working.</source>
- <translation>Compartilhamento de diretórios externos ainda não está funcionando.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="473"/>
- <location filename="../src/gui/sharedialog.cpp" line="506"/>
+ <location filename="../src/gui/sharedialog.cpp" line="418"/>
+ <location filename="../src/gui/sharedialog.cpp" line="460"/>
<source>Public sh&aring requires a password</source>
<translation>Comp&artilhamento público requer uma senha</translation>
</message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="617"/>
- <source>Cannot find a folder to upload to.</source>
- <translation>Não foi possível localizar uma pasta para fazer o envio.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
- <source>Waiting to upload...</source>
- <translation>Esperando para fazer o envio...</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="653"/>
- <source>Unable to register in sync space.</source>
- <translation>Não foi possível registrar no espaço sincronia.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="694"/>
- <source>Sync of registered file was not successful yet.</source>
- <translation>Sincronização de arquivos registrados não foi bem sucedida ainda.</translation>
- </message>
</context>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>Login Error</source>
<translation>Erro de Login</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>You must sign in as user %1</source>
<translation>Você deve entrar como usuário %1</translation>
</message>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="452"/>
+ <location filename="../src/gui/socketapi.cpp" line="447"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Compartilhar com %1</translation>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="97"/>
+ <location filename="../src/libsync/syncengine.cpp" line="94"/>
<source>Success.</source>
<translation>Sucesso.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="104"/>
+ <location filename="../src/libsync/syncengine.cpp" line="101"/>
<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="107"/>
+ <location filename="../src/libsync/syncengine.cpp" line="104"/>
<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="110"/>
+ <location filename="../src/libsync/syncengine.cpp" line="107"/>
<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="113"/>
+ <location filename="../src/libsync/syncengine.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync falhou ao reservar memória.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>Erro fatal de parametro do CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="119"/>
+ <location filename="../src/libsync/syncengine.cpp" line="116"/>
<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="122"/>
+ <location filename="../src/libsync/syncengine.cpp" line="119"/>
<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="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="122"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="125"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="128"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="131"/>
<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="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="134"/>
<source>A network connection timeout happened.</source>
<translation>Ocorreu uma desconexão de rede. </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="137"/>
<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="143"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation>CSync falhou devido a uma negativa de permissão não resolvida.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
<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="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
<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="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
<source>Error while reading folder.</source>
<translation>Erro ao ler pasta.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="996"/>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
<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="1003"/>
+ <location filename="../src/libsync/syncengine.cpp" line="991"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="152"/>
<source>CSync unspecified error.</source>
<translation>Erro não especificado no CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="155"/>
<source>Aborted by the user</source>
<translation>Abortado pelo usuário</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="392"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>Nome do arquivo contém caracteres inválidos que não podem ser sincronizados entre plataformas.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="143"/>
<source>CSync failed to access</source>
<translation>CSync não conseguiu o acesso</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <location filename="../src/libsync/syncengine.cpp" line="97"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <source>CSync failed due to unhandled permission denied.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="146"/>
<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="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="158"/>
<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="175"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<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="230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="227"/>
<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="389"/>
+ <location filename="../src/libsync/syncengine.cpp" line="386"/>
<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="392"/>
+ <location filename="../src/libsync/syncengine.cpp" line="389"/>
<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="398"/>
+ <location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename is too long.</source>
<translation>O nome do arquivo é muito longo.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="401"/>
+ <location filename="../src/libsync/syncengine.cpp" line="398"/>
<source>File is ignored because it's hidden.</source>
<translation>Arquivo foi ignorado porque está escondido.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="407"/>
+ <location filename="../src/libsync/syncengine.cpp" line="404"/>
<source>Stat failed.</source>
<translation>Stat falhou.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="429"/>
+ <location filename="../src/libsync/syncengine.cpp" line="426"/>
<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="561"/>
+ <location filename="../src/libsync/syncengine.cpp" line="558"/>
<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="631"/>
+ <location filename="../src/libsync/syncengine.cpp" line="612"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="645"/>
<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="718"/>
+ <location filename="../src/libsync/syncengine.cpp" line="723"/>
<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="965"/>
- <location filename="../src/libsync/syncengine.cpp" line="972"/>
+ <location filename="../src/libsync/syncengine.cpp" line="953"/>
+ <location filename="../src/libsync/syncengine.cpp" line="960"/>
<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="990"/>
+ <location filename="../src/libsync/syncengine.cpp" line="978"/>
<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="1023"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1011"/>
<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="1040"/>
- <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1028"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1048"/>
<source>Not allowed to remove, restoring</source>
<translation>Não é permitido remover, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1073"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1061"/>
<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="1128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1116"/>
<source>Move not allowed, item restored</source>
<translation>Não é permitido mover, item restaurado</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1125"/>
<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="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the destination</source>
<translation>o destino</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the source</source>
<translation>a fonte</translation>
</message>
</message>
</context>
<context>
- <name>OCC::TransmissionChecksumValidator</name>
+ <name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="128"/>
<source>The checksum header is malformed.</source>
- <translation>O cabeçalho de checksum está incorreto.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+ <source>The checksum header contained an unknown checksum type '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="148"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
- <translation>O arquivo baixado não coincide com o checksum, ele será retomado.</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<source>Recent Changes</source>
<translation>Alterações Recentes</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="561"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="331"/>
<source>Managed Folders:</source>
<source>Open %1 in browser</source>
<translation>Abrir %1 no navegador</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="449"/>
- <source>Log out everywhere</source>
- <translation>Sair em todos os lugares</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="457"/>
- <source>Log in everywhere...</source>
- <translation>Entrar de qualquer luga</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="513"/>
<source>Unknown status</source>
<source>Account %1: %2</source>
<translation>Conta %1: %2</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="449"/>
+ <source>Log out of all accounts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="457"/>
+ <source>Log in to all accounts...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="532"/>
<source>Crash now</source>
<source>No items synced recently</source>
<translation>Não há itens sincronizados recentemente</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="561"/>
- <source>Discovering '%1'</source>
- <translation>Descobrir '%1'</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="566"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>%L1 B</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="306"/>
+ <location filename="../src/libsync/utility.cpp" line="303"/>
<source>%Ln year(s)</source>
<translation>%Ln ano(s)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="307"/>
+ <location filename="../src/libsync/utility.cpp" line="304"/>
<source>%Ln month(s)</source>
<translation>%Ln mês(es)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="308"/>
+ <location filename="../src/libsync/utility.cpp" line="305"/>
<source>%Ln day(s)</source>
<translation>%Ln dia(s)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="309"/>
+ <location filename="../src/libsync/utility.cpp" line="306"/>
<source>%Ln hour(s)</source>
<translation>%Ln hora(s)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="310"/>
+ <location filename="../src/libsync/utility.cpp" line="307"/>
<source>%Ln minute(s)</source>
<translation>%Ln minuto(s)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="311"/>
+ <location filename="../src/libsync/utility.cpp" line="308"/>
<source>%Ln second(s)</source>
<translation>%Ln segundo(s)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="318"/>
<source>0 seconds</source>
<translation>0 segundos</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="336"/>
+ <location filename="../src/libsync/utility.cpp" line="333"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="73"/>
+ <source>Enter your credentials to connect to the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <source>Sign in</source>
+ <translation>Войти</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="89"/>
<source>Remove the account configuration from the client</source>
<translation>Удалить конфигурацию учетной записи из клиента</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Remove Account</source>
<translation>Удалить учётную запись</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="97"/>
+ <location filename="../src/gui/accountsettings.ui" line="113"/>
<source>Storage space: ...</source>
<translation>Размер хранилища: ...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="167"/>
+ <location filename="../src/gui/accountsettings.ui" line="183"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Не отмеченные каталоги будут <b>удалены</b> из вашей локальной файловой системы и больше не будут синхронизироваться на этом компьютере</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="230"/>
<source>Apply</source>
<translation>Применить</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="198"/>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
- <location filename="../src/gui/accountsettings.cpp" line="571"/>
+ <location filename="../src/gui/accountsettings.ui" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="289"/>
+ <location filename="../src/gui/accountsettings.cpp" line="646"/>
<source>Cancel</source>
<translation>Отмена</translation>
</message>
<translation>Подключен к <server> как <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="115"/>
+ <location filename="../src/gui/accountsettings.cpp" line="121"/>
<source>No account configured.</source>
<translation>Учётная запись не настроена.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="161"/>
+ <source>Choose what to sync</source>
+ <translation>Уточнить объекты</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="168"/>
+ <source>Remove folder sync connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="234"/>
<source>Folder creation failed</source>
<translation>Ошибка создания каталога</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="230"/>
+ <location filename="../src/gui/accountsettings.cpp" line="235"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation><p>Не удалось создать локальный каталог <i>%1</i>.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="283"/>
- <source>Stop syncing</source>
- <translation>Остановить синхронизацию</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
+ <source>Confirm Folder Sync Connection Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>Remove Folder Sync Connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="309"/>
+ <location filename="../src/gui/accountsettings.cpp" line="314"/>
<source>Confirm Folder Reset</source>
<translation>Подтвердить сброс каталога</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="310"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Вы действительно хотите сбросить каталог <i>%1</i> и перестроить клиентскую базу данных?</p><p><b>Заметка:</b> Данный функционал предназначен только для технического обслуживания. Файлы не будут удалены, но, в зависимости от размера каталога, операция может занять от нескольких минут до нескольких часов и может вызвать передачу большого объема данных. Используйте данную операцию только по рекомендации администратора.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="391"/>
+ <location filename="../src/gui/accountsettings.cpp" line="396"/>
<source>Sync Running</source>
<translation>Синхронизация запущена</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="392"/>
+ <location filename="../src/gui/accountsettings.cpp" line="397"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Синхронизация запущена.<br/>Вы хотите её остановить?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="472"/>
+ <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <source>%1 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="485"/>
<source>%1 as <i>%2</i></source>
<translation>%1 как <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="476"/>
+ <location filename="../src/gui/accountsettings.cpp" line="495"/>
<source>Connected to %1.</source>
<translation>Соединен с %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="478"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Сервер %1 временно недоступен.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="480"/>
+ <location filename="../src/gui/accountsettings.cpp" line="499"/>
<source>Signed out from %1.</source>
<translation>Успешно вышли из %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="482"/>
+ <location filename="../src/gui/accountsettings.cpp" line="501"/>
<source>No connection to %1 at %2.</source>
<translation>Нет соединения с %1 в %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
- <source>There are new folders that were not synchronized because they are too big: %1</source>
- <translation>Есть новые каталоги, которые не были синхронизированы, так как они слишком большие: %1</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="536"/>
- <source>, </source>
- <translation>,</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <source>There are new folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="563"/>
+ <location filename="../src/gui/accountsettings.cpp" line="638"/>
<source>Confirm Account Removal</source>
<translation>Подтверждение удаления учетной записи</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="564"/>
+ <location filename="../src/gui/accountsettings.cpp" line="639"/>
<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="570"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>Remove connection</source>
<translation>Удалить подключение</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="158"/>
<source>Open folder</source>
<translation>Открыть папку</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="168"/>
- <source>Choose What to Sync</source>
- <translation>Уточнить объекты</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Resume sync</source>
<translation>Продолжить синхронизацию</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Pause sync</source>
<translation>Приостановить синхронизацию</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="176"/>
- <source>Remove sync</source>
- <translation>Удалить синхронизацию</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="277"/>
- <source>Confirm Sync Removal</source>
- <translation>Подтверждение удаления синхронизации</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="278"/>
+ <location filename="../src/gui/accountsettings.cpp" line="283"/>
<source><p>Do you really want to stop syncing the folder <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="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="452"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) из %2 используется. Некоторые папки, включая сетевые или общие, могут иметь разные ограничения.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="448"/>
+ <location filename="../src/gui/accountsettings.cpp" line="453"/>
<source>%1 of %2 in use</source>
<translation>%1 из %2 используется</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="453"/>
+ <location filename="../src/gui/accountsettings.cpp" line="462"/>
<source>Currently there is no storage usage information available.</source>
<translation>В данный момент информация о заполненности хранилища недоступна.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="507"/>
<source>No %1 connection configured.</source>
<translation>Нет настроенного подключения %1.</translation>
</message>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="95"/>
+ <location filename="../src/gui/accountstate.cpp" line="99"/>
<source>Signed out</source>
<translation>Вышли из аккаунта</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="97"/>
+ <location filename="../src/gui/accountstate.cpp" line="101"/>
<source>Disconnected</source>
<translation>Отсоединен</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="99"/>
+ <location filename="../src/gui/accountstate.cpp" line="103"/>
<source>Connected</source>
<translation>Соединен</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="101"/>
+ <location filename="../src/gui/accountstate.cpp" line="105"/>
<source>Service unavailable</source>
<translation>Сервис недоступен</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="103"/>
+ <location filename="../src/gui/accountstate.cpp" line="107"/>
<source>Network error</source>
<translation>Ошибка сети</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="105"/>
+ <location filename="../src/gui/accountstate.cpp" line="109"/>
<source>Configuration error</source>
<translation>Ошибка конфигурации</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="107"/>
+ <location filename="../src/gui/accountstate.cpp" line="111"/>
<source>Unknown account state</source>
<translation>Неизвестное состояние учетной записи</translation>
</message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>Reauthentication required</source>
+ <translation>Требуется повторная аутентификация</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>You need to re-login to continue using the account %1.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
<translation>Обновите сервер до последней версии и перезапустите клиент.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="143"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="135"/>
<source>Authentication error: Either username or password are wrong.</source>
<translation>Ошибка авторизации: Имя пользователя или пароль не верны.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="155"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="147"/>
<source>timeout</source>
<translation>тайм-аут</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="186"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="178"/>
<source>The provided credentials are not correct</source>
<translation>Введённые учётные данные не верны</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="524"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="537"/>
<source>Aborted by the user</source>
<translation>Прервано пользов</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="107"/>
+ <location filename="../src/gui/folder.cpp" line="108"/>
<source>Unable to create csync-context</source>
<translation>Невозможно создать контекст csync</translation>
</message>
<translation>Журнал синхронизации</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="845"/>
+ <location filename="../src/gui/folder.cpp" line="870"/>
<source>Could not read system exclude file</source>
<translation>Невозможно прочесть системный файл исключений</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1102"/>
+ <location filename="../src/gui/folder.cpp" line="1127"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Новый каталог размером более %1 МБ был добавлен: %2.
Пожалуйста, перейдите в настройки, если хотите скачать его.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1115"/>
+ <location filename="../src/gui/folder.cpp" line="1140"/>
<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="1119"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Remove All Files?</source>
<translation>Удалить все файлы?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1121"/>
+ <location filename="../src/gui/folder.cpp" line="1146"/>
<source>Remove all files</source>
<translation>Удалить все файлы</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1122"/>
+ <location filename="../src/gui/folder.cpp" line="1147"/>
<source>Keep files</source>
<translation>Сохранить файлы</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="275"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<source>Could not reset folder state</source>
<translation>Невозможно сбросить состояние каталога</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="276"/>
+ <location filename="../src/gui/folderman.cpp" line="271"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Найден старый журнал синхронизации '%1', и он не может быть удалён. Убедитесь что он не открыт в другом приложении.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="877"/>
+ <location filename="../src/gui/folderman.cpp" line="865"/>
<source> (backup)</source>
<translation>(бэкап)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="882"/>
+ <location filename="../src/gui/folderman.cpp" line="870"/>
<source> (backup %1)</source>
<translation>(бэкап %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1091"/>
+ <location filename="../src/gui/folderman.cpp" line="1079"/>
<source>Undefined State.</source>
<translation>Неопределенное состояние.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1094"/>
- <source>Waits to start syncing.</source>
- <translation>Ожидает синхронизации.</translation>
+ <location filename="../src/gui/folderman.cpp" line="1082"/>
+ <source>Waiting to start syncing.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1097"/>
+ <location filename="../src/gui/folderman.cpp" line="1085"/>
<source>Preparing for sync.</source>
<translation>Подготовка к синхронизации.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1100"/>
+ <location filename="../src/gui/folderman.cpp" line="1088"/>
<source>Sync is running.</source>
<translation>Идет синхронизация.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1103"/>
+ <location filename="../src/gui/folderman.cpp" line="1091"/>
<source>Last Sync was successful.</source>
<translation>Последняя синхронизация прошла успешно.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1108"/>
+ <location filename="../src/gui/folderman.cpp" line="1096"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Последняя синхронизация прошла успешно, но были предупреждения для некоторых файлов.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1111"/>
+ <location filename="../src/gui/folderman.cpp" line="1099"/>
<source>Setup Error.</source>
<translation>Ошибка установки.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1114"/>
+ <location filename="../src/gui/folderman.cpp" line="1102"/>
<source>User Abort.</source>
<translation>Отмена пользователем.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1117"/>
+ <location filename="../src/gui/folderman.cpp" line="1105"/>
<source>Sync is paused.</source>
<translation>Синхронизация приостановлена.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1123"/>
+ <location filename="../src/gui/folderman.cpp" line="1111"/>
<source>%1 (Sync is paused)</source>
<translation>%! (синхронизация приостановлена)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1119"/>
<source>No valid folder selected!</source>
<translation>Не выбран валидный каталог!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1130"/>
<source>The selected path is not a folder!</source>
<translation>Выбранный путь не является папкой!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1146"/>
+ <location filename="../src/gui/folderman.cpp" line="1134"/>
<source>You have no permission to write to the selected folder!</source>
<translation>У вас недостаточно прав для записи в выбранный каталог!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1161"/>
+ <location filename="../src/gui/folderman.cpp" line="1149"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>Локальная папка %1 уже используется для синхронизации. Пожалуйста выберите другую!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1166"/>
+ <location filename="../src/gui/folderman.cpp" line="1154"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Локальная папка %1 уже содержит папку, которая используется для синхронизации. Пожалуйста выберите другую!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1173"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Локальная папка %1 является символьной ссылкой. Эта ссылка уже содержит папку для синхронизации. Пожалуйста выберите другую!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1168"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Локальная папка %1 уже содержит папку, которая используется для синхронизации. Пожалуйста выберите другую!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1186"/>
+ <location filename="../src/gui/folderman.cpp" line="1174"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Локальная папка %1 является символьной ссылкой. Эта ссылка уже содержит папку, которая используется для синхронизации. Пожалуйста укажите другую!</translation>
</message>
<translation>Добавить папку для синхронизации</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="85"/>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="274"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="271"/>
<source>File</source>
<translation>Файл</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="228"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="224"/>
<source>Syncing selected files in your account with</source>
<translation>Выбранные файлы в вашей учетной записи синхронизируются с</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="231"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="227"/>
<source>Remote path: %1</source>
<translation>Удаленный путь: %1</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="121"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="122"/>
<source>You need to be connected to add a folder</source>
<translation>Необходимо подключиться, чтобы добавить каталог</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="126"/>
- <source>Adding folder is disabled because your 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="131"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="132"/>
<source>Click this button to add a folder to synchronize.</source>
<translation>Нажмите на эту кнопку для добавления каталога к синхронизации.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="141"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="142"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="156"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
<source>Error while loading the list of folders from the server.</source>
<translation>Ошибка загрузки списка папок с сервера.</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="182"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="192"/>
<source>Signed out</source>
<translation>Вышли из аккаунта</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="727"/>
- <source>Discovering '%1'</source>
- <translation>Ищем '%1'</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="127"/>
+ <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="163"/>
+ <source>Fetching folder list from server...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="789"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="787"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="849"/>
<source>Syncing %1</source>
<translation>Синхронизация %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="792"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="854"/>
<source>download %1/s</source>
<translation>скачать %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="794"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="856"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="800"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>upload %1/s</source>
<translation>выгрузка %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="802"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="864"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="807"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="869"/>
<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="811"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="873"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="827"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="889"/>
<source>%1 of %2, file %3 of %4
Total time left %5</source>
<translation>%1 / %2, файл %3 / %4
Оставшееся время: %5</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
<source>file %1 of %2</source>
<translation>файл %1 из %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="932"/>
<source>Waiting...</source>
<translation>Ожидание...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="934"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>Ожидание %n папки...</numerusform><numerusform>Ожидание %s папок...</numerusform><numerusform>Ожидание %s папок...</numerusform><numerusform>Ожидание %s папок...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="878"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>Preparing to sync...</source>
<translation>Подготовка к синхронизации...</translation>
</message>
<name>OCC::FolderWizard</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <source>Add Folder Sync Connection</source>
+ <translation>Добавить папку для синхронизации</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderwizard.cpp" line="564"/>
- <source>Add Folder</source>
- <translation>Добавить каталог</translation>
+ <source>Add Sync Connection</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Дополнительно</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="61"/>
+ <location filename="../src/gui/generalsettings.ui" line="109"/>
<source>Ask confirmation before downloading folders larger than</source>
<translation>Запрашивать подтверждения перед загрузкой каталогов больше, чем</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
+ <location filename="../src/gui/generalsettings.ui" line="129"/>
<source>MB</source>
<translation>МБ</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="109"/>
+ <location filename="../src/gui/generalsettings.ui" line="159"/>
<source>Show crash reporter</source>
<translation>Показать отчёты об ошибках</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="118"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit Ignored Files</source>
<translation>Игнорируемые файлы</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="142"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
<source>Add an Account</source>
<translation>Добавить учетную запись</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="167"/>
- <location filename="../src/gui/generalsettings.ui" line="173"/>
+ <location filename="../src/gui/generalsettings.ui" line="171"/>
+ <location filename="../src/gui/generalsettings.ui" line="177"/>
<source>About</source>
<translation>О программе</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <location filename="../src/gui/generalsettings.ui" line="187"/>
<source>Updates</source>
<translation>Обновления</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="208"/>
+ <location filename="../src/gui/generalsettings.ui" line="212"/>
<source>&Restart && Update</source>
<translation>&Перезапуск и обновление</translation>
</message>
</context>
-<context>
- <name>OCC::HttpCredentials</name>
- <message>
- <location filename="../src/libsync/creds/httpcredentials.cpp" line="290"/>
- <source>Reading from keychain failed with error: '%1'</source>
- <translation>Чтение из брелока завершилось с ошибкой: '%1'</translation>
- </message>
-</context>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="32"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
<source>Please enter %1 password:
User: %2
</translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="41"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <source>Reading from keychain failed with error: '%1'</source>
+ <translation>Чтение из брелока завершилось с ошибкой: '%1'</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
<source>Enter Password</source>
<translation>Введите пароль</translation>
</message>
<translation>Удалить</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="40"/>
<source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
Элементы, где это разрешается, будут удалены, в случае если они помешают удалению папки. Используется для метаданных.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="109"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
<source>Could not open file</source>
<translation>Невозможно открыть файл</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="111"/>
<source>Cannot write changes to '%1'.</source>
<translation>Невозможно записать изменения в '%1'.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="138"/>
<source>Add Ignore Pattern</source>
<translation>Добавить шаблон игнорирования</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>Add a new ignore pattern:</source>
<translation>Добавить новый шаблон игнорирования:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="45"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="46"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Эта запись сделана системой в '%1' и не может быть изменена в этом представлении.</translation>
</message>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="163"/>
+ <location filename="../src/libsync/logger.cpp" line="190"/>
<source>Error</source>
<translation>Ошибка</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="164"/>
+ <location filename="../src/libsync/logger.cpp" line="191"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Файл '%1'<br/>не может быть открыт на запись.<br/><br/>Журнал <b>не может</b> быть сохранён!</nobr></translation>
</message>
</message>
<message>
<location filename="../src/gui/networksettings.ui" line="203"/>
- <location filename="../src/gui/networksettings.ui" line="295"/>
+ <location filename="../src/gui/networksettings.ui" line="292"/>
<source>No limit</source>
<translation>Без ограничений</translation>
</message>
<source>SOCKS5 proxy</source>
<translation>SOCKS5-прокси</translation>
</message>
+ <message>
+ <location filename="../src/gui/networksettings.cpp" line="128"/>
+ <source>Qt >= 5.4 is required in order to use the bandwidth limit</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::OCUpdater</name>
<source>Downloading version %1. Please wait...</source>
<translation>Загрузка версии %1. Пожалуйста, подождите...</translation>
</message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
- <source>Version %1 available. Restart application to start the update.</source>
- <translation>Доступна версия %1. Перезапустите приложение для начала процедуры обновления.</translation>
- </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="145"/>
<source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
<source>Could not check for new updates.</source>
<translation>Не удалось проверить наличие новых обновлений.</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
+ <source>%1 version %2 available. Restart application to start the update.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
- <source>New version %1 available. Please use the system's update tool to install it.</source>
- <translation>Доступна новая версия %1. Чтобы её установить, воспользуйтесь инструментом обновления системы.</translation>
+ <source>New %1 version %2 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="151"/>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="114"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="110"/>
<source>Connection Timeout</source>
<translation>Время ожидания подключения истекло</translation>
</message>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="171"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="167"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Не правильный JSON ответ на сформированный URL</translation>
</message>
</context>
-<context>
- <name>OCC::PropagateDownloadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="435"/>
- <source>Sync was aborted by user.</source>
- <translation>Синхронизация прервана пользователем.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="488"/>
- <source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation>E-Tag от сервера не получен, проверьте настройки прокси/шлюза.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="494"/>
- <source>We received a different E-Tag for resuming. Retrying next time.</source>
- <translation>Мы получили другой E-Tag для возобновления. Повторите попытку позже.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="516"/>
- <source>Server returned wrong content-range</source>
- <translation>Сервер вернул неверный диапазон содержимого</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="567"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation>Файл %1 не может быть загружен из-за локального конфликта имен!</translation>
- </message>
-</context>
<context>
<name>OCC::PropagateDownloadFileQNAM</name>
<message>
<translation>Файл %1 не может быть загружен из-за локального конфликта имен!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="457"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
+ <source>The download would reduce free disk space below %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="372"/>
+ <source>Free space on disk is less than %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="482"/>
<source>File was deleted from server</source>
<translation>Файл был удален с сервера</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="506"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="531"/>
<source>The file could not be downloaded completely.</source>
<translation>Невозможно полностью загрузить файл.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="601"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="636"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Файл %1 не может быть сохранён из-за локального конфликта имен!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="641"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="676"/>
<source>File has changed since discovery</source>
<translation>После обнаружения файл был изменен</translation>
</message>
<context>
<name>OCC::PropagateItemJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="92"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
<source>; Restoration Failed: %1</source>
<translation>; Восстановление не удалось: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="138"/>
<source>Continue blacklisting:</source>
<translation>Продолжить занесение в чёрный список:</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="230"/>
<source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation>Файл или папка была удалена из доступа только для чтения, восстановление завершилось с ошибкой: %s</translation>
</message>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove folder '%1';</source>
- <translation>Не удается удалить папку '%1';</translation>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="243"/>
- <location filename="../src/libsync/propagator_legacy.cpp" line="302"/>
- <source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>Локальный файл изменился в процессе синхронизации, повторяем процесс</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="246"/>
- <source>Sync was aborted by user.</source>
- <translation>Синхронизация прервана пользователем.</translation>
- </message>
+ <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="252"/>
- <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
- <translation>Ð\98змененнÑ\8bй Ñ\84айл пÑ\80инадлежиÑ\82 Ñ\83даленномÑ\83 обÑ\89емÑ\83 Ñ\80еÑ\81Ñ\83Ñ\80Ñ\81Ñ\83 Ñ\82олÑ\8cко длÑ\8f Ñ\87Ñ\82ениÑ\8f. Файл бÑ\8bл воÑ\81Ñ\81Ñ\82ановлен, ваÑ\88и пÑ\80авки доÑ\81Ñ\82Ñ\83пнÑ\8b в Ñ\84айле конÑ\84ликÑ\82ов.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="205"/>
+ <source>File name contains at least one invalid character</source>
+ <translation>Ð\98мÑ\8f Ñ\84айла Ñ\81одеÑ\80жиÑ\82 по кÑ\80айней меÑ\80е один некоÑ\80Ñ\80екÑ\82нÑ\8bй Ñ\81имвол</translation>
</message>
-</context>
-<context>
- <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="226"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="262"/>
<source>File Removed</source>
<translation>Файл Перемещён</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="274"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Локальный файл изменился в процессе синхронизации. Операция будет возобновлена.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="250"/>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="286"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="665"/>
<source>Local file changed during sync.</source>
<translation>Локальный файл изменился в процессе синхронизации.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="558"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="592"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>Принудительная остановка задачи при сбросе HTTP подключения для Qt < 5.4.2.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="566"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="600"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Измененный файл принадлежит удаленному общему ресурсу только для чтения. Файл был восстановлен, ваши правки доступны в файле конфликтов.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="597"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="631"/>
<source>Poll URL missing</source>
<translation>Не хватает сформированного URL</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="620"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="654"/>
<source>The local file was removed during sync.</source>
<translation>Локальный файл был удалён в процессе синхронизации.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="646"/>
- <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
- <translation>Сервер не смог подтвердить последнюю часть данных.(Отсутствовали теги e-tag)</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="680"/>
+ <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Не отмеченные каталоги будут <b>удалены</b> из вашей локальной файловой системы и больше не будут синхронизироваться на этом компьютере</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>Выберите Что Синхронизировать: Выберите папки на удалённом сервер, которые Вы хотели бы синхронизировать.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>Выберите Что Синхронизировать: Снимите выбор папок на удалённом сервере, которые Вы не хотите синхронизировать.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
<source>Choose What to Sync</source>
<translation>Уточнить объекты</translation>
</message>
<translation>Размер</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
<source>No subfolders currently on the server.</source>
<translation>Нет подкаталогов на сервере на данный момент.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>Возникла ошибка при загрузке списка подкаталогов.</translation>
</message>
<translation>Настройки</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="80"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="84"/>
<source>Activity</source>
<translation>События</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="86"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="90"/>
<source>General</source>
<translation>Основные</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>Network</source>
<translation>Сеть</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharedialog.ui" line="22"/>
- <location filename="../src/gui/sharedialog.ui" line="234"/>
+ <location filename="../src/gui/sharedialog.ui" line="258"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<translation>Путь к OwnCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="182"/>
+ <location filename="../src/gui/sharedialog.ui" line="116"/>
<source>Set &password </source>
<translation>Установить &пароль</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="196"/>
+ <location filename="../src/gui/sharedialog.ui" line="130"/>
<source>Set &expiration date</source>
<translation>Установить срок &доступа</translation>
</message>
+ <message>
+ <location filename="../src/gui/sharedialog.ui" line="214"/>
+ <source>Allow editing</source>
+ <translation>Разрешить редактирование</translation>
+ </message>
<message>
<location filename="../src/gui/sharedialog.ui" line="77"/>
<source>Share link</source>
<translation>Поделиться ссылкой</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="125"/>
+ <location filename="../src/gui/sharedialog.ui" line="203"/>
<source>Copy &link</source>
<translation>Копировать &ссылку</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="142"/>
+ <location filename="../src/gui/sharedialog.ui" line="154"/>
<source>Set password</source>
<translation>Установить пароль</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="692"/>
- <source>%1 path: %2</source>
- <translation>%1 путь: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="115"/>
+ <location filename="../src/gui/sharedialog.cpp" line="120"/>
<source>%1 Sharing</source>
<translation>Вы поделились %1 </translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="103"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="112"/>
+ <location filename="../src/gui/sharedialog.cpp" line="117"/>
<source>Folder: %2</source>
<translation>Папка: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="121"/>
<source>P&assword protect</source>
<translation>Защитить паролем</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="221"/>
+ <location filename="../src/gui/sharedialog.cpp" line="214"/>
<source>Password Protected</source>
<translation>Защищено Паролем</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="382"/>
+ <location filename="../src/gui/sharedialog.cpp" line="338"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Невозможно предоставить общий доступ к файлу: нет разрешения на предоставление общего доступа.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="528"/>
+ <location filename="../src/gui/sharedialog.cpp" line="475"/>
<source>Please Set Password</source>
<translation>Пожалуйста, установите пароль</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="564"/>
- <location filename="../src/gui/sharedialog.cpp" line="565"/>
+ <location filename="../src/gui/sharedialog.cpp" line="538"/>
+ <location filename="../src/gui/sharedialog.cpp" line="539"/>
<source>&Share link</source>
<translation>Поделиться ссылкой</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="583"/>
+ <location filename="../src/gui/sharedialog.cpp" line="552"/>
+ <location filename="../src/gui/sharedialog.cpp" line="564"/>
<source>OCS API error code: %1</source>
<translation>Код ошибки OCS API: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="605"/>
- <source>There is no sync folder configured.</source>
- <translation>Нет папок настроенных для синхронизации.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="639"/>
- <source>A sync file with the same name exists. The file cannot be registered to sync.</source>
- <translation>Существует файл с именем как и у синхронизируемого. Файл не может быть принят к синхронизации.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="684"/>
- <source>The file cannot be synced.</source>
- <translation>Файл не может быть синхронизирован.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="624"/>
- <source>Sharing of external directories is not yet working.</source>
- <translation>Функция открытия доступа к внешним папкам пока не работает.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="473"/>
- <location filename="../src/gui/sharedialog.cpp" line="506"/>
+ <location filename="../src/gui/sharedialog.cpp" line="418"/>
+ <location filename="../src/gui/sharedialog.cpp" line="460"/>
<source>Public sh&aring requires a password</source>
<translation>Публичные ссылки требуют пароля</translation>
</message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="617"/>
- <source>Cannot find a folder to upload to.</source>
- <translation>Невозможно найти папку для загрузки в неё.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
- <source>Waiting to upload...</source>
- <translation>Ожидание загрузки...</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="653"/>
- <source>Unable to register in sync space.</source>
- <translation>Не возможно зарегистрироваться в синхронизируемом пространстве.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="694"/>
- <source>Sync of registered file was not successful yet.</source>
- <translation>Синхронизация зарегистрированного файла пока не была успешной.</translation>
- </message>
</context>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>Login Error</source>
<translation>Ошибка входа</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>You must sign in as user %1</source>
<translation>Вы должны войти как пользователь %1</translation>
</message>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="452"/>
+ <location filename="../src/gui/socketapi.cpp" line="447"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Поделиться с %1</translation>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="97"/>
+ <location filename="../src/libsync/syncengine.cpp" line="94"/>
<source>Success.</source>
<translation>Успешно.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="104"/>
+ <location filename="../src/libsync/syncengine.cpp" line="101"/>
<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="107"/>
+ <location filename="../src/libsync/syncengine.cpp" line="104"/>
<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="110"/>
+ <location filename="../src/libsync/syncengine.cpp" line="107"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync получил сообщение об ошибке при обработке внутренних деревьев.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="113"/>
+ <location filename="../src/libsync/syncengine.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync не удалось зарезервировать память.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>Критическая ошибка параметра CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="119"/>
+ <location filename="../src/libsync/syncengine.cpp" line="116"/>
<source>CSync processing step update failed.</source>
<translation>Процесс обновления CSync не удался.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="122"/>
+ <location filename="../src/libsync/syncengine.cpp" line="119"/>
<source>CSync processing step reconcile failed.</source>
<translation>Процесс согласования CSync не удался.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="122"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync не удалось авторизоваться на прокси сервере.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="125"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync не удалось найти прокси сервер.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="128"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync не удалось авторизоваться на сервере %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="131"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync не удалось подключиться к сети.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="134"/>
<source>A network connection timeout happened.</source>
<translation>Вышло время ожидания подключения к сети.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="137"/>
<source>A HTTP transmission error happened.</source>
<translation>Произошла ошибка передачи HTTP.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation>CSync не работает из-за неожиданного отказа в доступе.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation>Смонтированная папка временно недоступна на сервере</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
<source>An error occurred while opening a folder</source>
<translation>Произошла ошибка во время открытия папки</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
<source>Error while reading folder.</source>
<translation>Произошла ошибка во время чтения папки.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="996"/>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
<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="1003"/>
+ <location filename="../src/libsync/syncengine.cpp" line="991"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: Нет свободного пространства на сервере %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="152"/>
<source>CSync unspecified error.</source>
<translation>Неизвестная ошибка CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="155"/>
<source>Aborted by the user</source>
<translation>Прервано пользователем</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="392"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>Файл содержит недопустимые символы, которые невозможно синхронизировать между платформами.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="143"/>
<source>CSync failed to access</source>
<translation>CSync отказано в доступе</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <location filename="../src/libsync/syncengine.cpp" line="97"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <source>CSync failed due to unhandled permission denied.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="146"/>
<source>CSync tried to create a folder that already exists.</source>
<translation>CSync попытался создать папку, которая уже существует.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="158"/>
<source>The service is temporarily unavailable</source>
<translation>Сервис временно недоступен</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="175"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>An internal error number %1 occurred.</source>
<translation>Произошла внутренняя ошибка номер %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="227"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Элемент не синхронизируется из-за произошедших ошибок: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="389"/>
+ <location filename="../src/libsync/syncengine.cpp" line="386"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Синхронизация символических ссылок не поддерживается.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="392"/>
+ <location filename="../src/libsync/syncengine.cpp" line="389"/>
<source>File is listed on the ignore list.</source>
<translation>Файл присутствует в списке игнорируемых.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="398"/>
+ <location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename is too long.</source>
<translation>Имя файла слишком длинное.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="401"/>
+ <location filename="../src/libsync/syncengine.cpp" line="398"/>
<source>File is ignored because it's hidden.</source>
<translation>Файл проигнорирован, потому что он скрытый.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="407"/>
+ <location filename="../src/libsync/syncengine.cpp" line="404"/>
<source>Stat failed.</source>
<translation>Не удалось загрузить статистику.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="429"/>
+ <location filename="../src/libsync/syncengine.cpp" line="426"/>
<source>Filename encoding is not valid</source>
<translation>Кодировка имени файла не верна</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="561"/>
+ <location filename="../src/libsync/syncengine.cpp" line="558"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Недопустимые символы, пожалуйста, переименуйте "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="631"/>
+ <location filename="../src/libsync/syncengine.cpp" line="612"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="645"/>
<source>Unable to initialize a sync journal.</source>
<translation>Невозможно инициализировать журнал синхронизации.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="718"/>
+ <location filename="../src/libsync/syncengine.cpp" line="723"/>
<source>Cannot open the sync journal</source>
<translation>Не удаётся открыть журнал синхронизации</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="965"/>
- <location filename="../src/libsync/syncengine.cpp" line="972"/>
+ <location filename="../src/libsync/syncengine.cpp" line="953"/>
+ <location filename="../src/libsync/syncengine.cpp" line="960"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Игнорируется из-за черного списка в "что синхронизировать"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <location filename="../src/libsync/syncengine.cpp" line="978"/>
<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="1023"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1011"/>
<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="1040"/>
- <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1028"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1048"/>
<source>Not allowed to remove, restoring</source>
<translation>Не допускается удаление, восстанавливаем</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1073"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1061"/>
<source>Local files and share folder removed.</source>
<translation>Локальные файлы и общий каталог удалены.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1116"/>
<source>Move not allowed, item restored</source>
<translation>Перемещение не допускается, элемент восстановлен</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1125"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Перемещение не допускается, поскольку %1 помечен только для чтения</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the destination</source>
<translation>назначение</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the source</source>
<translation>источник</translation>
</message>
</message>
</context>
<context>
- <name>OCC::TransmissionChecksumValidator</name>
+ <name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="128"/>
<source>The checksum header is malformed.</source>
<translation>Некорректная контрольная сумма заголовка</translation>
</message>
<message>
<location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+ <source>The checksum header contained an unknown checksum type '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="148"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>Загруженный файл не соответствует контрольной сумме, операция будет возобновлена.</translation>
</message>
<source>Recent Changes</source>
<translation>Недавние изменения</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="561"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="331"/>
<source>Managed Folders:</source>
<source>Open %1 in browser</source>
<translation>Открыть %1 в браузере</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="449"/>
- <source>Log out everywhere</source>
- <translation>Выйти на всех устройствах</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="457"/>
- <source>Log in everywhere...</source>
- <translation>Войти на всех устройствах...</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="513"/>
<source>Unknown status</source>
<source>Account %1: %2</source>
<translation>Учетная запись %1: %2</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="449"/>
+ <source>Log out of all accounts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="457"/>
+ <source>Log in to all accounts...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="532"/>
<source>Crash now</source>
<source>No items synced recently</source>
<translation>Недавно ничего не синхронизировалось</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="561"/>
- <source>Discovering '%1'</source>
- <translation>Ищем '%1'</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="566"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>%L1 Б</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="306"/>
+ <location filename="../src/libsync/utility.cpp" line="303"/>
<source>%Ln year(s)</source>
<translation>%Ln год(лет)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="307"/>
+ <location filename="../src/libsync/utility.cpp" line="304"/>
<source>%Ln month(s)</source>
<translation>%Ln месяц(ев)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="308"/>
+ <location filename="../src/libsync/utility.cpp" line="305"/>
<source>%Ln day(s)</source>
<translation>%Ln день(дней)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="309"/>
+ <location filename="../src/libsync/utility.cpp" line="306"/>
<source>%Ln hour(s)</source>
<translation>%Ln час(ов)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="310"/>
+ <location filename="../src/libsync/utility.cpp" line="307"/>
<source>%Ln minute(s)</source>
<translation>%Ln минут(а)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="311"/>
+ <location filename="../src/libsync/utility.cpp" line="308"/>
<source>%Ln second(s)</source>
<translation>%Ln секунд(а)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="318"/>
<source>0 seconds</source>
<translation>0 секунд</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="336"/>
+ <location filename="../src/libsync/utility.cpp" line="333"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="73"/>
+ <source>Enter your credentials to connect to the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <source>Sign in</source>
+ <translation>Prihlásenie</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="89"/>
<source>Remove the account configuration from the client</source>
<translation>Odstrániť nastavenia účtu z klienta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Remove Account</source>
<translation>Odstrániť účet</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="97"/>
+ <location filename="../src/gui/accountsettings.ui" line="113"/>
<source>Storage space: ...</source>
<translation>Úložný priestor: ...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="167"/>
+ <location filename="../src/gui/accountsettings.ui" line="183"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Neoznačené priečinky budú <b>odstránené</b> z lokálneho systému a nebudú už synchronizované na tento počítač</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="230"/>
<source>Apply</source>
<translation>Aplikovať</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="198"/>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
- <location filename="../src/gui/accountsettings.cpp" line="571"/>
+ <location filename="../src/gui/accountsettings.ui" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="289"/>
+ <location filename="../src/gui/accountsettings.cpp" line="646"/>
<source>Cancel</source>
<translation>Zrušiť</translation>
</message>
<translation>Spojené z <server> ako <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="115"/>
+ <location filename="../src/gui/accountsettings.cpp" line="121"/>
<source>No account configured.</source>
<translation>Žiadny účet nie je nastavený.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="161"/>
+ <source>Choose what to sync</source>
+ <translation>Vybrať čo synchronizovať</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="168"/>
+ <source>Remove folder sync connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="234"/>
<source>Folder creation failed</source>
<translation>Vytvorenie priečinka zlyhalo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="230"/>
+ <location filename="../src/gui/accountsettings.cpp" line="235"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation><p>Nemožno vytvoriť lokálny priečinok <i>%1</i>.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="283"/>
- <source>Stop syncing</source>
- <translation>Zastaviť synchronizáciu</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
+ <source>Confirm Folder Sync Connection Removal</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="309"/>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>Remove Folder Sync Connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="314"/>
<source>Confirm Folder Reset</source>
<translation>Potvrdiť zresetovanie priečinka</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="310"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Skutočne chcete zresetovať priečinok <i>%1</i> a opätovne zostaviť klientskú databázu?</p><p><b>Poznámka:</b> Táto funkcia je navrhnutá len pre účely údržby. Žiadne súbory nebudú odstránené, ale môže to spôsobiť značnú dátovú prevádzku a vyžiadať si niekoľko minút alebo hodín pre dokončenie, v závislosti od veľkosti priečinka. Použite túto možnosť pokiaľ máte doporučenie od správcu.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="391"/>
+ <location filename="../src/gui/accountsettings.cpp" line="396"/>
<source>Sync Running</source>
<translation>Prebiehajúca synchronizácia</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="392"/>
+ <location filename="../src/gui/accountsettings.cpp" line="397"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Proces synchronizácie práve prebieha.<br/>Chcete ho ukončiť?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="472"/>
+ <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <source>%1 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="485"/>
<source>%1 as <i>%2</i></source>
<translation>%1 ako <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="476"/>
+ <location filename="../src/gui/accountsettings.cpp" line="495"/>
<source>Connected to %1.</source>
<translation>Pripojené k %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="478"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Server %1 je dočasne nedostupný.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="480"/>
+ <location filename="../src/gui/accountsettings.cpp" line="499"/>
<source>Signed out from %1.</source>
<translation>Odhlásený z %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="482"/>
+ <location filename="../src/gui/accountsettings.cpp" line="501"/>
<source>No connection to %1 at %2.</source>
<translation>Žiadne pripojenie k %1 na %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
- <source>There are new folders that were not synchronized because they are too big: %1</source>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <source>There are new folders that were not synchronized because they are too big: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="536"/>
- <source>, </source>
- <translation>, </translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="563"/>
+ <location filename="../src/gui/accountsettings.cpp" line="638"/>
<source>Confirm Account Removal</source>
<translation>Potvrďte ostránenie účtu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="564"/>
+ <location filename="../src/gui/accountsettings.cpp" line="639"/>
<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="570"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>Remove connection</source>
<translation>Vymazať pripojenie</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="158"/>
<source>Open folder</source>
<translation>Otvoriť priečinok</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="168"/>
- <source>Choose What to Sync</source>
- <translation>Vybrať čo synchronizovať</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Resume sync</source>
<translation>Obnoviť synchronizáciu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Pause sync</source>
<translation>Pozastaviť synchronizáciu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="176"/>
- <source>Remove sync</source>
- <translation>Odstrániť synchronizáciu</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="277"/>
- <source>Confirm Sync Removal</source>
- <translation>Potvrdiť odstránenie synchronizácie</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="278"/>
+ <location filename="../src/gui/accountsettings.cpp" line="283"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>Naozaj si prajete zastaviť synchronizácu priečinka <i>%1</i>?</p><p><b>Poznámka:</b> Toto <b>nevymaže</b> žiadne súbory.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="452"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) z %2 je využitých. Niektoré priečinky, vrátane sieťových a zdieľaných, môžu mať iné limity.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="448"/>
+ <location filename="../src/gui/accountsettings.cpp" line="453"/>
<source>%1 of %2 in use</source>
<translation>%1 z %2 je využitých</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="453"/>
+ <location filename="../src/gui/accountsettings.cpp" line="462"/>
<source>Currently there is no storage usage information available.</source>
<translation>Teraz nie sú k dispozícii žiadne informácie o využití úložiska.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="507"/>
<source>No %1 connection configured.</source>
<translation>Žiadne nakonfigurované %1 spojenie</translation>
</message>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="95"/>
+ <location filename="../src/gui/accountstate.cpp" line="99"/>
<source>Signed out</source>
<translation>Odhlásený</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="97"/>
+ <location filename="../src/gui/accountstate.cpp" line="101"/>
<source>Disconnected</source>
<translation>Odpojený</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="99"/>
+ <location filename="../src/gui/accountstate.cpp" line="103"/>
<source>Connected</source>
<translation>Pripojené</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="101"/>
+ <location filename="../src/gui/accountstate.cpp" line="105"/>
<source>Service unavailable</source>
<translation>Služba nedostupná</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="103"/>
+ <location filename="../src/gui/accountstate.cpp" line="107"/>
<source>Network error</source>
<translation>Chyba siete</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="105"/>
+ <location filename="../src/gui/accountstate.cpp" line="109"/>
<source>Configuration error</source>
<translation>Chyba nastavenia</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="107"/>
+ <location filename="../src/gui/accountstate.cpp" line="111"/>
<source>Unknown account state</source>
<translation>Neznámy stav účtu</translation>
</message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>Reauthentication required</source>
+ <translation>Vyžaduje sa opätovné overenie</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>You need to re-login to continue using the account %1.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
<translation>Prosím aktualizujte na najnovšiu verziu servera a reštartujte klienta.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="143"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="135"/>
<source>Authentication error: Either username or password are wrong.</source>
<translation>Chyba overenia: Používateľské meno alebo heslo nie je správne.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="155"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="147"/>
<source>timeout</source>
<translation>vypršal časový limit</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="186"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="178"/>
<source>The provided credentials are not correct</source>
<translation>Poskytnuté poverenia nie sú správne</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="524"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="537"/>
<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="107"/>
+ <location filename="../src/gui/folder.cpp" line="108"/>
<source>Unable to create csync-context</source>
<translation>Nemožno vytvoriť "csync-kontext"</translation>
</message>
<translation>Aktivita synchronizácie</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="845"/>
+ <location filename="../src/gui/folder.cpp" line="870"/>
<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="1102"/>
+ <location filename="../src/gui/folder.cpp" line="1127"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Bol pridaný nový priečinok, väčší ako %1 MB: %2.
Pokiaľ si ho prajete stiahnuť, vyberte ho v nastaveniach.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1115"/>
+ <location filename="../src/gui/folder.cpp" line="1140"/>
<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="1119"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Remove All Files?</source>
<translation>Odstrániť všetky súbory?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1121"/>
+ <location filename="../src/gui/folder.cpp" line="1146"/>
<source>Remove all files</source>
<translation>Odstrániť všetky súbory</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1122"/>
+ <location filename="../src/gui/folder.cpp" line="1147"/>
<source>Keep files</source>
<translation>Ponechať súbory</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="275"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<source>Could not reset folder state</source>
<translation>Nemožno resetovať stav priečinka</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="276"/>
+ <location filename="../src/gui/folderman.cpp" line="271"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Starý synchronizačný žurnál '%1' nájdený, avšak neodstrániteľný. Prosím uistite sa, že žiadna aplikácia ho práve nevyužíva.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="877"/>
+ <location filename="../src/gui/folderman.cpp" line="865"/>
<source> (backup)</source>
<translation> (záloha)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="882"/>
+ <location filename="../src/gui/folderman.cpp" line="870"/>
<source> (backup %1)</source>
<translation> (záloha %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1091"/>
+ <location filename="../src/gui/folderman.cpp" line="1079"/>
<source>Undefined State.</source>
<translation>Nedefinovaný stav.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1094"/>
- <source>Waits to start syncing.</source>
- <translation>Čakanie na štart synchronizácie.</translation>
+ <location filename="../src/gui/folderman.cpp" line="1082"/>
+ <source>Waiting to start syncing.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1097"/>
+ <location filename="../src/gui/folderman.cpp" line="1085"/>
<source>Preparing for sync.</source>
<translation>Príprava na synchronizáciu.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1100"/>
+ <location filename="../src/gui/folderman.cpp" line="1088"/>
<source>Sync is running.</source>
<translation>Synchronizácia prebieha.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1103"/>
+ <location filename="../src/gui/folderman.cpp" line="1091"/>
<source>Last Sync was successful.</source>
<translation>Posledná synchronizácia sa úspešne skončila.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1108"/>
+ <location filename="../src/gui/folderman.cpp" line="1096"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Posledná synchronizácia bola úspešná, ale s varovaniami pre individuálne súbory.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1111"/>
+ <location filename="../src/gui/folderman.cpp" line="1099"/>
<source>Setup Error.</source>
<translation>Chyba pri inštalácii.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1114"/>
+ <location filename="../src/gui/folderman.cpp" line="1102"/>
<source>User Abort.</source>
<translation>Zrušené používateľom.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1117"/>
+ <location filename="../src/gui/folderman.cpp" line="1105"/>
<source>Sync is paused.</source>
<translation>Synchronizácia je pozastavená.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1123"/>
+ <location filename="../src/gui/folderman.cpp" line="1111"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronizácia je pozastavená)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1119"/>
<source>No valid folder selected!</source>
<translation>Nebol zvolený platný priečinok.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1130"/>
<source>The selected path is not a folder!</source>
<translation>Zvolená cesta nie je priečinok.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1146"/>
+ <location filename="../src/gui/folderman.cpp" line="1134"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Nemáte oprávnenia pre zápis do daného priečinka!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1161"/>
+ <location filename="../src/gui/folderman.cpp" line="1149"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1166"/>
+ <location filename="../src/gui/folderman.cpp" line="1154"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1173"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1168"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1186"/>
+ <location filename="../src/gui/folderman.cpp" line="1174"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="85"/>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="274"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="271"/>
<source>File</source>
<translation>Súbor</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="228"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="224"/>
<source>Syncing selected files in your account with</source>
<translation>Synchornizácia vybraných súborov vášho účtu s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="231"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="227"/>
<source>Remote path: %1</source>
<translation>Vzdialená cesta: %1</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="121"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="122"/>
<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="126"/>
- <source>Adding folder is disabled because your 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="131"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="132"/>
<source>Click this button to add a folder to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="141"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="142"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="156"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
<source>Error while loading the list of folders from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="182"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="192"/>
<source>Signed out</source>
<translation>Odhlásený</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="727"/>
- <source>Discovering '%1'</source>
- <translation>Prehľadávam '%1'</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="127"/>
+ <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="787"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="163"/>
+ <source>Fetching folder list from server...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="789"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="849"/>
<source>Syncing %1</source>
<translation>Synchronizuje sa %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="792"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="854"/>
<source>download %1/s</source>
<translation>stiahnuť %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="794"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="856"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="800"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>upload %1/s</source>
<translation>nahrať %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="802"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="864"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="807"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="869"/>
<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="811"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="873"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="827"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="889"/>
<source>%1 of %2, file %3 of %4
Total time left %5</source>
<translation>%1 z %2, súbor %3 z %4
Celkom zostáva %5</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
<source>file %1 of %2</source>
<translation>súbor %1 z %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="932"/>
<source>Waiting...</source>
<translation>Čakajte...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="934"/>
<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="878"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>Preparing to sync...</source>
<translation>Príprava na synchronizáciu...</translation>
</message>
<name>OCC::FolderWizard</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <source>Add Folder Sync Connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderwizard.cpp" line="564"/>
- <source>Add Folder</source>
- <translation>Pridať priečinok</translation>
+ <source>Add Sync Connection</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Rozšírené</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="61"/>
+ <location filename="../src/gui/generalsettings.ui" line="109"/>
<source>Ask confirmation before downloading folders larger than</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
+ <location filename="../src/gui/generalsettings.ui" line="129"/>
<source>MB</source>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="109"/>
+ <location filename="../src/gui/generalsettings.ui" line="159"/>
<source>Show crash reporter</source>
<translation>Zobraziť hlásenie o pádoch</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="118"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit Ignored Files</source>
<translation>Upraviť ignorované súbory</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="142"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
<source>Add an Account</source>
<translation>Pridanie účtu</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="167"/>
- <location filename="../src/gui/generalsettings.ui" line="173"/>
+ <location filename="../src/gui/generalsettings.ui" line="171"/>
+ <location filename="../src/gui/generalsettings.ui" line="177"/>
<source>About</source>
<translation>O</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <location filename="../src/gui/generalsettings.ui" line="187"/>
<source>Updates</source>
<translation>Aktualizácie</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="208"/>
+ <location filename="../src/gui/generalsettings.ui" line="212"/>
<source>&Restart && Update</source>
<translation>&Restart && aktualizácia</translation>
</message>
</context>
-<context>
- <name>OCC::HttpCredentials</name>
- <message>
- <location filename="../src/libsync/creds/httpcredentials.cpp" line="290"/>
- <source>Reading from keychain failed with error: '%1'</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="32"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
<source>Please enter %1 password:
User: %2
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="41"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <source>Reading from keychain failed with error: '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
<source>Enter Password</source>
<translation>Vložte heslo</translation>
</message>
<translation>Odobrať</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="40"/>
<source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="109"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
<source>Could not open file</source>
<translation>Nemožno otvoriť súbor</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="111"/>
<source>Cannot write changes to '%1'.</source>
<translation>Nemožno zapísať zmeny do '%1'.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="138"/>
<source>Add Ignore Pattern</source>
<translation>Pridať vzor ignorovaného súboru</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>Add a new ignore pattern:</source>
<translation>Pridať nový vzor ignorovaného súboru:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="45"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="46"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Táto položka je poskytovaná systémom na '%1' a nesmie byť modifikovaná v tomto zobrazení.</translation>
</message>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="163"/>
+ <location filename="../src/libsync/logger.cpp" line="190"/>
<source>Error</source>
<translation>Chyba</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="164"/>
+ <location filename="../src/libsync/logger.cpp" line="191"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Súbor '%1'<br/>nesmie byť otvorený pre proces úprav.</br/><br/>Systémový záznam (log) <b>nemôže</b> byť uložený!</nobr></translation>
</message>
</message>
<message>
<location filename="../src/gui/networksettings.ui" line="203"/>
- <location filename="../src/gui/networksettings.ui" line="295"/>
+ <location filename="../src/gui/networksettings.ui" line="292"/>
<source>No limit</source>
<translation>Žiadny limit</translation>
</message>
<source>SOCKS5 proxy</source>
<translation>SOCKS5 proxy</translation>
</message>
+ <message>
+ <location filename="../src/gui/networksettings.cpp" line="128"/>
+ <source>Qt >= 5.4 is required in order to use the bandwidth limit</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::OCUpdater</name>
<source>Downloading version %1. Please wait...</source>
<translation>Sťahujem verziu %1. Čakajte prosím...</translation>
</message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
- <source>Version %1 available. Restart application to start the update.</source>
- <translation>Verzia %1 je dostupná. Aktualizáciu spustite reštartovaním aplikácie.</translation>
- </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="145"/>
<source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
<source>Could not check for new updates.</source>
<translation>Nemôžem skontrolovať dostupnosť aktualizácie.</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
+ <source>%1 version %2 available. Restart application to start the update.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
- <source>New version %1 available. Please use the system's update tool to install it.</source>
- <translation>Je dostupná nová verzia %1. Prosím, použite nástroj na aktualizáciu systému, aby ste ju nainštalovali.</translation>
+ <source>New %1 version %2 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="151"/>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="114"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="110"/>
<source>Connection Timeout</source>
<translation>Spojenie vypršalo</translation>
</message>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="171"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="167"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Neplatná JSON odpoveď z URL adresy</translation>
</message>
</context>
-<context>
- <name>OCC::PropagateDownloadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="435"/>
- <source>Sync was aborted by user.</source>
- <translation>Synchronizácia zrušená používateľom.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="488"/>
- <source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation>Zo servera nebol prijatý E-Tag, skontrolujte proxy/bránu</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="494"/>
- <source>We received a different E-Tag for resuming. Retrying next time.</source>
- <translation>Prijali sme iný E-Tag pre pokračovanie. Skúsim to neskôr znovu.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="516"/>
- <source>Server returned wrong content-range</source>
- <translation>Server vrátil nesprávnu hodnotu Content-range</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="567"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation>Súbor %1 nie je možné stiahnuť, pretože súbor s rovnakým menom už existuje!</translation>
- </message>
-</context>
<context>
<name>OCC::PropagateDownloadFileQNAM</name>
<message>
<translation>Súbor %1 nie je možné stiahnuť, pretože súbor s rovnakým menom už existuje!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="457"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
+ <source>The download would reduce free disk space below %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="372"/>
+ <source>Free space on disk is less than %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="482"/>
<source>File was deleted from server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="506"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="531"/>
<source>The file could not be downloaded completely.</source>
<translation>Súbor sa nedá stiahnuť úplne.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="601"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="636"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Súbor %1 nie je možné uložiť, pretože jeho názov koliduje s názvom lokálneho súboru!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="641"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="676"/>
<source>File has changed since discovery</source>
<translation>Súbor sa medzitým zmenil</translation>
</message>
<context>
<name>OCC::PropagateItemJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="92"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
<source>; Restoration Failed: %1</source>
<translation>; Obnovenie zlyhalo: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="138"/>
<source>Continue blacklisting:</source>
<translation>Pokračovať v blacklistingu: </translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="230"/>
<source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove folder '%1';</source>
- <translation>Nemožno odstrániť priečinok '%1'; </translation>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="243"/>
- <location filename="../src/libsync/propagator_legacy.cpp" line="302"/>
- <source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>Lokálny súbor bol počas synchronizácie zmenený, zosynchronizuje sa, akonáhle bude kompletný</translation>
- </message>
+ <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="246"/>
- <source>Sync was aborted by user.</source>
- <translation>Synchronizácia zrušená používateľom.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="205"/>
+ <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/propagator_legacy.cpp" line="252"/>
- <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
- <translation>Súbor bol zmenený, ale je súčasťou zdieľania len na čítanie. Pôvodný súbor bol obnovený a upravená verzia je uložená v konfliktnom súbore.</translation>
- </message>
-</context>
-<context>
- <name>OCC::PropagateUploadFileQNAM</name>
- <message>
- <location filename="../src/libsync/propagateupload.cpp" line="226"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="262"/>
<source>File Removed</source>
<translation>Súbor zmazaný</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="274"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Lokálny súbor bol zmenený počas synchronizácie. Bude obnovený.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="250"/>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="286"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="665"/>
<source>Local file changed during sync.</source>
<translation>Lokálny súbor bol zmenený počas synchronizácie.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="558"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="592"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>Vynútené ukončenie procesu pri resete HTTP pripojení s Qt < 5.4.2.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="566"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="600"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Súbor bol zmenený, ale je súčasťou zdieľania len na čítanie. Pôvodný súbor bol obnovený a upravená verzia je uložená v konfliktnom súbore.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="597"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="631"/>
<source>Poll URL missing</source>
<translation>Chýba URL adresa</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="620"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="654"/>
<source>The local file was removed during sync.</source>
<translation>Lokálny súbor bol odstránený počas synchronizácie.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="646"/>
- <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
- <translation>Server nepotvrdil posledný kúsok. (Nebol prítomný e-tag)</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="680"/>
+ <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Neoznačené priečinky budú <b>odstránené</b> z lokálneho systému a nebudú už synchronizované na tento počítač</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>Výber synchronizácie: Označte vzdialené podpriečinky, ktoré si želáte synchronizovať.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>Výber synchronizácie: Odoberte vzdialené podpriečinky, ktoré si neželáte synchronizovať.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
<source>Choose What to Sync</source>
<translation>Vybrať čo synchronizovať</translation>
</message>
<translation>Veľkosť</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
<source>No subfolders currently on the server.</source>
<translation>Na serveri teraz nie sú žiadne podpriečinky.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>Nastala chyba počas načítavania zoznamu podpriečinkov.</translation>
</message>
<translation>Nastavenia</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="80"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="84"/>
<source>Activity</source>
<translation>Aktivita</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="86"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="90"/>
<source>General</source>
<translation>Všeobecné</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>Network</source>
<translation>Sieť</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharedialog.ui" line="22"/>
- <location filename="../src/gui/sharedialog.ui" line="234"/>
+ <location filename="../src/gui/sharedialog.ui" line="258"/>
<source>TextLabel</source>
<translation>Štítok</translation>
</message>
<translation>ownCloud cesta:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="182"/>
+ <location filename="../src/gui/sharedialog.ui" line="116"/>
<source>Set &password </source>
<translation>Nastaviť &heslo </translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="196"/>
+ <location filename="../src/gui/sharedialog.ui" line="130"/>
<source>Set &expiration date</source>
<translation>Nastaviť dátum &expirácie</translation>
</message>
+ <message>
+ <location filename="../src/gui/sharedialog.ui" line="214"/>
+ <source>Allow editing</source>
+ <translation>Povoliť úpravy</translation>
+ </message>
<message>
<location filename="../src/gui/sharedialog.ui" line="77"/>
<source>Share link</source>
<translation>Zdieľať linku</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="125"/>
+ <location filename="../src/gui/sharedialog.ui" line="203"/>
<source>Copy &link</source>
<translation>Skopírovať &odkaz</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="142"/>
+ <location filename="../src/gui/sharedialog.ui" line="154"/>
<source>Set password</source>
<translation>Nastaviť heslo</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="692"/>
- <source>%1 path: %2</source>
- <translation>%1 v umiestnení: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="115"/>
+ <location filename="../src/gui/sharedialog.cpp" line="120"/>
<source>%1 Sharing</source>
<translation>%1 zdieľanie</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="103"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="112"/>
+ <location filename="../src/gui/sharedialog.cpp" line="117"/>
<source>Folder: %2</source>
<translation>Priečinok: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="121"/>
<source>P&assword protect</source>
<translation>Ch&rániť heslom</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="221"/>
+ <location filename="../src/gui/sharedialog.cpp" line="214"/>
<source>Password Protected</source>
<translation>Chránené heslom</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="382"/>
+ <location filename="../src/gui/sharedialog.cpp" line="338"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Tento súbor nemožno zdieľať, lebo bol vyzdieľaný bez možnosti ďalšieho zdieľania.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="528"/>
+ <location filename="../src/gui/sharedialog.cpp" line="475"/>
<source>Please Set Password</source>
<translation>Prosím nastavte si heslo</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="564"/>
- <location filename="../src/gui/sharedialog.cpp" line="565"/>
+ <location filename="../src/gui/sharedialog.cpp" line="538"/>
+ <location filename="../src/gui/sharedialog.cpp" line="539"/>
<source>&Share link</source>
<translation>&Zdieľať odkaz</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="583"/>
+ <location filename="../src/gui/sharedialog.cpp" line="552"/>
+ <location filename="../src/gui/sharedialog.cpp" line="564"/>
<source>OCS API error code: %1</source>
<translation>OCS API chybový kód: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="605"/>
- <source>There is no sync folder configured.</source>
- <translation>Nie je nakonfigurovaný žiadny synchronizačný priečinok.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="639"/>
- <source>A sync file with the same name exists. The file cannot be registered to sync.</source>
- <translation>Súbor s rovnakým názvom už existuje. Nemožno ho preto registrovať na synchronizáciu.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="684"/>
- <source>The file cannot be synced.</source>
- <translation>Súbor nemožno synchronizovať.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="624"/>
- <source>Sharing of external directories is not yet working.</source>
- <translation>Zdieľanie externých priečinkov ešte nefunguje.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="473"/>
- <location filename="../src/gui/sharedialog.cpp" line="506"/>
+ <location filename="../src/gui/sharedialog.cpp" line="418"/>
+ <location filename="../src/gui/sharedialog.cpp" line="460"/>
<source>Public sh&aring requires a password</source>
<translation>Verejné z&dieľanie vyžaduje heslo</translation>
</message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="617"/>
- <source>Cannot find a folder to upload to.</source>
- <translation>Nemožno nájsť priečinok na nahrávanie.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
- <source>Waiting to upload...</source>
- <translation>Čakanie na nahrávanie...</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="653"/>
- <source>Unable to register in sync space.</source>
- <translation>Nemožno registrovať v synchronizačnom umiestnení.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="694"/>
- <source>Sync of registered file was not successful yet.</source>
- <translation>Synchronizácia registrovaného súboru ešte nebola dokončená.</translation>
- </message>
</context>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>Login Error</source>
<translation>Chybné prihlásenie</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>You must sign in as user %1</source>
<translation>Musíte sa prihlásiť ako používateľ %1</translation>
</message>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="452"/>
+ <location filename="../src/gui/socketapi.cpp" line="447"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Zdieľať s %1</translation>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="97"/>
+ <location filename="../src/libsync/syncengine.cpp" line="94"/>
<source>Success.</source>
<translation>Úspech.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="104"/>
+ <location filename="../src/libsync/syncengine.cpp" line="101"/>
<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="107"/>
+ <location filename="../src/libsync/syncengine.cpp" line="104"/>
<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="110"/>
+ <location filename="../src/libsync/syncengine.cpp" line="107"/>
<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="113"/>
+ <location filename="../src/libsync/syncengine.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync sa nepodarilo zarezervovať pamäť.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>CSync kritická chyba parametrov.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="119"/>
+ <location filename="../src/libsync/syncengine.cpp" line="116"/>
<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="122"/>
+ <location filename="../src/libsync/syncengine.cpp" line="119"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync sa nepodarilo spracovať krok zladenia.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="122"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="125"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="128"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="131"/>
<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="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="134"/>
<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="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="137"/>
<source>A HTTP transmission error happened.</source>
<translation>Chyba HTTP prenosu.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation>CSync zlyhalo. Nedostatočné oprávnenie.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
<source>An error occurred while opening a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
<source>Error while reading folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="996"/>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
<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="1003"/>
+ <location filename="../src/libsync/syncengine.cpp" line="991"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="152"/>
<source>CSync unspecified error.</source>
<translation>CSync nešpecifikovaná chyba.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="155"/>
<source>Aborted by the user</source>
<translation>Zrušené používateľom</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="392"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="143"/>
<source>CSync failed to access</source>
<translation>Prístup pre CSync zlyhal</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <location filename="../src/libsync/syncengine.cpp" line="97"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <source>CSync failed due to unhandled permission denied.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="146"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="158"/>
<source>The service is temporarily unavailable</source>
<translation>Služba je dočasne nedostupná</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="175"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<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="230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="227"/>
<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="389"/>
+ <location filename="../src/libsync/syncengine.cpp" line="386"/>
<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="392"/>
+ <location filename="../src/libsync/syncengine.cpp" line="389"/>
<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="398"/>
+ <location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename is too long.</source>
<translation>Meno súboru je veľmi dlhé.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="401"/>
+ <location filename="../src/libsync/syncengine.cpp" line="398"/>
<source>File is ignored because it's hidden.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="407"/>
+ <location filename="../src/libsync/syncengine.cpp" line="404"/>
<source>Stat failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="429"/>
+ <location filename="../src/libsync/syncengine.cpp" line="426"/>
<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="561"/>
+ <location filename="../src/libsync/syncengine.cpp" line="558"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Neplatné znaky, premenujte prosím "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="631"/>
+ <location filename="../src/libsync/syncengine.cpp" line="612"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="645"/>
<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="718"/>
+ <location filename="../src/libsync/syncengine.cpp" line="723"/>
<source>Cannot open the sync journal</source>
<translation>Nemožno otvoriť sync žurnál</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="965"/>
- <location filename="../src/libsync/syncengine.cpp" line="972"/>
+ <location filename="../src/libsync/syncengine.cpp" line="953"/>
+ <location filename="../src/libsync/syncengine.cpp" line="960"/>
<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="990"/>
+ <location filename="../src/libsync/syncengine.cpp" line="978"/>
<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="1023"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1011"/>
<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="1040"/>
- <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1028"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1048"/>
<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="1073"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1061"/>
<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="1128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1116"/>
<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="1137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1125"/>
<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="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the destination</source>
<translation>cieľ</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the source</source>
<translation>zdroj</translation>
</message>
</message>
</context>
<context>
- <name>OCC::TransmissionChecksumValidator</name>
+ <name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="128"/>
<source>The checksum header is malformed.</source>
<translation>Hlavička kontrolného súčtu je poškodená.</translation>
</message>
<message>
<location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+ <source>The checksum header contained an unknown checksum type '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="148"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>Stiahnutý súbor nemá správny kontrolný súčet, bude stiahnutý znovu.</translation>
</message>
<source>Recent Changes</source>
<translation>Nedávne zmeny</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="561"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="331"/>
<source>Managed Folders:</source>
<source>Open %1 in browser</source>
<translation>Otvoriť %1 v prehliadači</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="449"/>
- <source>Log out everywhere</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="457"/>
- <source>Log in everywhere...</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="513"/>
<source>Unknown status</source>
<source>Account %1: %2</source>
<translation>Účet %1: %2</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="449"/>
+ <source>Log out of all accounts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="457"/>
+ <source>Log in to all accounts...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="532"/>
<source>Crash now</source>
<source>No items synced recently</source>
<translation>Žiadne nedávno synchronizované položky</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="561"/>
- <source>Discovering '%1'</source>
- <translation>Prehľadávam '%1'</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="566"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>%L1 B</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="306"/>
+ <location filename="../src/libsync/utility.cpp" line="303"/>
<source>%Ln year(s)</source>
<translation>%Ln rok(y-ov)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="307"/>
+ <location filename="../src/libsync/utility.cpp" line="304"/>
<source>%Ln month(s)</source>
<translation>%Ln mesiac(e-ov)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="308"/>
+ <location filename="../src/libsync/utility.cpp" line="305"/>
<source>%Ln day(s)</source>
<translation>%Ln deň(dni-dní)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="309"/>
+ <location filename="../src/libsync/utility.cpp" line="306"/>
<source>%Ln hour(s)</source>
<translation>%Ln hodina(y-ín)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="310"/>
+ <location filename="../src/libsync/utility.cpp" line="307"/>
<source>%Ln minute(s)</source>
<translation>%Ln minúta(y-minút)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="311"/>
+ <location filename="../src/libsync/utility.cpp" line="308"/>
<source>%Ln second(s)</source>
<translation>%Ln sekunda(y-sekúnd)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="318"/>
<source>0 seconds</source>
<translation>0 sekúnd</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="336"/>
+ <location filename="../src/libsync/utility.cpp" line="333"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="73"/>
- <source>Remove the account configuration from the client</source>
+ <source>Enter your credentials to connect to the server</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="76"/>
+ <source>Sign in</source>
+ <translation>Prijava</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="89"/>
+ <source>Remove the account configuration from the client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Remove Account</source>
<translation>Odstrani račun</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="97"/>
+ <location filename="../src/gui/accountsettings.ui" line="113"/>
<source>Storage space: ...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="167"/>
+ <location filename="../src/gui/accountsettings.ui" line="183"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Neizbrane mape bodo <b>odstranjene</b> iz krajevnega datotečnega sistema in s tem računalnikom ne bodo več usklajevane!</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="230"/>
<source>Apply</source>
<translation>Uveljavi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="198"/>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
- <location filename="../src/gui/accountsettings.cpp" line="571"/>
+ <location filename="../src/gui/accountsettings.ui" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="289"/>
+ <location filename="../src/gui/accountsettings.cpp" line="646"/>
<source>Cancel</source>
<translation>Prekliči</translation>
</message>
<translation>Vzpostavljena je povezava s strežnikom <server> kot <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="115"/>
+ <location filename="../src/gui/accountsettings.cpp" line="121"/>
<source>No account configured.</source>
<translation>Ni nastavljenega računa.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="161"/>
+ <source>Choose what to sync</source>
+ <translation>Izbor datotek za usklajevanje</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="168"/>
+ <source>Remove folder sync connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="234"/>
<source>Folder creation failed</source>
<translation>Ustvarjanje mape je spodletelo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="230"/>
+ <location filename="../src/gui/accountsettings.cpp" line="235"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="283"/>
- <source>Stop syncing</source>
- <translation>Zaustavi usklajevanje</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
+ <source>Confirm Folder Sync Connection Removal</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="309"/>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>Remove Folder Sync Connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="314"/>
<source>Confirm Folder Reset</source>
<translation>Potrdi ponastavitev mape</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="310"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Ali ste prepričani, da želite mapo <i>%1</i> ponastaviti in ponovno izgraditi podatkovno zbirko?</p><p><b>Opozorilo:</b> Možnost je zasnovana za vzdrževanje. Datoteke sicer ne bodo spremenjene, vendar pa je opravilo lahko zelo dolgotrajno in lahko traja tudi več ur. Trajanje je odvisno od velikosti mape. Možnost uporabite le, če vam to svetuje skrbnik sistema.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="391"/>
+ <location filename="../src/gui/accountsettings.cpp" line="396"/>
<source>Sync Running</source>
<translation>Usklajevanje je v teku</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="392"/>
+ <location filename="../src/gui/accountsettings.cpp" line="397"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Izvaja se usklajevanje.<br/>Ali želite opravilo prekiniti?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="472"/>
+ <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <source>%1 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="485"/>
<source>%1 as <i>%2</i></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="476"/>
+ <location filename="../src/gui/accountsettings.cpp" line="495"/>
<source>Connected to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="478"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
<source>Server %1 is temporarily unavailable.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="480"/>
+ <location filename="../src/gui/accountsettings.cpp" line="499"/>
<source>Signed out from %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="482"/>
+ <location filename="../src/gui/accountsettings.cpp" line="501"/>
<source>No connection to %1 at %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
- <source>There are new folders that were not synchronized because they are too big: %1</source>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <source>There are new folders that were not synchronized because they are too big: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="536"/>
- <source>, </source>
- <translation>,</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="563"/>
+ <location filename="../src/gui/accountsettings.cpp" line="638"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="564"/>
+ <location filename="../src/gui/accountsettings.cpp" line="639"/>
<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="570"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="158"/>
<source>Open folder</source>
<translation>Odpri mapo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="168"/>
- <source>Choose What to Sync</source>
- <translation>Izbor map za usklajevanje</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Resume sync</source>
<translation>Nadaljuj z usklajevanjem</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Pause sync</source>
<translation>Premor usklajevanja</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="176"/>
- <source>Remove sync</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="277"/>
- <source>Confirm Sync Removal</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="278"/>
+ <location filename="../src/gui/accountsettings.cpp" line="283"/>
<source><p>Do you really want to stop syncing the folder <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="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="452"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="448"/>
+ <location filename="../src/gui/accountsettings.cpp" line="453"/>
<source>%1 of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="453"/>
+ <location filename="../src/gui/accountsettings.cpp" line="462"/>
<source>Currently there is no storage usage information available.</source>
<translation>Trenutno ni na voljo nobenih podatkov o porabi prostora.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="507"/>
<source>No %1 connection configured.</source>
<translation>Ni nastavljene povezave %1.</translation>
</message>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="95"/>
+ <location filename="../src/gui/accountstate.cpp" line="99"/>
<source>Signed out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="97"/>
+ <location filename="../src/gui/accountstate.cpp" line="101"/>
<source>Disconnected</source>
<translation>Brez povezave</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="99"/>
+ <location filename="../src/gui/accountstate.cpp" line="103"/>
<source>Connected</source>
<translation>Povezano</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="101"/>
+ <location filename="../src/gui/accountstate.cpp" line="105"/>
<source>Service unavailable</source>
<translation>Storitev ni na voljo</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="103"/>
+ <location filename="../src/gui/accountstate.cpp" line="107"/>
<source>Network error</source>
<translation>Omrežna napaka</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="105"/>
+ <location filename="../src/gui/accountstate.cpp" line="109"/>
<source>Configuration error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="107"/>
+ <location filename="../src/gui/accountstate.cpp" line="111"/>
<source>Unknown account state</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>Reauthentication required</source>
+ <translation>Zahtevano je vnovično overjanje istovetnosti</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>You need to re-login to continue using the account %1.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
<translation>Posodobite strežnik in ponovno zaženite odjemalca.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="143"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="135"/>
<source>Authentication error: Either username or password are wrong.</source>
<translation>Napaka overitve: uporabniško ime ali geslo je napačno.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="155"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="147"/>
<source>timeout</source>
<translation>časovni zamik</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="186"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="178"/>
<source>The provided credentials are not correct</source>
<translation>Podana poverila niso pravilna.</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="524"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="537"/>
<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="107"/>
+ <location filename="../src/gui/folder.cpp" line="108"/>
<source>Unable to create csync-context</source>
<translation>Ni mogoče ustvariti vsebine csync-context</translation>
</message>
<translation>Dejavnost usklajevanja</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="845"/>
+ <location filename="../src/gui/folder.cpp" line="870"/>
<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="1102"/>
+ <location filename="../src/gui/folder.cpp" line="1127"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1115"/>
+ <location filename="../src/gui/folder.cpp" line="1140"/>
<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="1119"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Remove All Files?</source>
<translation>Ali naj bodo odstranjene vse datoteke?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1121"/>
+ <location filename="../src/gui/folder.cpp" line="1146"/>
<source>Remove all files</source>
<translation>Odstrani vse datoteke</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1122"/>
+ <location filename="../src/gui/folder.cpp" line="1147"/>
<source>Keep files</source>
<translation>Ohrani datoteke</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="275"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<source>Could not reset folder state</source>
<translation>Ni mogoče ponastaviti stanja mape</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="276"/>
+ <location filename="../src/gui/folderman.cpp" line="271"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Obstaja starejši dnevnik usklajevanja '%1', vendar ga ni mogoče odstraniti. Preverite, ali je datoteka v uporabi.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="877"/>
+ <location filename="../src/gui/folderman.cpp" line="865"/>
<source> (backup)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="882"/>
+ <location filename="../src/gui/folderman.cpp" line="870"/>
<source> (backup %1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1091"/>
+ <location filename="../src/gui/folderman.cpp" line="1079"/>
<source>Undefined State.</source>
<translation>Nedoločeno stanje.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1094"/>
- <source>Waits to start syncing.</source>
- <translation>V čakanju na začetek usklajevanja.</translation>
+ <location filename="../src/gui/folderman.cpp" line="1082"/>
+ <source>Waiting to start syncing.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1097"/>
+ <location filename="../src/gui/folderman.cpp" line="1085"/>
<source>Preparing for sync.</source>
<translation>Poteka priprava za usklajevanje.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1100"/>
+ <location filename="../src/gui/folderman.cpp" line="1088"/>
<source>Sync is running.</source>
<translation>Usklajevanje je v teku.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1103"/>
+ <location filename="../src/gui/folderman.cpp" line="1091"/>
<source>Last Sync was successful.</source>
<translation>Zadnje usklajevanje je bilo uspešno končano.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1108"/>
+ <location filename="../src/gui/folderman.cpp" line="1096"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Zadnje usklajevanje je bilo sicer uspešno, vendar z opozorili za posamezne datoteke.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1111"/>
+ <location filename="../src/gui/folderman.cpp" line="1099"/>
<source>Setup Error.</source>
<translation>Napaka nastavitve.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1114"/>
+ <location filename="../src/gui/folderman.cpp" line="1102"/>
<source>User Abort.</source>
<translation>Uporabniška prekinitev.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1117"/>
+ <location filename="../src/gui/folderman.cpp" line="1105"/>
<source>Sync is paused.</source>
<translation>Usklajevanje je začasno v premoru.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1123"/>
+ <location filename="../src/gui/folderman.cpp" line="1111"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (usklajevanje je v premoru)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1119"/>
<source>No valid folder selected!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1130"/>
<source>The selected path is not a folder!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1146"/>
+ <location filename="../src/gui/folderman.cpp" line="1134"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Ni ustreznih dovoljenj za pisanje v izbrano mapo!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1161"/>
+ <location filename="../src/gui/folderman.cpp" line="1149"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1166"/>
+ <location filename="../src/gui/folderman.cpp" line="1154"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1173"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1168"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1186"/>
+ <location filename="../src/gui/folderman.cpp" line="1174"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="85"/>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="274"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="271"/>
<source>File</source>
<translation>Datoteka</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="228"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="224"/>
<source>Syncing selected files in your account with</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="231"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="227"/>
<source>Remote path: %1</source>
<translation>Oddaljena pot: %1</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="121"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="122"/>
<source>You need to be connected to add a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="126"/>
- <source>Adding folder is disabled because your 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="131"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="132"/>
<source>Click this button to add a folder to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="141"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="142"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="156"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
<source>Error while loading the list of folders from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="182"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="192"/>
<source>Signed out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="727"/>
- <source>Discovering '%1'</source>
- <translation>Poteka preučevanje '%1'</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="127"/>
+ <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="787"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="163"/>
+ <source>Fetching folder list from server...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="789"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="849"/>
<source>Syncing %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="792"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="854"/>
<source>download %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="794"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="856"/>
<source>u2193 %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="800"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>upload %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="802"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="864"/>
<source>u2191 %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="807"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="869"/>
<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="811"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="873"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="827"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="889"/>
<source>%1 of %2, file %3 of %4
Total time left %5</source>
<translation>%1 od %2, datoteka %3 od %4
Skupaj še %5</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
<source>file %1 of %2</source>
<translation>datoteka %1 od %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="932"/>
<source>Waiting...</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="934"/>
<source>Waiting for %n other folder(s)...</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="878"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>Preparing to sync...</source>
<translation type="unfinished"/>
</message>
<name>OCC::FolderWizard</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <source>Add Folder Sync Connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderwizard.cpp" line="564"/>
- <source>Add Folder</source>
- <translation>Dodaj mapo</translation>
+ <source>Add Sync Connection</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Napredne možnosti</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="61"/>
+ <location filename="../src/gui/generalsettings.ui" line="109"/>
<source>Ask confirmation before downloading folders larger than</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
+ <location filename="../src/gui/generalsettings.ui" line="129"/>
<source>MB</source>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="109"/>
+ <location filename="../src/gui/generalsettings.ui" line="159"/>
<source>Show crash reporter</source>
<translation>Prikaži poročevalca sesutja</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="118"/>
+ <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="142"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
<source>Add an Account</source>
<translation>Dodaj račun</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="167"/>
- <location filename="../src/gui/generalsettings.ui" line="173"/>
+ <location filename="../src/gui/generalsettings.ui" line="171"/>
+ <location filename="../src/gui/generalsettings.ui" line="177"/>
<source>About</source>
<translation>O programu...</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <location filename="../src/gui/generalsettings.ui" line="187"/>
<source>Updates</source>
<translation>Posodobitve</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="208"/>
+ <location filename="../src/gui/generalsettings.ui" line="212"/>
<source>&Restart && Update</source>
<translation>&Ponovno zaženi && posodobi</translation>
</message>
</context>
-<context>
- <name>OCC::HttpCredentials</name>
- <message>
- <location filename="../src/libsync/creds/httpcredentials.cpp" line="290"/>
- <source>Reading from keychain failed with error: '%1'</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="32"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
<source>Please enter %1 password:
User: %2
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="41"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <source>Reading from keychain failed with error: '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
<source>Enter Password</source>
<translation>Vnos gesla</translation>
</message>
<translation>Odstrani</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="40"/>
<source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="109"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
<source>Could not open file</source>
<translation>Datoteke ni mogoče odpreti</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="111"/>
<source>Cannot write changes to '%1'.</source>
<translation>Ni mogoče zapisati sprememb v '%1'.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="138"/>
<source>Add Ignore Pattern</source>
<translation>Dodaj vzorec za izpuščanje</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>Add a new ignore pattern:</source>
<translation>Dodaj nov vzorec za izpuščanje:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="45"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="46"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Ta vnos je ponujen pri '%1' in ga v tem pogledu ni mogoče spreminjati.</translation>
</message>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="163"/>
+ <location filename="../src/libsync/logger.cpp" line="190"/>
<source>Error</source>
<translation>Napaka</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="164"/>
+ <location filename="../src/libsync/logger.cpp" line="191"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Datoteke '%1'<br/>ni mogoče odpreti za pisanje.<br/><br/>Dnevniškega zapisa <b>ni mogoče</b> shraniti!</nobr></translation>
</message>
</message>
<message>
<location filename="../src/gui/networksettings.ui" line="203"/>
- <location filename="../src/gui/networksettings.ui" line="295"/>
+ <location filename="../src/gui/networksettings.ui" line="292"/>
<source>No limit</source>
<translation>Ni omejitve</translation>
</message>
<source>SOCKS5 proxy</source>
<translation>Posredniški strežnik SOCKS5</translation>
</message>
+ <message>
+ <location filename="../src/gui/networksettings.cpp" line="128"/>
+ <source>Qt >= 5.4 is required in order to use the bandwidth limit</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::OCUpdater</name>
<source>Downloading version %1. Please wait...</source>
<translation>Poteka prejemanje različice %1 ...</translation>
</message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
- <source>Version %1 available. Restart application to start the update.</source>
- <translation>Na voljo je nova različica %1. Za začetek namestitve je treba program ponovno zagnati.</translation>
- </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="145"/>
<source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
<source>Could not check for new updates.</source>
<translation>Ni mogoče preveriti za nove posodobitve.</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
+ <source>%1 version %2 available. Restart application to start the update.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
- <source>New version %1 available. Please use the system's update tool to install it.</source>
- <translation>Na voljo je nova različica %1. Uporabite orodje za namestitev in posodobitev sistema.</translation>
+ <source>New %1 version %2 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="151"/>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="114"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="110"/>
<source>Connection Timeout</source>
<translation>Povezava časovno pretekla</translation>
</message>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="171"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="167"/>
<source>Invalid JSON reply from the poll URL</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>OCC::PropagateDownloadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="435"/>
- <source>Sync was aborted by user.</source>
- <translation>Usklajevanje je bilo prekinjeno s strani uporabnika</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="488"/>
- <source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation>Ni prejete oznake s strežnika. Preveriti je treba podatke posredovalnega strežnika ali prehoda.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="494"/>
- <source>We received a different E-Tag for resuming. Retrying next time.</source>
- <translation>Prejeta je različna oznaka za nadaljevanje opravila. Ponovni poskus bo izveden kasneje.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="516"/>
- <source>Server returned wrong content-range</source>
- <translation>Odziv strežnika kaže na neveljaven obseg vsebine</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="567"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation>Datoteke %1 ni mogoče prejeti zaradi neskladja z imenom krajevne datoteke!</translation>
- </message>
-</context>
<context>
<name>OCC::PropagateDownloadFileQNAM</name>
<message>
<translation>Datoteke %1 ni mogoče prejeti zaradi neskladja z imenom krajevne datoteke!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="457"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
+ <source>The download would reduce free disk space below %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="372"/>
+ <source>Free space on disk is less than %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="482"/>
<source>File was deleted from server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="506"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="531"/>
<source>The file could not be downloaded completely.</source>
<translation>Datoteke ni mogoče v celoti prejeti.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="601"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="636"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Datoteke %1 ni mogoče shraniti zaradi neskladja z imenom obstoječe datoteke!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="641"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="676"/>
<source>File has changed since discovery</source>
<translation>Datoteka je bila po spremenjena po usklajevanju seznama datotek.</translation>
</message>
<context>
<name>OCC::PropagateItemJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="92"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
<source>; Restoration Failed: %1</source>
<translation>; obnovitev je spodletela: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="138"/>
<source>Continue blacklisting:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="230"/>
<source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove folder '%1';</source>
+ <source>Could not remove folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="243"/>
- <location filename="../src/libsync/propagator_legacy.cpp" line="302"/>
- <source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>Krajevna datoteka je bila med usklajevanjem spremenjena. Usklajena bo, ko bo shranjena.</translation>
- </message>
+ <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="246"/>
- <source>Sync was aborted by user.</source>
- <translation>Usklajevanje je bilo prekinjeno s strani uporabnika</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="205"/>
+ <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/propagator_legacy.cpp" line="252"/>
- <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
- <translation>Datoteka je bila krajevno spremenjena, vendar pa je označena za souporabo le za branje. Izvorna datoteka je obnovljena, vaše spremembe pa so zabeležene v datoteki spora.</translation>
- </message>
-</context>
-<context>
- <name>OCC::PropagateUploadFileQNAM</name>
- <message>
- <location filename="../src/libsync/propagateupload.cpp" line="226"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="262"/>
<source>File Removed</source>
<translation>Datoteka je odstranjena</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="274"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Krajevna datoteka je bila med usklajevanjem spremenjena. Usklajena bo, ko bo shranjena.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="250"/>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="286"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="665"/>
<source>Local file changed during sync.</source>
<translation>Krajevna datoteka je bila med usklajevanjem spremenjena.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="558"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="592"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="566"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="600"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Datoteka je bila krajevno spremenjena, vendar pa je označena za souporabo le za branje. Izvorna datoteka je obnovljena, vaše spremembe pa so zabeležene v datoteki spora.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="597"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="631"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="620"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="654"/>
<source>The local file was removed during sync.</source>
<translation>Krajevna datoteka je bila me usklajevanjem odstranjena.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="646"/>
- <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
- <translation>Strežnik ni prepoznal zadnjega niza besed. (ni določenih e-oznak)</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="680"/>
+ <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Neizbrane mape bodo <b>odstranjene</b> iz krajevnega datotečnega sistema in s tem računalnikom ne bodo več usklajevane!</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
<source>Choose What to Sync</source>
<translation>Izbor map za usklajevanje</translation>
</message>
<translation>Velikost</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
<source>No subfolders currently on the server.</source>
<translation>Na strežniku trenutno ni podrejenih map.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>Prišlo je do napake med nalaganjem seznama podrejenih map.</translation>
</message>
<translation>Nastavitve</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="80"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="84"/>
<source>Activity</source>
<translation>Dejavnosti</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="86"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="90"/>
<source>General</source>
<translation>Splošno</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>Network</source>
<translation>Omrežje</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharedialog.ui" line="22"/>
- <location filename="../src/gui/sharedialog.ui" line="234"/>
+ <location filename="../src/gui/sharedialog.ui" line="258"/>
<source>TextLabel</source>
<translation>Besedilna oznaka</translation>
</message>
<translation>Pot do OwnCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="182"/>
+ <location filename="../src/gui/sharedialog.ui" line="116"/>
<source>Set &password </source>
<translation>Nastavi &geslo</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="196"/>
+ <location filename="../src/gui/sharedialog.ui" line="130"/>
<source>Set &expiration date</source>
<translation>Nastavi datum &preteka</translation>
</message>
+ <message>
+ <location filename="../src/gui/sharedialog.ui" line="214"/>
+ <source>Allow editing</source>
+ <translation>Dovoli urejanje</translation>
+ </message>
<message>
<location filename="../src/gui/sharedialog.ui" line="77"/>
<source>Share link</source>
<translation>Povezava za souporabo</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="125"/>
+ <location filename="../src/gui/sharedialog.ui" line="203"/>
<source>Copy &link</source>
<translation>&Kopiraj povezavo</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="142"/>
+ <location filename="../src/gui/sharedialog.ui" line="154"/>
<source>Set password</source>
<translation>Nastavi geslo</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="692"/>
- <source>%1 path: %2</source>
- <translation>Pot %1: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="115"/>
+ <location filename="../src/gui/sharedialog.cpp" line="120"/>
<source>%1 Sharing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="103"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="112"/>
+ <location filename="../src/gui/sharedialog.cpp" line="117"/>
<source>Folder: %2</source>
<translation>Mapa: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="121"/>
<source>P&assword protect</source>
<translation>&Zaščiti z geslom</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="221"/>
+ <location filename="../src/gui/sharedialog.cpp" line="214"/>
<source>Password Protected</source>
<translation>Zaščiteno z geslom</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="382"/>
+ <location filename="../src/gui/sharedialog.cpp" line="338"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="528"/>
+ <location filename="../src/gui/sharedialog.cpp" line="475"/>
<source>Please Set Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="564"/>
- <location filename="../src/gui/sharedialog.cpp" line="565"/>
+ <location filename="../src/gui/sharedialog.cpp" line="538"/>
+ <location filename="../src/gui/sharedialog.cpp" line="539"/>
<source>&Share link</source>
<translation>Povezava za &souporabo</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="583"/>
+ <location filename="../src/gui/sharedialog.cpp" line="552"/>
+ <location filename="../src/gui/sharedialog.cpp" line="564"/>
<source>OCS API error code: %1</source>
<translation>Koda napake OCS API: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="605"/>
- <source>There is no sync folder configured.</source>
- <translation>Ni nastavljenih map za usklajevanje.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="639"/>
- <source>A sync file with the same name exists. The file cannot be registered to sync.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="684"/>
- <source>The file cannot be synced.</source>
- <translation>Datoteke ni mogoče uskladiti.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="624"/>
- <source>Sharing of external directories is not yet working.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="473"/>
- <location filename="../src/gui/sharedialog.cpp" line="506"/>
+ <location filename="../src/gui/sharedialog.cpp" line="418"/>
+ <location filename="../src/gui/sharedialog.cpp" line="460"/>
<source>Public sh&aring requires a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="617"/>
- <source>Cannot find a folder to upload to.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
- <source>Waiting to upload...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="653"/>
- <source>Unable to register in sync space.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="694"/>
- <source>Sync of registered file was not successful yet.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>Login Error</source>
<translation>Napaka prijave</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>You must sign in as user %1</source>
<translation>Prijaviti se je treba kot uporabnik %1</translation>
</message>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="452"/>
+ <location filename="../src/gui/socketapi.cpp" line="447"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Omogoči souporabo z %1</translation>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="97"/>
+ <location filename="../src/libsync/syncengine.cpp" line="94"/>
<source>Success.</source>
<translation>Uspešno končano.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="104"/>
+ <location filename="../src/libsync/syncengine.cpp" line="101"/>
<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="107"/>
+ <location filename="../src/libsync/syncengine.cpp" line="104"/>
<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="110"/>
+ <location filename="../src/libsync/syncengine.cpp" line="107"/>
<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="113"/>
+ <location filename="../src/libsync/syncengine.cpp" line="110"/>
<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="116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>Usodna napaka parametra CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="119"/>
+ <location filename="../src/libsync/syncengine.cpp" line="116"/>
<source>CSync processing step update failed.</source>
<translation>Korak opravila posodobitve CSync je spodletel.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="122"/>
+ <location filename="../src/libsync/syncengine.cpp" line="119"/>
<source>CSync processing step reconcile failed.</source>
<translation>Korak opravila poravnave CSync je spodletel.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="122"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="125"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="128"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="131"/>
<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="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="134"/>
<source>A network connection timeout happened.</source>
<translation>Omrežna povezava je časovno potekla.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="137"/>
<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="143"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation>Delovanje CSync je zaradi neustreznih dovoljenj spodletelo.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
<source>An error occurred while opening a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
<source>Error while reading folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="996"/>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
<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="1003"/>
+ <location filename="../src/libsync/syncengine.cpp" line="991"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="152"/>
<source>CSync unspecified error.</source>
<translation>Nedoločena napaka CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="155"/>
<source>Aborted by the user</source>
<translation>Opravilo je bilo prekinjeno s strani uporabnika</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="392"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="143"/>
<source>CSync failed to access</source>
<translation>Dostop s CSync je spodletel</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <location filename="../src/libsync/syncengine.cpp" line="97"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <source>CSync failed due to unhandled permission denied.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="146"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="158"/>
<source>The service is temporarily unavailable</source>
<translation>Storitev trenutno ni na voljo</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="175"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<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="230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="227"/>
<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="389"/>
+ <location filename="../src/libsync/syncengine.cpp" line="386"/>
<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="392"/>
+ <location filename="../src/libsync/syncengine.cpp" line="389"/>
<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="398"/>
+ <location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename is too long.</source>
<translation>Ime datoteke je predolgo.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="401"/>
+ <location filename="../src/libsync/syncengine.cpp" line="398"/>
<source>File is ignored because it's hidden.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="407"/>
+ <location filename="../src/libsync/syncengine.cpp" line="404"/>
<source>Stat failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="429"/>
+ <location filename="../src/libsync/syncengine.cpp" line="426"/>
<source>Filename encoding is not valid</source>
<translation>Kodni zapis imena datoteke ni veljaven.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="561"/>
+ <location filename="../src/libsync/syncengine.cpp" line="558"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="631"/>
+ <location filename="../src/libsync/syncengine.cpp" line="612"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="645"/>
<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="718"/>
+ <location filename="../src/libsync/syncengine.cpp" line="723"/>
<source>Cannot open the sync journal</source>
<translation>Ni mogoče odpreti dnevnika usklajevanja</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="965"/>
- <location filename="../src/libsync/syncengine.cpp" line="972"/>
+ <location filename="../src/libsync/syncengine.cpp" line="953"/>
+ <location filename="../src/libsync/syncengine.cpp" line="960"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Prezrto, ker ni neizbrano za usklajevanje</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <location filename="../src/libsync/syncengine.cpp" line="978"/>
<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="1023"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1011"/>
<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="1040"/>
- <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1028"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1048"/>
<source>Not allowed to remove, restoring</source>
<translation>Odstranitev ni dovoljena, datoteka bo obnovljena.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1073"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1061"/>
<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="1128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1116"/>
<source>Move not allowed, item restored</source>
<translation>Premikanje ni dovoljeno, datoteka bo obnovljena.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1125"/>
<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="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the destination</source>
<translation>cilj</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the source</source>
<translation>vir</translation>
</message>
</message>
</context>
<context>
- <name>OCC::TransmissionChecksumValidator</name>
+ <name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="128"/>
<source>The checksum header is malformed.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+ <source>The checksum header contained an unknown checksum type '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="148"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation type="unfinished"/>
</message>
<source>Recent Changes</source>
<translation>Nedavne spremembe</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="561"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="331"/>
<source>Managed Folders:</source>
<source>Open %1 in browser</source>
<translation>Odpri %1 v brskalniku</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="449"/>
- <source>Log out everywhere</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="457"/>
- <source>Log in everywhere...</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="513"/>
<source>Unknown status</source>
<source>Account %1: %2</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="449"/>
+ <source>Log out of all accounts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="457"/>
+ <source>Log in to all accounts...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="532"/>
<source>Crash now</source>
<source>No items synced recently</source>
<translation>Ni nedavno usklajenih predmetov</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="561"/>
- <source>Discovering '%1'</source>
- <translation>Poteka preučevanje '%1'</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="566"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>%L1 B</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="306"/>
+ <location filename="../src/libsync/utility.cpp" line="303"/>
<source>%Ln year(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="307"/>
+ <location filename="../src/libsync/utility.cpp" line="304"/>
<source>%Ln month(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="308"/>
+ <location filename="../src/libsync/utility.cpp" line="305"/>
<source>%Ln day(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="309"/>
+ <location filename="../src/libsync/utility.cpp" line="306"/>
<source>%Ln hour(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="310"/>
+ <location filename="../src/libsync/utility.cpp" line="307"/>
<source>%Ln minute(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="311"/>
+ <location filename="../src/libsync/utility.cpp" line="308"/>
<source>%Ln second(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="318"/>
<source>0 seconds</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="336"/>
+ <location filename="../src/libsync/utility.cpp" line="333"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="73"/>
- <source>Remove the account configuration from the client</source>
+ <source>Enter your credentials to connect to the server</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="76"/>
+ <source>Sign in</source>
+ <translation>Пријави се</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="89"/>
+ <source>Remove the account configuration from the client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Remove Account</source>
<translation>Уклони налог</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="97"/>
+ <location filename="../src/gui/accountsettings.ui" line="113"/>
<source>Storage space: ...</source>
<translation>Простор у складишту: ...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="167"/>
+ <location filename="../src/gui/accountsettings.ui" line="183"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Неозначене фасцикле биће <b>уклоњене</b> из локалног фајл-система и више се неће синхронизовати на овом рачунару</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="230"/>
<source>Apply</source>
<translation>Примени</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="198"/>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
- <location filename="../src/gui/accountsettings.cpp" line="571"/>
+ <location filename="../src/gui/accountsettings.ui" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="289"/>
+ <location filename="../src/gui/accountsettings.cpp" line="646"/>
<source>Cancel</source>
<translation>Одустани</translation>
</message>
<translation>Повезан са <server> као <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="115"/>
+ <location filename="../src/gui/accountsettings.cpp" line="121"/>
<source>No account configured.</source>
<translation>Није подешен налог.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="161"/>
+ <source>Choose what to sync</source>
+ <translation>Изаберите шта синхронизовати</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="168"/>
+ <source>Remove folder sync connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="234"/>
<source>Folder creation failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="230"/>
+ <location filename="../src/gui/accountsettings.cpp" line="235"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation><p>Не могу да направим локалну фасциклу <i>%1</i>.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="283"/>
- <source>Stop syncing</source>
- <translation>Заустави синхронизацију</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
+ <source>Confirm Folder Sync Connection Removal</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="309"/>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>Remove Folder Sync Connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="314"/>
<source>Confirm Folder Reset</source>
<translation>Потврда ресетовања фасцикле</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="310"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Заиста желите да ресетујете фасциклу <i>%1</i> и поново изградите базу клијента?</p><p><b>Напомена:</b> Ова функција је намењена за сврху одржавања. Фајлови неће бити уклоњени, али ово може узроковати значајан пренос података и може трајати неколико минута или сати док се заврши, зависно од величине фасцикле. Користите ову опцију само ако вам је тако саветовао администратор.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="391"/>
+ <location filename="../src/gui/accountsettings.cpp" line="396"/>
<source>Sync Running</source>
<translation>Синхронизација у току</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="392"/>
+ <location filename="../src/gui/accountsettings.cpp" line="397"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Синхронизација је у току.<br/>Желите ли да је прекинете?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="472"/>
+ <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <source>%1 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="485"/>
<source>%1 as <i>%2</i></source>
<translation>%1 као <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="476"/>
+ <location filename="../src/gui/accountsettings.cpp" line="495"/>
<source>Connected to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="478"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Сервер %1 је привремено недоступан.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="480"/>
+ <location filename="../src/gui/accountsettings.cpp" line="499"/>
<source>Signed out from %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="482"/>
+ <location filename="../src/gui/accountsettings.cpp" line="501"/>
<source>No connection to %1 at %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
- <source>There are new folders that were not synchronized because they are too big: %1</source>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <source>There are new folders that were not synchronized because they are too big: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="536"/>
- <source>, </source>
- <translation>, </translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="563"/>
+ <location filename="../src/gui/accountsettings.cpp" line="638"/>
<source>Confirm Account Removal</source>
<translation>Потврда уклањања налога</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="564"/>
+ <location filename="../src/gui/accountsettings.cpp" line="639"/>
<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="570"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="158"/>
<source>Open folder</source>
<translation>Отвори фасциклу</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="168"/>
- <source>Choose What to Sync</source>
- <translation>Избор шта синхронизовати</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Resume sync</source>
<translation>Настави синхронизацију</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Pause sync</source>
<translation>Паузирај синхронизацију</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="176"/>
- <source>Remove sync</source>
- <translation>Уклони синхронизацију</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="277"/>
- <source>Confirm Sync Removal</source>
- <translation>Потврда уклањања синхронизације</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="278"/>
+ <location filename="../src/gui/accountsettings.cpp" line="283"/>
<source><p>Do you really want to stop syncing the folder <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="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="452"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="448"/>
+ <location filename="../src/gui/accountsettings.cpp" line="453"/>
<source>%1 of %2 in use</source>
<translation>%1% од %2 искоришћено</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="453"/>
+ <location filename="../src/gui/accountsettings.cpp" line="462"/>
<source>Currently there is no storage usage information available.</source>
<translation>Тренутно нема доступних података о заузећу складишта.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="507"/>
<source>No %1 connection configured.</source>
<translation>Нема подешене %1 везе.</translation>
</message>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="95"/>
+ <location filename="../src/gui/accountstate.cpp" line="99"/>
<source>Signed out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="97"/>
+ <location filename="../src/gui/accountstate.cpp" line="101"/>
<source>Disconnected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="99"/>
+ <location filename="../src/gui/accountstate.cpp" line="103"/>
<source>Connected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="101"/>
+ <location filename="../src/gui/accountstate.cpp" line="105"/>
<source>Service unavailable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="103"/>
+ <location filename="../src/gui/accountstate.cpp" line="107"/>
<source>Network error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="105"/>
+ <location filename="../src/gui/accountstate.cpp" line="109"/>
<source>Configuration error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="107"/>
+ <location filename="../src/gui/accountstate.cpp" line="111"/>
<source>Unknown account state</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>Reauthentication required</source>
+ <translation>Неопходна поновна аутентификација</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>You need to re-login to continue using the account %1.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
<translation>Ажурирајте сервер и поново покрените клијента.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="143"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="135"/>
<source>Authentication error: Either username or password are wrong.</source>
<translation>Грешка аутентификације: лозинка или корисничко име су погрешни.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="155"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="147"/>
<source>timeout</source>
<translation>истек времена</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="186"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="178"/>
<source>The provided credentials are not correct</source>
<translation>Дати акредитиви нису исправни</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="524"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="537"/>
<source>Aborted by the user</source>
<translation>Прекинуо корисник</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="107"/>
+ <location filename="../src/gui/folder.cpp" line="108"/>
<source>Unable to create csync-context</source>
<translation>Не могу да направим „csync“ контекст</translation>
</message>
<translation>Активност синхронизације</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="845"/>
+ <location filename="../src/gui/folder.cpp" line="870"/>
<source>Could not read system exclude file</source>
<translation>Не могу да прочитам системски списак за игнорисање</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1102"/>
+ <location filename="../src/gui/folder.cpp" line="1127"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1115"/>
+ <location filename="../src/gui/folder.cpp" line="1140"/>
<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="1119"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Remove All Files?</source>
<translation>Уклонити све фајлове?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1121"/>
+ <location filename="../src/gui/folder.cpp" line="1146"/>
<source>Remove all files</source>
<translation>Уклони све фајлове</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1122"/>
+ <location filename="../src/gui/folder.cpp" line="1147"/>
<source>Keep files</source>
<translation>Остави фајлове</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="275"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<source>Could not reset folder state</source>
<translation>Не могу да ресетујем стање фасцикле</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="276"/>
+ <location filename="../src/gui/folderman.cpp" line="271"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Пронађен је стари журнал синхронизације „%1“ али се не може уклонити. Проверите да га нека апликација тренутно не користи.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="877"/>
+ <location filename="../src/gui/folderman.cpp" line="865"/>
<source> (backup)</source>
<translation> (резерва)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="882"/>
+ <location filename="../src/gui/folderman.cpp" line="870"/>
<source> (backup %1)</source>
<translation> (резерва %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1091"/>
+ <location filename="../src/gui/folderman.cpp" line="1079"/>
<source>Undefined State.</source>
<translation>Неодређено стање.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1094"/>
- <source>Waits to start syncing.</source>
- <translation>Чекам почетак синхронизације.</translation>
+ <location filename="../src/gui/folderman.cpp" line="1082"/>
+ <source>Waiting to start syncing.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1097"/>
+ <location filename="../src/gui/folderman.cpp" line="1085"/>
<source>Preparing for sync.</source>
<translation>Припремам синхронизацију.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1100"/>
+ <location filename="../src/gui/folderman.cpp" line="1088"/>
<source>Sync is running.</source>
<translation>Синхронизација у току.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1103"/>
+ <location filename="../src/gui/folderman.cpp" line="1091"/>
<source>Last Sync was successful.</source>
<translation>Последња синхронизација је била успешна.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1108"/>
+ <location filename="../src/gui/folderman.cpp" line="1096"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Последња синхронизација је била успешна али са упозорењима за поједине фајлове.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1111"/>
+ <location filename="../src/gui/folderman.cpp" line="1099"/>
<source>Setup Error.</source>
<translation>Грешка подешавања.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1114"/>
+ <location filename="../src/gui/folderman.cpp" line="1102"/>
<source>User Abort.</source>
<translation>Корисник прекинуо.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1117"/>
+ <location filename="../src/gui/folderman.cpp" line="1105"/>
<source>Sync is paused.</source>
<translation>Синхронизација је паузирана.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1123"/>
+ <location filename="../src/gui/folderman.cpp" line="1111"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (синхронизација паузирана)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1119"/>
<source>No valid folder selected!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1130"/>
<source>The selected path is not a folder!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1146"/>
+ <location filename="../src/gui/folderman.cpp" line="1134"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Немате дозволе за упис у изабрану фасциклу!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1161"/>
+ <location filename="../src/gui/folderman.cpp" line="1149"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1166"/>
+ <location filename="../src/gui/folderman.cpp" line="1154"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1173"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1168"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1186"/>
+ <location filename="../src/gui/folderman.cpp" line="1174"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="85"/>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="274"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="271"/>
<source>File</source>
<translation>Фајл</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="228"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="224"/>
<source>Syncing selected files in your account with</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="231"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="227"/>
<source>Remote path: %1</source>
<translation>Удаљена путања: %1</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="121"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="122"/>
<source>You need to be connected to add a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="126"/>
- <source>Adding folder is disabled because your 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="131"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="132"/>
<source>Click this button to add a folder to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="141"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="142"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="156"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
<source>Error while loading the list of folders from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="182"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="192"/>
<source>Signed out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="727"/>
- <source>Discovering '%1'</source>
- <translation>Откривам „%1“</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="127"/>
+ <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="787"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="163"/>
+ <source>Fetching folder list from server...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="789"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="849"/>
<source>Syncing %1</source>
<translation>Синхронизујем %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="792"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="854"/>
<source>download %1/s</source>
<translation>преузми %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="794"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="856"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="800"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>upload %1/s</source>
<translation>отпреми %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="802"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="864"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="807"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="869"/>
<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="811"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="873"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="827"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="889"/>
<source>%1 of %2, file %3 of %4
Total time left %5</source>
<translation>%1 од %2, фајл %3 од %4
укупно преостало %5</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
<source>file %1 of %2</source>
<translation>фајл %1 од %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="932"/>
<source>Waiting...</source>
<translation>Чекам...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="934"/>
<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="878"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>Preparing to sync...</source>
<translation>Припремам синхронизацију...</translation>
</message>
<name>OCC::FolderWizard</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <source>Add Folder Sync Connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderwizard.cpp" line="564"/>
- <source>Add Folder</source>
- <translation>Додај фасциклу</translation>
+ <source>Add Sync Connection</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Напредно</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="61"/>
+ <location filename="../src/gui/generalsettings.ui" line="109"/>
<source>Ask confirmation before downloading folders larger than</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
+ <location filename="../src/gui/generalsettings.ui" line="129"/>
<source>MB</source>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="109"/>
+ <location filename="../src/gui/generalsettings.ui" line="159"/>
<source>Show crash reporter</source>
<translation>Прикажи извештај о паду</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="118"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit Ignored Files</source>
<translation>Уреди игнорисане фајлове</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="142"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
<source>Add an Account</source>
<translation>Додај налог</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="167"/>
- <location filename="../src/gui/generalsettings.ui" line="173"/>
+ <location filename="../src/gui/generalsettings.ui" line="171"/>
+ <location filename="../src/gui/generalsettings.ui" line="177"/>
<source>About</source>
<translation>О програму</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <location filename="../src/gui/generalsettings.ui" line="187"/>
<source>Updates</source>
<translation>Ажурирања</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="208"/>
+ <location filename="../src/gui/generalsettings.ui" line="212"/>
<source>&Restart && Update</source>
<translation>&Поново покрени и ажурирај</translation>
</message>
</context>
-<context>
- <name>OCC::HttpCredentials</name>
- <message>
- <location filename="../src/libsync/creds/httpcredentials.cpp" line="290"/>
- <source>Reading from keychain failed with error: '%1'</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="32"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
<source>Please enter %1 password:
User: %2
</translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="41"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <source>Reading from keychain failed with error: '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
<source>Enter Password</source>
<translation>Унесите лозинку</translation>
</message>
<translation>Уклони</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="40"/>
<source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="109"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
<source>Could not open file</source>
<translation>Не могу да отворим фајл</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="111"/>
<source>Cannot write changes to '%1'.</source>
<translation>Не могу да упишем измене у „%1“</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="138"/>
<source>Add Ignore Pattern</source>
<translation>Додавање шаблона за игнорисање</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>Add a new ignore pattern:</source>
<translation>Додајте нови шаблон за игнорисање:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="45"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="46"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Овај унос је системски из „%1“ и не може се овде изменити.</translation>
</message>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="163"/>
+ <location filename="../src/libsync/logger.cpp" line="190"/>
<source>Error</source>
<translation>Грешка</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="164"/>
+ <location filename="../src/libsync/logger.cpp" line="191"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Фајл „%1“<br/>није уписив.<br/><br/>Записник се <b>не може</b> сачувати!</nobr></translation>
</message>
</message>
<message>
<location filename="../src/gui/networksettings.ui" line="203"/>
- <location filename="../src/gui/networksettings.ui" line="295"/>
+ <location filename="../src/gui/networksettings.ui" line="292"/>
<source>No limit</source>
<translation>без ограничења</translation>
</message>
<source>SOCKS5 proxy</source>
<translation>СОКС-5 прокси</translation>
</message>
+ <message>
+ <location filename="../src/gui/networksettings.cpp" line="128"/>
+ <source>Qt >= 5.4 is required in order to use the bandwidth limit</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::OCUpdater</name>
<source>Downloading version %1. Please wait...</source>
<translation>Преузимам верзију %1. Сачекајте...</translation>
</message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
- <source>Version %1 available. Restart application to start the update.</source>
- <translation>Верзија %1 је доступна. Поново покрените апликацију да почнете ажурирање.</translation>
- </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="145"/>
<source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
<source>Could not check for new updates.</source>
<translation>Не могу да проверим нова ажурирања.</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
+ <source>%1 version %2 available. Restart application to start the update.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
- <source>New version %1 available. Please use the system's update tool to install it.</source>
- <translation>Нова верзија %1 је доступна. Употребите системски алат за ажурирање да је инсталирате.</translation>
+ <source>New %1 version %2 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="151"/>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="114"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="110"/>
<source>Connection Timeout</source>
<translation>Веза је истекла</translation>
</message>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="171"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="167"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Неисправан ЈСОН одговор са адресе упита</translation>
</message>
</context>
-<context>
- <name>OCC::PropagateDownloadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="435"/>
- <source>Sync was aborted by user.</source>
- <translation>Корисник је прекинуо синхронизацију.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="488"/>
- <source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation>Ниједна е-ознака није примљена са сервера. Проверите прокси или мрежни излаз</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="494"/>
- <source>We received a different E-Tag for resuming. Retrying next time.</source>
- <translation>Добијена је различита е-ознака за наставак преноса. Покушаћу следећи пут.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="516"/>
- <source>Server returned wrong content-range</source>
- <translation>Сервер је вратио погрешан опсег садржаја</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="567"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation>Фајл %1 се не може преузети јер се судара са називом локалног фајла!</translation>
- </message>
-</context>
<context>
<name>OCC::PropagateDownloadFileQNAM</name>
<message>
<translation>Фајл %1 се не може преузети јер се судара са називом локалног фајла!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="457"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
+ <source>The download would reduce free disk space below %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="372"/>
+ <source>Free space on disk is less than %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="482"/>
<source>File was deleted from server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="506"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="531"/>
<source>The file could not be downloaded completely.</source>
<translation>Фајл није могао бити преузет у потпуности.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="601"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="636"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Фајл %1 се не може сачувати јер се судара са називом локалног фајла!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="641"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="676"/>
<source>File has changed since discovery</source>
<translation>Фајл је измењен у међувремену</translation>
</message>
<context>
<name>OCC::PropagateItemJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="92"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
<source>; Restoration Failed: %1</source>
<translation>; Враћање није успело: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="138"/>
<source>Continue blacklisting:</source>
<translation>Настави блокирање:</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="230"/>
<source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove folder '%1';</source>
+ <source>Could not remove folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="243"/>
- <location filename="../src/libsync/propagator_legacy.cpp" line="302"/>
- <source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>Локални фајл је измењен током синхронизације. Синхронизујте када се преузме у целости</translation>
- </message>
+ <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="246"/>
- <source>Sync was aborted by user.</source>
- <translation>Ð\9aоÑ\80иÑ\81ник Ñ\98е пÑ\80екинÑ\83о Ñ\81инÑ\85Ñ\80онизаÑ\86иÑ\98Ñ\83.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="205"/>
+ <source>File name contains at least one invalid character</source>
+ <translation>Ð\9dазив Ñ\81адÑ\80жи баÑ\80 Ñ\98едан недозвоÑ\99ен каÑ\80акÑ\82еÑ\80</translation>
</message>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="252"/>
- <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
- <translation>Фајл је измењен локално али је у саставу дељења које је само за читање. Враћен је у претходно стање а измене су у фајлу сукоба.</translation>
- </message>
-</context>
-<context>
- <name>OCC::PropagateUploadFileQNAM</name>
- <message>
- <location filename="../src/libsync/propagateupload.cpp" line="226"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="262"/>
<source>File Removed</source>
<translation>Фајл уклоњен</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="274"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Локални фајл је измењен током синхронизације. Биће настављена.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="250"/>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="286"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="665"/>
<source>Local file changed during sync.</source>
<translation>Локални фајл измењен током синхронизације.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="558"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="592"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>Присили прекид посла код прекида ХТТП везе са КуТ < 5.4.2</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="566"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="600"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Фајл је измењен локално али је у саставу дељења које је само за читање. Враћен је у претходно стање а измене су у фајлу сукоба.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="597"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="631"/>
<source>Poll URL missing</source>
<translation>Адреса упита недостаје</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="620"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="654"/>
<source>The local file was removed during sync.</source>
<translation>Локални фајл је уклоњен током синхронизације.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="646"/>
- <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
- <translation>Сервер није потврдио последње парче. (није било е-ознаке)</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="680"/>
+ <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Неозначене фасцикле биће <b>уклоњене</b> из локалног фајл-система и више се неће синхронизовати на овом рачунару</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>Изаберите шта синхронизујете. Изаберите удаљене фасцикле које желите да синхронизујете.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>Изаберите шта синхронизујете. Избаците удаљене фасцикле које не желите да синхронизујете.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
<source>Choose What to Sync</source>
<translation>Изаберите шта синхронизовати</translation>
</message>
<translation>величина</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
<source>No subfolders currently on the server.</source>
<translation>На серверу тренутно нема потфасцикли.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>Дошло је до грешке при учитавању листе потфасикли.</translation>
</message>
<translation>Поставке</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="80"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="84"/>
<source>Activity</source>
<translation>Активност</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="86"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="90"/>
<source>General</source>
<translation>Опште</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>Network</source>
<translation>Мрежа</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharedialog.ui" line="22"/>
- <location filename="../src/gui/sharedialog.ui" line="234"/>
+ <location filename="../src/gui/sharedialog.ui" line="258"/>
<source>TextLabel</source>
<translation>Текст ознака</translation>
</message>
<translation>оунКлауд путања:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="182"/>
+ <location filename="../src/gui/sharedialog.ui" line="116"/>
<source>Set &password </source>
<translation>Постави &лозинку</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="196"/>
+ <location filename="../src/gui/sharedialog.ui" line="130"/>
<source>Set &expiration date</source>
<translation>Датум &истека</translation>
</message>
+ <message>
+ <location filename="../src/gui/sharedialog.ui" line="214"/>
+ <source>Allow editing</source>
+ <translation>Дозволи уређивање</translation>
+ </message>
<message>
<location filename="../src/gui/sharedialog.ui" line="77"/>
<source>Share link</source>
<translation>Веза дељења</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="125"/>
+ <location filename="../src/gui/sharedialog.ui" line="203"/>
<source>Copy &link</source>
<translation>Копирај &везу</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="142"/>
+ <location filename="../src/gui/sharedialog.ui" line="154"/>
<source>Set password</source>
<translation>Постави лозинку</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="692"/>
- <source>%1 path: %2</source>
- <translation>%1 путања: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="115"/>
+ <location filename="../src/gui/sharedialog.cpp" line="120"/>
<source>%1 Sharing</source>
<translation>%1 дељење</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="103"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="112"/>
+ <location filename="../src/gui/sharedialog.cpp" line="117"/>
<source>Folder: %2</source>
<translation>Фасцикла: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="121"/>
<source>P&assword protect</source>
<translation>&Заштићено лозинком</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="221"/>
+ <location filename="../src/gui/sharedialog.cpp" line="214"/>
<source>Password Protected</source>
<translation>Заштићено лозинком</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="382"/>
+ <location filename="../src/gui/sharedialog.cpp" line="338"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Фајл се не може делити јер је подељен без дозволе за поновно дељење.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="528"/>
+ <location filename="../src/gui/sharedialog.cpp" line="475"/>
<source>Please Set Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="564"/>
- <location filename="../src/gui/sharedialog.cpp" line="565"/>
+ <location filename="../src/gui/sharedialog.cpp" line="538"/>
+ <location filename="../src/gui/sharedialog.cpp" line="539"/>
<source>&Share link</source>
<translation>&Веза дељења</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="583"/>
+ <location filename="../src/gui/sharedialog.cpp" line="552"/>
+ <location filename="../src/gui/sharedialog.cpp" line="564"/>
<source>OCS API error code: %1</source>
<translation>ОЦС АПИ код грешке: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="605"/>
- <source>There is no sync folder configured.</source>
- <translation>Фасцикла за синхронизацију није подешена.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="639"/>
- <source>A sync file with the same name exists. The file cannot be registered to sync.</source>
- <translation>Фајл са истим називом већ постоји. Не може се изабрати за синхронизацију.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="684"/>
- <source>The file cannot be synced.</source>
- <translation>Фајл се не може синхронизовати.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="624"/>
- <source>Sharing of external directories is not yet working.</source>
- <translation>Дељење спољних директоријума још увек не ради.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="473"/>
- <location filename="../src/gui/sharedialog.cpp" line="506"/>
+ <location filename="../src/gui/sharedialog.cpp" line="418"/>
+ <location filename="../src/gui/sharedialog.cpp" line="460"/>
<source>Public sh&aring requires a password</source>
<translation>Јавно дељење з&хтева лозинку</translation>
</message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="617"/>
- <source>Cannot find a folder to upload to.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
- <source>Waiting to upload...</source>
- <translation>Чекам отпремање...</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="653"/>
- <source>Unable to register in sync space.</source>
- <translation>Не могу да пријавим синхронизацију.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="694"/>
- <source>Sync of registered file was not successful yet.</source>
- <translation>Синхронизација пријављеног фајла још није успела.</translation>
- </message>
</context>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>Login Error</source>
<translation>Грешка пријављивања</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>You must sign in as user %1</source>
<translation>Морате се пријавити као %1</translation>
</message>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="452"/>
+ <location filename="../src/gui/socketapi.cpp" line="447"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Подели са %1</translation>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="97"/>
+ <location filename="../src/libsync/syncengine.cpp" line="94"/>
<source>Success.</source>
<translation>Успешно.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="104"/>
+ <location filename="../src/libsync/syncengine.cpp" line="101"/>
<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="107"/>
+ <location filename="../src/libsync/syncengine.cpp" line="104"/>
<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="110"/>
+ <location filename="../src/libsync/syncengine.cpp" line="107"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync има грешку при обради интерног стабла.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="113"/>
+ <location filename="../src/libsync/syncengine.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync не може да резервише меморију.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>CSync фатална грешка параметара.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="119"/>
+ <location filename="../src/libsync/syncengine.cpp" line="116"/>
<source>CSync processing step update failed.</source>
<translation>CSync није успео да ажурира корак процесирања.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="122"/>
+ <location filename="../src/libsync/syncengine.cpp" line="119"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync није успео да усклади корак процесирања.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="122"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync не може да се аутентификује на проксију.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="125"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync не налази прокси или сервер.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="128"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync не може да се аутентификује на %1 серверу.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="131"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync не може да приступи мрежи.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="134"/>
<source>A network connection timeout happened.</source>
<translation>Истекло је време за повезивање.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="137"/>
<source>A HTTP transmission error happened.</source>
<translation>Дошло је до грешке ХТТП преноса.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation>CSync није успео јер нема радње услед одбијања дозвола.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
<source>An error occurred while opening a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
<source>Error while reading folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="996"/>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
<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="1003"/>
+ <location filename="../src/libsync/syncengine.cpp" line="991"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: нема простора на %1 серверу.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="152"/>
<source>CSync unspecified error.</source>
<translation>CSync недефинисана грешка.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="155"/>
<source>Aborted by the user</source>
<translation>Прекинуо корисник</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="392"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="143"/>
<source>CSync failed to access</source>
<translation>CSync није приступио</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <location filename="../src/libsync/syncengine.cpp" line="97"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <source>CSync failed due to unhandled permission denied.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="146"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="158"/>
<source>The service is temporarily unavailable</source>
<translation>Услуга је привремено недоступна</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="175"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>An internal error number %1 occurred.</source>
<translation>Десила се интерна грешка број %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="227"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Ставка није синхронизована због ранијих грешака: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="389"/>
+ <location filename="../src/libsync/syncengine.cpp" line="386"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Симболичке везе нису подржане у синхронизацији.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="392"/>
+ <location filename="../src/libsync/syncengine.cpp" line="389"/>
<source>File is listed on the ignore list.</source>
<translation>Фајл се налази на листи за игнорисање.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="398"/>
+ <location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename is too long.</source>
<translation>Назив фајла је предугачак.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="401"/>
+ <location filename="../src/libsync/syncengine.cpp" line="398"/>
<source>File is ignored because it's hidden.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="407"/>
+ <location filename="../src/libsync/syncengine.cpp" line="404"/>
<source>Stat failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="429"/>
+ <location filename="../src/libsync/syncengine.cpp" line="426"/>
<source>Filename encoding is not valid</source>
<translation>Кодирање назива фајла није исправно</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="561"/>
+ <location filename="../src/libsync/syncengine.cpp" line="558"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="631"/>
+ <location filename="../src/libsync/syncengine.cpp" line="612"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="645"/>
<source>Unable to initialize a sync journal.</source>
<translation>Није могуће покренути у синхронизацију дневника.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="718"/>
+ <location filename="../src/libsync/syncengine.cpp" line="723"/>
<source>Cannot open the sync journal</source>
<translation>Не могу да отворим дневник синхронизације</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="965"/>
- <location filename="../src/libsync/syncengine.cpp" line="972"/>
+ <location filename="../src/libsync/syncengine.cpp" line="953"/>
+ <location filename="../src/libsync/syncengine.cpp" line="960"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Игнорисано јер се не налази на листи за синхронизацију</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <location filename="../src/libsync/syncengine.cpp" line="978"/>
<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="1023"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1011"/>
<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="1040"/>
- <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1028"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1048"/>
<source>Not allowed to remove, restoring</source>
<translation>Није могуће уклањање. Враћам</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1073"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1061"/>
<source>Local files and share folder removed.</source>
<translation>Локални фајлови и дељена фасцикла су уклоњени.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1116"/>
<source>Move not allowed, item restored</source>
<translation>Премештање није дозвољено. Ставка је враћена</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1125"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Премештање није дозвољено јер %1 је само за читање</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the destination</source>
<translation>одредиште</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the source</source>
<translation>извор</translation>
</message>
</message>
</context>
<context>
- <name>OCC::TransmissionChecksumValidator</name>
+ <name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="128"/>
<source>The checksum header is malformed.</source>
<translation>Заглавље контролне суме је лоше формирано.</translation>
</message>
<message>
<location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+ <source>The checksum header contained an unknown checksum type '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="148"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>Преузети фајл се не поклапа с контролном сумом. Биће настављено.</translation>
</message>
<source>Recent Changes</source>
<translation>Недавне измене</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="561"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="331"/>
<source>Managed Folders:</source>
<source>Open %1 in browser</source>
<translation>Отвори %1 у прегледачу</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="449"/>
- <source>Log out everywhere</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="457"/>
- <source>Log in everywhere...</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="513"/>
<source>Unknown status</source>
<source>Account %1: %2</source>
<translation>Налог %1: %2</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="449"/>
+ <source>Log out of all accounts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="457"/>
+ <source>Log in to all accounts...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="532"/>
<source>Crash now</source>
<source>No items synced recently</source>
<translation>Ништа није недавно синхронизовано</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="561"/>
- <source>Discovering '%1'</source>
- <translation>Откривам „%1“</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="566"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>%L1 B</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="306"/>
+ <location filename="../src/libsync/utility.cpp" line="303"/>
<source>%Ln year(s)</source>
<translation>%Ln година(е)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="307"/>
+ <location filename="../src/libsync/utility.cpp" line="304"/>
<source>%Ln month(s)</source>
<translation>%Ln месец(и)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="308"/>
+ <location filename="../src/libsync/utility.cpp" line="305"/>
<source>%Ln day(s)</source>
<translation>%Ln дан(а)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="309"/>
+ <location filename="../src/libsync/utility.cpp" line="306"/>
<source>%Ln hour(s)</source>
<translation>%Ln сат(и)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="310"/>
+ <location filename="../src/libsync/utility.cpp" line="307"/>
<source>%Ln minute(s)</source>
<translation>%Ln минут(а)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="311"/>
+ <location filename="../src/libsync/utility.cpp" line="308"/>
<source>%Ln second(s)</source>
<translation>%Ln секунд(и)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="318"/>
<source>0 seconds</source>
<translation>0 секунди</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="336"/>
+ <location filename="../src/libsync/utility.cpp" line="333"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="73"/>
- <source>Remove the account configuration from the client</source>
+ <source>Enter your credentials to connect to the server</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="76"/>
+ <source>Sign in</source>
+ <translation>Logga in</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="89"/>
+ <source>Remove the account configuration from the client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Remove Account</source>
<translation>Radera Konto</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="97"/>
+ <location filename="../src/gui/accountsettings.ui" line="113"/>
<source>Storage space: ...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="167"/>
+ <location filename="../src/gui/accountsettings.ui" line="183"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>De mappar som inte väljs kommer att <b>raderas</b> från det lokala filsystemet och kommer inte att synkroniseras till den här datorn längre.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="230"/>
<source>Apply</source>
<translation>Tillämpa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="198"/>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
- <location filename="../src/gui/accountsettings.cpp" line="571"/>
+ <location filename="../src/gui/accountsettings.ui" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="289"/>
+ <location filename="../src/gui/accountsettings.cpp" line="646"/>
<source>Cancel</source>
<translation>Avbryt</translation>
</message>
<translation>Ansluten till <server> som <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="115"/>
+ <location filename="../src/gui/accountsettings.cpp" line="121"/>
<source>No account configured.</source>
<translation>Inget konto är konfigurerat.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="161"/>
+ <source>Choose what to sync</source>
+ <translation>Välj vad som ska synkas</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="168"/>
+ <source>Remove folder sync connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="234"/>
<source>Folder creation failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="230"/>
+ <location filename="../src/gui/accountsettings.cpp" line="235"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="283"/>
- <source>Stop syncing</source>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
+ <source>Confirm Folder Sync Connection Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="309"/>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>Remove Folder Sync Connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="314"/>
<source>Confirm Folder Reset</source>
<translation>Bekräfta återställning av mapp</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="310"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Vill du verkligen nollställa mappen <i>%1</i> och återställa din databas?</p><p><b>Notera:</b> Denna funktion är endast designad för underhållsuppgifter. Inga filer raderas, men kan skapa mycket datatrafik och ta allt från några minuter till flera timmar att slutföra, beroende på storleken på mappen. Använd endast detta alternativ om du har blivit uppmanad av din systemadministratör.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="391"/>
+ <location filename="../src/gui/accountsettings.cpp" line="396"/>
<source>Sync Running</source>
<translation>Synkronisering pågår</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="392"/>
+ <location filename="../src/gui/accountsettings.cpp" line="397"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>En synkronisering pågår.<br/>Vill du avbryta den?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="472"/>
+ <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <source>%1 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="485"/>
<source>%1 as <i>%2</i></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="476"/>
+ <location filename="../src/gui/accountsettings.cpp" line="495"/>
<source>Connected to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="478"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
<source>Server %1 is temporarily unavailable.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="480"/>
+ <location filename="../src/gui/accountsettings.cpp" line="499"/>
<source>Signed out from %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="482"/>
+ <location filename="../src/gui/accountsettings.cpp" line="501"/>
<source>No connection to %1 at %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
- <source>There are new folders that were not synchronized because they are too big: %1</source>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <source>There are new folders that were not synchronized because they are too big: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="536"/>
- <source>, </source>
- <translation>,</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="563"/>
+ <location filename="../src/gui/accountsettings.cpp" line="638"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="564"/>
+ <location filename="../src/gui/accountsettings.cpp" line="639"/>
<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="570"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="158"/>
<source>Open folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="168"/>
- <source>Choose What to Sync</source>
- <translation>Välj vad som ska synkas</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="176"/>
- <source>Remove sync</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="277"/>
- <source>Confirm Sync Removal</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="278"/>
+ <location filename="../src/gui/accountsettings.cpp" line="283"/>
<source><p>Do you really want to stop syncing the folder <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="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="452"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="448"/>
+ <location filename="../src/gui/accountsettings.cpp" line="453"/>
<source>%1 of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="453"/>
+ <location filename="../src/gui/accountsettings.cpp" line="462"/>
<source>Currently there is no storage usage information available.</source>
<translation>Just nu finns ingen utrymmes information tillgänglig</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="507"/>
<source>No %1 connection configured.</source>
<translation>Ingen %1 anslutning konfigurerad.</translation>
</message>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="95"/>
+ <location filename="../src/gui/accountstate.cpp" line="99"/>
<source>Signed out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="97"/>
+ <location filename="../src/gui/accountstate.cpp" line="101"/>
<source>Disconnected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="99"/>
+ <location filename="../src/gui/accountstate.cpp" line="103"/>
<source>Connected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="101"/>
+ <location filename="../src/gui/accountstate.cpp" line="105"/>
<source>Service unavailable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="103"/>
+ <location filename="../src/gui/accountstate.cpp" line="107"/>
<source>Network error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="105"/>
+ <location filename="../src/gui/accountstate.cpp" line="109"/>
<source>Configuration error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="107"/>
+ <location filename="../src/gui/accountstate.cpp" line="111"/>
<source>Unknown account state</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>Reauthentication required</source>
+ <translation>Autentisering krävs</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>You need to re-login to continue using the account %1.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
<translation>Uppgradera servern och starta sedan om klienten.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="143"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="135"/>
<source>Authentication error: Either username or password are wrong.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="155"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="147"/>
<source>timeout</source>
<translation>timeout</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="186"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="178"/>
<source>The provided credentials are not correct</source>
<translation>De angivna uppgifterna stämmer ej</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="524"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="537"/>
<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="107"/>
+ <location filename="../src/gui/folder.cpp" line="108"/>
<source>Unable to create csync-context</source>
<translation>Kan inte skapa csync-context</translation>
</message>
<translation>Synk aktivitet</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="845"/>
+ <location filename="../src/gui/folder.cpp" line="870"/>
<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="1102"/>
+ <location filename="../src/gui/folder.cpp" line="1127"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1115"/>
+ <location filename="../src/gui/folder.cpp" line="1140"/>
<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="1119"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Remove All Files?</source>
<translation>Ta bort alla filer?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1121"/>
+ <location filename="../src/gui/folder.cpp" line="1146"/>
<source>Remove all files</source>
<translation>Ta bort alla filer</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1122"/>
+ <location filename="../src/gui/folder.cpp" line="1147"/>
<source>Keep files</source>
<translation>Behåll filer</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="275"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<source>Could not reset folder state</source>
<translation>Kunde inte återställa mappens skick</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="276"/>
+ <location filename="../src/gui/folderman.cpp" line="271"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>En gammal synkroniseringsjournal '%1' hittades, men kunde inte raderas. Vänligen se till att inga program för tillfället använder den.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="877"/>
+ <location filename="../src/gui/folderman.cpp" line="865"/>
<source> (backup)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="882"/>
+ <location filename="../src/gui/folderman.cpp" line="870"/>
<source> (backup %1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1091"/>
+ <location filename="../src/gui/folderman.cpp" line="1079"/>
<source>Undefined State.</source>
<translation>Okänt tillstånd.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1094"/>
- <source>Waits to start syncing.</source>
- <translation>Väntar på att starta synkronisering.</translation>
+ <location filename="../src/gui/folderman.cpp" line="1082"/>
+ <source>Waiting to start syncing.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1097"/>
+ <location filename="../src/gui/folderman.cpp" line="1085"/>
<source>Preparing for sync.</source>
<translation>Förbereder synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1100"/>
+ <location filename="../src/gui/folderman.cpp" line="1088"/>
<source>Sync is running.</source>
<translation>Synkronisering pågår.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1103"/>
+ <location filename="../src/gui/folderman.cpp" line="1091"/>
<source>Last Sync was successful.</source>
<translation>Senaste synkronisering lyckades.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1108"/>
+ <location filename="../src/gui/folderman.cpp" line="1096"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Senaste synkning lyckades, men det finns varningar för vissa filer!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1111"/>
+ <location filename="../src/gui/folderman.cpp" line="1099"/>
<source>Setup Error.</source>
<translation>Inställningsfel.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1114"/>
+ <location filename="../src/gui/folderman.cpp" line="1102"/>
<source>User Abort.</source>
<translation>Användare Avbryt</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1117"/>
+ <location filename="../src/gui/folderman.cpp" line="1105"/>
<source>Sync is paused.</source>
<translation>Synkronisering är pausad.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1123"/>
+ <location filename="../src/gui/folderman.cpp" line="1111"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synk är stoppad)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1119"/>
<source>No valid folder selected!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1130"/>
<source>The selected path is not a folder!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1146"/>
+ <location filename="../src/gui/folderman.cpp" line="1134"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Du har inga skrivrättigheter till den valda mappen!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1161"/>
+ <location filename="../src/gui/folderman.cpp" line="1149"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1166"/>
+ <location filename="../src/gui/folderman.cpp" line="1154"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1173"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1168"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1186"/>
+ <location filename="../src/gui/folderman.cpp" line="1174"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="85"/>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="274"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="271"/>
<source>File</source>
<translation>Fil</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="228"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="224"/>
<source>Syncing selected files in your account with</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="231"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="227"/>
<source>Remote path: %1</source>
<translation>Fjärrsökväg: %1</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="121"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="122"/>
<source>You need to be connected to add a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="126"/>
- <source>Adding folder is disabled because your 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="131"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="132"/>
<source>Click this button to add a folder to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="141"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="142"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="156"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
<source>Error while loading the list of folders from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="182"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="192"/>
<source>Signed out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="727"/>
- <source>Discovering '%1'</source>
- <translation>Söker igenom '%1'</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="127"/>
+ <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="163"/>
+ <source>Fetching folder list from server...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="787"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="789"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="849"/>
<source>Syncing %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="792"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="854"/>
<source>download %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="794"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="856"/>
<source>u2193 %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="800"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>upload %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="802"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="864"/>
<source>u2191 %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="807"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="869"/>
<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="811"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="873"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="827"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="889"/>
<source>%1 of %2, file %3 of %4
Total time left %5</source>
<translation>%1 av %2, fil %3 av %4
Total tid kvar %5</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
<source>file %1 of %2</source>
<translation>fil %1 av %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="932"/>
<source>Waiting...</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="934"/>
<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="878"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>Preparing to sync...</source>
<translation type="unfinished"/>
</message>
<name>OCC::FolderWizard</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <source>Add Folder Sync Connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderwizard.cpp" line="564"/>
- <source>Add Folder</source>
- <translation>Lägg till mapp</translation>
+ <source>Add Sync Connection</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Avancerad</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="61"/>
+ <location filename="../src/gui/generalsettings.ui" line="109"/>
<source>Ask confirmation before downloading folders larger than</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
+ <location filename="../src/gui/generalsettings.ui" line="129"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="109"/>
+ <location filename="../src/gui/generalsettings.ui" line="159"/>
<source>Show crash reporter</source>
<translation>Visa kraschrapporteringsverktyg</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="118"/>
+ <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="142"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
<source>Add an Account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="167"/>
- <location filename="../src/gui/generalsettings.ui" line="173"/>
+ <location filename="../src/gui/generalsettings.ui" line="171"/>
+ <location filename="../src/gui/generalsettings.ui" line="177"/>
<source>About</source>
<translation>Om</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <location filename="../src/gui/generalsettings.ui" line="187"/>
<source>Updates</source>
<translation>Uppdateringar</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="208"/>
+ <location filename="../src/gui/generalsettings.ui" line="212"/>
<source>&Restart && Update</source>
<translation>%Starta om && Uppdatera</translation>
</message>
</context>
-<context>
- <name>OCC::HttpCredentials</name>
- <message>
- <location filename="../src/libsync/creds/httpcredentials.cpp" line="290"/>
- <source>Reading from keychain failed with error: '%1'</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="32"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
<source>Please enter %1 password:
User: %2
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="41"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <source>Reading from keychain failed with error: '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
<source>Enter Password</source>
<translation>Ange lösenord</translation>
</message>
<translation>Radera</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="40"/>
<source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="109"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
<source>Could not open file</source>
<translation>Kunde inte öppna fil</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="111"/>
<source>Cannot write changes to '%1'.</source>
<translation>Kan inte skriva förändringar till '%1'.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="138"/>
<source>Add Ignore Pattern</source>
<translation>Lägg till synk-filter</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>Add a new ignore pattern:</source>
<translation>Lägg till ett nytt synk-filter:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="45"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="46"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Denna post hanteras av systemet på '%1' och kan inte ändras här.</translation>
</message>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="163"/>
+ <location filename="../src/libsync/logger.cpp" line="190"/>
<source>Error</source>
<translation>Fel</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="164"/>
+ <location filename="../src/libsync/logger.cpp" line="191"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Filen '%1'<br/>kan inte öppnas för skrivning.<br/><br/>Loggtexten kan <b>inte</b> sparas!</nobr></translation>
</message>
</message>
<message>
<location filename="../src/gui/networksettings.ui" line="203"/>
- <location filename="../src/gui/networksettings.ui" line="295"/>
+ <location filename="../src/gui/networksettings.ui" line="292"/>
<source>No limit</source>
<translation>Ingen gräns</translation>
</message>
<source>SOCKS5 proxy</source>
<translation>SOCKS5 proxy</translation>
</message>
+ <message>
+ <location filename="../src/gui/networksettings.cpp" line="128"/>
+ <source>Qt >= 5.4 is required in order to use the bandwidth limit</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::OCUpdater</name>
<source>Downloading version %1. Please wait...</source>
<translation>Laddar ner version %1. Var god vänta...</translation>
</message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
- <source>Version %1 available. Restart application to start the update.</source>
- <translation>Version %1 tillgänglig. Starta om applikationen för att start uppdateringen.</translation>
- </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="145"/>
<source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
<source>Could not check for new updates.</source>
<translation>Kunde inte söka efter uppdateringar.</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
+ <source>%1 version %2 available. Restart application to start the update.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
- <source>New version %1 available. Please use the system's update tool to install it.</source>
- <translation>Ny version %1 är tillgänglig. Vänligen använd systemets uppdateringverktyg för att installera den.</translation>
+ <source>New %1 version %2 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="151"/>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="114"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="110"/>
<source>Connection Timeout</source>
<translation>Anslutningen avbröts på grund av timeout</translation>
</message>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="171"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="167"/>
<source>Invalid JSON reply from the poll URL</source>
<translation type="unfinished"/>
</message>
</context>
-<context>
- <name>OCC::PropagateDownloadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="435"/>
- <source>Sync was aborted by user.</source>
- <translation>Synkningen avbröts av användare.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="488"/>
- <source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation>Ingen E-Tag mottogs från servern, kontrollera proxy/gateway</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="494"/>
- <source>We received a different E-Tag for resuming. Retrying next time.</source>
- <translation>Vi mottog en helt annan e-tag för att återuppta. Försök igen nästa gång.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="516"/>
- <source>Server returned wrong content-range</source>
- <translation>Servern returnerade felaktig content-range</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="567"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation>Fil %1 kan inte laddas ner på grund av namnkonflikt med en lokal fil!</translation>
- </message>
-</context>
<context>
<name>OCC::PropagateDownloadFileQNAM</name>
<message>
<translation>Fil %1 kan inte laddas ner på grund av namnkonflikt med en lokal fil!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="457"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
+ <source>The download would reduce free disk space below %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="372"/>
+ <source>Free space on disk is less than %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="482"/>
<source>File was deleted from server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="506"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="531"/>
<source>The file could not be downloaded completely.</source>
<translation>Filen kunde inte laddas ner fullständigt.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="601"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="636"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Fil %1 kan inte sparas eftersom namnet krockar med en lokal fil!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="641"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="676"/>
<source>File has changed since discovery</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateItemJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="92"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
<source>; Restoration Failed: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="138"/>
<source>Continue blacklisting:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="230"/>
<source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove folder '%1';</source>
+ <source>Could not remove folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="243"/>
- <location filename="../src/libsync/propagator_legacy.cpp" line="302"/>
- <source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>Lokal fil ändrades under synk, synkar när den har anlänt komplett</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="246"/>
- <source>Sync was aborted by user.</source>
- <translation>Synkningen avbröts av användare.</translation>
- </message>
+ <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="252"/>
- <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
- <translation>Filen ändrades lokalt men är en del av en endast-läsbar delning. Den återställdes och din editering är i konflikt filen.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="205"/>
+ <source>File name contains at least one invalid character</source>
+ <translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="226"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="262"/>
<source>File Removed</source>
<translation>Filen Raderad</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="274"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="250"/>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="286"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="665"/>
<source>Local file changed during sync.</source>
<translation>Lokal fil ändrades under synk.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="558"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="592"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="566"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="600"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Filen ändrades lokalt men är en del av en endast-läsbar delning. Den återställdes och din editering är i konflikt filen.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="597"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="631"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="620"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="654"/>
<source>The local file was removed during sync.</source>
<translation>Den lokala filen togs bort under synkronisering.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="646"/>
- <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
- <translation>Servern bekräftade inte det sista fil-fragmentet (Ingen e-tag fanns tillgänglig)</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="680"/>
+ <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>De mappar som inte väljs kommer att <b>raderas</b> från det lokala filsystemet och kommer inte att synkroniseras till den här datorn längre.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
<source>Choose What to Sync</source>
<translation>Välj vad som ska synkas</translation>
</message>
<translation>Storlek</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
<source>No subfolders currently on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
<source>An error occured while loading the list of sub folders.</source>
<translation type="unfinished"/>
</message>
<translation>Inställningar</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="80"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="84"/>
<source>Activity</source>
<translation>Aktivitet</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="86"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="90"/>
<source>General</source>
<translation>Allmänt</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>Network</source>
<translation>Nätverk</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharedialog.ui" line="22"/>
- <location filename="../src/gui/sharedialog.ui" line="234"/>
+ <location filename="../src/gui/sharedialog.ui" line="258"/>
<source>TextLabel</source>
<translation>Textetikett</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="182"/>
+ <location filename="../src/gui/sharedialog.ui" line="116"/>
<source>Set &password </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="196"/>
+ <location filename="../src/gui/sharedialog.ui" line="130"/>
<source>Set &expiration date</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/sharedialog.ui" line="214"/>
+ <source>Allow editing</source>
+ <translation>Tillåt redigering</translation>
+ </message>
<message>
<location filename="../src/gui/sharedialog.ui" line="77"/>
<source>Share link</source>
<translation>Dela länk</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="125"/>
+ <location filename="../src/gui/sharedialog.ui" line="203"/>
<source>Copy &link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="142"/>
+ <location filename="../src/gui/sharedialog.ui" line="154"/>
<source>Set password</source>
<translation>Ange lösenord</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="692"/>
- <source>%1 path: %2</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="115"/>
+ <location filename="../src/gui/sharedialog.cpp" line="120"/>
<source>%1 Sharing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="103"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="112"/>
+ <location filename="../src/gui/sharedialog.cpp" line="117"/>
<source>Folder: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="121"/>
<source>P&assword protect</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="221"/>
+ <location filename="../src/gui/sharedialog.cpp" line="214"/>
<source>Password Protected</source>
<translation>Lösenordsskyddad</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="382"/>
+ <location filename="../src/gui/sharedialog.cpp" line="338"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="528"/>
+ <location filename="../src/gui/sharedialog.cpp" line="475"/>
<source>Please Set Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="564"/>
- <location filename="../src/gui/sharedialog.cpp" line="565"/>
+ <location filename="../src/gui/sharedialog.cpp" line="538"/>
+ <location filename="../src/gui/sharedialog.cpp" line="539"/>
<source>&Share link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="583"/>
+ <location filename="../src/gui/sharedialog.cpp" line="552"/>
+ <location filename="../src/gui/sharedialog.cpp" line="564"/>
<source>OCS API error code: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="605"/>
- <source>There is no sync folder configured.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="639"/>
- <source>A sync file with the same name exists. The file cannot be registered to sync.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="684"/>
- <source>The file cannot be synced.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="624"/>
- <source>Sharing of external directories is not yet working.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="473"/>
- <location filename="../src/gui/sharedialog.cpp" line="506"/>
+ <location filename="../src/gui/sharedialog.cpp" line="418"/>
+ <location filename="../src/gui/sharedialog.cpp" line="460"/>
<source>Public sh&aring requires a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="617"/>
- <source>Cannot find a folder to upload to.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
- <source>Waiting to upload...</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="653"/>
- <source>Unable to register in sync space.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="694"/>
- <source>Sync of registered file was not successful yet.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>Login Error</source>
<translation>Login fel</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>You must sign in as user %1</source>
<translation>Du måste logga in som en användare %1</translation>
</message>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="452"/>
+ <location filename="../src/gui/socketapi.cpp" line="447"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Dela med %1</translation>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="97"/>
+ <location filename="../src/libsync/syncengine.cpp" line="94"/>
<source>Success.</source>
<translation>Lyckades.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="104"/>
+ <location filename="../src/libsync/syncengine.cpp" line="101"/>
<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="107"/>
+ <location filename="../src/libsync/syncengine.cpp" line="104"/>
<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="110"/>
+ <location filename="../src/libsync/syncengine.cpp" line="107"/>
<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="113"/>
+ <location filename="../src/libsync/syncengine.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync misslyckades att reservera minne.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>CSync fatal parameter fel.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="119"/>
+ <location filename="../src/libsync/syncengine.cpp" line="116"/>
<source>CSync processing step update failed.</source>
<translation>CSync processteg update misslyckades.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="122"/>
+ <location filename="../src/libsync/syncengine.cpp" line="119"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync processteg reconcile misslyckades.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="122"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="125"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="128"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="131"/>
<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="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="134"/>
<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="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="137"/>
<source>A HTTP transmission error happened.</source>
<translation>Ett HTTP överföringsfel inträffade.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation>CSYNC misslyckades på grund av att nekad åtkomst inte hanterades.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
<source>An error occurred while opening a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
<source>Error while reading folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="996"/>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
<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="1003"/>
+ <location filename="../src/libsync/syncengine.cpp" line="991"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="152"/>
<source>CSync unspecified error.</source>
<translation>CSync ospecificerat fel.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="155"/>
<source>Aborted by the user</source>
<translation>Avbruten av användare</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="392"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="143"/>
<source>CSync failed to access</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <location filename="../src/libsync/syncengine.cpp" line="97"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <source>CSync failed due to unhandled permission denied.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="146"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="158"/>
<source>The service is temporarily unavailable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="175"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>An internal error number %1 occurred.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="227"/>
<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="389"/>
+ <location filename="../src/libsync/syncengine.cpp" line="386"/>
<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="392"/>
+ <location filename="../src/libsync/syncengine.cpp" line="389"/>
<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="398"/>
+ <location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename is too long.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="401"/>
+ <location filename="../src/libsync/syncengine.cpp" line="398"/>
<source>File is ignored because it's hidden.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="407"/>
+ <location filename="../src/libsync/syncengine.cpp" line="404"/>
<source>Stat failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="429"/>
+ <location filename="../src/libsync/syncengine.cpp" line="426"/>
<source>Filename encoding is not valid</source>
<translation>Filnamnskodning är inte giltig</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="561"/>
+ <location filename="../src/libsync/syncengine.cpp" line="558"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="631"/>
+ <location filename="../src/libsync/syncengine.cpp" line="612"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="645"/>
<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="718"/>
+ <location filename="../src/libsync/syncengine.cpp" line="723"/>
<source>Cannot open the sync journal</source>
<translation>Kunde inte öppna synk journalen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="965"/>
- <location filename="../src/libsync/syncengine.cpp" line="972"/>
+ <location filename="../src/libsync/syncengine.cpp" line="953"/>
+ <location filename="../src/libsync/syncengine.cpp" line="960"/>
<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="990"/>
+ <location filename="../src/libsync/syncengine.cpp" line="978"/>
<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="1023"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1011"/>
<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="1040"/>
- <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1028"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1048"/>
<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="1073"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1061"/>
<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="1128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1116"/>
<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="1137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1125"/>
<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="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the destination</source>
<translation>destinationen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the source</source>
<translation>källan</translation>
</message>
</message>
</context>
<context>
- <name>OCC::TransmissionChecksumValidator</name>
+ <name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="128"/>
<source>The checksum header is malformed.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+ <source>The checksum header contained an unknown checksum type '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="148"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation type="unfinished"/>
</message>
<source>Recent Changes</source>
<translation>Senaste ändringar</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="561"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="331"/>
<source>Managed Folders:</source>
<source>Open %1 in browser</source>
<translation>Öppna %1 i webbläsaren</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="449"/>
- <source>Log out everywhere</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="457"/>
- <source>Log in everywhere...</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="513"/>
<source>Unknown status</source>
<source>Account %1: %2</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="449"/>
+ <source>Log out of all accounts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="457"/>
+ <source>Log in to all accounts...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="532"/>
<source>Crash now</source>
<source>No items synced recently</source>
<translation>Inga filer har synkroniseras nyligen</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="561"/>
- <source>Discovering '%1'</source>
- <translation>Söker igenom '%1'</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="566"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>%L1 B</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="306"/>
+ <location filename="../src/libsync/utility.cpp" line="303"/>
<source>%Ln year(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="307"/>
+ <location filename="../src/libsync/utility.cpp" line="304"/>
<source>%Ln month(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="308"/>
+ <location filename="../src/libsync/utility.cpp" line="305"/>
<source>%Ln day(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="309"/>
+ <location filename="../src/libsync/utility.cpp" line="306"/>
<source>%Ln hour(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="310"/>
+ <location filename="../src/libsync/utility.cpp" line="307"/>
<source>%Ln minute(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="311"/>
+ <location filename="../src/libsync/utility.cpp" line="308"/>
<source>%Ln second(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="318"/>
<source>0 seconds</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="336"/>
+ <location filename="../src/libsync/utility.cpp" line="333"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="73"/>
+ <source>Enter your credentials to connect to the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <source>Sign in</source>
+ <translation>เข้าสู่ระบบ</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="89"/>
<source>Remove the account configuration from the client</source>
<translation>ลบการตั้งค่าบัญชีจากไคลเอ็นต์</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Remove Account</source>
<translation>ลบบัญชี</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="97"/>
+ <location filename="../src/gui/accountsettings.ui" line="113"/>
<source>Storage space: ...</source>
<translation>พื้นที่จัดเก็บข้อมูล: ...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="167"/>
+ <location filename="../src/gui/accountsettings.ui" line="183"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>โฟลเดอร์ที่ไม่ถูกตรวจสอบจะถูก <b>ลบ</b> จากระบบแฟ้มต้นทางของคุณและจะไม่ประสานข้อมูลกับคอมพิวเตอร์เครื่องนี้อีกต่อไป</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="230"/>
<source>Apply</source>
<translation>นำไปใช้</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="198"/>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
- <location filename="../src/gui/accountsettings.cpp" line="571"/>
+ <location filename="../src/gui/accountsettings.ui" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="289"/>
+ <location filename="../src/gui/accountsettings.cpp" line="646"/>
<source>Cancel</source>
<translation>ยกเลิก</translation>
</message>
<translation>เชื่อมต่อกับ <server> ด้วยผู้ใช้ <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="115"/>
+ <location filename="../src/gui/accountsettings.cpp" line="121"/>
<source>No account configured.</source>
<translation>ไม่มีการกำหนดค่าบัญชี</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="161"/>
+ <source>Choose what to sync</source>
+ <translation>เลือกข้อมูลที่ต้องการประสาน</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="168"/>
+ <source>Remove folder sync connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="234"/>
<source>Folder creation failed</source>
<translation>สร้างโฟลเดอร์ล้มเหลว</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="230"/>
+ <location filename="../src/gui/accountsettings.cpp" line="235"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation><p>ไม่สามารถสร้างโฟลเดอร์ต้นทาง <i>%1</i>.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="283"/>
- <source>Stop syncing</source>
- <translation>ยกเลิกการประสานข้อมูล</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
+ <source>Confirm Folder Sync Connection Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>Remove Folder Sync Connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="309"/>
+ <location filename="../src/gui/accountsettings.cpp" line="314"/>
<source>Confirm Folder Reset</source>
<translation>ยืนยันการรีเซ็ตโฟลเดอร์</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="310"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>คุณต้องการที่จะตั้งค่าโฟลเดอร์ <i>%1</i> และสร้างฐานข้อมูลไคลเอนต์ของคุณหรือไม่?</p><p><b>หมายเหตุ:</b>ฟังก์ชั่นนี้ถูกออกแบบมาเพื่อวัตถุประสงค์ในการซ่อมบำรุงเท่านั้น จะไม่มีไฟล์ที่ถูกลบออก แต่นี้อาจทำให้เกิดการจราจรข้อมูลที่สำคัญและใช้เวลาหลายนาทีหรือชั่วโมงขึ้นอยู่กับขนาดของโฟลเดอร์ ใช้ตัวเลือกนี้หากได้รับคำแนะนำจากผู้ดูแลระบบของคุณ</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="391"/>
+ <location filename="../src/gui/accountsettings.cpp" line="396"/>
<source>Sync Running</source>
<translation>กำลังประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="392"/>
+ <location filename="../src/gui/accountsettings.cpp" line="397"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>การดำเนินการเพื่อประสานข้อมูลกำลังทำงานอยู่ <br/>คุณต้องการสิ้นสุดการทำงานหรือไม่?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="472"/>
+ <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <source>%1 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="485"/>
<source>%1 as <i>%2</i></source>
<translation>%1 เช่น <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="476"/>
+ <location filename="../src/gui/accountsettings.cpp" line="495"/>
<source>Connected to %1.</source>
<translation>เชื่อมต่อกับ %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="478"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>เซิร์ฟเวอร์ %1 ไม่สามารถใช้ได้ชั่วคราว</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="480"/>
+ <location filename="../src/gui/accountsettings.cpp" line="499"/>
<source>Signed out from %1.</source>
<translation>ลงชื่อออกจาก %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="482"/>
+ <location filename="../src/gui/accountsettings.cpp" line="501"/>
<source>No connection to %1 at %2.</source>
<translation>ไม่มีการเชื่อมต่อไปยัง %1 ที่ %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
- <source>There are new folders that were not synchronized because they are too big: %1</source>
- <translation>มีโฟลเดอร์ใหม่ที่ไม่ถูกประสานข้อมูลเพราะโฟลเดอร์มีขนาดใหญ่เกินไป: %1</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="536"/>
- <source>, </source>
- <translation>หรือ</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <source>There are new folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="563"/>
+ <location filename="../src/gui/accountsettings.cpp" line="638"/>
<source>Confirm Account Removal</source>
<translation>ยืนยันการลบบัญชี</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="564"/>
+ <location filename="../src/gui/accountsettings.cpp" line="639"/>
<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="570"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>Remove connection</source>
<translation>ลบการเชื่อมต่อ</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="158"/>
<source>Open folder</source>
<translation>เปิดโฟลเดอร์</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="168"/>
- <source>Choose What to Sync</source>
- <translation>เลือกสิ่งที่ต้องการประสานข้อมูล</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Resume sync</source>
<translation>ประสานข้อมูลอีกครั้ง</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Pause sync</source>
<translation>หยุดประสานข้อมูลชั่วคราว</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="176"/>
- <source>Remove sync</source>
- <translation>ลบการประสานข้อมูล</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="277"/>
- <source>Confirm Sync Removal</source>
- <translation>ยืนยันลบการประสานข้อมูล</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="278"/>
+ <location filename="../src/gui/accountsettings.cpp" line="283"/>
<source><p>Do you really want to stop syncing the folder <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="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="452"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>มีการใช้งาน %1 (%3%) จาก %2 บางโฟลเดอร์รวมทั้งเครือข่ายที่ติดตั้งหรือโฟลเดอร์ที่แชร์อาจมีข้อจำกัดที่แตกต่างกัน</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="448"/>
+ <location filename="../src/gui/accountsettings.cpp" line="453"/>
<source>%1 of %2 in use</source>
<translation>มีการใช้งาน %1 จาก %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="453"/>
+ <location filename="../src/gui/accountsettings.cpp" line="462"/>
<source>Currently there is no storage usage information available.</source>
<translation>ขณะนี้ไม่มีพื้นที่จัดเก็บข้อมูลที่ใช้งานได้</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="507"/>
<source>No %1 connection configured.</source>
<translation>ไม่มีการเชื่อมต่อ %1 ที่ถูกกำหนดค่า</translation>
</message>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="95"/>
+ <location filename="../src/gui/accountstate.cpp" line="99"/>
<source>Signed out</source>
<translation>ออกจากระบบ</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="97"/>
+ <location filename="../src/gui/accountstate.cpp" line="101"/>
<source>Disconnected</source>
<translation>ยกเลิกการเชื่อมต่อ</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="99"/>
+ <location filename="../src/gui/accountstate.cpp" line="103"/>
<source>Connected</source>
<translation>เชื่อมต่อ</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="101"/>
+ <location filename="../src/gui/accountstate.cpp" line="105"/>
<source>Service unavailable</source>
<translation>ไม่สามารถให้บริการได้</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="103"/>
+ <location filename="../src/gui/accountstate.cpp" line="107"/>
<source>Network error</source>
<translation>ข้อผิดพลาดของเครือข่าย</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="105"/>
+ <location filename="../src/gui/accountstate.cpp" line="109"/>
<source>Configuration error</source>
<translation>กำหนดค่าผิดพลาด</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="107"/>
+ <location filename="../src/gui/accountstate.cpp" line="111"/>
<source>Unknown account state</source>
<translation>ไม่ระบุสถานะบัญชี</translation>
</message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>Reauthentication required</source>
+ <translation>จำเป้นต้องรับรองความถูกต้องอีกครั้ง</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>You need to re-login to continue using the account %1.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
<translation>กรุณาอัพเดทเซิร์ฟเวอร์ใหม่ใหม่ที่สุดและรีสตาร์ทไคลเอนต์</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="143"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="135"/>
<source>Authentication error: Either username or password are wrong.</source>
<translation>ข้อผิดพลาดในการตรวจสอบ: ทั้งชื่อผู้ใช้หรือรหัสผ่านไม่ถูกต้อง</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="155"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="147"/>
<source>timeout</source>
<translation>หมดเวลา</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="186"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="178"/>
<source>The provided credentials are not correct</source>
<translation>ระบุข้อมูลประจำตัวไม่ถูกต้อง</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="524"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="537"/>
<source>Aborted by the user</source>
<translation>ยกเลิกโดยผู้ใช้</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="107"/>
+ <location filename="../src/gui/folder.cpp" line="108"/>
<source>Unable to create csync-context</source>
<translation>ไม่สามารถสร้าง csync-context</translation>
</message>
<translation>ความเคลื่อนไหวของการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="845"/>
+ <location filename="../src/gui/folder.cpp" line="870"/>
<source>Could not read system exclude file</source>
<translation>ไม่สามารถอ่าน ยกเว้นไฟล์ระบบ</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1102"/>
+ <location filename="../src/gui/folder.cpp" line="1127"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>โฟลเดอร์ใหม่มีขนาดใหญ่กว่า %1 เมกะไบต์ ได้ถูกเพิ่ม: %2
กรุณาไปตั้งค่าถ้าคุณต้องการให้มันดาวน์โหลดได้</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1115"/>
+ <location filename="../src/gui/folder.cpp" line="1140"/>
<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="1119"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Remove All Files?</source>
<translation>ลบไฟล์ทั้งหมด?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1121"/>
+ <location filename="../src/gui/folder.cpp" line="1146"/>
<source>Remove all files</source>
<translation>ลบไฟล์ทั้งหมด</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1122"/>
+ <location filename="../src/gui/folder.cpp" line="1147"/>
<source>Keep files</source>
<translation>เก็บไฟล์เอาไว้</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="275"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<source>Could not reset folder state</source>
<translation>ไม่สามารถรีเซ็ตสถานะโฟลเดอร์</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="276"/>
+ <location filename="../src/gui/folderman.cpp" line="271"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>บนบันทึกการประสานข้อมูลเก่า '%1' แต่ไม่สามารถลบออกได้ กรุณาตรวจสอบให้แน่ใจว่าไม่มีแอพฯ หรือการทำงานใดๆที่ใช้มันอยู่</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="877"/>
+ <location filename="../src/gui/folderman.cpp" line="865"/>
<source> (backup)</source>
<translation>(สำรองข้อมูล)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="882"/>
+ <location filename="../src/gui/folderman.cpp" line="870"/>
<source> (backup %1)</source>
<translation>(สำรองข้อมูล %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1091"/>
+ <location filename="../src/gui/folderman.cpp" line="1079"/>
<source>Undefined State.</source>
<translation>สถานะที่ยังไม่ได้ถูกกำหนด</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1094"/>
- <source>Waits to start syncing.</source>
- <translation>รอเริ่มต้นการประสานข้อมูล</translation>
+ <location filename="../src/gui/folderman.cpp" line="1082"/>
+ <source>Waiting to start syncing.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1097"/>
+ <location filename="../src/gui/folderman.cpp" line="1085"/>
<source>Preparing for sync.</source>
<translation>กำลังเตรียมการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1100"/>
+ <location filename="../src/gui/folderman.cpp" line="1088"/>
<source>Sync is running.</source>
<translation>การประสานข้อมูลกำลังทำงาน</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1103"/>
+ <location filename="../src/gui/folderman.cpp" line="1091"/>
<source>Last Sync was successful.</source>
<translation>ประสานข้อมูลครั้งล่าสุดเสร็จเรียบร้อยแล้ว</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1108"/>
+ <location filename="../src/gui/folderman.cpp" line="1096"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>การประสานข้อมูลสำเร็จ แต่มีคำเตือนในแต่ละไฟล์</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1111"/>
+ <location filename="../src/gui/folderman.cpp" line="1099"/>
<source>Setup Error.</source>
<translation>เกิดข้อผิดพลาดในการติดตั้ง</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1114"/>
+ <location filename="../src/gui/folderman.cpp" line="1102"/>
<source>User Abort.</source>
<translation>ยกเลิกผู้ใช้</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1117"/>
+ <location filename="../src/gui/folderman.cpp" line="1105"/>
<source>Sync is paused.</source>
<translation>การประสานข้อมูลถูกหยุดไว้ชั่วคราว</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1123"/>
+ <location filename="../src/gui/folderman.cpp" line="1111"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (การประสานข้อมูลถูกหยุดชั่วคราว)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1119"/>
<source>No valid folder selected!</source>
<translation>เลือกโฟลเดอร์ไม่ถูกต้อง!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1130"/>
<source>The selected path is not a folder!</source>
<translation>เส้นทางที่เลือกไม่ใช่โฟลเดอร์!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1146"/>
+ <location filename="../src/gui/folderman.cpp" line="1134"/>
<source>You have no permission to write to the selected folder!</source>
<translation>คุณมีสิทธิ์ที่จะเขียนโฟลเดอร์ที่เลือกนี้!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1161"/>
+ <location filename="../src/gui/folderman.cpp" line="1149"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>โฟลเดอร์ต้นทาง %1 ถูกใช้ไปแล้วในโฟลเดอร์ที่ประสานข้อมูล กรุณาเลือกอีกอันหนึ่ง!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1166"/>
+ <location filename="../src/gui/folderman.cpp" line="1154"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>เนื้อหาโฟลเดอร์ต้นทาง %1 ได้ถูกใช้ไปแล้วในโฟลเดอร์ที่ประสานข้อมูล กรุณาเลือกอีกอันหนึ่ง!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1173"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>โฟลเดอร์ต้นทาง %1 เป็นการเชื่อมโยงสัญลักษณ์ ลิงค์เป้าหมายมีเนื้อหาโฟลเดอร์ที่ถูกใช้ไปแล้วในโฟลเดอร์ที่ประสานข้อมูล กรุณาเลือกอีกอันหนึ่ง!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1168"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>เนื้อหาของโฟลเดอร์ต้นทาง %1 ไดถูกใช้ไปแล้วในโฟลเดอร์ที่ประสานข้อมูล กรุณาเลือกอีกอันหนึ่ง!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1186"/>
+ <location filename="../src/gui/folderman.cpp" line="1174"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>โฟลเดอร์ต้นทาง %1 เป็นการเชื่อมโยงสัญลักษณ์
เป้าหมายของลิงค์มีเนื้อหาที่ถูกใช้ไปแล้วในโฟลเดอร์ที่ประสานข้อมูล กรุณาเลือกอีกอันหนึ่ง!</translation>
<translation>เพิ่มโฟลเดอร์ที่ต้องการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="85"/>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="274"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="271"/>
<source>File</source>
<translation>ไฟล์</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="228"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="224"/>
<source>Syncing selected files in your account with</source>
<translation>ซิงค์ไฟล์ที่เลือกในบัญชีของคุณด้วย</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="231"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="227"/>
<source>Remote path: %1</source>
<translation>ตำแหน่งพาธระยะไกล: %1</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="121"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="122"/>
<source>You need to be connected to add a folder</source>
<translation>คุณจะต้องเชื่อมต่อก่อนที่จะเพิ่มโฟลเดอร์</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="126"/>
- <source>Adding folder is disabled because your 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="131"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="132"/>
<source>Click this button to add a folder to synchronize.</source>
<translation>คลิกที่ปุ่มนี้เพื่อเพิ่มโฟลเดอร์ที่ต้องการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="141"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="142"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="156"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
<source>Error while loading the list of folders from the server.</source>
<translation>ข้อผิดพลาดในขณะที่โหลดรายชื่อโฟลเดอร์จากเซิร์ฟเวอร์</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="182"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="192"/>
<source>Signed out</source>
<translation>ออกจากระบบ</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="727"/>
- <source>Discovering '%1'</source>
- <translation>กำลังค้นหา '%1'</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="127"/>
+ <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="163"/>
+ <source>Fetching folder list from server...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="789"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="787"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="849"/>
<source>Syncing %1</source>
<translation>กำลังประสานข้อมูล %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="792"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="854"/>
<source>download %1/s</source>
<translation>ดาวน์โหลด %1/วินาที</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="794"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="856"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/วินาที</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="800"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>upload %1/s</source>
<translation>อัปโหลด</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="802"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="864"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/วินาที</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="807"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="869"/>
<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="811"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="873"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="827"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="889"/>
<source>%1 of %2, file %3 of %4
Total time left %5</source>
<translation>%1 จาก %2, ไฟล์ %3 จาก %4 เวลาที่เหลือทั้งหมด %5</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
<source>file %1 of %2</source>
<translation>ไฟล์ %1 จาก %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="932"/>
<source>Waiting...</source>
<translation>กรุณารอซักครู่...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="934"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>กำลังรออีก (%n) โฟลเดอร์...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="878"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>Preparing to sync...</source>
<translation>กำลังเตรียมพร้อมในการประสานข้อมูล</translation>
</message>
<name>OCC::FolderWizard</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <source>Add Folder Sync Connection</source>
+ <translation>เพิ่มโฟลเดอร์ที่ต้องการประสานข้อมูล</translation>
+ </message>
+ <message>
<location filename="../src/gui/folderwizard.cpp" line="564"/>
- <source>Add Folder</source>
- <translation>เพิ่มโฟลเดอร์</translation>
+ <source>Add Sync Connection</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>ขั้นสูง</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="61"/>
+ <location filename="../src/gui/generalsettings.ui" line="109"/>
<source>Ask confirmation before downloading folders larger than</source>
<translation>สอบถามการยืนยันก่อนดาวน์โหลดโฟลเดอร์ที่มีขนาดใหญ่กว่า</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
+ <location filename="../src/gui/generalsettings.ui" line="129"/>
<source>MB</source>
<translation>เมกะไบต์</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="109"/>
+ <location filename="../src/gui/generalsettings.ui" line="159"/>
<source>Show crash reporter</source>
<translation>แสดงรายงานความผิดพลาด</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="118"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit Ignored Files</source>
<translation>แก้ไขไฟล์ที่ถูกละเว้น</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="142"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
<source>Add an Account</source>
<translation>เพิ่มบัญชี</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="167"/>
- <location filename="../src/gui/generalsettings.ui" line="173"/>
+ <location filename="../src/gui/generalsettings.ui" line="171"/>
+ <location filename="../src/gui/generalsettings.ui" line="177"/>
<source>About</source>
<translation>เกี่ยวกับเรา</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <location filename="../src/gui/generalsettings.ui" line="187"/>
<source>Updates</source>
<translation>อัพเดท</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="208"/>
+ <location filename="../src/gui/generalsettings.ui" line="212"/>
<source>&Restart && Update</source>
<translation>และเริ่มต้นใหม่ && อัพเดท</translation>
</message>
</context>
-<context>
- <name>OCC::HttpCredentials</name>
- <message>
- <location filename="../src/libsync/creds/httpcredentials.cpp" line="290"/>
- <source>Reading from keychain failed with error: '%1'</source>
- <translation>อ่านจาก Keychain ล้มเหลวด้วยข้อผิดพลาด: '%1'</translation>
- </message>
-</context>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="32"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
<source>Please enter %1 password:
User: %2
</translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="41"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <source>Reading from keychain failed with error: '%1'</source>
+ <translation>อ่านจาก Keychain ล้มเหลวด้วยข้อผิดพลาด: '%1'</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
<source>Enter Password</source>
<translation>ป้อนรหัสผ่าน</translation>
</message>
<translation>ลบออก</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="40"/>
<source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
รายการที่ลบจะถูกอนุญาตให้ลบถ้าพวกเขาป้องกันไม่ให้ไดเรกทอรีถูกลบออก นี้จะเป็นประโยชน์สำหรับข้อมูล meta</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="109"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
<source>Could not open file</source>
<translation>ไม่สามารถเปิดไฟล์</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="111"/>
<source>Cannot write changes to '%1'.</source>
<translation>ไม่สามารถเขียนเปลี่ยนเป็น '%1'</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="138"/>
<source>Add Ignore Pattern</source>
<translation>เพิ่มการละเว้นรูปแบบ</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>Add a new ignore pattern:</source>
<translation>เพิ่มการละเว้นรูปแบบใหม่:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="45"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="46"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>รายการนี้ถูกระบุโดยระบบที่ '%1' และไม่สามารถแก้ไขได้ในมุมมองนี้</translation>
</message>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="163"/>
+ <location filename="../src/libsync/logger.cpp" line="190"/>
<source>Error</source>
<translation>ข้อผิดพลาด</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="164"/>
+ <location filename="../src/libsync/logger.cpp" line="191"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>ไฟล์ '%1'<br/>ไม่สามารถเปิดขึ้นมาเพื่อเขียนข้อมูลได้.<br/><br/>บันทึกผลลัพธ์ <b>ไม่สามารถ</b> บันทึกข้อมูลได้!</nobr></translation>
</message>
</message>
<message>
<location filename="../src/gui/networksettings.ui" line="203"/>
- <location filename="../src/gui/networksettings.ui" line="295"/>
+ <location filename="../src/gui/networksettings.ui" line="292"/>
<source>No limit</source>
<translation>ไม่จำกัด</translation>
</message>
<source>SOCKS5 proxy</source>
<translation>พร็อกซี SOCKS5</translation>
</message>
+ <message>
+ <location filename="../src/gui/networksettings.cpp" line="128"/>
+ <source>Qt >= 5.4 is required in order to use the bandwidth limit</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::OCUpdater</name>
<source>Downloading version %1. Please wait...</source>
<translation>กำลังดาวน์โหลดรุ่น %1 กรุณารอสักครู่...</translation>
</message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
- <source>Version %1 available. Restart application to start the update.</source>
- <translation>มีรุ่น %1 แล้ว เริ่มต้นแอพลิเคชันใหม่เพื่อเริ่มการอัพเดท</translation>
- </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="145"/>
<source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
<source>Could not check for new updates.</source>
<translation>ไม่สามารถตรวจสอบการอัพเดทใหม่</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
+ <source>%1 version %2 available. Restart application to start the update.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
- <source>New version %1 available. Please use the system's update tool to install it.</source>
- <translation>มีรุ่น %1 ใหม่ กรุณาใช้เครื่องมือการอัพเดทระบบเพื่อติดตั้งมัน</translation>
+ <source>New %1 version %2 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="151"/>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="114"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="110"/>
<source>Connection Timeout</source>
<translation>หมดเวลาการเชื่อมต่อ</translation>
</message>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="171"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="167"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>ตอบกลับ JSON ไม่ถูกต้องจาก URL แบบสำรวจความคิดเห็น</translation>
</message>
</context>
-<context>
- <name>OCC::PropagateDownloadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="435"/>
- <source>Sync was aborted by user.</source>
- <translation>การประสานข้อมูลถูกยกเลิกโดยผู้ใช้</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="488"/>
- <source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation>ไม่มี E-Tag ที่ได้รับจากเซิร์ฟเวอร์ กรุณาตรวจสอบ พร็อกซี่หรือเกตเวย์</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="494"/>
- <source>We received a different E-Tag for resuming. Retrying next time.</source>
- <translation>เราได้รับ E-Tag ที่แตกต่างกันสำหรับการทำงาน กรุณาลองอีกครั้งในเวลาถัดไป</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="516"/>
- <source>Server returned wrong content-range</source>
- <translation>เซิร์ฟเวอร์ส่งคืนช่วงของเนื้อหาที่ผิด</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="567"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation>ไฟล์ %1 ไม่สามารถดาวน์โหลดได้เพราะชื่อไฟล์ต้นทางผิดพลาด!</translation>
- </message>
-</context>
<context>
<name>OCC::PropagateDownloadFileQNAM</name>
<message>
<translation>ไฟล์ %1 ไม่สามารถดาวน์โหลดได้เพราะชื่อไฟล์ต้นทางเหมือนกัน!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="457"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
+ <source>The download would reduce free disk space below %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="372"/>
+ <source>Free space on disk is less than %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="482"/>
<source>File was deleted from server</source>
<translation>ไฟล์ถูกลบออกจากเซิร์ฟเวอร์</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="506"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="531"/>
<source>The file could not be downloaded completely.</source>
<translation>ไฟล์ไม่สามารถดาวน์โหลดได้อย่างสมบูรณ์</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="601"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="636"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>ไฟล์ %1 ไม่สามารถบันทึกได้เพราะชื่อไฟล์ต้นทางเหมือนกัน!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="641"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="676"/>
<source>File has changed since discovery</source>
<translation>ไฟล์มีการเปลี่ยนแปลงตั้งแต่ถูกพบ</translation>
</message>
<context>
<name>OCC::PropagateItemJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="92"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
<source>; Restoration Failed: %1</source>
<translation>; ฟื้นฟูล้มเหลว: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="138"/>
<source>Continue blacklisting:</source>
<translation>ดำเนินการขึ้นบัญชีดำ:</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="230"/>
<source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation>ไฟล์หรือโฟลเดอร์ที่ถูกลบออกจากส่วนการอ่านเพียงอย่างเดียว แต่ล้มเหลวในการฟื้นฟู: %1</translation>
</message>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove folder '%1';</source>
- <translation>ไม่สามารถลบโฟลเดอร์ '%1';</translation>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="243"/>
- <location filename="../src/libsync/propagator_legacy.cpp" line="302"/>
- <source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>ไฟล์ต้นทางมีการเปลี่ยนแปลงขณะประสานข้อมูล จะทำการประสานข้อมูลหลังจากที่มันมาถึงอย่างสมบูรณ์</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="246"/>
- <source>Sync was aborted by user.</source>
- <translation>การประสานข้อมูลถูกยกเลิกโดยผู้ใช้</translation>
- </message>
+ <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="252"/>
- <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
- <translation>à¹\84à¸\9fลà¹\8cà¸\95à¹\89à¸\99à¸\97าà¸\87à¸\97ีà¹\88à¸\96ูà¸\81à¹\81à¸\81à¹\89à¹\84à¸\82à¹\81à¸\95à¹\88à¹\80à¸\9bà¹\87à¸\99สà¹\88วà¸\99หà¸\99ึà¹\88à¸\87à¸\82à¸à¸\87à¸\81ารà¹\81à¸\8aรà¹\8cà¹\83หà¹\89à¸à¹\88าà¸\99à¸à¸¢à¹\88าà¸\87à¹\80à¸\94ียว มัà¸\99à¸\96ูà¸\81à¹\80รียà¸\81à¸\84ืà¸\99à¹\81ละà¹\81à¸\81à¹\89à¹\84à¸\82à¸\82à¸à¸\87à¸\84ุà¸\93à¸à¸¢à¸¹à¹\88à¹\83à¸\99à¹\84à¸\9fลà¹\8cà¸\84วามà¸\82ัà¸\94à¹\81ยà¹\89ง</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="205"/>
+ <source>File name contains at least one invalid character</source>
+ <translation>มีà¸\8aืà¹\88à¸à¹\81à¸\9fà¹\89มà¸à¸¢à¹\88าà¸\87à¸\99à¹\89à¸à¸¢à¸«à¸\99ึà¹\88à¸\87à¸\95ัวà¸à¸±à¸\81ษรà¸\97ีà¹\88à¹\84มà¹\88à¸\96ูà¸\81à¸\95à¹\89à¸ง</translation>
</message>
-</context>
-<context>
- <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="226"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="262"/>
<source>File Removed</source>
<translation>ไฟล์ถูกลบไปแล้ว</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="274"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>ไฟล์ต้นทางถูกเปลี่ยนแปลงในระหว่างการซิงค์ มันจะกลับมา</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="250"/>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="286"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="665"/>
<source>Local file changed during sync.</source>
<translation>ไฟล์ต้อนมีการเปลี่ยนแปลงขณะประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="558"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="592"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>บังคับให้ยกเลิกงานในการตั้งค่าการเชื่อมต่อ HTTP กับ Qt < 5.4.2</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="566"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="600"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>ไฟล์ต้นทางที่ถูกแก้ไขแต่เป็นส่วนหนึ่งของการแชร์ให้อ่านอย่างเดียว มันถูกเรียกคืนและแก้ไขของคุณอยู่ในไฟล์ความขัดแย้ง</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="597"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="631"/>
<source>Poll URL missing</source>
<translation>URL แบบสำรวจความคิดเห็นหายไป</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="620"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="654"/>
<source>The local file was removed during sync.</source>
<translation>ไฟล์ถูกลบออกในระหว่างการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="646"/>
- <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
- <translation>เซิร์ฟเวอร์ไม่ยอมรับอันสุดท้าย (ไม่มี e-tag อยู่ในปัจจุบัน)</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="680"/>
+ <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>โฟลเดอร์ที่ไม่ถูกตรวจสอบจะถูก <b>ลบ</b> จากระบบแฟ้มต้นทางของคุณและจะไม่ประสานข้อมูลกับคอมพิวเตอร์เครื่องนี้อีกต่อไป</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>เลือกสิ่งที่ต้องการประสานข้อมูล: เลือกโฟลเดอร์ย่อยระยะไกลที่คุณต้องการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>เลือกสิ่งที่ต้องการประสานข้อมูล: ยกเลิกการเลือกโฟลเดอร์ย่อยระยะไกลที่คุณต้องการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
<source>Choose What to Sync</source>
<translation>เลือกสิ่งที่ต้องการประสานข้อมูล</translation>
</message>
<translation>ขนาด</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
<source>No subfolders currently on the server.</source>
<translation>ไม่มีโฟลเดอร์ย่อยอยู่บนเซิร์ฟเวอร์</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>เกิดข้อผิดพลาดขณะโหลดรายชื่อของโฟลเดอร์ย่อย</translation>
</message>
<translation>ตั้งค่า</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="80"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="84"/>
<source>Activity</source>
<translation>กิจกรรม</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="86"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="90"/>
<source>General</source>
<translation>ทั่วไป</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>Network</source>
<translation>เครือข่าย</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharedialog.ui" line="22"/>
- <location filename="../src/gui/sharedialog.ui" line="234"/>
+ <location filename="../src/gui/sharedialog.ui" line="258"/>
<source>TextLabel</source>
<translation>ป้ายข้อความ</translation>
</message>
<translation>พาธ ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="182"/>
+ <location filename="../src/gui/sharedialog.ui" line="116"/>
<source>Set &password </source>
<translation>ตั้ง &รหัสผ่าน</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="196"/>
+ <location filename="../src/gui/sharedialog.ui" line="130"/>
<source>Set &expiration date</source>
<translation>ตั้ง &วันหมดอายุ</translation>
</message>
+ <message>
+ <location filename="../src/gui/sharedialog.ui" line="214"/>
+ <source>Allow editing</source>
+ <translation>อนุญาตให้แก้ไข</translation>
+ </message>
<message>
<location filename="../src/gui/sharedialog.ui" line="77"/>
<source>Share link</source>
<translation>แชร์ลิงค์</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="125"/>
+ <location filename="../src/gui/sharedialog.ui" line="203"/>
<source>Copy &link</source>
<translation>คัดลอก &ลิงค์</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="142"/>
+ <location filename="../src/gui/sharedialog.ui" line="154"/>
<source>Set password</source>
<translation>ตั้งรหัสผ่าน</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="692"/>
- <source>%1 path: %2</source>
- <translation>พาธ %1 : %2</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="115"/>
+ <location filename="../src/gui/sharedialog.cpp" line="120"/>
<source>%1 Sharing</source>
<translation>กำลังแชร์ %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="103"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="112"/>
+ <location filename="../src/gui/sharedialog.cpp" line="117"/>
<source>Folder: %2</source>
<translation>โฟลเดอร์: %2 </translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="121"/>
<source>P&assword protect</source>
<translation>รหัสผ่านป้องกัน</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="221"/>
+ <location filename="../src/gui/sharedialog.cpp" line="214"/>
<source>Password Protected</source>
<translation>รหัสผ่านถูกป้องกันแล้ว</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="382"/>
+ <location filename="../src/gui/sharedialog.cpp" line="338"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>ไม่สามารถแชร์ไฟล์เพราะไม่ได้รับอนุญาต</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="528"/>
+ <location filename="../src/gui/sharedialog.cpp" line="475"/>
<source>Please Set Password</source>
<translation>กรุณาตั้งรหัสผ่าน</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="564"/>
- <location filename="../src/gui/sharedialog.cpp" line="565"/>
+ <location filename="../src/gui/sharedialog.cpp" line="538"/>
+ <location filename="../src/gui/sharedialog.cpp" line="539"/>
<source>&Share link</source>
<translation>&แชร์ลิงค์</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="583"/>
+ <location filename="../src/gui/sharedialog.cpp" line="552"/>
+ <location filename="../src/gui/sharedialog.cpp" line="564"/>
<source>OCS API error code: %1</source>
<translation>รหัสข้อผิดพลาด OCS API: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="605"/>
- <source>There is no sync folder configured.</source>
- <translation>ไม่มีการกำหนดค่าการประสานข้อมูลโฟลเดอร์</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="639"/>
- <source>A sync file with the same name exists. The file cannot be registered to sync.</source>
- <translation>มีการประสานไฟล์ข้อมูลที่มีชื่อเดียวกันอยู่แล้ว ไฟล์จะไม่สามารถลงทะเบียนเพื่อผสานข้อมูล</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="684"/>
- <source>The file cannot be synced.</source>
- <translation>ไม่สามารถประสานข้อมูลไฟล์</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="624"/>
- <source>Sharing of external directories is not yet working.</source>
- <translation>การแชร์ไดเรกทอรีภายนอกยังไม่สามารถทำงานได้</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="473"/>
- <location filename="../src/gui/sharedialog.cpp" line="506"/>
+ <location filename="../src/gui/sharedialog.cpp" line="418"/>
+ <location filename="../src/gui/sharedialog.cpp" line="460"/>
<source>Public sh&aring requires a password</source>
<translation>การแชร์สาธารณะจำเป็นต้องมีรหัสผ่าน</translation>
</message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="617"/>
- <source>Cannot find a folder to upload to.</source>
- <translation>ไม่พบโฟลเดอร์ที่อัพโหลด</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
- <source>Waiting to upload...</source>
- <translation>กำลังรอที่จะอัพโหลด</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="653"/>
- <source>Unable to register in sync space.</source>
- <translation>ไม่สามารถลงทะเบียนในพื้นที่ประสานข้อมูล</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="694"/>
- <source>Sync of registered file was not successful yet.</source>
- <translation>การผสานข้อมูลของไฟล์ที่ลงทะเบียนไม่ประสบความสำเร็จเลย</translation>
- </message>
</context>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>Login Error</source>
<translation>เข้าสู่ระบบผิดพลาด</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>You must sign in as user %1</source>
<translation>คุณต้องเข้าสู่ระบบเป็นผู้ใช้ %1</translation>
</message>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="452"/>
+ <location filename="../src/gui/socketapi.cpp" line="447"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>แชร์กับ %1</translation>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="97"/>
+ <location filename="../src/libsync/syncengine.cpp" line="94"/>
<source>Success.</source>
<translation>เสร็จสิ้น</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="104"/>
+ <location filename="../src/libsync/syncengine.cpp" line="101"/>
<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="107"/>
+ <location filename="../src/libsync/syncengine.cpp" line="104"/>
<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="110"/>
+ <location filename="../src/libsync/syncengine.cpp" line="107"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync เกิดข้อผิดพลาดบางประการในระหว่างประมวลผล internal trees</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="113"/>
+ <location filename="../src/libsync/syncengine.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>การจัดสรรหน่วยความจำ CSync ล้มเหลว</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>พบข้อผิดพลาดเกี่ยวกับ CSync fatal parameter</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="119"/>
+ <location filename="../src/libsync/syncengine.cpp" line="116"/>
<source>CSync processing step update failed.</source>
<translation>การอัพเดทขั้นตอนการประมวลผล CSync ล้มเหลว</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="122"/>
+ <location filename="../src/libsync/syncengine.cpp" line="119"/>
<source>CSync processing step reconcile failed.</source>
<translation>การปรับปรุงขั้นตอนการประมวลผล CSync ล้มเหลว</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="122"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync ไม่สามารถรับรองความถูกต้องที่พร็อกซี่</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="125"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync ไม่สามารถค้นหาพร็อกซี่บนเซิร์ฟเวอร์ได้</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="128"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync ล้มเหลวในการยืนยันสิทธิ์การเข้าใช้งานที่เซิร์ฟเวอร์ %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="131"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync ล้มเหลวในการเชื่อมต่อกับเครือข่าย</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="134"/>
<source>A network connection timeout happened.</source>
<translation>หมดเวลาการเชื่อมต่อเครือข่าย</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="137"/>
<source>A HTTP transmission error happened.</source>
<translation>เกิดข้อผิดพลาดเกี่ยวกับ HTTP transmission</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation>CSync ล้มเหลว เนื่องจากไม่สามารถจัดการกับการปฏิเสธให้เข้าใช้งานได้</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation>โฟลเดอร์ที่ติดตั้งชั่วคราว ไม่สามารถใช้งานบนเซิร์ฟเวอร์</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
<source>An error occurred while opening a folder</source>
<translation>เกิดข้อผิดพลาดบางอย่างขณะกำลังเปิดโฟลเดอร์</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
<source>Error while reading folder.</source>
<translation>เกิดข้อผิดพลาดขณะกำลังอ่านโฟลเดอร์</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="996"/>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
<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="1003"/>
+ <location filename="../src/libsync/syncengine.cpp" line="991"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: ไม่มีพื้นที่เหลือเพียงพอบนเซิร์ฟเวอร์ %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="152"/>
<source>CSync unspecified error.</source>
<translation>CSync ไม่สามารถระบุข้อผิดพลาดได้</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="155"/>
<source>Aborted by the user</source>
<translation>ยกเลิกโดยผู้ใช้</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="392"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>ชื่อไฟล์มีอักขระที่ไม่ถูกต้องจึงไม่สามารถประสานข้อมูลข้ามแพลตฟอร์ม</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="143"/>
<source>CSync failed to access</source>
<translation>ล้มเหลวในการเข้าถึง CSync</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <location filename="../src/libsync/syncengine.cpp" line="97"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <source>CSync failed due to unhandled permission denied.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="146"/>
<source>CSync tried to create a folder that already exists.</source>
<translation>CSync พยายามสร้างโฟลเดอร์ที่มีอยู่แล้ว</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="158"/>
<source>The service is temporarily unavailable</source>
<translation>ไม่สามารถใช้บริการได้ชั่วคราว</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="175"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>An internal error number %1 occurred.</source>
<translation>จำนวนข้อผิดพลาดภายในที่เกิดขึ้น %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="227"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>รายการจะไม่ถูกประสานข้อมูลเนื่องจากเกิดข้อผิดพลาดก่อนหน้านี้: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="389"/>
+ <location filename="../src/libsync/syncengine.cpp" line="386"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>ลิงค์สัญลักษณ์จะไม่ได้รับการสนับสนุนในการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="392"/>
+ <location filename="../src/libsync/syncengine.cpp" line="389"/>
<source>File is listed on the ignore list.</source>
<translation>ไฟล์อยู่ในรายการที่ละเว้น</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="398"/>
+ <location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename is too long.</source>
<translation>ชื่อไฟล์ยาวเกินไป</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="401"/>
+ <location filename="../src/libsync/syncengine.cpp" line="398"/>
<source>File is ignored because it's hidden.</source>
<translation>ไฟล์จะถูกละเว้นเพราะมีสถานะซ่อนอยู่</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="407"/>
+ <location filename="../src/libsync/syncengine.cpp" line="404"/>
<source>Stat failed.</source>
<translation>สถิติความล้มเหลว</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="429"/>
+ <location filename="../src/libsync/syncengine.cpp" line="426"/>
<source>Filename encoding is not valid</source>
<translation>การเข้ารหัสชื่อไฟล์ไม่ถูกต้อง</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="561"/>
+ <location filename="../src/libsync/syncengine.cpp" line="558"/>
<source>Invalid characters, please rename "%1"</source>
<translation>ตัวอักษรไม่ถูกต้อง โปรดเปลี่ยนชื่อ "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="631"/>
+ <location filename="../src/libsync/syncengine.cpp" line="612"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="645"/>
<source>Unable to initialize a sync journal.</source>
<translation>ไม่สามารถเตรียมการประสานข้อมูลเจอร์นัล</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="718"/>
+ <location filename="../src/libsync/syncengine.cpp" line="723"/>
<source>Cannot open the sync journal</source>
<translation>ไม่สามารถเปิดการผสานข้อมูลเจอร์นัล</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="965"/>
- <location filename="../src/libsync/syncengine.cpp" line="972"/>
+ <location filename="../src/libsync/syncengine.cpp" line="953"/>
+ <location filename="../src/libsync/syncengine.cpp" line="960"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>ถูกละเว้นเพราะ "ข้อมูลที่เลือกประสาน" ติดบัญชีดำ</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <location filename="../src/libsync/syncengine.cpp" line="978"/>
<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="1023"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1011"/>
<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="1040"/>
- <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1028"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1048"/>
<source>Not allowed to remove, restoring</source>
<translation>ไม่อนุญาตให้ลบเพราะกำลังฟื้นฟู</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1073"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1061"/>
<source>Local files and share folder removed.</source>
<translation>ไฟล์ต้นทางและโฟลเดอร์ที่แชร์ถูกลบออก</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1116"/>
<source>Move not allowed, item restored</source>
<translation>ไม่ได้รับอนุญาตให้ย้าย เพราะกำลังฟื้นฟูรายการ</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1125"/>
<source>Move not allowed because %1 is read-only</source>
<translation>ไม่อนุญาตให้ย้ายเพราะ %1 จะอ่านได้เพียงอย่างเดียว</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the destination</source>
<translation>ปลายทาง</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the source</source>
<translation>แหล่งที่มา</translation>
</message>
</message>
</context>
<context>
- <name>OCC::TransmissionChecksumValidator</name>
+ <name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="128"/>
<source>The checksum header is malformed.</source>
<translation>การตรวจสอบส่วนหัวผิดรูปแบบ</translation>
</message>
<message>
<location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+ <source>The checksum header contained an unknown checksum type '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="148"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>ไฟล์ที่ดาวน์โหลดมาไม่ตรงกับการตรวจสอบที่จะกลับมา</translation>
</message>
<source>Recent Changes</source>
<translation>การเปลี่ยนแปลงล่าสุด</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="561"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="331"/>
<source>Managed Folders:</source>
<source>Open %1 in browser</source>
<translation>เปิด %1 ในเบราว์เซอร์</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="449"/>
- <source>Log out everywhere</source>
- <translation>ออกจากระบบในที่อื่นๆ</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="457"/>
- <source>Log in everywhere...</source>
- <translation>เข้าสู่ระบบจากที่อื่นๆ</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="513"/>
<source>Unknown status</source>
<source>Account %1: %2</source>
<translation>บัญชี %1: %2</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="449"/>
+ <source>Log out of all accounts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="457"/>
+ <source>Log in to all accounts...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="532"/>
<source>Crash now</source>
<source>No items synced recently</source>
<translation>ไม่มีรายการที่ถูกประสานข้อมูลเมื่อเร็วๆ นี้</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="561"/>
- <source>Discovering '%1'</source>
- <translation>กำลังค้นหา '%1'</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="566"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>%L1 B</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="306"/>
+ <location filename="../src/libsync/utility.cpp" line="303"/>
<source>%Ln year(s)</source>
<translation>%Ln (ปี)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="307"/>
+ <location filename="../src/libsync/utility.cpp" line="304"/>
<source>%Ln month(s)</source>
<translation>%Ln (เดือน)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="308"/>
+ <location filename="../src/libsync/utility.cpp" line="305"/>
<source>%Ln day(s)</source>
<translation>%Ln (วัน)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="309"/>
+ <location filename="../src/libsync/utility.cpp" line="306"/>
<source>%Ln hour(s)</source>
<translation>%Ln (ชั่วโมง)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="310"/>
+ <location filename="../src/libsync/utility.cpp" line="307"/>
<source>%Ln minute(s)</source>
<translation>%Ln (นาที)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="311"/>
+ <location filename="../src/libsync/utility.cpp" line="308"/>
<source>%Ln second(s)</source>
<translation>%Ln (วินาที)</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="318"/>
<source>0 seconds</source>
<translation>0 วินาที</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="336"/>
+ <location filename="../src/libsync/utility.cpp" line="333"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="73"/>
+ <source>Enter your credentials to connect to the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <source>Sign in</source>
+ <translation>Oturum aç</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="89"/>
<source>Remove the account configuration from the client</source>
<translation>Hesap yapılandırmasını istemciden kaldır</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Remove Account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="97"/>
+ <location filename="../src/gui/accountsettings.ui" line="113"/>
<source>Storage space: ...</source>
<translation>Depolama alanı: ...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="167"/>
+ <location filename="../src/gui/accountsettings.ui" line="183"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Seçilmemiş klasörler yerel dosya sisteminizden <b>silinecek</b> ve bir daha bu bilgisayarla eşitlenmeyecektir</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="230"/>
<source>Apply</source>
<translation>Uygula</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="198"/>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
- <location filename="../src/gui/accountsettings.cpp" line="571"/>
+ <location filename="../src/gui/accountsettings.ui" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="289"/>
+ <location filename="../src/gui/accountsettings.cpp" line="646"/>
<source>Cancel</source>
<translation>İptal</translation>
</message>
<translation><server> ile <user> olarak bağlantı kuruldu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="115"/>
+ <location filename="../src/gui/accountsettings.cpp" line="121"/>
<source>No account configured.</source>
<translation>Hiçbir hesap yapılandırılmamış.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="161"/>
+ <source>Choose what to sync</source>
+ <translation>Ne eşitleneceğini seçin</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="168"/>
+ <source>Remove folder sync connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="234"/>
<source>Folder creation failed</source>
<translation>Klasör oluşturma başarısız oldu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="230"/>
+ <location filename="../src/gui/accountsettings.cpp" line="235"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation><p><i>%1</i> yerel klasörü oluşturulamadı.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="283"/>
- <source>Stop syncing</source>
- <translation>Eşitlemeyi durdur</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
+ <source>Confirm Folder Sync Connection Removal</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="309"/>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>Remove Folder Sync Connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="314"/>
<source>Confirm Folder Reset</source>
<translation>Klasör Sıfırlamayı Onayla</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="310"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Gerçekten <i>%1</i> klasörünü sıfırlamak ve istemci veritabanını yeniden inşa etmek istiyor musunuz?</p><p><b>Not:</b> Bu işlev sadece bakım amaçlı tasarlandı. Hiçbir dosya kaldırılmayacak, fakat bu işlem büyük veri trafiğine sebep olabilir ve klasör boyutuna bağlı olarak tamamlanması birkaç dakikadan birkaç saate kadar sürebilir. Bu seçeneği sadece yöneticiniz tarafından istenmişse kullanın.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="391"/>
+ <location filename="../src/gui/accountsettings.cpp" line="396"/>
<source>Sync Running</source>
<translation>Eşitleme Çalışıyor</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="392"/>
+ <location filename="../src/gui/accountsettings.cpp" line="397"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Eşitleme işlemi devam ediyor.<br/>Durdurmak istiyor musunuz?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="472"/>
+ <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <source>%1 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="485"/>
<source>%1 as <i>%2</i></source>
<translation>%1 <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="476"/>
+ <location filename="../src/gui/accountsettings.cpp" line="495"/>
<source>Connected to %1.</source>
<translation>%1 ile bağlı.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="478"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>%1 sunucusu geçici olarak ulaşılamaz durumda.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="480"/>
+ <location filename="../src/gui/accountsettings.cpp" line="499"/>
<source>Signed out from %1.</source>
<translation>%1 oturumu sonlandırıldı.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="482"/>
+ <location filename="../src/gui/accountsettings.cpp" line="501"/>
<source>No connection to %1 at %2.</source>
<translation>%1 ile %2 bağlantısı yok.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
- <source>There are new folders that were not synchronized because they are too big: %1</source>
- <translation>Çok büyük olduklarından eşitlenmemiş yeni klasörler mevcut: %1</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="536"/>
- <source>, </source>
- <translation>, </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <source>There are new folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="563"/>
+ <location filename="../src/gui/accountsettings.cpp" line="638"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="564"/>
+ <location filename="../src/gui/accountsettings.cpp" line="639"/>
<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="570"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>Remove connection</source>
<translation>Bağlantıyı kaldır</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="158"/>
<source>Open folder</source>
<translation>Klasörü aç</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="168"/>
- <source>Choose What to Sync</source>
- <translation>Ne Eşitleneceğini Seçin</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Resume sync</source>
<translation>Eşitlemeye devam et</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Pause sync</source>
<translation>Eşitlemeyi duraklat</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="176"/>
- <source>Remove sync</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="277"/>
- <source>Confirm Sync Removal</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="278"/>
+ <location filename="../src/gui/accountsettings.cpp" line="283"/>
<source><p>Do you really want to stop syncing the folder <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p><i>%1</i> klasörünün eşitlemesini durdurmayı 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="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="452"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) / %2 kullanımda. Ağdan bağlanmış veya paylaşılan dizinlerin farklı sınırları olabilir.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="448"/>
+ <location filename="../src/gui/accountsettings.cpp" line="453"/>
<source>%1 of %2 in use</source>
<translation>%1 / %2 kullanımda</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="453"/>
+ <location filename="../src/gui/accountsettings.cpp" line="462"/>
<source>Currently there is no storage usage information available.</source>
<translation>Şu anda depolama kullanım bilgisi mevcut değil.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="507"/>
<source>No %1 connection configured.</source>
<translation>Hiç %1 bağlantısı yapılandırılmamış.</translation>
</message>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="95"/>
+ <location filename="../src/gui/accountstate.cpp" line="99"/>
<source>Signed out</source>
<translation>Oturum sonlandırıldı</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="97"/>
+ <location filename="../src/gui/accountstate.cpp" line="101"/>
<source>Disconnected</source>
<translation>Bağlantı kesildi</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="99"/>
+ <location filename="../src/gui/accountstate.cpp" line="103"/>
<source>Connected</source>
<translation>Bağlandı</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="101"/>
+ <location filename="../src/gui/accountstate.cpp" line="105"/>
<source>Service unavailable</source>
<translation>Hizmet kullanılamıyor</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="103"/>
+ <location filename="../src/gui/accountstate.cpp" line="107"/>
<source>Network error</source>
<translation>Ağ hatası</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="105"/>
+ <location filename="../src/gui/accountstate.cpp" line="109"/>
<source>Configuration error</source>
<translation>Yapılandırma hatası</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="107"/>
+ <location filename="../src/gui/accountstate.cpp" line="111"/>
<source>Unknown account state</source>
<translation>Bilinmeyen hesap durumu</translation>
</message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>Reauthentication required</source>
+ <translation>Yeniden kimlik doğrulama gerekli</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>You need to re-login to continue using the account %1.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
<translation>Lütfen en son sunucuya güncelleyin veya istemciyi yeniden başlatın</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="143"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="135"/>
<source>Authentication error: Either username or password are wrong.</source>
<translation>Giriş hatası: Kullanıcı adı veya parola hatalı.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="155"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="147"/>
<source>timeout</source>
<translation>zaman aşımı</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="186"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="178"/>
<source>The provided credentials are not correct</source>
<translation>Sağlanan kimlik bilgileri doğru değil</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="524"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="537"/>
<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="107"/>
+ <location filename="../src/gui/folder.cpp" line="108"/>
<source>Unable to create csync-context</source>
<translation>csync-context oluşturma başarısız</translation>
</message>
<translation>Eşitleme Etkinliği</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="845"/>
+ <location filename="../src/gui/folder.cpp" line="870"/>
<source>Could not read system exclude file</source>
<translation>Sistem hariç tutulma dosyası okunamadı</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1102"/>
+ <location filename="../src/gui/folder.cpp" line="1127"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>%1 MB boyutundan daha büyük bir yeni klasör eklendi: %2\n
İndirmek istiyorsanız lütfen ayarlar bölümünden seçin.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1115"/>
+ <location filename="../src/gui/folder.cpp" line="1140"/>
<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="1119"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Remove All Files?</source>
<translation>Tüm Dosyalar Kaldırılsın mı?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1121"/>
+ <location filename="../src/gui/folder.cpp" line="1146"/>
<source>Remove all files</source>
<translation>Tüm dosyaları kaldır</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1122"/>
+ <location filename="../src/gui/folder.cpp" line="1147"/>
<source>Keep files</source>
<translation>Dosyaları koru</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="275"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<source>Could not reset folder state</source>
<translation>Klasör durumu sıfırılanamadı</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="276"/>
+ <location filename="../src/gui/folderman.cpp" line="271"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Eski eşitleme günlüğü '%1' bulundu ancak kaldırılamadı. Başka bir uygulama tarafından kullanılmadığından emin olun.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="877"/>
+ <location filename="../src/gui/folderman.cpp" line="865"/>
<source> (backup)</source>
<translation> (yedek)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="882"/>
+ <location filename="../src/gui/folderman.cpp" line="870"/>
<source> (backup %1)</source>
<translation> (yedek %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1091"/>
+ <location filename="../src/gui/folderman.cpp" line="1079"/>
<source>Undefined State.</source>
<translation>Tanımlanmamış Durum.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1094"/>
- <source>Waits to start syncing.</source>
- <translation>Eşitleme başlatmak için bekliyor.</translation>
+ <location filename="../src/gui/folderman.cpp" line="1082"/>
+ <source>Waiting to start syncing.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1097"/>
+ <location filename="../src/gui/folderman.cpp" line="1085"/>
<source>Preparing for sync.</source>
<translation>Eşitleme için hazırlanıyor.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1100"/>
+ <location filename="../src/gui/folderman.cpp" line="1088"/>
<source>Sync is running.</source>
<translation>Eşitleme çalışıyor.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1103"/>
+ <location filename="../src/gui/folderman.cpp" line="1091"/>
<source>Last Sync was successful.</source>
<translation>Son Eşitleme başarılı oldu.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1108"/>
+ <location filename="../src/gui/folderman.cpp" line="1096"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Son eşitleme başarılıydı, ancak tekil dosyalarda uyarılar vardı.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1111"/>
+ <location filename="../src/gui/folderman.cpp" line="1099"/>
<source>Setup Error.</source>
<translation>Kurulum Hatası.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1114"/>
+ <location filename="../src/gui/folderman.cpp" line="1102"/>
<source>User Abort.</source>
<translation>Kullanıcı İptal Etti.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1117"/>
+ <location filename="../src/gui/folderman.cpp" line="1105"/>
<source>Sync is paused.</source>
<translation>Eşitleme duraklatıldı.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1123"/>
+ <location filename="../src/gui/folderman.cpp" line="1111"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Eşitleme duraklatıldı)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1119"/>
<source>No valid folder selected!</source>
<translation>Geçerli klasör seçilmedi!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1130"/>
<source>The selected path is not a folder!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1146"/>
+ <location filename="../src/gui/folderman.cpp" line="1134"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Seçilen klasöre yazma izniniz yok!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1161"/>
+ <location filename="../src/gui/folderman.cpp" line="1149"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1166"/>
+ <location filename="../src/gui/folderman.cpp" line="1154"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1173"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1168"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1186"/>
+ <location filename="../src/gui/folderman.cpp" line="1174"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="85"/>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="274"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="271"/>
<source>File</source>
<translation>Dosya</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="228"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="224"/>
<source>Syncing selected files in your account with</source>
<translation>Seçilen dosyaları hesabınızla eşitleniyor</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="231"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="227"/>
<source>Remote path: %1</source>
<translation>Uzak yol: %1</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="121"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="122"/>
<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="126"/>
- <source>Adding folder is disabled because your are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
- <translation>Tüm dosyalarınızı eşitlediğinizden klasör ekleyemezsiniz. Birden çok klasörü eşitlemek 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="131"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="132"/>
<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="141"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="142"/>
<source>%1 (%2)</source>
<translation>%1 (%2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="156"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
<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="182"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="192"/>
<source>Signed out</source>
<translation>Oturum sonlandırıldı</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="727"/>
- <source>Discovering '%1'</source>
- <translation>Ortaya çıkarılan: %1</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="127"/>
+ <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="163"/>
+ <source>Fetching folder list from server...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="789"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="787"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="849"/>
<source>Syncing %1</source>
<translation>%1 eşitleniyor</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="792"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="854"/>
<source>download %1/s</source>
<translation>indir %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="794"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="856"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="800"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>upload %1/s</source>
<translation>yükle %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="802"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="864"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="807"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="869"/>
<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="811"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="873"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="827"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="889"/>
<source>%1 of %2, file %3 of %4
Total time left %5</source>
<translation>%1/%2, dosya %3/%4
Toplam kalan süre: %5</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
<source>file %1 of %2</source>
<translation>dosya %1/%2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="932"/>
<source>Waiting...</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="934"/>
<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="878"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>Preparing to sync...</source>
<translation type="unfinished"/>
</message>
<name>OCC::FolderWizard</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <source>Add Folder Sync Connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderwizard.cpp" line="564"/>
- <source>Add Folder</source>
- <translation>Klasör Ekle</translation>
+ <source>Add Sync Connection</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Gelişmiş</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="61"/>
+ <location filename="../src/gui/generalsettings.ui" line="109"/>
<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="81"/>
+ <location filename="../src/gui/generalsettings.ui" line="129"/>
<source>MB</source>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="109"/>
+ <location filename="../src/gui/generalsettings.ui" line="159"/>
<source>Show crash reporter</source>
<translation>Çökme bildiriciyi göster</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="118"/>
+ <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="142"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
<source>Add an Account</source>
<translation>Bir Hesap Ekle</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="167"/>
- <location filename="../src/gui/generalsettings.ui" line="173"/>
+ <location filename="../src/gui/generalsettings.ui" line="171"/>
+ <location filename="../src/gui/generalsettings.ui" line="177"/>
<source>About</source>
<translation>Hakkında</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <location filename="../src/gui/generalsettings.ui" line="187"/>
<source>Updates</source>
<translation>Güncellemeler</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="208"/>
+ <location filename="../src/gui/generalsettings.ui" line="212"/>
<source>&Restart && Update</source>
<translation>&Yeniden Başlat ve Güncelle</translation>
</message>
</context>
-<context>
- <name>OCC::HttpCredentials</name>
- <message>
- <location filename="../src/libsync/creds/httpcredentials.cpp" line="290"/>
- <source>Reading from keychain failed with error: '%1'</source>
- <translation>Anahtar zinciri okuması hatayla sonuçlandı: '%1'</translation>
- </message>
-</context>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="32"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
<source>Please enter %1 password:
User: %2
</translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="41"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <source>Reading from keychain failed with error: '%1'</source>
+ <translation>Anahtar zinciri okuması hatayla sonuçlandı: '%1'</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
<source>Enter Password</source>
<translation>Parolayı Girin</translation>
</message>
<translation>Kaldır</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="40"/>
<source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="109"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
<source>Could not open file</source>
<translation>Dosya açılamadı</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="111"/>
<source>Cannot write changes to '%1'.</source>
<translation>Değişiklikler '%1' üzerine yazılamıyor.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="138"/>
<source>Add Ignore Pattern</source>
<translation>Yoksayma Deseni Ekle</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>Add a new ignore pattern:</source>
<translation>Yeni bir yoksayma deseni ekle:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="45"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="46"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Bu girdi '%1' üzerinde sistem tarafından sağlanmaktadır ve bu görünümde değiştirilemez.</translation>
</message>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="163"/>
+ <location filename="../src/libsync/logger.cpp" line="190"/>
<source>Error</source>
<translation>Hata</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="164"/>
+ <location filename="../src/libsync/logger.cpp" line="191"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>'%1' dosyası<br/>yazmak üzere açılamadı.<br/><br/>Günlük çıktısı <b>kaydedilemez</b>!</nobr></translation>
</message>
</message>
<message>
<location filename="../src/gui/networksettings.ui" line="203"/>
- <location filename="../src/gui/networksettings.ui" line="295"/>
+ <location filename="../src/gui/networksettings.ui" line="292"/>
<source>No limit</source>
<translation>Sınır yok</translation>
</message>
<source>SOCKS5 proxy</source>
<translation>SOCKS5 vekil sunucusu</translation>
</message>
+ <message>
+ <location filename="../src/gui/networksettings.cpp" line="128"/>
+ <source>Qt >= 5.4 is required in order to use the bandwidth limit</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::OCUpdater</name>
<source>Downloading version %1. Please wait...</source>
<translation>%1 sürümü indirilyor. Lütfen bekleyin...</translation>
</message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
- <source>Version %1 available. Restart application to start the update.</source>
- <translation>%1 sürümü mevcut. Güncellemeyi başlatmak için uygulamayı yeniden başlatın.</translation>
- </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="145"/>
<source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
<source>Could not check for new updates.</source>
<translation>Yeni güncellemeler denetlenemedi.</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
+ <source>%1 version %2 available. Restart application to start the update.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
- <source>New version %1 available. Please use the system's update tool to install it.</source>
- <translation>Yeni %1 sürüm mevcut. Lütfen kurulum için sistem güncelleştirme aracını kullanın.</translation>
+ <source>New %1 version %2 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="151"/>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="114"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="110"/>
<source>Connection Timeout</source>
<translation>Bağlantı Zaman Aşımı</translation>
</message>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="171"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="167"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Getirme URL'sinden geçersiz JSON yanıtı</translation>
</message>
</context>
-<context>
- <name>OCC::PropagateDownloadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="435"/>
- <source>Sync was aborted by user.</source>
- <translation>Eşitleme kullanıcı tarafından iptal edildi.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="488"/>
- <source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation>Sunucudan E-Etiket alınamadı, Vekil sunucu/Ağ geçidini denetleyin.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="494"/>
- <source>We received a different E-Tag for resuming. Retrying next time.</source>
- <translation>Devam etmek üzere farklı bir E-Etiket aldık. Sonraki işlemde yeniden denenecek.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="516"/>
- <source>Server returned wrong content-range</source>
- <translation>Sunucu yanlış içerik aralığı döndürdü</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="567"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation>%1 dosyası, yerel dosya adı çakışması nedeniyle indirilemiyor!</translation>
- </message>
-</context>
<context>
<name>OCC::PropagateDownloadFileQNAM</name>
<message>
<translation>%1 dosyası, yerel dosya adı çakışması nedeniyle indirilemiyor!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="457"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
+ <source>The download would reduce free disk space below %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="372"/>
+ <source>Free space on disk is less than %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="482"/>
<source>File was deleted from server</source>
<translation>Dosya sunucudan silindi</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="506"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="531"/>
<source>The file could not be downloaded completely.</source>
<translation>Dosya tamamıyla indirilemedi.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="601"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="636"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Yerel bir dosya ismi ile çakıştığından, %1 dosyası kaydedilemedi!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="641"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="676"/>
<source>File has changed since discovery</source>
<translation>Dosya, bulunduğundan itibaren değişmiş</translation>
</message>
<context>
<name>OCC::PropagateItemJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="92"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
<source>; Restoration Failed: %1</source>
<translation>; Geri Yükleme Başarısız: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="138"/>
<source>Continue blacklisting:</source>
<translation>Kara listeye devam et:</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="230"/>
<source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove folder '%1';</source>
+ <source>Could not remove folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="243"/>
- <location filename="../src/libsync/propagator_legacy.cpp" line="302"/>
- <source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>Eşitleme sırasında yerel dosya değişti, tamamen ulaştıktan sonra bir kez eşitlenecek</translation>
- </message>
+ <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="246"/>
- <source>Sync was aborted by user.</source>
- <translation>Eşitleme kullanıcı tarafından iptal edildi.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="205"/>
+ <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/propagator_legacy.cpp" line="252"/>
- <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
- <translation>Dosya yerel olarak düzenlendi ancak salt okunur paylaşımın bir parçası. Geri yüklendi ve düzenlemeniz çakışan dosyada.</translation>
- </message>
-</context>
-<context>
- <name>OCC::PropagateUploadFileQNAM</name>
- <message>
- <location filename="../src/libsync/propagateupload.cpp" line="226"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="262"/>
<source>File Removed</source>
<translation>Dosya Kaldırıldı</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="274"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Eşitleme sırasında yerel dosya değişti. Devam edilecek.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="250"/>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="286"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="665"/>
<source>Local file changed during sync.</source>
<translation>Eşitleme sırasında yerel dosya değişti.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="558"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="592"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>Qt < 5.4.2 ile HTTP bağlantı sıfırlamasında görev iptali zorlanıyor.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="566"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="600"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Dosya yerel olarak düzenlendi ancak salt okunur paylaşımın bir parçası. Geri yüklendi ve düzenlemeniz çakışan dosyada.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="597"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="631"/>
<source>Poll URL missing</source>
<translation>Getirme URL'si eksik</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="620"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="654"/>
<source>The local file was removed during sync.</source>
<translation>Eşitleme sırasında yerel dosya kaldırıldı.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="646"/>
- <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
- <translation>Sunucu son yığını onaylamadı. (Mevcut e-etiket bulunamadı)</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="680"/>
+ <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Seçilmemiş klasörler yerel dosya sisteminizden <b>silinecek</b> ve bir daha bu bilgisayarla eşitlenmeyecektir</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>Ne Eşitleneceğini Seçin: Eşitlemek istediğiniz uzak alt klasörleri seçin.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>Ne Eşitleneceğini Seçin: Eşitlemek istemediğiniz uzak alt klasörlerin seçimini kaldırın.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
<source>Choose What to Sync</source>
<translation>Ne Eşitleneceğini Seçin</translation>
</message>
<translation>Boyut</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
<source>No subfolders currently on the server.</source>
<translation>Sunucuda şu anda alt dizin bulunmuyor.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>Alt dizin listesi alınırken bir hata oluştu.</translation>
</message>
<translation>Ayarlar</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="80"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="84"/>
<source>Activity</source>
<translation>Etkinlik</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="86"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="90"/>
<source>General</source>
<translation>Genel</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>Network</source>
<translation>Ağ</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharedialog.ui" line="22"/>
- <location filename="../src/gui/sharedialog.ui" line="234"/>
+ <location filename="../src/gui/sharedialog.ui" line="258"/>
<source>TextLabel</source>
<translation>MetinEtiketi</translation>
</message>
<translation>ownCloud Yolu:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="182"/>
+ <location filename="../src/gui/sharedialog.ui" line="116"/>
<source>Set &password </source>
<translation>&Parola belirle</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="196"/>
+ <location filename="../src/gui/sharedialog.ui" line="130"/>
<source>Set &expiration date</source>
<translation>Son kullanma tarihi b&elirle</translation>
</message>
+ <message>
+ <location filename="../src/gui/sharedialog.ui" line="214"/>
+ <source>Allow editing</source>
+ <translation>Düzenlemeye izin ver</translation>
+ </message>
<message>
<location filename="../src/gui/sharedialog.ui" line="77"/>
<source>Share link</source>
<translation>Paylaşma bağlantısı</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="125"/>
+ <location filename="../src/gui/sharedialog.ui" line="203"/>
<source>Copy &link</source>
<translation>Bağ&lantıyı kopyala</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="142"/>
+ <location filename="../src/gui/sharedialog.ui" line="154"/>
<source>Set password</source>
<translation>Parolayı ayarla</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="692"/>
- <source>%1 path: %2</source>
- <translation>%1 yol: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="115"/>
+ <location filename="../src/gui/sharedialog.cpp" line="120"/>
<source>%1 Sharing</source>
<translation>%1 Paylaşma</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="103"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="112"/>
+ <location filename="../src/gui/sharedialog.cpp" line="117"/>
<source>Folder: %2</source>
<translation>Klasör: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="121"/>
<source>P&assword protect</source>
<translation>&Parola koruması</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="221"/>
+ <location filename="../src/gui/sharedialog.cpp" line="214"/>
<source>Password Protected</source>
<translation>Parola Korumalı</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="382"/>
+ <location filename="../src/gui/sharedialog.cpp" line="338"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Dosya paylaşılamaz, çünkü sizinle paylaşım izni olmaksızın paylaşılmış.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="528"/>
+ <location filename="../src/gui/sharedialog.cpp" line="475"/>
<source>Please Set Password</source>
<translation>Lütfen Parola Atayın</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="564"/>
- <location filename="../src/gui/sharedialog.cpp" line="565"/>
+ <location filename="../src/gui/sharedialog.cpp" line="538"/>
+ <location filename="../src/gui/sharedialog.cpp" line="539"/>
<source>&Share link</source>
<translation>&Paylaşma bağlantısı</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="583"/>
+ <location filename="../src/gui/sharedialog.cpp" line="552"/>
+ <location filename="../src/gui/sharedialog.cpp" line="564"/>
<source>OCS API error code: %1</source>
<translation>OCS API hata kodu: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="605"/>
- <source>There is no sync folder configured.</source>
- <translation>Yapılandırılmış eşitleme klasörü yok.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="639"/>
- <source>A sync file with the same name exists. The file cannot be registered to sync.</source>
- <translation>Eşitlenecek dosya ile aynı isimde bir dosya var. Dosya eşitleme için kaydedilemiyor.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="684"/>
- <source>The file cannot be synced.</source>
- <translation>Dosya eşitlenemedi.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="624"/>
- <source>Sharing of external directories is not yet working.</source>
- <translation>Harici dizinlerin paylaşımı henüz çalışmıyor.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="473"/>
- <location filename="../src/gui/sharedialog.cpp" line="506"/>
+ <location filename="../src/gui/sharedialog.cpp" line="418"/>
+ <location filename="../src/gui/sharedialog.cpp" line="460"/>
<source>Public sh&aring requires a password</source>
<translation>Herkese &açık paylaşım için parola gerekir</translation>
</message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="617"/>
- <source>Cannot find a folder to upload to.</source>
- <translation>Yüklenecek bir klasör bulunamadı.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
- <source>Waiting to upload...</source>
- <translation>Yüklemek için bekliyor...</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="653"/>
- <source>Unable to register in sync space.</source>
- <translation>Eşitleme uzayında kaydetme başarısız.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="694"/>
- <source>Sync of registered file was not successful yet.</source>
- <translation>Kayıtlı dosyanın eşitlenmesi henüz başarılı değil.</translation>
- </message>
</context>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>Login Error</source>
<translation>Oturum Açma Hatası</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>You must sign in as user %1</source>
<translation>%1 kullanıcısı olarak oturum açmalısınız</translation>
</message>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="452"/>
+ <location filename="../src/gui/socketapi.cpp" line="447"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>%1 ile paylaş</translation>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="97"/>
+ <location filename="../src/libsync/syncengine.cpp" line="94"/>
<source>Success.</source>
<translation>Başarılı.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="104"/>
+ <location filename="../src/libsync/syncengine.cpp" line="101"/>
<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="107"/>
+ <location filename="../src/libsync/syncengine.cpp" line="104"/>
<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="110"/>
+ <location filename="../src/libsync/syncengine.cpp" line="107"/>
<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="113"/>
+ <location filename="../src/libsync/syncengine.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync bellek ayıramadı.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>CSync ciddi parametre hatası.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="119"/>
+ <location filename="../src/libsync/syncengine.cpp" line="116"/>
<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="122"/>
+ <location filename="../src/libsync/syncengine.cpp" line="119"/>
<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="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="122"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="125"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="128"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="131"/>
<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="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="134"/>
<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="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="137"/>
<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="143"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation>CSync ele alınmayan izin reddinden dolayı başarısız.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
<source>An error occurred while opening a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
<source>Error while reading folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="996"/>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
<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="1003"/>
+ <location filename="../src/libsync/syncengine.cpp" line="991"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="152"/>
<source>CSync unspecified error.</source>
<translation>CSync belirtilmemiş hata.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="155"/>
<source>Aborted by the user</source>
<translation>Kullanıcı tarafından iptal edildi</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="392"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>Dosya adı platformlar arası eşitleme yapılamayacak geçersiz karakterler içeriyor.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="143"/>
<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="100"/>
+ <location filename="../src/libsync/syncengine.cpp" line="97"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <source>CSync failed due to unhandled permission denied.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="146"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="158"/>
<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="175"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<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="230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="227"/>
<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="389"/>
+ <location filename="../src/libsync/syncengine.cpp" line="386"/>
<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="392"/>
+ <location filename="../src/libsync/syncengine.cpp" line="389"/>
<source>File is listed on the ignore list.</source>
<translation>Dosya yoksayma listesinde.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="398"/>
+ <location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename is too long.</source>
<translation>Dosya adı çok uzun.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="401"/>
+ <location filename="../src/libsync/syncengine.cpp" line="398"/>
<source>File is ignored because it's hidden.</source>
<translation>Dosya gizli olduğundan yoksayıldı.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="407"/>
+ <location filename="../src/libsync/syncengine.cpp" line="404"/>
<source>Stat failed.</source>
<translation>Durum hatalı.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="429"/>
+ <location filename="../src/libsync/syncengine.cpp" line="426"/>
<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="561"/>
+ <location filename="../src/libsync/syncengine.cpp" line="558"/>
<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="631"/>
+ <location filename="../src/libsync/syncengine.cpp" line="612"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="645"/>
<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="718"/>
+ <location filename="../src/libsync/syncengine.cpp" line="723"/>
<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="965"/>
- <location filename="../src/libsync/syncengine.cpp" line="972"/>
+ <location filename="../src/libsync/syncengine.cpp" line="953"/>
+ <location filename="../src/libsync/syncengine.cpp" line="960"/>
<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="990"/>
+ <location filename="../src/libsync/syncengine.cpp" line="978"/>
<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="1023"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1011"/>
<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="1040"/>
- <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1028"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1048"/>
<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="1073"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1061"/>
<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="1128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1116"/>
<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="1137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1125"/>
<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="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the destination</source>
<translation>hedef</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the source</source>
<translation>kaynak</translation>
</message>
</message>
</context>
<context>
- <name>OCC::TransmissionChecksumValidator</name>
+ <name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="128"/>
<source>The checksum header is malformed.</source>
<translation>Sağlama toplam başlığı bozulmuş.</translation>
</message>
<message>
<location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+ <source>The checksum header contained an unknown checksum type '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="148"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>İndirilen dosya sağlama toplamı ile eşleşmiyor, devam edilecek.</translation>
</message>
<source>Recent Changes</source>
<translation>Son Değişiklikler</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="561"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="331"/>
<source>Managed Folders:</source>
<source>Open %1 in browser</source>
<translation>%1'ı tarayıcıda aç</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="449"/>
- <source>Log out everywhere</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="457"/>
- <source>Log in everywhere...</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="513"/>
<source>Unknown status</source>
<source>Account %1: %2</source>
<translation>Hesap %1: %2</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="449"/>
+ <source>Log out of all accounts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="457"/>
+ <source>Log in to all accounts...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="532"/>
<source>Crash now</source>
<source>No items synced recently</source>
<translation>Yakın zamanda eşitlenen öge yok</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="561"/>
- <source>Discovering '%1'</source>
- <translation>Ortaya çıkarılan: %1</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="566"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>%L1 B</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="306"/>
+ <location filename="../src/libsync/utility.cpp" line="303"/>
<source>%Ln year(s)</source>
<translation>%Ln yıl</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="307"/>
+ <location filename="../src/libsync/utility.cpp" line="304"/>
<source>%Ln month(s)</source>
<translation>%Ln ay</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="308"/>
+ <location filename="../src/libsync/utility.cpp" line="305"/>
<source>%Ln day(s)</source>
<translation>%Ln gün</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="309"/>
+ <location filename="../src/libsync/utility.cpp" line="306"/>
<source>%Ln hour(s)</source>
<translation>%Ln saat</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="310"/>
+ <location filename="../src/libsync/utility.cpp" line="307"/>
<source>%Ln minute(s)</source>
<translation>%Ln dakika</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="311"/>
+ <location filename="../src/libsync/utility.cpp" line="308"/>
<source>%Ln second(s)</source>
<translation>%Ln saniye</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="318"/>
<source>0 seconds</source>
<translation>0 saniye</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="336"/>
+ <location filename="../src/libsync/utility.cpp" line="333"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="73"/>
- <source>Remove the account configuration from the client</source>
+ <source>Enter your credentials to connect to the server</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="76"/>
+ <source>Sign in</source>
+ <translation>Ввійти...</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="89"/>
+ <source>Remove the account configuration from the client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Remove Account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="97"/>
+ <location filename="../src/gui/accountsettings.ui" line="113"/>
<source>Storage space: ...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="167"/>
+ <location filename="../src/gui/accountsettings.ui" line="183"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Не позначені теки будуть <b>видалені</b> з вашої системи та більше не будуть синхронізуватися</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="230"/>
<source>Apply</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="198"/>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
- <location filename="../src/gui/accountsettings.cpp" line="571"/>
+ <location filename="../src/gui/accountsettings.ui" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="289"/>
+ <location filename="../src/gui/accountsettings.cpp" line="646"/>
<source>Cancel</source>
<translation>Скасувати</translation>
</message>
<translation>Підключено до <server> як <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="115"/>
+ <location filename="../src/gui/accountsettings.cpp" line="121"/>
<source>No account configured.</source>
<translation>Обліковий запис не налаштовано.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="161"/>
+ <source>Choose what to sync</source>
+ <translation>Оберіть, що хочете синхронізувати</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="168"/>
+ <source>Remove folder sync connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="234"/>
<source>Folder creation failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="230"/>
+ <location filename="../src/gui/accountsettings.cpp" line="235"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="283"/>
- <source>Stop syncing</source>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
+ <source>Confirm Folder Sync Connection Removal</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>Remove Folder Sync Connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="309"/>
+ <location filename="../src/gui/accountsettings.cpp" line="314"/>
<source>Confirm Folder Reset</source>
<translation>Підтвердіть скидання теки</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="310"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>Ви дійсно бажаєте скинути теку <i>%1</i> та перебудувати клієнтську базу даних?</p><p><b>Зверніть увагу:</b> Дана функція призначена лише для технічного обслуговування. Файли не будуть видалені, але, в залежності від розміру теки, операція може зайняти від кількох хвилин до кількох годин та може бути переданий великий обсяг даних. Використовуйте дану операцію лише за рекомендації адміністратора.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="391"/>
+ <location filename="../src/gui/accountsettings.cpp" line="396"/>
<source>Sync Running</source>
<translation>Виконується синхронізація</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="392"/>
+ <location filename="../src/gui/accountsettings.cpp" line="397"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>Виконується процедура синхронізації.<br/>Бажаєте відмінити?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="472"/>
+ <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <source>%1 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="485"/>
<source>%1 as <i>%2</i></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="476"/>
+ <location filename="../src/gui/accountsettings.cpp" line="495"/>
<source>Connected to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="478"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
<source>Server %1 is temporarily unavailable.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="480"/>
+ <location filename="../src/gui/accountsettings.cpp" line="499"/>
<source>Signed out from %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="482"/>
+ <location filename="../src/gui/accountsettings.cpp" line="501"/>
<source>No connection to %1 at %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
- <source>There are new folders that were not synchronized because they are too big: %1</source>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <source>There are new folders that were not synchronized because they are too big: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="536"/>
- <source>, </source>
- <translation>,</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="563"/>
+ <location filename="../src/gui/accountsettings.cpp" line="638"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="564"/>
+ <location filename="../src/gui/accountsettings.cpp" line="639"/>
<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="570"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="158"/>
<source>Open folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="168"/>
- <source>Choose What to Sync</source>
- <translation>Оберіть, що хочете синхронізувати</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="176"/>
- <source>Remove sync</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="277"/>
- <source>Confirm Sync Removal</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="278"/>
+ <location filename="../src/gui/accountsettings.cpp" line="283"/>
<source><p>Do you really want to stop syncing the folder <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="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="452"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="448"/>
+ <location filename="../src/gui/accountsettings.cpp" line="453"/>
<source>%1 of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="453"/>
+ <location filename="../src/gui/accountsettings.cpp" line="462"/>
<source>Currently there is no storage usage information available.</source>
<translation>На даний час немає відомостей про наповнення сховища.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="507"/>
<source>No %1 connection configured.</source>
<translation>Жодного %1 підключення не налаштовано.</translation>
</message>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="95"/>
+ <location filename="../src/gui/accountstate.cpp" line="99"/>
<source>Signed out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="97"/>
+ <location filename="../src/gui/accountstate.cpp" line="101"/>
<source>Disconnected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="99"/>
+ <location filename="../src/gui/accountstate.cpp" line="103"/>
<source>Connected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="101"/>
+ <location filename="../src/gui/accountstate.cpp" line="105"/>
<source>Service unavailable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="103"/>
+ <location filename="../src/gui/accountstate.cpp" line="107"/>
<source>Network error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="105"/>
+ <location filename="../src/gui/accountstate.cpp" line="109"/>
<source>Configuration error</source>
<translation>Помилка конфігурації</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="107"/>
+ <location filename="../src/gui/accountstate.cpp" line="111"/>
<source>Unknown account state</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>Reauthentication required</source>
+ <translation>Потрібна повторна аутентифікація</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>You need to re-login to continue using the account %1.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
<translation>Будь ласка, оновіть сервер до останньої версії та перезавантажте клієнт.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="143"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="135"/>
<source>Authentication error: Either username or password are wrong.</source>
<translation>Помилка автентифікації: ім'я користувача або пароль невірні.</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="155"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="147"/>
<source>timeout</source>
<translation>час вичерпано</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="186"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="178"/>
<source>The provided credentials are not correct</source>
<translation>Введені дані не вірні</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="524"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="537"/>
<source>Aborted by the user</source>
<translation>Перервано користувачем</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="107"/>
+ <location filename="../src/gui/folder.cpp" line="108"/>
<source>Unable to create csync-context</source>
<translation>Неможливо створити csync-контекст</translation>
</message>
<translation>Журнал синхронізації</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="845"/>
+ <location filename="../src/gui/folder.cpp" line="870"/>
<source>Could not read system exclude file</source>
<translation>Неможливо прочитати виключений системний файл</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1102"/>
+ <location filename="../src/gui/folder.cpp" line="1127"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1115"/>
+ <location filename="../src/gui/folder.cpp" line="1140"/>
<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="1119"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Remove All Files?</source>
<translation>Видалити усі файли?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1121"/>
+ <location filename="../src/gui/folder.cpp" line="1146"/>
<source>Remove all files</source>
<translation>Видалити усі файли</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1122"/>
+ <location filename="../src/gui/folder.cpp" line="1147"/>
<source>Keep files</source>
<translation>Зберегти файли</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="275"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<source>Could not reset folder state</source>
<translation>Не вдалося скинути стан теки</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="276"/>
+ <location filename="../src/gui/folderman.cpp" line="271"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Знайдено старий журнал синхронізації '%1', його неможливо видалити. Будь ласка, впевніться що він не відкритий в іншій програмі.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="877"/>
+ <location filename="../src/gui/folderman.cpp" line="865"/>
<source> (backup)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="882"/>
+ <location filename="../src/gui/folderman.cpp" line="870"/>
<source> (backup %1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1091"/>
+ <location filename="../src/gui/folderman.cpp" line="1079"/>
<source>Undefined State.</source>
<translation>Невизначений стан.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1094"/>
- <source>Waits to start syncing.</source>
- <translation>Очікування початку синхронізації.</translation>
+ <location filename="../src/gui/folderman.cpp" line="1082"/>
+ <source>Waiting to start syncing.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1097"/>
+ <location filename="../src/gui/folderman.cpp" line="1085"/>
<source>Preparing for sync.</source>
<translation>Підготовка до синхронізації</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1100"/>
+ <location filename="../src/gui/folderman.cpp" line="1088"/>
<source>Sync is running.</source>
<translation>Синхронізація запущена.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1103"/>
+ <location filename="../src/gui/folderman.cpp" line="1091"/>
<source>Last Sync was successful.</source>
<translation>Остання синхронізація була успішною.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1108"/>
+ <location filename="../src/gui/folderman.cpp" line="1096"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Остання синхронізація пройшла вдало, але були зауваження про деякі файли.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1111"/>
+ <location filename="../src/gui/folderman.cpp" line="1099"/>
<source>Setup Error.</source>
<translation>Помилка установки.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1114"/>
+ <location filename="../src/gui/folderman.cpp" line="1102"/>
<source>User Abort.</source>
<translation>Відмінено користувачем.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1117"/>
+ <location filename="../src/gui/folderman.cpp" line="1105"/>
<source>Sync is paused.</source>
<translation>Синхронізація призупинена.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1123"/>
+ <location filename="../src/gui/folderman.cpp" line="1111"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Синхронізація призупинена)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1119"/>
<source>No valid folder selected!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1130"/>
<source>The selected path is not a folder!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1146"/>
+ <location filename="../src/gui/folderman.cpp" line="1134"/>
<source>You have no permission to write to the selected folder!</source>
<translation>У вас немає прав на запис в цю теку!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1161"/>
+ <location filename="../src/gui/folderman.cpp" line="1149"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1166"/>
+ <location filename="../src/gui/folderman.cpp" line="1154"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1173"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1168"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1186"/>
+ <location filename="../src/gui/folderman.cpp" line="1174"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="85"/>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="274"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="271"/>
<source>File</source>
<translation>Файл</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="228"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="224"/>
<source>Syncing selected files in your account with</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="231"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="227"/>
<source>Remote path: %1</source>
<translation>Віддалений шлях: %1</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="121"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="122"/>
<source>You need to be connected to add a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="126"/>
- <source>Adding folder is disabled because your 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="131"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="132"/>
<source>Click this button to add a folder to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="141"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="142"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="156"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
<source>Error while loading the list of folders from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="182"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="192"/>
<source>Signed out</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="727"/>
- <source>Discovering '%1'</source>
- <translation>Виявлення '%1'</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="127"/>
+ <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="163"/>
+ <source>Fetching folder list from server...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="787"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="789"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="849"/>
<source>Syncing %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="792"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="854"/>
<source>download %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="794"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="856"/>
<source>u2193 %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="800"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>upload %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="802"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="864"/>
<source>u2191 %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="807"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="869"/>
<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="811"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="873"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="827"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="889"/>
<source>%1 of %2, file %3 of %4
Total time left %5</source>
<translation>%1 of %2, файл %3 з %4
Залишилось: %5</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
<source>file %1 of %2</source>
<translation>файл %1 з %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="932"/>
<source>Waiting...</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="934"/>
<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="878"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>Preparing to sync...</source>
<translation type="unfinished"/>
</message>
<name>OCC::FolderWizard</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <source>Add Folder Sync Connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderwizard.cpp" line="564"/>
- <source>Add Folder</source>
- <translation>Додати Теку</translation>
+ <source>Add Sync Connection</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Додатково</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="61"/>
+ <location filename="../src/gui/generalsettings.ui" line="109"/>
<source>Ask confirmation before downloading folders larger than</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
+ <location filename="../src/gui/generalsettings.ui" line="129"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="109"/>
+ <location filename="../src/gui/generalsettings.ui" line="159"/>
<source>Show crash reporter</source>
<translation>Показати звіти про помилки</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="118"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit Ignored Files</source>
<translation>Ігноровані файли</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="142"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
<source>Add an Account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="167"/>
- <location filename="../src/gui/generalsettings.ui" line="173"/>
+ <location filename="../src/gui/generalsettings.ui" line="171"/>
+ <location filename="../src/gui/generalsettings.ui" line="177"/>
<source>About</source>
<translation>Про</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <location filename="../src/gui/generalsettings.ui" line="187"/>
<source>Updates</source>
<translation>Оновлення</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="208"/>
+ <location filename="../src/gui/generalsettings.ui" line="212"/>
<source>&Restart && Update</source>
<translation>&Перезавантаження && Оновлення</translation>
</message>
</context>
-<context>
- <name>OCC::HttpCredentials</name>
- <message>
- <location filename="../src/libsync/creds/httpcredentials.cpp" line="290"/>
- <source>Reading from keychain failed with error: '%1'</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="32"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
<source>Please enter %1 password:
User: %2
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="41"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <source>Reading from keychain failed with error: '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
<source>Enter Password</source>
<translation>Введіть Пароль</translation>
</message>
<translation>Видалити</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="40"/>
<source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="109"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
<source>Could not open file</source>
<translation>Не вдалося відкрити файл</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="111"/>
<source>Cannot write changes to '%1'.</source>
<translation>Неможливо запиасати зміни до '%1'.</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="138"/>
<source>Add Ignore Pattern</source>
<translation>Додати шаблон ігнорування</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>Add a new ignore pattern:</source>
<translation>Додати новий шаблон ігнорування:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="45"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="46"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>Цей запис створено системою в '%1', тут змінити його не можна.</translation>
</message>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="163"/>
+ <location filename="../src/libsync/logger.cpp" line="190"/>
<source>Error</source>
<translation>Помилка</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="164"/>
+ <location filename="../src/libsync/logger.cpp" line="191"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>Файл '%1'<br/>не вдається відкрити на запис.<br/><br/>Журнал <b>не</b> можливо зберегти!</nobr></translation>
</message>
</message>
<message>
<location filename="../src/gui/networksettings.ui" line="203"/>
- <location filename="../src/gui/networksettings.ui" line="295"/>
+ <location filename="../src/gui/networksettings.ui" line="292"/>
<source>No limit</source>
<translation>Без обмежень</translation>
</message>
<source>SOCKS5 proxy</source>
<translation>SOCKS5 проксі</translation>
</message>
+ <message>
+ <location filename="../src/gui/networksettings.cpp" line="128"/>
+ <source>Qt >= 5.4 is required in order to use the bandwidth limit</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::OCUpdater</name>
<source>Downloading version %1. Please wait...</source>
<translation>Завантаження файлів %1. Будь ласка, почекайте...</translation>
</message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
- <source>Version %1 available. Restart application to start the update.</source>
- <translation>Доступна версія %1. Перезавантажте додаток та оновіть його.</translation>
- </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="145"/>
<source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
<source>Could not check for new updates.</source>
<translation>Не вдалося перевірити наявність оновлень. </translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
+ <source>%1 version %2 available. Restart application to start the update.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
- <source>New version %1 available. Please use the system's update tool to install it.</source>
- <translation>Доступна нова версія %1. Будь ласка, скористайтесь оновленням системи для встановлення.</translation>
+ <source>New %1 version %2 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="151"/>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="114"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="110"/>
<source>Connection Timeout</source>
<translation>Тайм-аут З'єднання</translation>
</message>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="171"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="167"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>Неправильна JSON відповідь на сформований URL</translation>
</message>
</context>
-<context>
- <name>OCC::PropagateDownloadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="435"/>
- <source>Sync was aborted by user.</source>
- <translation>Синхронізація перервана користувачем.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="488"/>
- <source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation>Не отримано E-Tag від серверу, перевірте мережеві налаштування (проксі, шлюз)</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="494"/>
- <source>We received a different E-Tag for resuming. Retrying next time.</source>
- <translation>Ми отримали інший E-Tag для відновлення. Спробуйте ще раз пізніше.</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="516"/>
- <source>Server returned wrong content-range</source>
- <translation>Сервер повернув невірний content-range</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="567"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation>Файл %1 не завантажено, через локальний конфлікт ім'я! </translation>
- </message>
-</context>
<context>
<name>OCC::PropagateDownloadFileQNAM</name>
<message>
<translation>Файл %1 не завантажено, через локальний конфлікт ім'я! </translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="457"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
+ <source>The download would reduce free disk space below %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="372"/>
+ <source>Free space on disk is less than %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="482"/>
<source>File was deleted from server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="506"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="531"/>
<source>The file could not be downloaded completely.</source>
<translation>Файл не може бути завантажений повністю.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="601"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="636"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>Файл %1 не збережено, через локальний конфлікт ім'я! </translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="641"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="676"/>
<source>File has changed since discovery</source>
<translation>Файл змінився з моменту знаходження</translation>
</message>
<context>
<name>OCC::PropagateItemJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="92"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
<source>; Restoration Failed: %1</source>
<translation>; Відновлення не вдалося: %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="138"/>
<source>Continue blacklisting:</source>
<translation>Продовжити занесення до чорного списку:</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="230"/>
<source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove folder '%1';</source>
+ <source>Could not remove folder '%1'</source>
<translation type="unfinished"/>
</message>
<message>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="243"/>
- <location filename="../src/libsync/propagator_legacy.cpp" line="302"/>
- <source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>Локальний файл змінився під час синхронізації, повторюємо процес</translation>
- </message>
+ <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="246"/>
- <source>Sync was aborted by user.</source>
- <translation>СинÑ\85Ñ\80онÑ\96заÑ\86Ñ\96Ñ\8f пеÑ\80еÑ\80вана коÑ\80иÑ\81Ñ\82Ñ\83ваÑ\87ем.</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="205"/>
+ <source>File name contains at least one invalid character</source>
+ <translation>Ð\86мâ\80\99Ñ\8f Ñ\84айлÑ\83 мÑ\96Ñ\81Ñ\82иÑ\82Ñ\8c пÑ\80инаймнÑ\96 один некоÑ\80екÑ\82ний Ñ\81имвол</translation>
</message>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="252"/>
- <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
- <translation>Файл було змінено локально, але він розташований в теці з правами лише на перегляд. Файл відновлено, а ваші зміни розташовані в теці конфліктів.</translation>
- </message>
-</context>
-<context>
- <name>OCC::PropagateUploadFileQNAM</name>
- <message>
- <location filename="../src/libsync/propagateupload.cpp" line="226"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="262"/>
<source>File Removed</source>
<translation>Файл переміщено</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="274"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>Локальний файл змінився під час синхронізації. Його буде відновлено.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="250"/>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="286"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="665"/>
<source>Local file changed during sync.</source>
<translation>Локальний файл змінився під час синхронізації.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="558"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="592"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation>Примусове припинення завдання при скиданні HTTP з’єднання з Qt < 5.4.2.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="566"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="600"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>Файл було змінено локально, але він розташований в теці з правами лише на перегляд. Файл відновлено, а ваші зміни розташовані в теці конфліктів.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="597"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="631"/>
<source>Poll URL missing</source>
<translation>Не вистачає сформованого URL</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="620"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="654"/>
<source>The local file was removed during sync.</source>
<translation>Локальний файл було видалено під час синхронізації.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="646"/>
- <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
- <translation>Сервер не зміг підтвердити останній відрізок даних. (Були відсутні e-tag)</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="680"/>
+ <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>Не позначені теки будуть <b>видалені</b> з вашої системи та більше не будуть синхронізуватися</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>Виберіть Що Синхронізувати: Виберіть папки на віддаленому сервері, які Ви хотіли б синхронізувати.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>Виберіть Що Синхронізувати: Зніміть вибір папок на віддаленому сервері, які Ви не хочете синхронізувати.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
<source>Choose What to Sync</source>
<translation>Оберіть, що хочете синхронізувати</translation>
</message>
<translation>Розмір</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
<source>No subfolders currently on the server.</source>
<translation>На сервері зараз немає підтек.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>Виникла помилка, поки завантажувався перелік підтек.</translation>
</message>
<translation>Налаштування</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="80"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="84"/>
<source>Activity</source>
<translation>Активність</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="86"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="90"/>
<source>General</source>
<translation>Загалом</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>Network</source>
<translation>Мережа</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharedialog.ui" line="22"/>
- <location filename="../src/gui/sharedialog.ui" line="234"/>
+ <location filename="../src/gui/sharedialog.ui" line="258"/>
<source>TextLabel</source>
<translation>Мітка</translation>
</message>
<translation>Шлях до ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="182"/>
+ <location filename="../src/gui/sharedialog.ui" line="116"/>
<source>Set &password </source>
<translation>Встановити &пароль</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="196"/>
+ <location filename="../src/gui/sharedialog.ui" line="130"/>
<source>Set &expiration date</source>
<translation>Встановити т&ермін дії</translation>
</message>
+ <message>
+ <location filename="../src/gui/sharedialog.ui" line="214"/>
+ <source>Allow editing</source>
+ <translation>Дозволити редагування</translation>
+ </message>
<message>
<location filename="../src/gui/sharedialog.ui" line="77"/>
<source>Share link</source>
<translation>Опублікувати посилання</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="125"/>
+ <location filename="../src/gui/sharedialog.ui" line="203"/>
<source>Copy &link</source>
<translation>Копіювати п&осилання</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="142"/>
+ <location filename="../src/gui/sharedialog.ui" line="154"/>
<source>Set password</source>
<translation>Встановіть пароль</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="692"/>
- <source>%1 path: %2</source>
- <translation>%1 шлях: %2</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="115"/>
+ <location filename="../src/gui/sharedialog.cpp" line="120"/>
<source>%1 Sharing</source>
<translation>Ви поділилися %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="103"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="112"/>
+ <location filename="../src/gui/sharedialog.cpp" line="117"/>
<source>Folder: %2</source>
<translation>Тека: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="121"/>
<source>P&assword protect</source>
<translation>&Захистити паролем</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="221"/>
+ <location filename="../src/gui/sharedialog.cpp" line="214"/>
<source>Password Protected</source>
<translation>Захищено паролем</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="382"/>
+ <location filename="../src/gui/sharedialog.cpp" line="338"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Цей файл неможливо поширити, бо ним поділилися без права на поширення.</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="528"/>
+ <location filename="../src/gui/sharedialog.cpp" line="475"/>
<source>Please Set Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="564"/>
- <location filename="../src/gui/sharedialog.cpp" line="565"/>
+ <location filename="../src/gui/sharedialog.cpp" line="538"/>
+ <location filename="../src/gui/sharedialog.cpp" line="539"/>
<source>&Share link</source>
<translation>По&ділитись посиланням</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="583"/>
+ <location filename="../src/gui/sharedialog.cpp" line="552"/>
+ <location filename="../src/gui/sharedialog.cpp" line="564"/>
<source>OCS API error code: %1</source>
<translation>OCS API код помилки: %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="605"/>
- <source>There is no sync folder configured.</source>
- <translation>Немає папок налаштованих для синхронізації.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="639"/>
- <source>A sync file with the same name exists. The file cannot be registered to sync.</source>
- <translation>Файл синхронізації з такою ж назвою існує. Цей файл неможливо зареєструвати для синхронізації.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="684"/>
- <source>The file cannot be synced.</source>
- <translation>Файл неможливо синхронізувати</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="624"/>
- <source>Sharing of external directories is not yet working.</source>
- <translation>Функція відкриття доступу до зовнішніх папок поки не працює.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="473"/>
- <location filename="../src/gui/sharedialog.cpp" line="506"/>
+ <location filename="../src/gui/sharedialog.cpp" line="418"/>
+ <location filename="../src/gui/sharedialog.cpp" line="460"/>
<source>Public sh&aring requires a password</source>
<translation>Публічне по&ширення вимагає пароль</translation>
</message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="617"/>
- <source>Cannot find a folder to upload to.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
- <source>Waiting to upload...</source>
- <translation>Очікування завантаження...</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="653"/>
- <source>Unable to register in sync space.</source>
- <translation>Неможливо зареєструватися в синхронізованому просторі.</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="694"/>
- <source>Sync of registered file was not successful yet.</source>
- <translation>Синхронізація зареєстрованого файлу поки не була успішною.</translation>
- </message>
</context>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>Login Error</source>
<translation>Помилка входу</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>You must sign in as user %1</source>
<translation>Ви маєте увійти як %1</translation>
</message>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="452"/>
+ <location filename="../src/gui/socketapi.cpp" line="447"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Поділитися з %1</translation>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="97"/>
+ <location filename="../src/libsync/syncengine.cpp" line="94"/>
<source>Success.</source>
<translation>Успішно.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="104"/>
+ <location filename="../src/libsync/syncengine.cpp" line="101"/>
<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="107"/>
+ <location filename="../src/libsync/syncengine.cpp" line="104"/>
<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="110"/>
+ <location filename="../src/libsync/syncengine.cpp" line="107"/>
<source>CSync got an error while processing internal trees.</source>
<translation>У CSync виникла помилка під час сканування внутрішньої структури каталогів.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="113"/>
+ <location filename="../src/libsync/syncengine.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync не вдалося зарезервувати пам'ять.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>У CSync сталася фатальна помилка параметра.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="119"/>
+ <location filename="../src/libsync/syncengine.cpp" line="116"/>
<source>CSync processing step update failed.</source>
<translation>CSync не вдалася зробити оновлення .</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="122"/>
+ <location filename="../src/libsync/syncengine.cpp" line="119"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync не вдалася зробити врегулювання.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="122"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync не вдалося аутентифікуватися на проксі-сервері.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="125"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync не вдалося знайти Проксі або Сервер.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="128"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync не вдалося аутентифікуватися на %1 сервері.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="131"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync не вдалося приєднатися до мережі.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="134"/>
<source>A network connection timeout happened.</source>
<translation>Час під'єднання до мережі вичерпався.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="137"/>
<source>A HTTP transmission error happened.</source>
<translation>Сталася помилка передачі даних по HTTP.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation>CSync завершився неуспішно через порушення прав доступу.</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
<source>An error occurred while opening a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
<source>Error while reading folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="996"/>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
<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="1003"/>
+ <location filename="../src/libsync/syncengine.cpp" line="991"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: на сервері %1 скінчилося місце.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="152"/>
<source>CSync unspecified error.</source>
<translation>Невизначена помилка CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="155"/>
<source>Aborted by the user</source>
<translation>Перервано користувачем</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="392"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="143"/>
<source>CSync failed to access</source>
<translation>CSync не вдалося отримати доступ</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <location filename="../src/libsync/syncengine.cpp" line="97"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <source>CSync failed due to unhandled permission denied.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="146"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="158"/>
<source>The service is temporarily unavailable</source>
<translation>Служба тимчасово недоступна</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="175"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>An internal error number %1 occurred.</source>
<translation>Виникла внутрішня помилка за номером %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="227"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Шлях не синхронізується через помилки: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="389"/>
+ <location filename="../src/libsync/syncengine.cpp" line="386"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Синхронізація символічних посилань не підтримується. </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="392"/>
+ <location filename="../src/libsync/syncengine.cpp" line="389"/>
<source>File is listed on the ignore list.</source>
<translation>Файл присутній у списку ігноруємих.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="398"/>
+ <location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename is too long.</source>
<translation>Шлях до файлу занадто довгий.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="401"/>
+ <location filename="../src/libsync/syncengine.cpp" line="398"/>
<source>File is ignored because it's hidden.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="407"/>
+ <location filename="../src/libsync/syncengine.cpp" line="404"/>
<source>Stat failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="429"/>
+ <location filename="../src/libsync/syncengine.cpp" line="426"/>
<source>Filename encoding is not valid</source>
<translation>Кодування файлу не припустиме</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="561"/>
+ <location filename="../src/libsync/syncengine.cpp" line="558"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="631"/>
+ <location filename="../src/libsync/syncengine.cpp" line="612"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="645"/>
<source>Unable to initialize a sync journal.</source>
<translation>Не вдалося ініціалізувати протокол синхронізації.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="718"/>
+ <location filename="../src/libsync/syncengine.cpp" line="723"/>
<source>Cannot open the sync journal</source>
<translation>Не вдається відкрити протокол синхронізації</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="965"/>
- <location filename="../src/libsync/syncengine.cpp" line="972"/>
+ <location filename="../src/libsync/syncengine.cpp" line="953"/>
+ <location filename="../src/libsync/syncengine.cpp" line="960"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ігнорується через чорний список в "обрати що синхронізувати"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <location filename="../src/libsync/syncengine.cpp" line="978"/>
<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="1023"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1011"/>
<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="1040"/>
- <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1028"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1048"/>
<source>Not allowed to remove, restoring</source>
<translation>Не дозволено видаляти, відновлюємо</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1073"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1061"/>
<source>Local files and share folder removed.</source>
<translation>Локальні файли та теки в загальному доступі було видалено.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1116"/>
<source>Move not allowed, item restored</source>
<translation>Переміщення не дозволено, елемент відновлено </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1125"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Переміщення не дозволено, оскільки %1 помічений тільки для перегляду</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the destination</source>
<translation>призначення</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the source</source>
<translation>джерело</translation>
</message>
</message>
</context>
<context>
- <name>OCC::TransmissionChecksumValidator</name>
+ <name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="128"/>
<source>The checksum header is malformed.</source>
<translation>Заголовок контрольної суми пошкоджено.</translation>
</message>
<message>
<location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+ <source>The checksum header contained an unknown checksum type '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="148"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>Завантажений файл не відповідає контрольній сумі, його буде відновлено.</translation>
</message>
<source>Recent Changes</source>
<translation>Недавні зміни</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="561"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="331"/>
<source>Managed Folders:</source>
<source>Open %1 in browser</source>
<translation>Відкрити %1 в браузері</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="449"/>
- <source>Log out everywhere</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="457"/>
- <source>Log in everywhere...</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="513"/>
<source>Unknown status</source>
<source>Account %1: %2</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="449"/>
+ <source>Log out of all accounts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="457"/>
+ <source>Log in to all accounts...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="532"/>
<source>Crash now</source>
<source>No items synced recently</source>
<translation>Нещодавно нічого не синхронізувалося</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="561"/>
- <source>Discovering '%1'</source>
- <translation>Виявлення '%1'</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="566"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>%L1 Б</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="306"/>
+ <location filename="../src/libsync/utility.cpp" line="303"/>
<source>%Ln year(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="307"/>
+ <location filename="../src/libsync/utility.cpp" line="304"/>
<source>%Ln month(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="308"/>
+ <location filename="../src/libsync/utility.cpp" line="305"/>
<source>%Ln day(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="309"/>
+ <location filename="../src/libsync/utility.cpp" line="306"/>
<source>%Ln hour(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="310"/>
+ <location filename="../src/libsync/utility.cpp" line="307"/>
<source>%Ln minute(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="311"/>
+ <location filename="../src/libsync/utility.cpp" line="308"/>
<source>%Ln second(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="318"/>
<source>0 seconds</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="336"/>
+ <location filename="../src/libsync/utility.cpp" line="333"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="73"/>
+ <source>Enter your credentials to connect to the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <source>Sign in</source>
+ <translation>登录</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="89"/>
<source>Remove the account configuration from the client</source>
<translation>从客户端中删除账号设置</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Remove Account</source>
<translation>删除账号</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="97"/>
+ <location filename="../src/gui/accountsettings.ui" line="113"/>
<source>Storage space: ...</source>
<translation>存储空间:...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="167"/>
+ <location filename="../src/gui/accountsettings.ui" line="183"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>取消选中的文件夹将会从本地<b>删除</b>，并不再同步到这台电脑上。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="230"/>
<source>Apply</source>
<translation>应用</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="198"/>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
- <location filename="../src/gui/accountsettings.cpp" line="571"/>
+ <location filename="../src/gui/accountsettings.ui" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="289"/>
+ <location filename="../src/gui/accountsettings.cpp" line="646"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
<translation><user> 已经连接到 <server> </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="115"/>
+ <location filename="../src/gui/accountsettings.cpp" line="121"/>
<source>No account configured.</source>
<translation>没有配置的帐号。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="161"/>
+ <source>Choose what to sync</source>
+ <translation>选择同步内容</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="168"/>
+ <source>Remove folder sync connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="234"/>
<source>Folder creation failed</source>
<translation>文件夹创建失败</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="230"/>
+ <location filename="../src/gui/accountsettings.cpp" line="235"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation><p>无法创建文件夹 <i>%1</i>。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="283"/>
- <source>Stop syncing</source>
- <translation>停止同步</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
+ <source>Confirm Folder Sync Connection Removal</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="309"/>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>Remove Folder Sync Connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="314"/>
<source>Confirm Folder Reset</source>
<translation>确认文件夹重置</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="310"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>您真希望重置文件夹 <i>%1</i> 并重新构建您的客户端数据库吗？</p><p><b>注意：</b>此功能设计仅用作维护操作。没有文件将被移除，但这将导致大量的数据传输。根据文件夹的大小，这一过程将持续几分钟到几小时。请仅在管理员指导的情况下使用此功能。</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="391"/>
+ <location filename="../src/gui/accountsettings.cpp" line="396"/>
<source>Sync Running</source>
<translation>同步正在运行</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="392"/>
+ <location filename="../src/gui/accountsettings.cpp" line="397"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>正在执行同步。<br />您确定要关闭它吗？</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="472"/>
+ <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <source>%1 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="485"/>
<source>%1 as <i>%2</i></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="476"/>
+ <location filename="../src/gui/accountsettings.cpp" line="495"/>
<source>Connected to %1.</source>
<translation>连接到 %1。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="478"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>远程服务器%1暂时不可用。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="480"/>
+ <location filename="../src/gui/accountsettings.cpp" line="499"/>
<source>Signed out from %1.</source>
<translation>从 %1 登出</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="482"/>
+ <location filename="../src/gui/accountsettings.cpp" line="501"/>
<source>No connection to %1 at %2.</source>
<translation>没有到位于%2中的%1的连接</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
- <source>There are new folders that were not synchronized because they are too big: %1</source>
- <translation>部分新文件夹没有被同步，因为他们太大：%1</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="536"/>
- <source>, </source>
- <translation>，</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <source>There are new folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="563"/>
+ <location filename="../src/gui/accountsettings.cpp" line="638"/>
<source>Confirm Account Removal</source>
<translation>确认删除账号</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="564"/>
+ <location filename="../src/gui/accountsettings.cpp" line="639"/>
<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="570"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>Remove connection</source>
<translation>删除连接</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="158"/>
<source>Open folder</source>
<translation>打开文件夹</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="168"/>
- <source>Choose What to Sync</source>
- <translation>选择同步内容</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Resume sync</source>
<translation>恢复同步</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Pause sync</source>
<translation>暂停同步</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="176"/>
- <source>Remove sync</source>
- <translation>删除同步</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="277"/>
- <source>Confirm Sync Removal</source>
- <translation>确认删除同步</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="278"/>
+ <location filename="../src/gui/accountsettings.cpp" line="283"/>
<source><p>Do you really want to stop syncing the folder <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="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="452"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="448"/>
+ <location filename="../src/gui/accountsettings.cpp" line="453"/>
<source>%1 of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="453"/>
+ <location filename="../src/gui/accountsettings.cpp" line="462"/>
<source>Currently there is no storage usage information available.</source>
<translation>目前没有储存使用量信息可用。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="507"/>
<source>No %1 connection configured.</source>
<translation>没有 %1 连接配置。</translation>
</message>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="95"/>
+ <location filename="../src/gui/accountstate.cpp" line="99"/>
<source>Signed out</source>
<translation>已登出</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="97"/>
+ <location filename="../src/gui/accountstate.cpp" line="101"/>
<source>Disconnected</source>
<translation>连接已断开</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="99"/>
+ <location filename="../src/gui/accountstate.cpp" line="103"/>
<source>Connected</source>
<translation>已连接</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="101"/>
+ <location filename="../src/gui/accountstate.cpp" line="105"/>
<source>Service unavailable</source>
<translation>服务不可用</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="103"/>
+ <location filename="../src/gui/accountstate.cpp" line="107"/>
<source>Network error</source>
<translation>网络错误</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="105"/>
+ <location filename="../src/gui/accountstate.cpp" line="109"/>
<source>Configuration error</source>
<translation>配置错误</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="107"/>
+ <location filename="../src/gui/accountstate.cpp" line="111"/>
<source>Unknown account state</source>
<translation>未知的账户状态</translation>
</message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>Reauthentication required</source>
+ <translation>需要重新认证</translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>You need to re-login to continue using the account %1.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
<translation>请更新到最新的服务器版本然后重启客户端。</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="143"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="135"/>
<source>Authentication error: Either username or password are wrong.</source>
<translation>认证失败：用户名或密码错误</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="155"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="147"/>
<source>timeout</source>
<translation>超时</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="186"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="178"/>
<source>The provided credentials are not correct</source>
<translation>提供的证书不正确</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="524"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="537"/>
<source>Aborted by the user</source>
<translation>用户撤销</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="107"/>
+ <location filename="../src/gui/folder.cpp" line="108"/>
<source>Unable to create csync-context</source>
<translation>不能生成 csync-context</translation>
</message>
<translation>同步活动</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="845"/>
+ <location filename="../src/gui/folder.cpp" line="870"/>
<source>Could not read system exclude file</source>
<translation>无法读取系统排除的文件</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1102"/>
+ <location filename="../src/gui/folder.cpp" line="1127"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1115"/>
+ <location filename="../src/gui/folder.cpp" line="1140"/>
<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="1119"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Remove All Files?</source>
<translation>删除所有文件？</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1121"/>
+ <location filename="../src/gui/folder.cpp" line="1146"/>
<source>Remove all files</source>
<translation>删除所有文件</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1122"/>
+ <location filename="../src/gui/folder.cpp" line="1147"/>
<source>Keep files</source>
<translation>保持所有文件</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="275"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<source>Could not reset folder state</source>
<translation>不能重置文件夹状态</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="276"/>
+ <location filename="../src/gui/folderman.cpp" line="271"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>一个旧的同步日志 '%1' 被找到，但是不能被移除。请确定没有应用程序正在使用它。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="877"/>
+ <location filename="../src/gui/folderman.cpp" line="865"/>
<source> (backup)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="882"/>
+ <location filename="../src/gui/folderman.cpp" line="870"/>
<source> (backup %1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1091"/>
+ <location filename="../src/gui/folderman.cpp" line="1079"/>
<source>Undefined State.</source>
<translation>未知状态。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1094"/>
- <source>Waits to start syncing.</source>
- <translation>等待启动同步。</translation>
+ <location filename="../src/gui/folderman.cpp" line="1082"/>
+ <source>Waiting to start syncing.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1097"/>
+ <location filename="../src/gui/folderman.cpp" line="1085"/>
<source>Preparing for sync.</source>
<translation>准备同步。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1100"/>
+ <location filename="../src/gui/folderman.cpp" line="1088"/>
<source>Sync is running.</source>
<translation>同步正在运行。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1103"/>
+ <location filename="../src/gui/folderman.cpp" line="1091"/>
<source>Last Sync was successful.</source>
<translation>最后一次同步成功。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1108"/>
+ <location filename="../src/gui/folderman.cpp" line="1096"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>上次同步已成功，不过一些文件出现了警告。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1111"/>
+ <location filename="../src/gui/folderman.cpp" line="1099"/>
<source>Setup Error.</source>
<translation>安装失败</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1114"/>
+ <location filename="../src/gui/folderman.cpp" line="1102"/>
<source>User Abort.</source>
<translation>用户撤销。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1117"/>
+ <location filename="../src/gui/folderman.cpp" line="1105"/>
<source>Sync is paused.</source>
<translation>同步已暂停。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1123"/>
+ <location filename="../src/gui/folderman.cpp" line="1111"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (同步已暂停)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1119"/>
<source>No valid folder selected!</source>
<translation>没有选择有效的文件夹！</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1130"/>
<source>The selected path is not a folder!</source>
<translation>选择的路径不是一个文件夹！</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1146"/>
+ <location filename="../src/gui/folderman.cpp" line="1134"/>
<source>You have no permission to write to the selected folder!</source>
<translation>你没有写入所选文件夹的权限！</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1161"/>
+ <location filename="../src/gui/folderman.cpp" line="1149"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1166"/>
+ <location filename="../src/gui/folderman.cpp" line="1154"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1173"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1168"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1186"/>
+ <location filename="../src/gui/folderman.cpp" line="1174"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="85"/>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="274"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="271"/>
<source>File</source>
<translation>文件</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="228"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="224"/>
<source>Syncing selected files in your account with</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="231"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="227"/>
<source>Remote path: %1</source>
<translation>远程路径： %1</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="121"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="122"/>
<source>You need to be connected to add a folder</source>
<translation>请先登录后再添加文件夹</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="126"/>
- <source>Adding folder is disabled because your 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="131"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="132"/>
<source>Click this button to add a folder to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="141"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="142"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="156"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
<source>Error while loading the list of folders from the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="182"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="192"/>
<source>Signed out</source>
<translation>已登出</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="727"/>
- <source>Discovering '%1'</source>
- <translation>正在发现 '%1'</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="127"/>
+ <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="787"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="163"/>
+ <source>Fetching folder list from server...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="789"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="849"/>
<source>Syncing %1</source>
<translation>正在同步 %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="792"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="854"/>
<source>download %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="794"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="856"/>
<source>u2193 %1/s</source>
<translation>u2193 %1/秒</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="800"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>upload %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="802"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="864"/>
<source>u2191 %1/s</source>
<translation>u2191 %1/秒</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="807"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="869"/>
<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="811"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="873"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="827"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="889"/>
<source>%1 of %2, file %3 of %4
Total time left %5</source>
<translation>%1 / %2 （第 %3 个文件，共 %4 个）
%5 后全部完成</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
<source>file %1 of %2</source>
<translation>第 %1 个文件，共 %2 个</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="932"/>
<source>Waiting...</source>
<translation>请稍等...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="934"/>
<source>Waiting for %n other folder(s)...</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="878"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>Preparing to sync...</source>
<translation type="unfinished"/>
</message>
<name>OCC::FolderWizard</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <source>Add Folder Sync Connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderwizard.cpp" line="564"/>
- <source>Add Folder</source>
- <translation>增加目录</translation>
+ <source>Add Sync Connection</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>高级</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="61"/>
+ <location filename="../src/gui/generalsettings.ui" line="109"/>
<source>Ask confirmation before downloading folders larger than</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
+ <location filename="../src/gui/generalsettings.ui" line="129"/>
<source>MB</source>
<translation>MB</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="109"/>
+ <location filename="../src/gui/generalsettings.ui" line="159"/>
<source>Show crash reporter</source>
<translation>显示崩溃报告器</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="118"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit Ignored Files</source>
<translation>编辑忽略的文件</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="142"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
<source>Add an Account</source>
<translation>添加账号</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="167"/>
- <location filename="../src/gui/generalsettings.ui" line="173"/>
+ <location filename="../src/gui/generalsettings.ui" line="171"/>
+ <location filename="../src/gui/generalsettings.ui" line="177"/>
<source>About</source>
<translation>关于</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <location filename="../src/gui/generalsettings.ui" line="187"/>
<source>Updates</source>
<translation>更新</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="208"/>
+ <location filename="../src/gui/generalsettings.ui" line="212"/>
<source>&Restart && Update</source>
<translation>重启并更新 (&R)</translation>
</message>
</context>
-<context>
- <name>OCC::HttpCredentials</name>
- <message>
- <location filename="../src/libsync/creds/httpcredentials.cpp" line="290"/>
- <source>Reading from keychain failed with error: '%1'</source>
- <translation type="unfinished"/>
- </message>
-</context>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="32"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
<source>Please enter %1 password:
User: %2
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="41"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <source>Reading from keychain failed with error: '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
<source>Enter Password</source>
<translation>输入密码</translation>
</message>
<translation>移除</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="40"/>
<source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="109"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
<source>Could not open file</source>
<translation>不能打开文件</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="111"/>
<source>Cannot write changes to '%1'.</source>
<translation>无法向 %1 中写入修改。</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="138"/>
<source>Add Ignore Pattern</source>
<translation>增加忽略模式</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>Add a new ignore pattern:</source>
<translation>增加新的忽略模式：</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="45"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="46"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>此项目由系统在 %1 处提供，不能在这里被修改。</translation>
</message>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="163"/>
+ <location filename="../src/libsync/logger.cpp" line="190"/>
<source>Error</source>
<translation>错误</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="164"/>
+ <location filename="../src/libsync/logger.cpp" line="191"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>文件 '%1'<br/>不能写入。<br/><br/>将<b>不</b>能保存日志输出！</nobr></translation>
</message>
</message>
<message>
<location filename="../src/gui/networksettings.ui" line="203"/>
- <location filename="../src/gui/networksettings.ui" line="295"/>
+ <location filename="../src/gui/networksettings.ui" line="292"/>
<source>No limit</source>
<translation>无限制</translation>
</message>
<source>SOCKS5 proxy</source>
<translation>SOCKS5 代理</translation>
</message>
+ <message>
+ <location filename="../src/gui/networksettings.cpp" line="128"/>
+ <source>Qt >= 5.4 is required in order to use the bandwidth limit</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::OCUpdater</name>
<source>Downloading version %1. Please wait...</source>
<translation>正在下载版本 %1，请稍后....</translation>
</message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
- <source>Version %1 available. Restart application to start the update.</source>
- <translation>版本 %1 现在可用，请重启应用以开始更新。</translation>
- </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="145"/>
<source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
<source>Could not check for new updates.</source>
<translation>无法检查新更新。</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
+ <source>%1 version %2 available. Restart application to start the update.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
- <source>New version %1 available. Please use the system's update tool to install it.</source>
- <translation>新版本 %1 已经可用，使用系统更新工具升级。</translation>
+ <source>New %1 version %2 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="151"/>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="114"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="110"/>
<source>Connection Timeout</source>
<translation>连接超时</translation>
</message>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="171"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="167"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>推送 URL 传来的 JSON 无效</translation>
</message>
</context>
-<context>
- <name>OCC::PropagateDownloadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="435"/>
- <source>Sync was aborted by user.</source>
- <translation>同步被用户撤销。</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="488"/>
- <source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation>未能收到来自服务器的 E-Tag，请检查代理/网关</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="494"/>
- <source>We received a different E-Tag for resuming. Retrying next time.</source>
- <translation>我们收到了不同的恢复 E-Tag，将在下次尝试。</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="516"/>
- <source>Server returned wrong content-range</source>
- <translation>服务器返回了错误的内容长度</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="567"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation>由于本地文件名冲突，文件 %1 无法下载。</translation>
- </message>
-</context>
<context>
<name>OCC::PropagateDownloadFileQNAM</name>
<message>
<translation>由于本地文件名冲突，文件 %1 无法下载。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="457"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
+ <source>The download would reduce free disk space below %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="372"/>
+ <source>Free space on disk is less than %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="482"/>
<source>File was deleted from server</source>
<translation>已从服务器删除文件</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="506"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="531"/>
<source>The file could not be downloaded completely.</source>
<translation>文件无法完整下载。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="601"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="636"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>由于本地文件名冲突，文件 %1 无法保存。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="641"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="676"/>
<source>File has changed since discovery</source>
<translation>自从发现文件以来，它已经被改变了</translation>
</message>
<context>
<name>OCC::PropagateItemJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="92"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
<source>; Restoration Failed: %1</source>
<translation>；恢复失败：%1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="138"/>
<source>Continue blacklisting:</source>
<translation>继续黑名单：</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="230"/>
<source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove folder '%1';</source>
- <translation>无法删除文件夹 %1</translation>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="243"/>
- <location filename="../src/libsync/propagator_legacy.cpp" line="302"/>
- <source>Local file changed during sync, syncing once it arrived completely</source>
- <translation>本地文件在同步时已修改，完成后会再次同步</translation>
- </message>
+ <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="246"/>
- <source>Sync was aborted by user.</source>
- <translation>同步被用户撤销。</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="205"/>
+ <source>File name contains at least one invalid character</source>
+ <translation>文件名中存在至少一个非法字符</translation>
</message>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="252"/>
- <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
- <translation>文件已经在本地修改，但这是某个只读分享的一部分，原文件已经恢复。您的修改已保存在冲突文件中。</translation>
- </message>
-</context>
-<context>
- <name>OCC::PropagateUploadFileQNAM</name>
- <message>
- <location filename="../src/libsync/propagateupload.cpp" line="226"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="262"/>
<source>File Removed</source>
<translation>已移除文件</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="274"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="250"/>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="286"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="665"/>
<source>Local file changed during sync.</source>
<translation>本地文件在同步时已修改。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="558"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="592"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="566"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="600"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation>文件已经在本地修改，但这是某个只读分享的一部分，原文件已经恢复。您的修改已保存在冲突文件中。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="597"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="631"/>
<source>Poll URL missing</source>
<translation>缺少轮询 URL</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="620"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="654"/>
<source>The local file was removed during sync.</source>
<translation>本地文件在同步时已删除。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="646"/>
- <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
- <translation>服务器找不到上一分块。（找不到 E-tag）</translation>
+ <location filename="../src/libsync/propagateupload.cpp" line="680"/>
+ <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>取消选中的文件夹将会从本地<b>删除</b>，并不再同步到这台电脑上。</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>选择同步内容（选中需同步的远程子文件夹）</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>选择同步内容（取消选中不需同步的远程子文件夹）</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
<source>Choose What to Sync</source>
<translation>选择同步内容</translation>
</message>
<translation>大小</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
<source>No subfolders currently on the server.</source>
<translation>这个服务器上暂不存在子文件夹。</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>载入子文件夹列表时发生错误。</translation>
</message>
<translation>设置</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="80"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="84"/>
<source>Activity</source>
<translation>动态</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="86"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="90"/>
<source>General</source>
<translation>常规</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>Network</source>
<translation>网络</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharedialog.ui" line="22"/>
- <location filename="../src/gui/sharedialog.ui" line="234"/>
+ <location filename="../src/gui/sharedialog.ui" line="258"/>
<source>TextLabel</source>
<translation>文本标签</translation>
</message>
<translation>ownCloud 路径：</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="182"/>
+ <location filename="../src/gui/sharedialog.ui" line="116"/>
<source>Set &password </source>
<translation>设置密码(&p)</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="196"/>
+ <location filename="../src/gui/sharedialog.ui" line="130"/>
<source>Set &expiration date</source>
<translation>设置过期日期(&e)</translation>
</message>
+ <message>
+ <location filename="../src/gui/sharedialog.ui" line="214"/>
+ <source>Allow editing</source>
+ <translation>允许编辑</translation>
+ </message>
<message>
<location filename="../src/gui/sharedialog.ui" line="77"/>
<source>Share link</source>
<translation>分享链接</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="125"/>
+ <location filename="../src/gui/sharedialog.ui" line="203"/>
<source>Copy &link</source>
<translation>复制链接(&l)</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="142"/>
+ <location filename="../src/gui/sharedialog.ui" line="154"/>
<source>Set password</source>
<translation>设置密码</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="692"/>
- <source>%1 path: %2</source>
- <translation>%1 路径：%2</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="115"/>
+ <location filename="../src/gui/sharedialog.cpp" line="120"/>
<source>%1 Sharing</source>
<translation>%1 分享</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="103"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="112"/>
+ <location filename="../src/gui/sharedialog.cpp" line="117"/>
<source>Folder: %2</source>
<translation>文件夹：%2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="121"/>
<source>P&assword protect</source>
<translation>密码保护(&a)</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="221"/>
+ <location filename="../src/gui/sharedialog.cpp" line="214"/>
<source>Password Protected</source>
<translation>密码保护</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="382"/>
+ <location filename="../src/gui/sharedialog.cpp" line="338"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>未分配共享权限，无法共享文件。</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="528"/>
+ <location filename="../src/gui/sharedialog.cpp" line="475"/>
<source>Please Set Password</source>
<translation>请设置密码</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="564"/>
- <location filename="../src/gui/sharedialog.cpp" line="565"/>
+ <location filename="../src/gui/sharedialog.cpp" line="538"/>
+ <location filename="../src/gui/sharedialog.cpp" line="539"/>
<source>&Share link</source>
<translation>分享链接(&s)</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="583"/>
+ <location filename="../src/gui/sharedialog.cpp" line="552"/>
+ <location filename="../src/gui/sharedialog.cpp" line="564"/>
<source>OCS API error code: %1</source>
<translation>OCS API 错误代码：%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="605"/>
- <source>There is no sync folder configured.</source>
- <translation>未配置共享文件夹。</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="639"/>
- <source>A sync file with the same name exists. The file cannot be registered to sync.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="684"/>
- <source>The file cannot be synced.</source>
- <translation>此文件无法同步。</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="624"/>
- <source>Sharing of external directories is not yet working.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="473"/>
- <location filename="../src/gui/sharedialog.cpp" line="506"/>
+ <location filename="../src/gui/sharedialog.cpp" line="418"/>
+ <location filename="../src/gui/sharedialog.cpp" line="460"/>
<source>Public sh&aring requires a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="617"/>
- <source>Cannot find a folder to upload to.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
- <source>Waiting to upload...</source>
- <translation>等待上传...</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="653"/>
- <source>Unable to register in sync space.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="694"/>
- <source>Sync of registered file was not successful yet.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>Login Error</source>
<translation>登录错误</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>You must sign in as user %1</source>
<translation>你必须以用户'%1'身份登录</translation>
</message>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="452"/>
+ <location filename="../src/gui/socketapi.cpp" line="447"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>共享给 %1</translation>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="97"/>
+ <location filename="../src/libsync/syncengine.cpp" line="94"/>
<source>Success.</source>
<translation>成功。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="104"/>
+ <location filename="../src/libsync/syncengine.cpp" line="101"/>
<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="107"/>
+ <location filename="../src/libsync/syncengine.cpp" line="104"/>
<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="110"/>
+ <location filename="../src/libsync/syncengine.cpp" line="107"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync 在处理内部文件树时出错。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="113"/>
+ <location filename="../src/libsync/syncengine.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync 失败，内存不足。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>CSync 致命参数错误。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="119"/>
+ <location filename="../src/libsync/syncengine.cpp" line="116"/>
<source>CSync processing step update failed.</source>
<translation>CSync 处理步骤更新失败。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="122"/>
+ <location filename="../src/libsync/syncengine.cpp" line="119"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync 处理步骤调和失败。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="122"/>
<source>CSync could not authenticate at the proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="125"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync 无法查询代理或服务器。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="128"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync 于 %1 服务器认证失败。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="131"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync 联网失败。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="134"/>
<source>A network connection timeout happened.</source>
<translation>网络连接超时。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="137"/>
<source>A HTTP transmission error happened.</source>
<translation>HTTP 传输错误。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation>出于未处理的权限拒绝，CSync 失败。</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
<source>An error occurred while opening a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
<source>Error while reading folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="996"/>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
<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="1003"/>
+ <location filename="../src/libsync/syncengine.cpp" line="991"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync：%1 服务器空间已满。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="152"/>
<source>CSync unspecified error.</source>
<translation>CSync 未定义错误。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="155"/>
<source>Aborted by the user</source>
<translation>用户撤销</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="392"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="143"/>
<source>CSync failed to access</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <location filename="../src/libsync/syncengine.cpp" line="97"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <source>CSync failed due to unhandled permission denied.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="146"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="158"/>
<source>The service is temporarily unavailable</source>
<translation>服务暂时不可用</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="175"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>An internal error number %1 occurred.</source>
<translation>发生内部错误 %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="227"/>
<source>The item is not synced because of previous errors: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="389"/>
+ <location filename="../src/libsync/syncengine.cpp" line="386"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>符号链接不被同步支持。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="392"/>
+ <location filename="../src/libsync/syncengine.cpp" line="389"/>
<source>File is listed on the ignore list.</source>
<translation>文件在忽略列表中。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="398"/>
+ <location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename is too long.</source>
<translation>文件名过长。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="401"/>
+ <location filename="../src/libsync/syncengine.cpp" line="398"/>
<source>File is ignored because it's hidden.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="407"/>
+ <location filename="../src/libsync/syncengine.cpp" line="404"/>
<source>Stat failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="429"/>
+ <location filename="../src/libsync/syncengine.cpp" line="426"/>
<source>Filename encoding is not valid</source>
<translation>文件名编码无效</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="561"/>
+ <location filename="../src/libsync/syncengine.cpp" line="558"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="631"/>
+ <location filename="../src/libsync/syncengine.cpp" line="612"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="645"/>
<source>Unable to initialize a sync journal.</source>
<translation>无法初始化同步日志</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="718"/>
+ <location filename="../src/libsync/syncengine.cpp" line="723"/>
<source>Cannot open the sync journal</source>
<translation>无法打开同步日志</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="965"/>
- <location filename="../src/libsync/syncengine.cpp" line="972"/>
+ <location filename="../src/libsync/syncengine.cpp" line="953"/>
+ <location filename="../src/libsync/syncengine.cpp" line="960"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>已忽略（“选择同步内容”黑名单）</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <location filename="../src/libsync/syncengine.cpp" line="978"/>
<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="1023"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1011"/>
<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="1040"/>
- <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1028"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1048"/>
<source>Not allowed to remove, restoring</source>
<translation>无法删除，正在回退</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1073"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1061"/>
<source>Local files and share folder removed.</source>
<translation>本地文件和共享文件夹已被删除。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1116"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1125"/>
<source>Move not allowed because %1 is read-only</source>
<translation>无法移动，%1为是只读的</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the destination</source>
<translation>目标</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the source</source>
<translation>源</translation>
</message>
</message>
</context>
<context>
- <name>OCC::TransmissionChecksumValidator</name>
+ <name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="128"/>
<source>The checksum header is malformed.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+ <source>The checksum header contained an unknown checksum type '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="148"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation type="unfinished"/>
</message>
<source>Recent Changes</source>
<translation>最近修改</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="561"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="331"/>
<source>Managed Folders:</source>
<source>Open %1 in browser</source>
<translation>在浏览器中打开%1</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="449"/>
- <source>Log out everywhere</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="457"/>
- <source>Log in everywhere...</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="513"/>
<source>Unknown status</source>
<source>Account %1: %2</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="449"/>
+ <source>Log out of all accounts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="457"/>
+ <source>Log in to all accounts...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="532"/>
<source>Crash now</source>
<source>No items synced recently</source>
<translation>近期没有项目被同步</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="561"/>
- <source>Discovering '%1'</source>
- <translation>正在发现 '%1'</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="566"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>%L1 B</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="306"/>
+ <location filename="../src/libsync/utility.cpp" line="303"/>
<source>%Ln year(s)</source>
<translation>%Ln 年</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="307"/>
+ <location filename="../src/libsync/utility.cpp" line="304"/>
<source>%Ln month(s)</source>
<translation>%Ln 月</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="308"/>
+ <location filename="../src/libsync/utility.cpp" line="305"/>
<source>%Ln day(s)</source>
<translation>%Ln 日</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="309"/>
+ <location filename="../src/libsync/utility.cpp" line="306"/>
<source>%Ln hour(s)</source>
<translation>%Ln 小时</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="310"/>
+ <location filename="../src/libsync/utility.cpp" line="307"/>
<source>%Ln minute(s)</source>
<translation>%Ln 分钟</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="311"/>
+ <location filename="../src/libsync/utility.cpp" line="308"/>
<source>%Ln second(s)</source>
<translation>%Ln 秒</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="318"/>
<source>0 seconds</source>
<translation>0 秒</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="336"/>
+ <location filename="../src/libsync/utility.cpp" line="333"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="73"/>
+ <source>Enter your credentials to connect to the server</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <source>Sign in</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="89"/>
<source>Remove the account configuration from the client</source>
<translation>將此帳號的設定資訊從程式刪除</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="76"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Remove Account</source>
<translation>移除帳號</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="97"/>
+ <location filename="../src/gui/accountsettings.ui" line="113"/>
<source>Storage space: ...</source>
<translation>儲存空間容量: ...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="167"/>
+ <location filename="../src/gui/accountsettings.ui" line="183"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>未標示的資料夾將會從這台電腦被 <b>刪除</b> 而且不會再被同步到這台電腦 </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="211"/>
+ <location filename="../src/gui/accountsettings.ui" line="230"/>
<source>Apply</source>
<translation>套用</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="198"/>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
- <location filename="../src/gui/accountsettings.cpp" line="571"/>
+ <location filename="../src/gui/accountsettings.ui" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="289"/>
+ <location filename="../src/gui/accountsettings.cpp" line="646"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
<translation>以 <user> 的身分連接 <server></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="115"/>
+ <location filename="../src/gui/accountsettings.cpp" line="121"/>
<source>No account configured.</source>
<translation>沒有設置帳號。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="161"/>
+ <source>Choose what to sync</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="168"/>
+ <source>Remove folder sync connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="234"/>
<source>Folder creation failed</source>
<translation>資料夾建立失敗</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="230"/>
+ <location filename="../src/gui/accountsettings.cpp" line="235"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation><p>無法建立本地資料夾 <i>%1</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="283"/>
- <source>Stop syncing</source>
- <translation>停止同步</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
+ <source>Confirm Folder Sync Connection Removal</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="309"/>
+ <location filename="../src/gui/accountsettings.cpp" line="288"/>
+ <source>Remove Folder Sync Connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="314"/>
<source>Confirm Folder Reset</source>
<translation>資料夾重設確認</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="310"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source><p>Do you really want to reset folder <i>%1</i> and rebuild your client database?</p><p><b>Note:</b> This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.</p></source>
<translation><p>你真的要重設資料夾 <i>%1</i> 且重新建置此程式的資料庫?</p><p><b>注意:</b> 這個功能是被設計用來維護時使用的，沒有檔案會被刪除，但可能會有大量的資料傳輸，依照檔案大小的不同，可能會耗時數分鐘至數小時，請詢問系統管理員之後再決定使用這個選項。</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="391"/>
+ <location filename="../src/gui/accountsettings.cpp" line="396"/>
<source>Sync Running</source>
<translation>正在同步中</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="392"/>
+ <location filename="../src/gui/accountsettings.cpp" line="397"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>正在同步中<br/>你真的想要中斷？</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="472"/>
+ <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <source>%1 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="485"/>
<source>%1 as <i>%2</i></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="476"/>
+ <location filename="../src/gui/accountsettings.cpp" line="495"/>
<source>Connected to %1.</source>
<translation>已連線到 %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="478"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>伺服器 ％1 暫時無法使用。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="480"/>
+ <location filename="../src/gui/accountsettings.cpp" line="499"/>
<source>Signed out from %1.</source>
<translation>從 %1 登出</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="482"/>
+ <location filename="../src/gui/accountsettings.cpp" line="501"/>
<source>No connection to %1 at %2.</source>
<translation>沒有從 %2 連線到 %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
- <source>There are new folders that were not synchronized because they are too big: %1</source>
- <translation>有部份的資料夾因為容量太大沒有辦法同步: %1</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="536"/>
- <source>, </source>
- <translation>, </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="605"/>
+ <source>There are new folders that were not synchronized because they are too big: </source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="563"/>
+ <location filename="../src/gui/accountsettings.cpp" line="638"/>
<source>Confirm Account Removal</source>
<translation>確認移除帳號</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="564"/>
+ <location filename="../src/gui/accountsettings.cpp" line="639"/>
<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="570"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>Remove connection</source>
<translation>移除連線</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="165"/>
+ <location filename="../src/gui/accountsettings.cpp" line="158"/>
<source>Open folder</source>
<translation>開啟資料夾</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="168"/>
- <source>Choose What to Sync</source>
- <translation>選擇要同步的項目</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Resume sync</source>
<translation>繼續同步</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="172"/>
+ <location filename="../src/gui/accountsettings.cpp" line="165"/>
<source>Pause sync</source>
<translation>暫停同步</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="176"/>
- <source>Remove sync</source>
- <translation>移除同步</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="277"/>
- <source>Confirm Sync Removal</source>
- <translation>確定移除同步</translation>
- </message>
- <message>
- <location filename="../src/gui/accountsettings.cpp" line="278"/>
+ <location filename="../src/gui/accountsettings.cpp" line="283"/>
<source><p>Do you really want to stop syncing the folder <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="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="452"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) 中的 %2 正在使用， 有些資料夾，包括網路掛載或分享資料夾，可能有不同的限制。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="448"/>
+ <location filename="../src/gui/accountsettings.cpp" line="453"/>
<source>%1 of %2 in use</source>
<translation>已使用 %2 中的 %1%</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="453"/>
+ <location filename="../src/gui/accountsettings.cpp" line="462"/>
<source>Currently there is no storage usage information available.</source>
<translation>目前無法查詢儲存空間使用資訊。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="507"/>
<source>No %1 connection configured.</source>
<translation>沒有 %1 連線設置。</translation>
</message>
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="95"/>
+ <location filename="../src/gui/accountstate.cpp" line="99"/>
<source>Signed out</source>
<translation>已登出</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="97"/>
+ <location filename="../src/gui/accountstate.cpp" line="101"/>
<source>Disconnected</source>
<translation>已經離線</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="99"/>
+ <location filename="../src/gui/accountstate.cpp" line="103"/>
<source>Connected</source>
<translation>已連線</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="101"/>
+ <location filename="../src/gui/accountstate.cpp" line="105"/>
<source>Service unavailable</source>
<translation>服務無法使用</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="103"/>
+ <location filename="../src/gui/accountstate.cpp" line="107"/>
<source>Network error</source>
<translation>網路異常</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="105"/>
+ <location filename="../src/gui/accountstate.cpp" line="109"/>
<source>Configuration error</source>
<translation>設定錯誤</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="107"/>
+ <location filename="../src/gui/accountstate.cpp" line="111"/>
<source>Unknown account state</source>
<translation>未知的帳號狀態</translation>
</message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>Reauthentication required</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountstate.cpp" line="245"/>
+ <source>You need to re-login to continue using the account %1.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::AddCertificateDialog</name>
<translation>請將伺服器端更新到最新版並重新啟動客戶端</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="143"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="135"/>
<source>Authentication error: Either username or password are wrong.</source>
<translation>驗證錯誤︰使用者名稱或是密碼錯誤</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="155"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="147"/>
<source>timeout</source>
<translation>逾時</translation>
</message>
<message>
- <location filename="../src/libsync/connectionvalidator.cpp" line="186"/>
+ <location filename="../src/libsync/connectionvalidator.cpp" line="178"/>
<source>The provided credentials are not correct</source>
<translation>提供的憑證不正確</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="524"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="537"/>
<source>Aborted by the user</source>
<translation>使用者中斷</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="107"/>
+ <location filename="../src/gui/folder.cpp" line="108"/>
<source>Unable to create csync-context</source>
<translation>無法建立csync-context</translation>
</message>
<translation>同步活動</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="845"/>
+ <location filename="../src/gui/folder.cpp" line="870"/>
<source>Could not read system exclude file</source>
<translation>無法讀取系統的排除檔案</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1102"/>
+ <location filename="../src/gui/folder.cpp" line="1127"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>一個大於 %1 MB 的資料夾已經新增至: %2.
如果您想要下載它的話，請至設定中選取。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1115"/>
+ <location filename="../src/gui/folder.cpp" line="1140"/>
<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="1119"/>
+ <location filename="../src/gui/folder.cpp" line="1144"/>
<source>Remove All Files?</source>
<translation>移除所有檔案?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1121"/>
+ <location filename="../src/gui/folder.cpp" line="1146"/>
<source>Remove all files</source>
<translation>移除所有檔案</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1122"/>
+ <location filename="../src/gui/folder.cpp" line="1147"/>
<source>Keep files</source>
<translation>保留檔案</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="275"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<source>Could not reset folder state</source>
<translation>無法重置資料夾狀態</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="276"/>
+ <location filename="../src/gui/folderman.cpp" line="271"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>發現較舊的同步處理日誌'%1'，但無法移除。請確認沒有應用程式正在使用它。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="877"/>
+ <location filename="../src/gui/folderman.cpp" line="865"/>
<source> (backup)</source>
<translation>（備份）</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="882"/>
+ <location filename="../src/gui/folderman.cpp" line="870"/>
<source> (backup %1)</source>
<translation>(備份 %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1091"/>
+ <location filename="../src/gui/folderman.cpp" line="1079"/>
<source>Undefined State.</source>
<translation>未知狀態</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1094"/>
- <source>Waits to start syncing.</source>
- <translation>等待啟動同步</translation>
+ <location filename="../src/gui/folderman.cpp" line="1082"/>
+ <source>Waiting to start syncing.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1097"/>
+ <location filename="../src/gui/folderman.cpp" line="1085"/>
<source>Preparing for sync.</source>
<translation>正在準備同步。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1100"/>
+ <location filename="../src/gui/folderman.cpp" line="1088"/>
<source>Sync is running.</source>
<translation>同步執行中</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1103"/>
+ <location filename="../src/gui/folderman.cpp" line="1091"/>
<source>Last Sync was successful.</source>
<translation>最後一次同步成功</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1108"/>
+ <location filename="../src/gui/folderman.cpp" line="1096"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>最新一次的同步已經成功，但是有部份檔案有問題</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1111"/>
+ <location filename="../src/gui/folderman.cpp" line="1099"/>
<source>Setup Error.</source>
<translation>安裝失敗</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1114"/>
+ <location filename="../src/gui/folderman.cpp" line="1102"/>
<source>User Abort.</source>
<translation>使用者中斷。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1117"/>
+ <location filename="../src/gui/folderman.cpp" line="1105"/>
<source>Sync is paused.</source>
<translation>同步已暫停</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1123"/>
+ <location filename="../src/gui/folderman.cpp" line="1111"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (同步暫停)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1119"/>
<source>No valid folder selected!</source>
<translation>沒有選擇有效的資料夾</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1130"/>
<source>The selected path is not a folder!</source>
<translation>所選的路徑並非資料夾!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1146"/>
+ <location filename="../src/gui/folderman.cpp" line="1134"/>
<source>You have no permission to write to the selected folder!</source>
<translation>您沒有權限來寫入被選取的資料夾!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1161"/>
+ <location filename="../src/gui/folderman.cpp" line="1149"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>本地資料夾 %1 已經被資料夾同步功能使用，請選擇其他資料夾！</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1166"/>
+ <location filename="../src/gui/folderman.cpp" line="1154"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>本地資料夾 %1 裡已經有被資料夾同步功能使用的資料夾，請選擇其他資料夾！</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1173"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>本地資料夾 %1 是一個捷徑，此資料夾裡已經有被資料夾同步功能使用的資料夾，請選擇其他資料夾！</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1168"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>本地資料夾 %1 是被包含在一個已經被資料夾同步功能使用的資料夾，請選擇其他資料夾！</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1186"/>
+ <location filename="../src/gui/folderman.cpp" line="1174"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>本地資料夾 %1 是一個捷徑，此捷徑的目標是被包含在一個已經被資料夾同步功能使用的資料夾，請選擇其他資料夾！</translation>
</message>
<translation>新增資料夾同步功能的連線</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="85"/>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="274"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="271"/>
<source>File</source>
<translation>檔案</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="228"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="224"/>
<source>Syncing selected files in your account with</source>
- <translation type="unfinished"/>
+ <translation>正在同步您的帳號所選取的檔案</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusdelegate.cpp" line="231"/>
+ <location filename="../src/gui/folderstatusdelegate.cpp" line="227"/>
<source>Remote path: %1</source>
<translation>遠端路徑: %1</translation>
</message>
<context>
<name>OCC::FolderStatusModel</name>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="121"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="122"/>
<source>You need to be connected to add a folder</source>
<translation>您必須連上伺服器才能新增資料夾</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="126"/>
- <source>Adding folder is disabled because your 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="131"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="132"/>
<source>Click this button to add a folder to synchronize.</source>
<translation>點擊此按鈕來新增同步資料夾</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="141"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="142"/>
<source>%1 (%2)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="156"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="161"/>
<source>Error while loading the list of folders from the server.</source>
<translation>從伺服器端同步資料夾清單時發生錯誤。</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="182"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="192"/>
<source>Signed out</source>
<translation>已登出</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="727"/>
- <source>Discovering '%1'</source>
- <translation>正在檢索 '%1'</translation>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="127"/>
+ <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="163"/>
+ <source>Fetching folder list from server...</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="787"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="789"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="849"/>
<source>Syncing %1</source>
<translation>同步 %1</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="792"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="854"/>
<source>download %1/s</source>
<translation>下載 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="794"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="856"/>
<source>u2193 %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="800"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="862"/>
<source>upload %1/s</source>
<translation>上傳 %1/s</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="802"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="864"/>
<source>u2191 %1/s</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="807"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="869"/>
<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="811"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="873"/>
<source>%1 %2</source>
<extracomment>Example text: "uploading foobar.png"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="827"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="889"/>
<source>%1 of %2, file %3 of %4
Total time left %5</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="833"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="895"/>
<source>file %1 of %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="870"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="932"/>
<source>Waiting...</source>
<translation>等待中...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="934"/>
<source>Waiting for %n other folder(s)...</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="878"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="940"/>
<source>Preparing to sync...</source>
<translation>正在準備同步...</translation>
</message>
<name>OCC::FolderWizard</name>
<message>
<location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <source>Add Folder Sync Connection</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../src/gui/folderwizard.cpp" line="564"/>
- <source>Add Folder</source>
- <translation>新增資料夾</translation>
+ <source>Add Sync Connection</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>進階</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="61"/>
+ <location filename="../src/gui/generalsettings.ui" line="109"/>
<source>Ask confirmation before downloading folders larger than</source>
<translation>要求確認資訊當下載的資料夾大於</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="81"/>
+ <location filename="../src/gui/generalsettings.ui" line="129"/>
<source>MB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="109"/>
+ <location filename="../src/gui/generalsettings.ui" line="159"/>
<source>Show crash reporter</source>
<translation>顯示意外回報器</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="118"/>
+ <location filename="../src/gui/generalsettings.ui" line="61"/>
<source>Edit Ignored Files</source>
<translation>編輯忽略的檔案</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="142"/>
+ <location filename="../src/gui/generalsettings.ui" line="85"/>
<source>Add an Account</source>
<translation>新增一個帳號</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="167"/>
- <location filename="../src/gui/generalsettings.ui" line="173"/>
+ <location filename="../src/gui/generalsettings.ui" line="171"/>
+ <location filename="../src/gui/generalsettings.ui" line="177"/>
<source>About</source>
<translation>關於</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="183"/>
+ <location filename="../src/gui/generalsettings.ui" line="187"/>
<source>Updates</source>
<translation>更新</translation>
</message>
<message>
- <location filename="../src/gui/generalsettings.ui" line="208"/>
+ <location filename="../src/gui/generalsettings.ui" line="212"/>
<source>&Restart && Update</source>
<translation>重新啟動並更新 (&R)</translation>
</message>
</context>
-<context>
- <name>OCC::HttpCredentials</name>
- <message>
- <location filename="../src/libsync/creds/httpcredentials.cpp" line="290"/>
- <source>Reading from keychain failed with error: '%1'</source>
- <translation>從授權碼讀取資料時失敗，錯誤: '%1'</translation>
- </message>
-</context>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="32"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
<source>Please enter %1 password:
User: %2
</translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="41"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <source>Reading from keychain failed with error: '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
<source>Enter Password</source>
<translation>輸入密碼</translation>
</message>
<translation>移除</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="39"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="40"/>
<source>Files or folders matching a pattern will not be synchronized.
Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="109"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
<source>Could not open file</source>
<translation>無法開啟檔案</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="111"/>
<source>Cannot write changes to '%1'.</source>
<translation>%1 無法寫入變更。</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="134"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="138"/>
<source>Add Ignore Pattern</source>
<translation>增加忽略格式</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="135"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="139"/>
<source>Add a new ignore pattern:</source>
<translation>增加一個新的忽略格式:</translation>
</message>
<message>
- <location filename="../src/gui/ignorelisteditor.cpp" line="45"/>
+ <location filename="../src/gui/ignorelisteditor.cpp" line="46"/>
<source>This entry is provided by the system at '%1' and cannot be modified in this view.</source>
<translation>這個項目是由系統提供在 '%1' 且不能在這個頁面被修改</translation>
</message>
<context>
<name>OCC::Logger</name>
<message>
- <location filename="../src/libsync/logger.cpp" line="163"/>
+ <location filename="../src/libsync/logger.cpp" line="190"/>
<source>Error</source>
<translation>錯誤</translation>
</message>
<message>
- <location filename="../src/libsync/logger.cpp" line="164"/>
+ <location filename="../src/libsync/logger.cpp" line="191"/>
<source><nobr>File '%1'<br/>cannot be opened for writing.<br/><br/>The log output can <b>not</b> be saved!</nobr></source>
<translation><nobr>檔案 '%1'<br/>無法開啟與寫入<br/><br/>記錄 <b>無法</b> 被儲存</nobr></translation>
</message>
</message>
<message>
<location filename="../src/gui/networksettings.ui" line="203"/>
- <location filename="../src/gui/networksettings.ui" line="295"/>
+ <location filename="../src/gui/networksettings.ui" line="292"/>
<source>No limit</source>
<translation>沒有限制</translation>
</message>
<source>SOCKS5 proxy</source>
<translation>SOCKS5 代理伺服器</translation>
</message>
+ <message>
+ <location filename="../src/gui/networksettings.cpp" line="128"/>
+ <source>Qt >= 5.4 is required in order to use the bandwidth limit</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::OCUpdater</name>
<source>Downloading version %1. Please wait...</source>
<translation>正在下載版本 %1，請稍候...</translation>
</message>
- <message>
- <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
- <source>Version %1 available. Restart application to start the update.</source>
- <translation>版本 %1 已經可以安裝，請重新啟動應用程式開始安裝更新。</translation>
- </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="145"/>
<source>Could not download update. Please click <a href='%1'>here</a> to download the update manually.</source>
<source>Could not check for new updates.</source>
<translation>無法檢查是否有新更新檔。</translation>
</message>
+ <message>
+ <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
+ <source>%1 version %2 available. Restart application to start the update.</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
- <source>New version %1 available. Please use the system's update tool to install it.</source>
- <translation>新版本 %1 已經可以安裝了， 請使用系統的安裝工具來安裝。</translation>
+ <source>New %1 version %2 available. Please use the system's update tool to install it.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="151"/>
<context>
<name>OCC::PUTFileJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="114"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="110"/>
<source>Connection Timeout</source>
<translation>連線逾時</translation>
</message>
<context>
<name>OCC::PollJob</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="171"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="167"/>
<source>Invalid JSON reply from the poll URL</source>
<translation>不合法的JSON資訊從URL中回傳</translation>
</message>
</context>
-<context>
- <name>OCC::PropagateDownloadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="435"/>
- <source>Sync was aborted by user.</source>
- <translation>使用者中斷同步</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="488"/>
- <source>No E-Tag received from server, check Proxy/Gateway</source>
- <translation>沒有收到來自伺服器的 E-tag，請檢查代理伺服器或網路閘道</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="494"/>
- <source>We received a different E-Tag for resuming. Retrying next time.</source>
- <translation>在復原時收到了不同的 E-Tag，將在下一次重新嘗試取得</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="516"/>
- <source>Server returned wrong content-range</source>
- <translation>伺服器回應錯誤的內容長度</translation>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="567"/>
- <source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation>檔案 %1 無法被下載，因為本地端的檔案名稱已毀損!</translation>
- </message>
-</context>
<context>
<name>OCC::PropagateDownloadFileQNAM</name>
<message>
<translation>檔案 %1 無法被下載，因為本地端的檔案名稱已毀損!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="457"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="367"/>
+ <source>The download would reduce free disk space below %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="372"/>
+ <source>Free space on disk is less than %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/propagatedownload.cpp" line="482"/>
<source>File was deleted from server</source>
<translation>檔案已從伺服器被刪除</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="506"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="531"/>
<source>The file could not be downloaded completely.</source>
<translation>檔案下載無法完成。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="601"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="636"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
<translation>檔案 %1 無法存檔，因為本地端的檔案名稱已毀損!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="641"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="676"/>
<source>File has changed since discovery</source>
<translation>尋找的過程中檔案已經被更改</translation>
</message>
<context>
<name>OCC::PropagateItemJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="92"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
<source>; Restoration Failed: %1</source>
<translation>; 重新儲存失敗 %1</translation>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="138"/>
<source>Continue blacklisting:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="211"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="230"/>
<source>A file or folder was removed from a read only share, but restoring failed: %1</source>
<translation type="unfinished"/>
</message>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
- <source>Could not remove folder '%1';</source>
- <translation>無法移除資料夾 '%1';</translation>
+ <source>Could not remove folder '%1'</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="113"/>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileLegacy</name>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="243"/>
- <location filename="../src/libsync/propagator_legacy.cpp" line="302"/>
- <source>Local file changed during sync, syncing once it arrived completely</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="246"/>
- <source>Sync was aborted by user.</source>
- <translation>使用者中斷同步</translation>
- </message>
+ <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagator_legacy.cpp" line="252"/>
- <source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="205"/>
+ <source>File name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
-</context>
-<context>
- <name>OCC::PropagateUploadFileQNAM</name>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="226"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="262"/>
<source>File Removed</source>
<translation>檔案已移除</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="238"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="274"/>
<source>Local file changed during syncing. It will be resumed.</source>
<translation>本地端的檔案在同步的過程中被更改，此檔案將會被還原。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="250"/>
- <location filename="../src/libsync/propagateupload.cpp" line="631"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="286"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="665"/>
<source>Local file changed during sync.</source>
<translation>本地端的檔案在同步過程中被更改。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="558"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="592"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="566"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="600"/>
<source>The file was edited locally but is part of a read only share. It is restored and your edit is in the conflict file.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="597"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="631"/>
<source>Poll URL missing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="620"/>
+ <location filename="../src/libsync/propagateupload.cpp" line="654"/>
<source>The local file was removed during sync.</source>
<translation>本地端的檔案在同步過程中被刪除。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateupload.cpp" line="646"/>
- <source>The server did not acknowledge the last chunk. (No e-tag were present)</source>
+ <location filename="../src/libsync/propagateupload.cpp" line="680"/>
+ <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
<translation type="unfinished"/>
</message>
</context>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Unchecked folders will be <b>removed</b> from your local file system and will not be synchronized to this computer anymore</source>
<translation>未標示的資料夾將會從這台電腦被 <b>刪除</b> 而且不會再被同步到這台電腦 </translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>請選擇要同步的內容: 您可以選擇想要同步的遠端子資料夾。</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>請選擇要同步的內容: 您可以不要點選不想同步的遠端子資料夾。</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
<source>Choose What to Sync</source>
<translation>選擇要同步的項目</translation>
</message>
<translation>大小</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
<source>No subfolders currently on the server.</source>
<translation>目前沒有子資料夾在伺服器上。</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>在讀取子資料夾清單中發生錯誤。</translation>
</message>
<translation>設定</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="80"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="84"/>
<source>Activity</source>
<translation>活動</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="86"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="90"/>
<source>General</source>
<translation>一般</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="96"/>
<source>Network</source>
<translation>網路</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharedialog.ui" line="22"/>
- <location filename="../src/gui/sharedialog.ui" line="234"/>
+ <location filename="../src/gui/sharedialog.ui" line="258"/>
<source>TextLabel</source>
<translation>文字標籤</translation>
</message>
<translation>ownCloud 路徑:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="182"/>
+ <location filename="../src/gui/sharedialog.ui" line="116"/>
<source>Set &password </source>
<translation>設定 &password</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="196"/>
+ <location filename="../src/gui/sharedialog.ui" line="130"/>
<source>Set &expiration date</source>
<translation>設定 &expiration date</translation>
</message>
+ <message>
+ <location filename="../src/gui/sharedialog.ui" line="214"/>
+ <source>Allow editing</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/sharedialog.ui" line="77"/>
<source>Share link</source>
<translation>分享連結</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="125"/>
+ <location filename="../src/gui/sharedialog.ui" line="203"/>
<source>Copy &link</source>
<translation>複製 &link</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.ui" line="142"/>
+ <location filename="../src/gui/sharedialog.ui" line="154"/>
<source>Set password</source>
<translation>設定密碼</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="692"/>
- <source>%1 path: %2</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="115"/>
+ <location filename="../src/gui/sharedialog.cpp" line="120"/>
<source>%1 Sharing</source>
<translation>%1 分享</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="103"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="112"/>
+ <location filename="../src/gui/sharedialog.cpp" line="117"/>
<source>Folder: %2</source>
<translation>資料夾: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="116"/>
+ <location filename="../src/gui/sharedialog.cpp" line="121"/>
<source>P&assword protect</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="221"/>
+ <location filename="../src/gui/sharedialog.cpp" line="214"/>
<source>Password Protected</source>
<translation>密碼保護</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="382"/>
+ <location filename="../src/gui/sharedialog.cpp" line="338"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>這個檔案無法被分享，並沒有分享此檔案的權限。</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="528"/>
+ <location filename="../src/gui/sharedialog.cpp" line="475"/>
<source>Please Set Password</source>
<translation>請設定密碼</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="564"/>
- <location filename="../src/gui/sharedialog.cpp" line="565"/>
+ <location filename="../src/gui/sharedialog.cpp" line="538"/>
+ <location filename="../src/gui/sharedialog.cpp" line="539"/>
<source>&Share link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="583"/>
+ <location filename="../src/gui/sharedialog.cpp" line="552"/>
+ <location filename="../src/gui/sharedialog.cpp" line="564"/>
<source>OCS API error code: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="605"/>
- <source>There is no sync folder configured.</source>
- <translation>尚未設置同步資料夾。</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="639"/>
- <source>A sync file with the same name exists. The file cannot be registered to sync.</source>
- <translation>同步的檔案有相同檔名的檔案存在，這個檔案將無法被同步。</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="684"/>
- <source>The file cannot be synced.</source>
- <translation>這個檔案無法被同步。</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="624"/>
- <source>Sharing of external directories is not yet working.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="473"/>
- <location filename="../src/gui/sharedialog.cpp" line="506"/>
+ <location filename="../src/gui/sharedialog.cpp" line="418"/>
+ <location filename="../src/gui/sharedialog.cpp" line="460"/>
<source>Public sh&aring requires a password</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="617"/>
- <source>Cannot find a folder to upload to.</source>
- <translation>無法找到該資料夾上傳。</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="651"/>
- <source>Waiting to upload...</source>
- <translation>上傳等候中...</translation>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="653"/>
- <source>Unable to register in sync space.</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/sharedialog.cpp" line="694"/>
- <source>Sync of registered file was not successful yet.</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>Login Error</source>
<translation>登入錯誤</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="291"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="224"/>
<source>You must sign in as user %1</source>
<translation>您必須以 %1 使用者登入</translation>
</message>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="452"/>
+ <location filename="../src/gui/socketapi.cpp" line="447"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>與 %1 分享</translation>
<context>
<name>OCC::SyncEngine</name>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="97"/>
+ <location filename="../src/libsync/syncengine.cpp" line="94"/>
<source>Success.</source>
<translation>成功。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="104"/>
+ <location filename="../src/libsync/syncengine.cpp" line="101"/>
<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="107"/>
+ <location filename="../src/libsync/syncengine.cpp" line="104"/>
<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="110"/>
+ <location filename="../src/libsync/syncengine.cpp" line="107"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync 處理內部資料樹時發生錯誤</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="113"/>
+ <location filename="../src/libsync/syncengine.cpp" line="110"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync 無法取得記憶體空間。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="116"/>
+ <location filename="../src/libsync/syncengine.cpp" line="113"/>
<source>CSync fatal parameter error.</source>
<translation>CSync 參數錯誤。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="119"/>
+ <location filename="../src/libsync/syncengine.cpp" line="116"/>
<source>CSync processing step update failed.</source>
<translation>CSync 處理步驟 "update" 失敗。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="122"/>
+ <location filename="../src/libsync/syncengine.cpp" line="119"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync 處理步驟 "reconcile" 失敗。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="122"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync 無法在代理伺服器認證。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="125"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync 查詢代理伺服器或伺服器失敗。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="128"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync 於伺服器 %1 認證失敗。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="131"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync 無法連接到網路。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="134"/>
<source>A network connection timeout happened.</source>
<translation>網路連線逾時。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="137"/>
<source>A HTTP transmission error happened.</source>
<translation>HTTP 傳輸錯誤。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
- <source>CSync failed due to not handled permission deniend.</source>
- <translation>CSync 失敗，由於未處理的存取被拒。</translation>
- </message>
- <message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="161"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation>掛載的資料夾暫時無法在伺服器上使用</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="164"/>
<source>An error occurred while opening a folder</source>
<translation>開啟資料夾時發生錯誤。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="167"/>
<source>Error while reading folder.</source>
<translation>讀取資料夾時發生錯誤。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="996"/>
+ <location filename="../src/libsync/syncengine.cpp" line="984"/>
<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="1003"/>
+ <location filename="../src/libsync/syncengine.cpp" line="991"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="149"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync：伺服器 %1 沒有可用空間。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="152"/>
<source>CSync unspecified error.</source>
<translation>CSync 未知的錯誤。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="155"/>
<source>Aborted by the user</source>
<translation>使用者中斷</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="395"/>
+ <location filename="../src/libsync/syncengine.cpp" line="392"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>檔案名稱含有非法的字元符號導致無法跨平台同步。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="143"/>
<source>CSync failed to access</source>
<translation>CSync 存取失敗。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="100"/>
+ <location filename="../src/libsync/syncengine.cpp" line="97"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <source>CSync failed due to unhandled permission denied.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="146"/>
<source>CSync tried to create a folder that already exists.</source>
<translation>CSync 試圖建立一個已經存在的資料夾。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="158"/>
<source>The service is temporarily unavailable</source>
<translation>這個服務暫時無法使用。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="175"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>An internal error number %1 occurred.</source>
<translation>發生內部錯誤，錯誤代碼 %1。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="230"/>
+ <location filename="../src/libsync/syncengine.cpp" line="227"/>
<source>The item is not synced because of previous errors: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="389"/>
+ <location filename="../src/libsync/syncengine.cpp" line="386"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="392"/>
+ <location filename="../src/libsync/syncengine.cpp" line="389"/>
<source>File is listed on the ignore list.</source>
<translation>檔案被列在忽略清單。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="398"/>
+ <location filename="../src/libsync/syncengine.cpp" line="395"/>
<source>Filename is too long.</source>
<translation>檔案名稱太長了。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="401"/>
+ <location filename="../src/libsync/syncengine.cpp" line="398"/>
<source>File is ignored because it's hidden.</source>
<translation>這個檔案被忽略了，因為他是隱藏檔。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="407"/>
+ <location filename="../src/libsync/syncengine.cpp" line="404"/>
<source>Stat failed.</source>
<translation>狀態失敗。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="429"/>
+ <location filename="../src/libsync/syncengine.cpp" line="426"/>
<source>Filename encoding is not valid</source>
<translation>檔案名稱編碼是無效的</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="561"/>
+ <location filename="../src/libsync/syncengine.cpp" line="558"/>
<source>Invalid characters, please rename "%1"</source>
<translation>無效的字元，請您重新命名 "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="631"/>
+ <location filename="../src/libsync/syncengine.cpp" line="612"/>
+ <source>Only %1 are available, need at least %2 to start</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="645"/>
<source>Unable to initialize a sync journal.</source>
<translation>同步處理日誌無法初始化</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="718"/>
+ <location filename="../src/libsync/syncengine.cpp" line="723"/>
<source>Cannot open the sync journal</source>
<translation>同步處理日誌無法開啟</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="965"/>
- <location filename="../src/libsync/syncengine.cpp" line="972"/>
+ <location filename="../src/libsync/syncengine.cpp" line="953"/>
+ <location filename="../src/libsync/syncengine.cpp" line="960"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="990"/>
+ <location filename="../src/libsync/syncengine.cpp" line="978"/>
<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="1023"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1011"/>
<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="1040"/>
- <location filename="../src/libsync/syncengine.cpp" line="1060"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1028"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1048"/>
<source>Not allowed to remove, restoring</source>
<translation>不允許刪除，復原中</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1073"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1061"/>
<source>Local files and share folder removed.</source>
<translation>本地端檔案和共享資料夾已被刪除。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1116"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1125"/>
<source>Move not allowed because %1 is read-only</source>
<translation>不允許移動，因為 %1 是唯讀的</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the destination</source>
<translation>目標</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1138"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1126"/>
<source>the source</source>
<translation>來源</translation>
</message>
</message>
</context>
<context>
- <name>OCC::TransmissionChecksumValidator</name>
+ <name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="111"/>
- <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="133"/>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="128"/>
<source>The checksum header is malformed.</source>
- <translation>校驗碼異常。</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="143"/>
+ <source>The checksum header contained an unknown checksum type '%1'</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/transmissionchecksumvalidator.cpp" line="148"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation type="unfinished"/>
</message>
<source>Recent Changes</source>
<translation>最近的更動</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="561"/>
+ <source>Checking for changes in '%1'</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="331"/>
<source>Managed Folders:</source>
<source>Open %1 in browser</source>
<translation>瀏覽器中開啟 %1</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="449"/>
- <source>Log out everywhere</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="457"/>
- <source>Log in everywhere...</source>
- <translation type="unfinished"/>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="513"/>
<source>Unknown status</source>
<source>Account %1: %2</source>
<translation>帳號 %1: %2</translation>
</message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="449"/>
+ <source>Log out of all accounts</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="457"/>
+ <source>Log in to all accounts...</source>
+ <translation type="unfinished"/>
+ </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="532"/>
<source>Crash now</source>
<source>No items synced recently</source>
<translation>最近沒有項目被同步</translation>
</message>
- <message>
- <location filename="../src/gui/owncloudgui.cpp" line="561"/>
- <source>Discovering '%1'</source>
- <translation>正在檢索 '%1'</translation>
- </message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="566"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>%L1 B</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="306"/>
+ <location filename="../src/libsync/utility.cpp" line="303"/>
<source>%Ln year(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="307"/>
+ <location filename="../src/libsync/utility.cpp" line="304"/>
<source>%Ln month(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="308"/>
+ <location filename="../src/libsync/utility.cpp" line="305"/>
<source>%Ln day(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="309"/>
+ <location filename="../src/libsync/utility.cpp" line="306"/>
<source>%Ln hour(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="310"/>
+ <location filename="../src/libsync/utility.cpp" line="307"/>
<source>%Ln minute(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="311"/>
+ <location filename="../src/libsync/utility.cpp" line="308"/>
<source>%Ln second(s)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="318"/>
<source>0 seconds</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="336"/>
+ <location filename="../src/libsync/utility.cpp" line="333"/>
<source>%1 %2</source>
<translation type="unfinished"/>
</message>
projects / nextcloud-desktop.git / commitdiff